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

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

version 1.28, 2006/02/07 05:08:21 version 1.35, 2007/07/02 03:37:19
Line 27  package LONCAPA::Enrollment; Line 27  package LONCAPA::Enrollment;
   
 use Apache::loncoursedata;  use Apache::loncoursedata;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon();
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonlocal;  use Apache::lonlocal;
 use HTML::Entities;  use HTML::Entities;
Line 146  sub update_LC { Line 147  sub update_LC {
     my @okusers = ();      my @okusers = ();
     foreach my $uname (@reg_students)  {      foreach my $uname (@reg_students)  {
         if (grep/^$uname$/,@excludedstudents) {          if (grep/^$uname$/,@excludedstudents) {
             $$logmsg .= "No re-enrollment for $uname - user was previously manually unenrolled and locked.".$linefeed;              $$logmsg .= &mt('No re-enrollment for [_1] - user was previously manually unenrolled and locked.',$uname).$linefeed;
         } elsif (@{$allenrolled{$uname}} > 1) {          } elsif (@{$allenrolled{$uname}} > 1) {
             my @sections = ();              my @sections = ();
             my $saved;              my $saved;
Line 169  sub update_LC { Line 170  sub update_LC {
                 push @okusers, $uname;                  push @okusers, $uname;
             }              }
             elsif (@sections > 1) {              elsif (@sections > 1) {
                 $$logmsg .=  "$uname appears in classlists for more than one section of this course, i.e. in sections: ";                  $$logmsg .=  &mt('[_1] appears in classlists for more than one section of this course, i.e. in sections: ',$uname);
                 foreach (@sections) {                  foreach (@sections) {
                     $$logmsg .= " $_,";                      $$logmsg .= " $_,";
                 }                  }
                 chop($$logmsg);                  chop($$logmsg);
                 $$logmsg .= ". Because of this ambiguity, no enrollment action was taken for this student.".$linefeed;                  $$logmsg .= '. '.&mt('Because of this ambiguity, no enrollment action was taken for this student.').$linefeed;
             }              }
         } else {          } else {
             @{$enrollinfo{$uname}} = @{$allenrolled{$uname}[0]};              @{$enrollinfo{$uname}} = @{$allenrolled{$uname}[0]};
Line 210  sub update_LC { Line 211  sub update_LC {
 # Check for studentID changes  # Check for studentID changes
                 if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) )  {                  if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) )  {
                     unless ( ($uidhash{$uname}) eq ($stuinfo[ $place{studentID} ]) ) {                      unless ( ($uidhash{$uname}) eq ($stuinfo[ $place{studentID} ]) ) {
                         $$logmsg .= "Change in ID for $uname. StudentID in LON-CAPA system is $uidhash{$uname}; StudentID in institutional data is $stuinfo[ $place{studentID} ]".$linefeed;                           $$logmsg .= &mt('Change in ID for [_1]. StudentID in LON-CAPA system is [_2]; StudentID in institutional data is [_3].',$uname,$uidhash{$uname},$stuinfo[ $place{studentID} ]).$linefeed; 
                     }                      }
                 }                  }
 # Check for switch from manual to auto  # Check for switch from manual to auto
Line 219  sub update_LC { Line 220  sub update_LC {
                     my $drop_reply = &Apache::lonnet::modifystudent($dom,$uname,'','','',undef,undef,undef,undef,$$currlist{$uname}[$sec],time,undef,undef,undef,undef,'auto','',$cid);                      my $drop_reply = &Apache::lonnet::modifystudent($dom,$uname,'','','',undef,undef,undef,undef,$$currlist{$uname}[$sec],time,undef,undef,undef,undef,'auto','',$cid);
 # re-enroll as auto student  # re-enroll as auto student
                     if ($drop_reply !~ /^ok/) {                      if ($drop_reply !~ /^ok/) {
                             $$logmsg .= "An error occured during the attempt to convert $uname from a manual type to an auto type student - $drop_reply.".$linefeed;                              $$logmsg .= &mt('An error occured during the attempt to convert [_1] from a manual type to an auto type student - [_2].',$uname,$drop_reply).$linefeed;
                     } else {                      } else {
 # re-enroll as auto student  # re-enroll as auto student
                         my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);                          my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);
                         &prepare_add($authtype,$autharg,$enddate,$startdate,\@stuinfo,\%place,\$dom,\$uname,\$auth,\$authparam,\$first,\$middle,\$last,\$gene,\$usec,\$end,\$start,\$emailaddr,\$pid,\$emailenc);                          &prepare_add($authtype,$autharg,$enddate,$startdate,\@stuinfo,\%place,\$dom,\$uname,\$auth,\$authparam,\$first,\$middle,\$last,\$gene,\$usec,\$end,\$start,\$emailaddr,\$pid,\$emailenc);
                         if ($$currlist{$uname}[$sec] ne $usec) {                          if ($$currlist{$uname}[$sec] ne $usec) {
                             $switchresult .= "Section for $uname switched from $$currlist{$uname}[$sec] to ".$usec.$linefeed;                              my $showoldsec = $$currlist{$uname}[$sec];
                               if ($$currlist{$uname}[$sec] eq '') {
                                   $showoldsec = &mt('none');
                               }
                               my $showsec = $usec;
                               if ($usec eq '') {
                                   $showsec = &mt('none');
                               }
                               $switchresult .= &mt("Section for [_1] switched from '[_2]' to '[_3]'.",$uname,$showoldsec,$showsec).$linefeed;
                             if ($context eq 'automated') {                              if ($context eq 'automated') {
                                 $$logmsg .= "Section switch for $uname from $$currlist{$uname}[$sec] to ".$usec.$linefeed; ;                                  $$logmsg .= &mt("Section switch for [_1] from '[_2]' to '[_3]'.",$uname,$showoldsec,$usec).$linefeed;
                             }                              }
                             $switchcount ++;                              $switchcount ++;
                         }                          }
Line 243  sub update_LC { Line 252  sub update_LC {
                             my $modify_access_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid);                              my $modify_access_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$enddate,$startdate,'auto','',$cid);
                             $access = &showaccess($enddate,$startdate);                              $access = &showaccess($enddate,$startdate);
                             if ($modify_access_result =~ /^ok/) {                              if ($modify_access_result =~ /^ok/) {
                                 $$logmsg .= "Change in access dates for $uname.".$access.$linefeed;                                  $$logmsg .= &mt('Change in access dates for [_1].',$uname).$access.$linefeed;
                             } else {                              } else {
                                 $$logmsg .= "Error when attempting to change start and/or end access dates for $uname in section: ".$stuinfo[ $place{groupID} ]." -error $modify_access_result".$linefeed;                                  $$logmsg .= &mt('Error when attempting to change start and/or end access dates for [_1] in section: [_2] -error [_3].',$uname,$stuinfo[$place{groupID}],$modify_access_result).$linefeed;
                             }                              }
                         }                          }
                     }                      }
Line 268  sub update_LC { Line 277  sub update_LC {
                                 $access =  &showaccess($enddate,$startdate);                                  $access =  &showaccess($enddate,$startdate);
                             }                              }
                             if ($modify_section_result =~ /^ok/) {                              if ($modify_section_result =~ /^ok/) {
                                 $switchresult .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ." to new section: ".$stuinfo[ $place{groupID} ].".".$access.$linefeed;                                  $switchresult .= &mt("Section for [_1] switched from old section: '[_2]' to new section: '[_3]'.",$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$access.$linefeed;
                                 if ($context eq 'automated') {                                  if ($context eq 'automated') {
                                     $$logmsg .= "Section switch for $uname from $$currlist{$uname}[$sec] to $stuinfo[ $place{groupID} ]".$linefeed;                                      $$logmsg .= &mt('Section switch for [_1] from [_2] to [_3]',$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ]).$linefeed;
                                 }                                  }
                                 $switchcount ++;                                  $switchcount ++;
                             } else {                              } else {
                                 $$logmsg .= "Error when attempting section change for $uname from old section ".$$currlist{$uname}[$sec]." to new section: ".$stuinfo[ $place{groupID} ]." -error: $modify_section_result".$linefeed;                                  $$logmsg .= &mt("Error when attempting section change for [_1], from old section: '[_2]' to new section: '[_3]' -error: [_4]",$uname,$$currlist{$uname}[$sec],$stuinfo[ $place{groupID} ],$modify_section_result).$linefeed;
                             }                              }
                         } else {                          } else {
                             $$logmsg .= "Error when attempting to expire role for $uname in old section" .$$currlist{$uname}[$sec]." -error: $expire_role_result".$linefeed;                              $$logmsg .= &mt("Error when attempting to expire role for [_1] in old section: '[_2]' -error: '[_3]'.",$uname,$$currlist{$uname}[$sec],$expire_role_result).$linefeed;
                         }                          }
                     }                      }
                 }                  }
