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

Diff for /loncom/enrollment/Enrollment.pm between versions 1.16 and 1.18

version 1.16, 2004/06/29 04:30:00 version 1.18, 2004/09/13 16:36:34
Line 32  use HTML::Entities; Line 32  use HTML::Entities;
 use LONCAPA::Configuration;  use LONCAPA::Configuration;
 use Time::Local;  use Time::Local;
 use lib '/home/httpd/lib/perl';  use lib '/home/httpd/lib/perl';
 use localenroll;  
   
 use strict;  use strict;
   
Line 52  sub update_LC { Line 51  sub update_LC {
     my @localstudents = ();      my @localstudents = ();
     my @futurestudents = ();      my @futurestudents = ();
     my @activestudents = ();      my @activestudents = ();
       my @excludedstudents = ();
     my $currlist;      my $currlist;
     foreach my $uname (keys %{$roster} ) {      foreach my $uname (keys %{$roster} ) {
         if ($uname =~ m/^(.+):$dom$/) {          if ($uname =~ m/^(.+):$dom$/) {
Line 63  sub update_LC { Line 63  sub update_LC {
                 push @futurestudents, $1;                  push @futurestudents, $1;
                 @{$$currlist{$1}} = @{$$roster{$uname}};                  @{$$currlist{$1}} = @{$$roster{$uname}};
                 push @localstudents, $1;                  push @localstudents, $1;
               } elsif ($$roster{$uname}[$lockedtype] == 1) {
                   push @excludedstudents, $1;
             }              }
         }          }
     }      }
Line 125  sub update_LC { Line 127  sub update_LC {
 # Check for multiple sections for a single student   # Check for multiple sections for a single student 
     my @okusers = ();      my @okusers = ();
     foreach my $uname (@reg_students)  {      foreach my $uname (@reg_students)  {
         if (@{$allenrolled{$uname}} > 1) {          if (grep/^$uname$/,@excludedstudents) {
               $$logmsg .= "No re-enrollment for $uname - user was previously manually unenrolled and locked.".$linefeed;
           } elsif (@{$allenrolled{$uname}} > 1) {
             my @sections = ();              my @sections = ();
             my $saved;              my $saved;
             for (my $i=0; $i<@{$allenrolled{$uname}}; $i++) {              for (my $i=0; $i<@{$allenrolled{$uname}}; $i++) {
Line 281  sub update_LC { Line 285  sub update_LC {
                                 }                                          }        
                             }                              }
                         } elsif ($auth eq "localauth") {                          } elsif ($auth eq "localauth") {
                             ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam);                              ($authparam,$create_passwd,$authchk) = &Apache::lonnet::auto_create_password($crs,$dom,$authparam);
                         } 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 student was not enrolled in the course.".$linefeed;                                  $$logmsg .= "No Kerberos domain was provided for the new user - $uname, so the new student was not enrolled in the course.".$linefeed;
Removed from v.1.16  
changed lines
  Added in v.1.18

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