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

version 1.3, 2003/12/28 18:27:49 version 1.6, 2003/12/31 18:32:23
Line 222  all settings except course code, course Line 222  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{'coursecode'};          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 = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
         if ($active_cc eq 'ok') {          if ($active_cc eq 'ok') {
Line 279  all settings except course code, course Line 279  all settings except course code, course
  <td>$$typeref{$key}</td>   <td>$$typeref{$key}</td>
  <td>$enrollvar{$key}</td>   <td>$enrollvar{$key}</td>
  </tr>";   </tr>";
        $iter ++;          $iter ++;
     }      }
     $disp_table .= "</table>      $disp_table .= "</table>
                    </td>                     </td>
Line 418  $disp_table Line 418  $disp_table
 <br/>  <br/>
 ENDDOCUMENT  ENDDOCUMENT
     &print_footer($r);      &print_footer($r);
       return;
 }  }
   
 sub modify_course {  sub modify_course {
Line 552  sub modify_course { Line 553  sub modify_course {
             my $course_check = &localenroll::validate_courseID($course_id);              my $course_check = &localenroll::validate_courseID($course_id);
             if ($course_check eq 'ok') {                if ($course_check eq 'ok') {  
                                         my $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});                                          my $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});
                 my $outcome = 'ok';  
                 unless ($outcome eq 'ok') {                   unless ($outcome eq 'ok') { 
             $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");              $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
                 }                  }
Line 563  sub modify_course { Line 563  sub modify_course {
             $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");              $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
                 }                  }
             }              }
                 }                   } elsif ($changeowner) {
                               foreach my $sec (@sections) {
                                   if ($sec =~ m/^(.+):/) {
                                       my $course_id = $newattr{'coursecode'}.$1;
                                       my $outcome = &localenroll::new_course($course_id,$newattr{'courseowner'});
                                       unless ($outcome eq 'ok') {
                                           $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
                                       }
                                   } else {
                                       $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
                                   }
                               }
                           }
             } else {              } else {
                 $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";                  $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";
             }              }
Line 660  $bodytag Line 672  $bodytag
  </tr>   </tr>
 </table>  </table>
 ENDTHIS  ENDTHIS
       return;
 }  }
   
 sub print_footer {  sub print_footer {
   my $r = shift;      my $r = shift;
   $r->print(<<ENDBASE);      $r->print(<<ENDBASE);
 <br/>  <br/>
 </body>  </body>
 </html>  </html>
 ENDBASE  ENDBASE
       return;
 }  }
   
 sub check_course {  sub check_course {
     my ($dom,$course) = @_;      my ($dom,$course) = @_;
     my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1);      my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1);
     my @courses = ();  
     foreach my $key (sort keys %courseIDs) {      foreach my $key (sort keys %courseIDs) {
         if ($key =~ m/^($dom)_(\w+)$/) {          if ($key =~ m/^($dom)_(\w+)$/) {
             push @courses, $2;              if ($2 eq $course) {
                   return 'ok';
               }
         }          }
     }      }
     if (grep/^$course$/,@courses) {      return 'invalid course';
         return 'ok';  
     }  
     else {  
         return 'invalid course';  
     }  
 }  }
   
   

Removed from v.1.3  
changed lines
  Added in v.1.6


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