Line 285  sub update_LC { Line 294  sub update_LC {
 # Check for changed usernames by checking studentIDs  # Check for changed usernames by checking studentIDs
                 if ( ($stuinfo[ $place{studentID} ] ne '') && (grep/^$stuinfo[ $place{studentID} ]$/,@LCids) ) {                  if ( ($stuinfo[ $place{studentID} ] ne '') && (grep/^$stuinfo[ $place{studentID} ]$/,@LCids) ) {
                     foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } }  ) {                      foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } }  ) {
                         $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $match and student ID: ".$stuinfo[ $place{studentID} ].". ";                          $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student ID: [_2].',$match,$stuinfo[ $place{studentID} ]);
                         if (grep/^$match$/,@okusers) {                          if (grep/^$match$/,@okusers) {
                             $$logmsg .= "The username $match remains in the institutional classlist, but the same student ID is used for new user: $uname now found in the institutional classlist. You may need to contact your Domain Coordinator to determine how to reolve this issue and whether to move student data files for user: $match to $uname. ";                              $$logmsg .= &mt('The username [_1] remains in the institutional classlist, but the same student ID is used for new user: [_2] now found in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to determine how to resolve this issue and whether to move student data files for user: [_1] to [_2].',$match,$uname).' ';
                         } else {                          } else {
                             unless ($drops == 1) {                              unless ($drops == 1) {
                                 $$logmsg .= "This username - $match - has been dropped from the institutional classlist, but the student ID of this user is also used by $uname who now appears in the institutional classlist. You may need to contact your Domain Coordinator to request a move of the student data files for user: $match to $uname. ";                                  $$logmsg .= &mt('This username - [_1] - has been dropped from the institutional classlist, but the student ID of this user is also used by [_2] who now appears in the institutional classlist.',$match,$uname).' '.&mt('You may need to contact your Domain Coordinator to request a move of the student data files for user: [_1] to [_2].',$match,$uname).' ';
                             }                              }
                         }                          }
                         $$logmsg .= "Because of this student ID conflict, the new username - $uname - has not been added to the LON-CAPA classlist.".$linefeed;                                $$logmsg .= &mt('Because of this student ID conflict, the new username - [_1] - has not been added to the LON-CAPA classlist',$uname).$linefeed;
                     }                      }
                 } elsif ($adds == 1) {                  } elsif ($adds == 1) {
                     my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);                      my ($auth,$authparam,$first,$middle,$last,$gene,$usec,$end,$start,$emailaddr,$pid,$emailenc);
