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

Diff for /loncom/interface/selfenroll.pm between versions 1.3 and 1.6

version 1.3, 2008/05/14 20:06:51 version 1.6, 2008/06/30 17:04:11
Line 171  END Line 171  END
             $r->print('<li>'.&mt('Otherwise:').'<br />');              $r->print('<li>'.&mt('Otherwise:').'<br />');
             my $count = 0;              my $count = 0;
             foreach my $type ('sso','login','email') {               foreach my $type ('sso','login','email') { 
                 if ($count> 0) {                  if (($count > 0) && ($count <@cancreate)) {
                     $r->print('&nbsp;, '.&mt('or').'<br />');                      $r->print('&nbsp;, '.&mt('or').'<br />');
                 }                  }
                 if (grep(/^$type$/,@cancreate)) {                  if (grep(/^$type$/,@cancreate)) {
Line 280  sub process_self_enroll { Line 280  sub process_self_enroll {
     my %userhash = &Apache::lonnet::userenvironment($udom,$uname,@info);      my %userhash = &Apache::lonnet::userenvironment($udom,$uname,@info);
     my ($enrolltypes,$longtypes,$alldoms) =       my ($enrolltypes,$longtypes,$alldoms) = 
         &get_selfenroll_filters($selfenroll_types,$udom);          &get_selfenroll_filters($selfenroll_types,$udom);
     my @inststatuses = &unescape(split(/:/,$userhash{'inststatus'}));      my @inststatuses;
     if (@inststatuses == 0) {      if ($userhash{'inststatus'} eq '') {
         push(@inststatuses,'other');          push(@inststatuses,'other'); 
       } else {
           my @esc_statuses = split(/:/,$userhash{'inststatus'});
           @inststatuses = map { &unescape($_); } (@esc_statuses);
     }      }
     my $selfenroll = 0;      my $selfenroll = 0;
     if ($alldoms) {      if ($alldoms) {
Line 310  sub process_self_enroll { Line 313  sub process_self_enroll {
             my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);              my ($registered,$instsec,$message) = &check_registered($cdom,$cnum);
             $usec = $instsec;              $usec = $instsec;
             if (!$registered) {              if (!$registered) {
                 $r->print(&mt('Self-enrollment is restricted to officially registered students.').'<br />');                  $r->print(&mt('Self-enrollment is restricted to students officially registered for this course.').'<br />');
                 if ($message) {                  if ($message) {
                     $r->print($message);                      $r->print($message);
                 } else {                  } else {
Line 321  sub process_self_enroll { Line 324  sub process_self_enroll {
         }          }
         my $enrollresult =           my $enrollresult = 
             &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,              &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,
                     undef,undef,$usec,$selfenroll_access_end,$selfenroll_access_start,                    'manual',undef,$cdom.'_'.$cnum,$selfenroll);                      undef,undef,$usec,$selfenroll_access_end,$selfenroll_access_start,
                      'manual',undef,$cdom.'_'.$cnum,$selfenroll);
         if ($enrollresult eq 'ok') {          if ($enrollresult eq 'ok') {
             my (%userroles,%newrole,%newgroups);              my (%userroles,%newrole,%newgroups);
             my $role = 'st';              my $role = 'st';
Line 431  sub print_selfenroll_types { Line 435  sub print_selfenroll_types {
                     }                      }
                 }                  }
             } else {              } else {
                 $output = &mt('Self-enrollment in this course is only available to users in the following domains (with the following status): ').'<ul>';                  $output = &mt('Self-enrollment in this course is only available to users in the following domains (with the following status):').' <ul>';
                 foreach my $selfdom (sort(keys(%{$longtypes}))) {                  foreach my $selfdom (sort(keys(%{$longtypes}))) {
                     if (ref($longtypes->{$selfdom}) eq 'ARRAY') {                      if (ref($longtypes->{$selfdom}) eq 'ARRAY') {
                         $output .= '<li>'.$selfdom.': '.join(', ',@{$longtypes->{$selfdom}}).'</li>';                          $output .= '<li>'.$selfdom.': '.join(', ',@{$longtypes->{$selfdom}}).'</li>';
Line 440  sub print_selfenroll_types { Line 444  sub print_selfenroll_types {
                 $output .= '</ul>';                  $output .= '</ul>';
             }              }
         } else {          } else {
             $output = &mt('Self-enrollment is not currently available in this course');              $output = &mt('Self-enrollment is not currently available for this course.');
         }          }
     }      }
     return $output;      return $output;
Removed from v.1.3  
changed lines
  Added in v.1.6

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