[BACK]Return to Enrollment.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / enrollment

Diff for /loncom/enrollment/Enrollment.pm between versions 1.33 and 1.35

version 1.33, 2007/03/02 21:38:18 version 1.35, 2007/07/02 03:37:19
Line 428  sub update_LC { Line 428  sub update_LC {
     if ($switchcount > 0) {      if ($switchcount > 0) {
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
             $switchresult = substr($switchresult,0,rindex($switchresult,"<li>"));              $switchresult = substr($switchresult,0,rindex($switchresult,"<li>"));
             print STDERR &mt("[quant,_1,student]",$switchcount)."\n";   
             $switchresult = &mt("The following [quant,_1,student] switched sections in this LON-CAPA course:",$switchcount).'<br/><ul><li>'.$switchresult.'</ul><br/><br/>';              $switchresult = &mt("The following [quant,_1,student] switched sections in this LON-CAPA course:",$switchcount).'<br/><ul><li>'.$switchresult.'</ul><br/><br/>';
         } else {          } else {
             $switchresult = &mt("The following [quant,_1,student] switched sections in this LON-CAPA course:",$switchcount)."\n\n".$switchresult."\n\n";              $switchresult = &mt("The following [quant,_1,student] switched sections in this LON-CAPA course:",$switchcount)."\n\n".$switchresult."\n\n";
Line 455  sub update_LC { Line 454  sub update_LC {
 }  }
   
 sub create_newuser {  sub create_newuser {
     my ($args,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,$courseinfo) = @_;      my ($args,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,$courseinfo,$context) = @_;
     my $auth = $args->{'auth'};      my $auth = $args->{'auth'};
     my $authparam = $args->{'authparam'};      my $authparam = $args->{'authparam'};
     my $emailenc = $args->{'emailenc'};      my $emailenc = $args->{'emailenc'};
Line 492  sub create_newuser { Line 491  sub create_newuser {
             }              }
         }          }
     } elsif ($auth eq "localauth") {      } elsif ($auth eq "localauth") {
         ($authparam,$create_passwd,$authchk) = &Apache::lonnet::auto_create_password($crs,$cdom,$authparam);          ($authparam,$create_passwd,$authchk) = &Apache::lonnet::auto_create_password($crs,$cdom,$authparam,$udom);
     } elsif ($auth =~ m/^krb/) {      } elsif ($auth =~ m/^krb/) {
         if ($authparam eq '') {          if ($authparam eq '') {
             $$logmsg .= &mt('No Kerberos domain was provided for the new user - [_1], so the new user was not enrolled in the course',$uname).$linefeed;              $$logmsg .= &mt('No Kerberos domain was provided for the new user - [_1], so the new user was not enrolled in the course',$uname).$linefeed;
Line 501  sub create_newuser { Line 500  sub create_newuser {
     } else {      } else {
         $authchk = 'invalid';          $authchk = 'invalid';
         $$logmsg .= &mt('An invalid authentication type was provided for the new user - [_1], so the user was not enrolled in the course.',$uname).$linefeed;          $$logmsg .= &mt('An invalid authentication type was provided for the new user - [_1], so the user was not enrolled in the course.',$uname).$linefeed;
     }         }
     if ($authchk eq 'ok') {      if ($authchk eq 'ok') {
 # Now create user.  # Now create user.
         my $type = 'auto';          my $type = 'auto';
Line 512  sub create_newuser { Line 511  sub create_newuser {
         if ($context eq 'createowner' || $context eq 'createcourse') {          if ($context eq 'createowner' || $context eq 'createcourse') {
             my $result = &Apache::lonnet::modifyuser($udom,$uname,$pid,$auth,$authparam,$first,$middle,$last,$gene,'1',undef,$emailaddr);              my $result = &Apache::lonnet::modifyuser($udom,$uname,$pid,$auth,$authparam,$first,$middle,$last,$gene,'1',undef,$emailaddr);
             if ($result eq 'ok' && $context eq 'createcourse') {              if ($result eq 'ok' && $context eq 'createcourse') {
                 $outcome = &Apache::loncommon::commit_standardrole($udom,$uname,$userurl,$role,$start,$end,$cdom,$crs,$usec);                  $outcome = &Apache::loncommon::commit_standardrole($udom,$uname,$userurl,$role,$start,$end,$cdom,$crs,$usec,$context);
                 unless ($outcome =~ /^Error:/) {                  unless ($outcome =~ /^Error:/) {
                     $outcome = 'ok';                      $outcome = 'ok';
                 }                  }
Line 575  sub create_newuser { Line 574  sub create_newuser {
         } else {          } else {
             $$logmsg .= &mt('An error occurred adding new user [_1] - [_2].',$uname,$outcome).$linefeed;              $$logmsg .= &mt('An error occurred adding new user [_1] - [_2].',$uname,$outcome).$linefeed;
         }          }
       } else {
           $$logmsg .= &mt('An error occurred adding the new user [_1] because the authcheck failed for authtype [_2] and parameter [_3].',$uname,$auth,$authparam).' '.&mt('The authcheck response was [_1].',$authchk).$linefeed;
     }      }
     return $outcome;      return $outcome;
 }  }
Removed from v.1.33  
changed lines
  Added in v.1.35

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>