Line 326  sub update_LC { Line 335  sub update_LC {
                     } else {                      } else {
                         &execute_add($context,'newstudent',$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,\$addresult,\$enrollcount,$linefeed,$logmsg);                          &execute_add($context,'newstudent',$uname,$dom,$auth,$authparam,$first,$middle,$last,$gene,$pid,$usec,$end,$start,$emailenc,$cid,\$addresult,\$enrollcount,$linefeed,$logmsg);
                     }                      }
                     if ($courseinfo{'showphotos'}) {                      if ($courseinfo{'showphoto'}) {
                         my ($result,$resulttype) =                           my ($result,$resulttype) = 
                            &Apache::lonnet::auto_checkphotos($uname,$dom,$pid);                             &Apache::lonnet::auto_checkphotos($uname,$dom,$pid);
                         if ($resulttype) {                          if ($resulttype) {
Line 337  sub update_LC { Line 346  sub update_LC {
             }              }
         }          }
     }      }
     if ($courseinfo{'showphotos'}) {      if ($courseinfo{'showphoto'}) {
         if (keys(%{$phototypes})>0) {          if (keys(%{$phototypes})>0) {
             my %lt = &photo_response_types();              my %lt = &photo_response_types();
             foreach my $type (sort(keys(%{$phototypes}))) {              foreach my $type (sort(keys(%{$phototypes}))) {
Line 345  sub update_LC { Line 354  sub update_LC {
                 if ($numphoto > 0) {                  if ($numphoto > 0) {
                     if ($context eq 'updatenow') {                      if ($context eq 'updatenow') {
                         $photoresult .=  '<br /><b>'.                          $photoresult .=  '<br /><b>'.
                                    &mt('For [_1] students, photos ',$numphoto).      &mt('For [_1] students, photos ',$numphoto).
                                                      $lt{$type}.'</b><ul><li>';      $lt{$type}.'</b><ul><li>';
                     } else {                      } else {
                         $photoresult .=  "\nFor $numphoto students, photos ".                          $photoresult .=  "\n".&mt("For [quant,_1,student], photos ",$numphoto).
                                                                $lt{$type}."\n";      $lt{$type}."\n";
                     }                      }
                     foreach my $user (@{$$phototypes{$type}}) {                       foreach my $user (@{$$phototypes{$type}}) { 
                         $photoresult .= $user.$linefeed;                          $photoresult .= $user.$linefeed;
                     }                      }
                     if ($context eq 'updatenow') {                      if ($context eq 'updatenow') {
                         $photoresult = substr($photoresult,0,                          $photoresult = substr($photoresult,0,
                                                   rindex($photoresult,"<li>"));        rindex($photoresult,"<li>"));
                         $photoresult .= '</ul><br />';                          $photoresult .= '</ul><br />';
                     } else {                      } else {
                         $photoresult .= "\n";                          $photoresult .= "\n";
Line 375  sub update_LC { Line 384  sub update_LC {
 # Check for changed usernames by checking studentIDs  # Check for changed usernames by checking studentIDs
                     if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) {                      if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) {
                         foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) {                          foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) {
                             $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $uname and student ID: $$currlist{$uname}[ $place{studentID} ].  This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match. Because of this, user $uname has not been dropped from the course.".$linefeed;                              $$logmsg .= &mt('A possible change in username has been detected for a student enrolled in this course.').' '.&mt('The existing LON-CAPA classlist contains user: [_1] and student ID: [_2].',$uname,$$currlist{$uname}[ $place{studentID} ]).' '.&mt('This username has been dropped from the institutional classlist, but the same student ID is used for user: [_1] who still appears in the institutional classlist.',$match).' '.&mt('You may need to move the student data files for user: [_1] to [_2]',$uname,$match).' '.&mt('Because of this, user [_1] has not been dropped from the course.',$uname).$linefeed;
                             push @saved,$uname;                              push @saved,$uname;
                         }                          }
                     } elsif (@saved == 0) {                      } elsif (@saved == 0) {
                         my $drop_reply = &Apache::lonnet::modifystudent($dom,$uname,'','','',undef,undef,undef,undef,$$currlist{$uname}[$sec],time,undef,undef,undef,undef,'auto','',$cid);                          my $drop_reply = &Apache::lonnet::modifystudent($dom,$uname,'','','',undef,undef,undef,undef,$$currlist{$uname}[$sec],time,undef,undef,undef,undef,'auto','',$cid);
                         if ($drop_reply !~ /^ok/) {                          if ($drop_reply !~ /^ok/) {
                             $$logmsg .= "An error occured during the attempt to expire the $uname from the old section $$currlist{$uname}[$sec] - $drop_reply.".$linefeed;                              $$logmsg .= &mt('An error occured during the attempt to expire the [_1] from the old section [_2] - [_3].',$uname,$$currlist{$uname}[$sec],$drop_reply).$linefeed;
                         } else {                          } else {
                             $dropcount ++;                              $dropcount ++;
                             my %userenv = &Apache::lonnet::get('environment',['firstname','lastname','id'],$dom,$uname);                              my %userenv = &Apache::lonnet::get('environment',['firstname','lastname','id'],$dom,$uname);
                             $dropresult .= $userenv{'firstname'}." ".$userenv{'lastname'}." (".$userenv{'id'}.") - ".$uname." dropped from section/group ".$$currlist{$uname}[$sec].$linefeed;                               $dropresult .= $userenv{'firstname'}." ".$userenv{'lastname'}." (".$userenv{'id'}.") - ".$uname.' '.&mt("dropped from section/group: '[_1]'.",$$currlist{$uname}[$sec]).$linefeed; 
                             if ($context eq 'automated') {                              if ($context eq 'automated') {
                                 $$logmsg .= "User $uname student role expired from course.".$linefeed;                                  $$logmsg .= &mt('User [_1] student role expired from course.',$uname).$linefeed;
                             }                              }
                         }                          }
                     }                      }
Line 403  sub update_LC { Line 412  sub update_LC {
     if ($enrollcount > 0) {      if ($enrollcount > 0) {
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
             $addresult = substr($addresult,0,rindex($addresult,"<li>"));              $addresult = substr($addresult,0,rindex($addresult,"<li>"));
             $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:<br/><ul><li>".$addresult."</ul><br/><br/>";              $addresult = &mt("The following [quant,_1,student was,students were] added to this LON-CAPA course:",$enrollcount).'<br/><ul><li>'.$addresult.'</ul><br/><br/>';
             if ($courseinfo{'showphotos'}) {  
   
             }  
         } else {          } else {
             $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:\n\n".$addresult."\n\n";              $addresult = &mt("The following [quant,_1,student was,students were] added to this LON-CAPA course:",$enrollcount)."\n\n".$addresult."\n\n";
         }          }
     }      }
     if ($dropcount > 0) {      if ($dropcount > 0) {
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
             $dropresult = substr($dropresult,0,rindex($dropresult,"<li>"));              $dropresult = substr($dropresult,0,rindex($dropresult,"<li>"));
             $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:<br/><ul><li>".$dropresult."</ul><br/><br/>";              $dropresult = &mt("The following [quant,_1,student was,students were] expired from this LON-CAPA course:",$dropcount).'<br/><ul><li>'.$dropresult.'</ul><br/><br/>';
         } else {          } else {
             $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:\n\n".$dropresult."\n\n";              $dropresult = &mt("The following [quant,_1,student was,students were] expired from this LON-CAPA course:",$dropcount)."\n\n".$dropresult."\n\n";
         }          }
     }      }
     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>"));
             $switchresult = "The following $switchcount student(s) switched sections in this LON-CAPA course:<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 = "The following $switchcount student(s) switched sections in this LON-CAPA course:\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";
         }          }
     }      }
     if ( ($adds) && ($enrollcount == 0) ) {      if ( ($adds) && ($enrollcount == 0) ) {
         $addresult = "There were no new students to add to the course.";          $addresult = &mt('There were no new students to add to the course.');
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
             $addresult .="<br/><br/>";              $addresult .="<br/><br/>";
         } else {          } else {
Line 436  sub update_LC { Line 442  sub update_LC {
         }          }
     }      }
     if ( ($drops) && ($dropcount == 0) ) {      if ( ($drops) && ($dropcount == 0) ) {
         $dropresult = "There were no students with roles to expire because all active students previously added to the course from institutional classlist(s) are still officially registered.";          $dropresult = &mt('There were no students with roles to expire because all active students previously added to the course from institutional classlist(s) are still officially registered.');
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
             $dropresult .="<br/>";              $dropresult .="<br/>";
         } else {          } else {
Line 448  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 485  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 .= "No Kerberos domain was provided for the new user - $uname, so the new user was not enrolled in the course.".$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;
             $authchk = 'invalid';              $authchk = 'invalid';
         }          }
     } else {      } else {
         $authchk = 'invalid';          $authchk = 'invalid';
         $$logmsg .= "An invalid authentication type was provided for the new user - $uname, so the user was not enrolled in the course.".$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 505  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::loncreateuser::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 517  sub create_newuser { Line 523  sub create_newuser {
         }          }
         if ($outcome eq 'ok') {          if ($outcome eq 'ok') {
             my $access = &showaccess($end,$start);              my $access = &showaccess($end,$start);
             $$addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$access.$linefeed;              my $showsec = $usec;
               if ($usec eq '') {
                   $showsec = &mt('none');
               }
               $$addresult .= "$first $last ($pid) - $uname ".&mt("enrolled in section/group: '[_1]'.",$showsec).$access.$linefeed;
             unless ($context eq 'createowner' || $context eq 'createcourse') {              unless ($context eq 'createowner' || $context eq 'createcourse') {
                 $$enrollcount ++;                  $$enrollcount ++;
             }              }
             if ($context eq 'automated') {              if ($context eq 'automated') {
                 $$logmsg .= "New $udom user $uname added successfully.";                  $$logmsg .= &mt('New [_1] user [_2] added successfully.',$udom,$uname);
             }              }
             unless ($emailenc eq '' || $context eq 'createowner' || $context eq 'createcourse') {              unless ($emailenc eq '' || $context eq 'createowner' || $context eq 'createcourse') {
                 my %emailHash;                  my %emailHash;
Line 536  sub create_newuser { Line 546  sub create_newuser {
 # If e-mail address is invalid, send password via message to courseowner i  # If e-mail address is invalid, send password via message to courseowner i
 # (if automated call) or to user if roster update.  # (if automated call) or to user if roster update.
                 if ($emailaddr eq '') {                  if ($emailaddr eq '') {
                     $$newusermsg .= " username: $uname, password: ".$authparam.$linefeed."\n";                      $$newusermsg .= &mt(' username: [_1], password: [_2]',$uname,$authparam).$linefeed."\n";
                 } else {                  } else {
                     my $subject = "New LON-CAPA account";                      my $subject = &mt('New LON-CAPA account');
                     my $body;                      my $body;
                     if ($context eq 'createowner') {                      if ($context eq 'createowner') {
                         $body = "A user account has been created for you while creating your new course in the LON-CAPA course management and online homework system.\n\nYou should log-in to the system using the following credentials:\nusername: $uname\npassword: $authparam\n\nThe URL you should use to access the LON-CAPA system at your school is: http://".$ENV{'SERVER_NAME'}."\n\n";                          $body = &mt('A user account has been created for you while creating your new course in the LON-CAPA course management and online homework system.')."\n\n".&mt('You should log-in to the system using the following credentials:')."\n".&mt('username: ').$uname."\n".&mt('password: ').$authparam."\n\n".&mt('The URL you should use to access the LON-CAPA system at your school is: ').'http://'.$ENV{'SERVER_NAME'}."\n\n";
                     } elsif ($context eq 'createcourse') {                      } elsif ($context eq 'createcourse') {
                         $body = "You have been assigned the role of $$longroles{$role} in a new course: $$courseinfo{'description'} - $$courseinfo{'inst_code'} in the LON-CAPA course management and online homework system.  As you did not have an existing user account in the system, one has been created for you.\n\nYou should log-in to the system using the following credentials:\nusername: $uname\npassword: $authparam\n\nThe URL you should use to access the LON-CAPA system at your school is: http://".$ENV{'SERVER_NAME'}."\n\n";                           $body = &mt('You have been assigned the role of [_1] in a new course: [_2] - [_3] in the LON-CAPA course management and online homework system.',$$longroles{$role},$$courseinfo{'description'},$$courseinfo{'inst_code'}).' '.&mt('As you did not have an existing user account in the system, one has been created for you.')."\n\n".&mt("You should log-in to the system using the following credentials:\nusername: [_1]\npassword: [_2]",$uname,$authparam)."\n\n".&mt('The URL you should use to access the LON-CAPA system at your school is: '),'http://'.$ENV{'SERVER_NAME'}."\n\n"; 
                     } else {                      } else {
                         my $access_start = 'immediately';                          my $access_start = 'immediately';
                         if ($start > 0) {                          if ($start > 0) {
                             $access_start = localtime($start)                              $access_start = localtime($start)
                         }                          }
                         $body = "You have been enrolled in the LON-CAPA system at your school, because you are a registered student in a class that is using the LON-CAPA couse management and online homework system.\n\nYou should log-in to the system using the following credentials:\nusername: $uname\npassword: $authparam\n\nThe URL you should use to access the LON-CAPA system at your school is: http://".$ENV{'SERVER_NAME'}."\n\n.When you log-in you will be able to access the LON-CAPA course for $$courseinfo{'description'} - $$courseinfo{'inst_code'} starting $access_start.\n";                          $body = &mt('You have been enrolled in the LON-CAPA system at your school, because you are a registered student in a class that is using the LON-CAPA couse management and online homework system.')."\n\n".&mt("You should log-in to the system using the following credentials:\nusername: [_1]\npassword: [_2]",$uname,$authparam)."\n\n".&mt('The URL you should use to access the LON-CAPA system at your school is: ').'http://'.$ENV{'SERVER_NAME'}."\n\n".&mt('When you log-in you will be able to access the LON-CAPA course for [_1] - [_2] starting [_3].',$$courseinfo{'description'},$$courseinfo{'inst_code'},$access_start)."\n";
                     }                      }
                     &Apache::lonmsg::sendemail($emailaddr,$subject,$body);                      &Apache::lonmsg::sendemail($emailaddr,$subject,$body);
                 }                  }
                 if ($context eq 'automated') {                  if ($context eq 'automated') {
                     $$logmsg .= " Initial password -  - sent to ".$emailaddr.$linefeed;                      $$logmsg .= &mt(' Initial password - sent to ').$emailaddr.$linefeed;
                 }                  }
             } else {              } else {
                 if ($context eq 'automated') {                  if ($context eq 'automated') {
Line 562  sub create_newuser { Line 572  sub create_newuser {
                 }                  }
             }              }
         } else {          } else {
             $$logmsg .= "An error occurred adding new user $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;
 }  }
Line 619  sub execute_add { Line 631  sub execute_add {
 # Get the user's e-mail address  # Get the user's e-mail address
     if ($userenv{critnotification} =~ m/%40/) {      if ($userenv{critnotification} =~ m/%40/) {
         unless ($emailenc eq $userenv{critnotification}) {          unless ($emailenc eq $userenv{critnotification}) {
             $$logmsg .= "Current critical notification e-mail              $$logmsg .= &mt('Current critical notification e-mail
 - ".$userenv{critnotification}." for $uname is different to e-mail address in institutional classlist - ".$emailenc.$linefeed;  - [_1] for [_2] is different to e-mail address in institutional classlist - [_3].',$userenv{critnotification},$uname,$emailenc).$linefeed;
         }          }
     }      }
     if ($userenv{notification} =~ m/%40/) {      if ($userenv{notification} =~ m/%40/) {
         unless ($emailenc eq $userenv{notification}) {          unless ($emailenc eq $userenv{notification}) {
             $$logmsg .= "Current standard notification e-mail              $$logmsg .= &mt('Current standard notification e-mail
 - ".$userenv{notification}." for $uname is different to e-mail address in institutional classlist - ".$emailenc.$linefeed;  - [_1] for [_2] is different to e-mail address in institutional classlist - [_3]',$userenv{notification},$uname,$emailenc).$linefeed;
         }          }
     }      }
     if ($userenv{permanentemail} =~ m/%40/) {      if ($userenv{permanentemail} =~ m/%40/) {
         unless ($emailenc eq $userenv{permanentemail}) {          unless ($emailenc eq $userenv{permanentemail}) {
             $$logmsg .= "Current permanent e-mail              $$logmsg .= &mt('Current permanent e-mail
 - ".$userenv{permanentemail}." for $uname is different to e-mail address in institutional classlist - ".$emailenc.$linefeed;  - [_1] for [_2] is different to e-mail address in institutional classlist - [_3]',$userenv{permanentemail},$uname,$emailenc).$linefeed;
         }          }
     }      }
     my $krbdefdom = '';      my $krbdefdom = '';
Line 643  sub execute_add { Line 655  sub execute_add {
     } elsif ($currentauth=~ /^(unix|internal|localauth):/) {      } elsif ($currentauth=~ /^(unix|internal|localauth):/) {
         $currentauth = $1;          $currentauth = $1;
     } else {      } else {
         $$logmsg .= "Invalid authentication method $currentauth for $uname.".$linefeed;          $$logmsg .= &mt('Invalid authentication method [_1] for [_2].',$currentauth,$uname).$linefeed;
     }      }
 # Report if authentication methods are different.  # Report if authentication methods are different.
     if ($currentauth ne $auth) {      if ($currentauth ne $auth) {
         $$logmsg .= "Authentication type mismatch for $uname - '$currentauth' in system, '$auth' based on information in classlist or default for this course.".$linefeed;          $$logmsg .= &mt("Authentication type mismatch for [_1] - '[_2]' in system, '[_3]' based on information in classlist or default for this course.",$uname,$currentauth,$auth).$linefeed;
     } elsif ($auth =~ m/^krb/) {      } elsif ($auth =~ m/^krb/) {
         if ($krbdefdom ne $authparam) {          if ($krbdefdom ne $authparam) {
             $$logmsg .= "Kerberos domain mismatch for $uname - '$krbdefdom' in system, '$authparam' based on information in classlist or default for this course.".$linefeed;              $$logmsg .= &mt("Kerberos domain mismatch for [_1] - '[_2]' in system, '[_3]' based on information in classlist or default for this course.",$uname,$krbdefdom,$authparam).$linefeed;
         }          }
     }      }
                                                                                                                                                                       
Line 671  sub execute_add { Line 683  sub execute_add {
         $changeHash{'permanentemail'} = $emailenc;          $changeHash{'permanentemail'} = $emailenc;
         my $putresult = &Apache::lonnet::put('environment',\%changeHash,$dom,$uname);          my $putresult = &Apache::lonnet::put('environment',\%changeHash,$dom,$uname);
         if ($putresult eq 'ok') {          if ($putresult eq 'ok') {
             $$logmsg .= "User information updated for user: $uname prior to enrollment.".$linefeed;              $$logmsg .= &mt('User information updated for user: [_1]$uname prior to enrollment.',$uname).$linefeed;
         } else {          } else {
             $$logmsg .= "There was a problem modifying user data for existing user - $uname -error: $putresult, enrollment will still be attempted.".$linefeed;              $$logmsg .= &mt('There was a problem modifying user data for existing user - [_1] -error: [_2], enrollment will still be attempted.',$uname,$putresult).$linefeed;
         }          }
     }      }
                                                                                                                                                                       
Line 681  sub execute_add { Line 693  sub execute_add {
     my $classlist_reply = &Apache::lonnet::modify_student_enrollment($dom,$uname,$pid,$first,$middle,$last,$gene,$usec,$end,$start,'auto','',$cid);      my $classlist_reply = &Apache::lonnet::modify_student_enrollment($dom,$uname,$pid,$first,$middle,$last,$gene,$usec,$end,$start,'auto','',$cid);
     if ($classlist_reply eq 'ok') {      if ($classlist_reply eq 'ok') {
         my $access = &showaccess($end,$start);          my $access = &showaccess($end,$start);
           my $showsec = $usec;
           if ($usec eq '') {
               $showsec = &mt('none');
           }
         if ($caller eq 'switchtype') {          if ($caller eq 'switchtype') {
             $$logmsg .= "Existing user $uname detected in institutional classlist - switched from 'manual' to 'auto' enrollment in section/group $usec.".$access.$linefeed;              $$logmsg .= &mt("Existing user [_1] detected in institutional classlist - switched from 'manual' to 'auto' enrollment in section/group [_2].",$uname,$showsec).$access.$linefeed;
         } elsif ($caller eq 'newstudent') {          } elsif ($caller eq 'newstudent') {
             $$enrollcount ++;              $$enrollcount ++;
             $$addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$access.$linefeed;              $$addresult .= "$first $last ($pid) - $uname ".&mt("enrolled in section/group '[_1]'.",$showsec).$access.$linefeed;
         }          }
         if ($context eq 'automated') {          if ($context eq 'automated') {
             $$logmsg .= "Existing $dom user $uname enrolled successfully.".$linefeed;              $$logmsg .= &mt('Existing [_1] user [_2] enrolled successfully.',$dom,$uname).$linefeed;
         }          }
     } else {      } else {
            $$logmsg .= "There was a problem updating the classlist db file for user $uname to show the new enrollment -error: $classlist_reply, so no enrollment occurred for this user.".$linefeed;             $$logmsg .= &mt('There was a problem updating the classlist db file for user [_1] to show the new enrollment -error: [_2], so no enrollment occurred for this user.',$uname,$classlist_reply).$linefeed;
     }      }
     return;      return;
 }  }
Line 728  sub showaccess { Line 744  sub showaccess {
     } else {      } else {
         $showend = &Apache::lonlocal::locallocaltime($end);          $showend = &Apache::lonlocal::locallocaltime($end);
     }      }
     my $access_msg = " Access starts: ".$showstart.", ends: ".$showend.".";      my $access_msg = ' '.&mt('Access starts: [_1], ends: [_2].',$showstart,$showend);
     return $access_msg;      return $access_msg;
 }  }
   
Line 829  sub get_courseinfo { Line 845  sub get_courseinfo {
     my ($dom,$crs,$courseinfo) = @_;      my ($dom,$crs,$courseinfo) = @_;
     my $owner;      my $owner;
     if (defined($dom) && defined($crs)) {      if (defined($dom) && defined($crs)) {
         my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphotos','description'],$dom,$crs);          my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.showphoto','description'],$dom,$crs);
         if ( defined($settings{'internal.coursecode'}) ) {          if ( defined($settings{'internal.coursecode'}) ) {
             $$courseinfo{'inst_code'} = $settings{'internal.coursecode'};              $$courseinfo{'inst_code'} = $settings{'internal.coursecode'};
         }          }
         if ( defined($settings{'description'}) ) {          if ( defined($settings{'description'}) ) {
             $$courseinfo{'description'} = $settings{'description'};              $$courseinfo{'description'} = $settings{'description'};
         }          }
         if ( defined($settings{'internal.showphotos'}) ) {          if ( defined($settings{'internal.showphoto'}) ) {
             $$courseinfo{'showphotos'} = $settings{'internal.showphotos'};              $$courseinfo{'showphoto'} = $settings{'internal.showphoto'};
         }          }
     }      }
     return;      return;
Line 856  sub CL_startdate { return 9; } Line 872  sub CL_startdate { return 9; }
 sub CL_studentID { return 10; }  sub CL_studentID { return 10; }
   
 sub photo_response_types {  sub photo_response_types {
     my %lt = &Apache::lonlocal::texthash (      my %lt = &Apache::lonlocal::texthash(
                       'same' => 'remained unchanged',                        'same' => 'remained unchanged',
                       'update' => 'were updated',                        'update' => 'were updated',
                       'new' => 'were added',                        'new' => 'were added',
Line 864  sub photo_response_types { Line 880  sub photo_response_types {
                       'error' => 'were not imported because an error occurred',                        'error' => 'were not imported because an error occurred',
                       'nouser' => 'were for users without accounts',                        'nouser' => 'were for users without accounts',
                       'noid' => 'were for users without student IDs',                        'noid' => 'were for users without student IDs',
     );   );
     return %lt;      return %lt;
 }  }
   
Removed from v.1.28  
changed lines
  Added in v.1.35

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