Diff for /loncom/interface/lonmodifycourse.pm between versions 1.18 and 1.22

version 1.18, 2005/04/27 19:09:30 version 1.22, 2006/02/10 23:38:15
Line 1 Line 1
   # The LearningOnline Network with CAPA
   # automated enrollment course setup handler
   #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 190  all settings except course code, course Line 195  all settings except course code, course
     $enrollvar{'autharg'} = '';      $enrollvar{'autharg'} = '';
     $enrollvar{'authtype'} = '';      $enrollvar{'authtype'} = '';
     foreach my $item (keys %settings) {      foreach my $item (keys %settings) {
         if ($item =~ m/^internal\.(.+)$/) {   if ($item =~ m/^internal\.(.+)$/) {
             if ( ($1 eq "autoadds") || ($1 eq "autodrops") ) {      my $type = $1;
   
               if ( ($type eq "autoadds") || ($type eq "autodrops") ) {
         if ($settings{$item} == 1) {          if ($settings{$item} == 1) {
             $enrollvar{$1} = "ON";              $enrollvar{$type} = "ON";
         } else {          } else {
             $enrollvar{$1} = "OFF";              $enrollvar{$type} = "OFF";
         }          }
             } elsif ( ($1 eq "autostart") || ($1 eq "autoend") ) {              } elsif ( ($type eq "autostart") || ($type eq "autoend") ) {
         if ( ($1 eq "autoend") && ($settings{$item} == 0) ) {          if ( ($type eq "autoend") && ($settings{$item} == 0) ) {
             $enrollvar{$1} = $lt{'noen'};              $enrollvar{$type} = $lt{'noen'};
         } else {          } else {
             $enrollvar{$1} = localtime($settings{$item});              $enrollvar{$type} = localtime($settings{$item});
         }          }
             } elsif ($1 eq "courseowner" || $1 eq "authtype" || $1 eq "autharg" || $1 eq "sectionnums" || $1 eq "coursecode" || $1 eq "crosslistings") {      } elsif ($type eq "sectionums") {
         $enrollvar{$1} = $settings{$item};   $enrollvar{$type} = $settings{$item};
    $enrollvar{$type} =~ s/,/, /g;
               } elsif ($type eq "courseowner"   || $type eq "authtype" 
        || $type eq "autharg"    || $type eq "coursecode"
        || $type eq "crosslistings") {
           $enrollvar{$type} = $settings{$item};
             }              }
         } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {          } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
             if ( ($1 eq 'end') && ($settings{$item} == 0) ) {      my $type = $1;
               if ( ($type eq 'end') && ($settings{$item} == 0) ) {
                 $enrollvar{$item} = $lt{'noen'};                  $enrollvar{$item} = $lt{'noen'};
             } elsif ( ($1 eq 'start') && ($settings{$item} eq '') ) {              } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) {
                 $enrollvar{$item} = 'When enrolled';                  $enrollvar{$item} = 'When enrolled';
             } else {              } else {
                 $enrollvar{$item} = localtime($settings{$item});                  $enrollvar{$item} = localtime($settings{$item});
Line 226  all settings except course code, course Line 239  all settings except course code, course
         my @roleinfo = split/:/,$_;          my @roleinfo = split/:/,$_;
         if ( ($roleinfo[0] eq 'cc')  && ($roleinfo[2] eq $dom) )  {          if ( ($roleinfo[0] eq 'cc')  && ($roleinfo[2] eq $dom) )  {
             unless (grep/^$roleinfo[1]$/,@local_ccs) {              unless (grep/^$roleinfo[1]$/,@local_ccs) {
                 $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc');                  $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc');
                 if ($active_cc eq 'ok') {                  if ($active_cc eq 'active') {
                     push @local_ccs, $roleinfo[1];                      push @local_ccs, $roleinfo[1];
                     $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);                      $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
                     $cc_status{$roleinfo[1]} = $lt{'actv'};                      $cc_status{$roleinfo[1]} = $lt{'actv'};
Line 238  all settings except course code, course Line 251  all settings except course code, course
     unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {      unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {
         push @local_ccs, $enrollvar{'courseowner'};          push @local_ccs, $enrollvar{'courseowner'};
         $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);          $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);
         $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');          $active_cc = &Apache::loncommon::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
         if ($active_cc eq 'ok') {          if ($active_cc eq 'active') {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};              $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
         } else {          } else {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};              $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};

Removed from v.1.18  
changed lines
  Added in v.1.22


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