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

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

version 1.14, 2004/11/27 17:23:09 version 1.18, 2005/04/27 19:09:30
Line 33  use lib '/home/httpd/lib/perl'; Line 33  use lib '/home/httpd/lib/perl';
   
 sub print_course_selection_page {  sub print_course_selection_page {
     my ($r,$tasklongref) = @_;      my ($r,$tasklongref) = @_;
     my $dom = $ENV{'request.role.domain'};      my $dom = $env{'request.role.domain'};
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                     'csae' => "Course settings for automated enrollment",                      'csae' => "Course settings for automated enrollment",
                     'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.",                       'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", 
Line 45  sub print_course_selection_page { Line 45  sub print_course_selection_page {
     );      );
                                                                                                                                                                               
 # Determine the courses  # Determine the courses
     my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.');      my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
     &print_header($r,$tasklongref);      &print_header($r,$tasklongref);
     $r->print(<<ENDBLOCK);      $r->print(<<ENDBLOCK);
 <form action="/adm/modifycourse" method="post" name="cmod">  <form action="/adm/modifycourse" method="post" name="cmod">
Line 132  sub print_course_modification_page { Line 132  sub print_course_modification_page {
     my %enrollvar = ();      my %enrollvar = ();
     my $javascript_validations;      my $javascript_validations;
     my $course = '';      my $course = '';
     my $dom = $ENV{'request.role.domain'};      my $dom = $env{'request.role.domain'};
     if ( defined($ENV{'form.course'}) ) {      if ( defined($env{'form.course'}) ) {
         $course = $ENV{'form.course'};          $course = $env{'form.course'};
     }      }
     my $ok_course = 'ok';      my $ok_course = 'ok';
     if ( ($course == -1) || ($course == '-2') || ($course eq '') ) {      if ( ($course == -1) || ($course == '-2') || ($course eq '') ) {
Line 142  sub print_course_modification_page { Line 142  sub print_course_modification_page {
     } else {      } else {
         $ok_course = &check_course($dom,$course);          $ok_course = &check_course($dom,$course);
     }      }
     print STDERR "Response was $ok_course for $dom,$course\n";  
   
     unless ($ok_course eq 'ok') {      unless ($ok_course eq 'ok') {
         &print_header($r,$tasklongref,'',\$javascript_validations);          &print_header($r,$tasklongref,'',\$javascript_validations);
Line 437  ENDDOCUMENT Line 436  ENDDOCUMENT
   
 sub modify_course {  sub modify_course {
     my ($r,$tasklongref,$typeref) = @_;      my ($r,$tasklongref,$typeref) = @_;
     my $dom = $ENV{'user.domain'};      my $dom = $env{'user.domain'};
     my $crs = $ENV{'form.course'};      my $crs = $env{'form.course'};
     unless ( &check_course($dom,$crs) eq 'ok' ) {      unless ( &check_course($dom,$crs) eq 'ok' ) {
         &print_header($r,$tasklongref);          &print_header($r,$tasklongref);
         my $reply = "<br/>".&mt("The LON-CAPA course selected was not a valid course for this domain");          my $reply = "<br/>".&mt("The LON-CAPA course selected was not a valid course for this domain");
Line 486  sub modify_course { Line 485  sub modify_course {
     my $description = $settings{'description'};      my $description = $settings{'description'};
     my %cenv = ();      my %cenv = ();
   
     if ($ENV{'form.login'} eq 'krb') {      if ($env{'form.login'} eq 'krb') {
         $newattr{'authtype'} = $ENV{'form.login'};          $newattr{'authtype'} = $env{'form.login'};
         $newattr{'authtype'} .= $ENV{'form.krbver'};          $newattr{'authtype'} .= $env{'form.krbver'};
         $newattr{'autharg'} = $ENV{'form.krbarg'};          $newattr{'autharg'} = $env{'form.krbarg'};
     } elsif ($ENV{'form.login'} eq 'int') {      } elsif ($env{'form.login'} eq 'int') {
         $newattr{'authtype'} ='internal';          $newattr{'authtype'} ='internal';
         if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {          if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
             $newattr{'autharg'} = $ENV{'form.intarg'};              $newattr{'autharg'} = $env{'form.intarg'};
         }          }
     } elsif ($ENV{'form.login'} eq 'loc') {      } elsif ($env{'form.login'} eq 'loc') {
         $newattr{'authtype'} = 'localauth';          $newattr{'authtype'} = 'localauth';
         if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {          if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
             $newattr{'autharg'} = $ENV{'form.locarg'};              $newattr{'autharg'} = $env{'form.locarg'};
         }          }
     }      }
     if ( $newattr{'authtype'}=~ /^krb/) {      if ( $newattr{'authtype'}=~ /^krb/) {
Line 508  sub modify_course { Line 507  sub modify_course {
         }          }
     }      }
   
     if ( exists($ENV{'form.courseowner'}) ) {      if ( exists($env{'form.courseowner'}) ) {
         $newattr{'courseowner'}=$ENV{'form.courseowner'};          $newattr{'courseowner'}=$env{'form.courseowner'};
         unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {          unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
             $changeowner = 1;              $changeowner = 1;
         }           } 
     }      }
               
     if ( exists($ENV{'form.coursecode'}) ) {      if ( exists($env{'form.coursecode'}) ) {
         $newattr{'coursecode'}=$ENV{'form.coursecode'};          $newattr{'coursecode'}=$env{'form.coursecode'};
         unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {          unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
             $changecode = 1;              $changecode = 1;
         }          }
     }      }
     if ($changeowner == 1 || $changecode == 1) {      if ($changeowner == 1 || $changecode == 1) {
         my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($ENV{'form.coursecode'}).':'.&Apache::lonnet::escape($ENV{'form.courseowner'});          my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($env{'form.coursecode'}).':'.&Apache::lonnet::escape($env{'form.courseowner'});
         &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom));          &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom));
     }      }
   
Line 642  sub print_header { Line 641  sub print_header {
              'comg' => 'Course Manager',               'comg' => 'Course Manager',
              );               );
     my $action = "start";      my $action = "start";
     if ( exists($ENV{'form.action'}) ) {      if ( exists($env{'form.action'}) ) {
         $action = $ENV{'form.action'};          $action = $env{'form.action'};
     }      }
     if ( ($description eq '') || (!defined($description)) ) {      if ( ($description eq '') || (!defined($description)) ) {
         $description = $lt{'comg'};          $description = $lt{'comg'};
Line 655  sub print_header { Line 654  sub print_header {
     } else {      } else {
         $page =  '<a href="/adm/modifycourse">'.$lt{'chco'}.'</a>';          $page =  '<a href="/adm/modifycourse">'.$lt{'chco'}.'</a>';
         if ( $action eq 'process' ) {          if ( $action eq 'process' ) {
             my $course = $ENV{'form.course'};              my $course = $env{'form.course'};
             $page .= "-&gt; <a href=\"/adm/modifycourse?action=display&course=$course\">".$$tasklongref{'display'}."</a> -&gt; <b>$$tasklongref{$action}</b> ";              $page .= "-&gt; <a href=\"/adm/modifycourse?action=display&course=$course\">".$$tasklongref{'display'}."</a> -&gt; <b>$$tasklongref{$action}</b> ";
         } else {          } else {
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";              $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";
         }          }
     }      }
       my $html=&Apache::lonxml::xmlbegin();
     $r->print("      $r->print("
 <html>  $html
 <head>");  <head>
   ");
     if ($action eq 'display') {      if ($action eq 'display') {
         $r->print("          $r->print("
 <script language=\"JavaScript\" type=\"text/javascript\">  <script language=\"JavaScript\" type=\"text/javascript\">
Line 700  ENDBASE Line 701  ENDBASE
   
 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,'.','.','.');
     foreach my $key (sort keys %courseIDs) {      foreach my $key (sort keys %courseIDs) {
         if ($key =~ m/^($dom)_(\w+)$/) {          if ($key =~ m/^($dom)_(\w+)$/) {
             if ($2 eq $course) {              if ($2 eq $course) {
Line 720  sub handler { Line 721  sub handler {
         return OK;          return OK;
     }      }
                                                                                                                                                                       
     if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {      if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
         &Apache::loncommon::content_type($r,'text/html');          &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;          $r->send_http_header;
   
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','course']);          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','course']);
         my $dom = $ENV{'user.domain'};          my $dom = $env{'user.domain'};
         my %longtype=&Apache::lonlocal::texthash(          my %longtype=&Apache::lonlocal::texthash(
                        'authtype' => 'Default authentication method',                         'authtype' => 'Default authentication method',
                        'autharg'  => 'Default authentication parameter',                         'autharg'  => 'Default authentication parameter',
Line 747  sub handler { Line 748  sub handler {
                         'process'  => 'Results of changes',                          'process'  => 'Results of changes',
                        );                         );
                                                                                                                                                                       
         if ($ENV{'form.action'} eq 'process') {          if ($env{'form.action'} eq 'process') {
             &modify_course($r,\%tasklong,\%longtype);              &modify_course($r,\%tasklong,\%longtype);
         } elsif ($ENV{'form.action'} eq 'display')  {          } elsif ($env{'form.action'} eq 'display')  {
             &print_course_modification_page($r,\%tasklong,\%longtype);              &print_course_modification_page($r,\%tasklong,\%longtype);
         } else {          } else {
             &print_course_selection_page($r,\%tasklong);              &print_course_selection_page($r,\%tasklong);
         }          }
     } else {      } else {
         $ENV{'user.error.msg'}=          $env{'user.error.msg'}=
         "/adm/modifycourse:ccc:0:0:Cannot modify course settings";          "/adm/modifycourse:ccc:0:0:Cannot modify course settings";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      }
Removed from v.1.14  
changed lines
  Added in v.1.18

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