Diff for /loncom/interface/Attic/londropadd.pm between versions 1.78 and 1.81

version 1.78, 2003/07/25 18:51:18 version 1.81, 2003/08/14 14:16:42
Line 198  to this page if the data selected is ins Line 198  to this page if the data selected is ins
 <input type="hidden" name="associate"  value="" />  <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="datatoken"  value="$datatoken" />  <input type="hidden" name="datatoken"  value="$datatoken" />
 <input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />  <input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
   <input type="hidden" name="noFirstLine" value="$ENV{'form.noFirstLine'}" />
 <input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />  <input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
 <input type="hidden" name="upfile_associate"   <input type="hidden" name="upfile_associate" 
                                        value="$ENV{'form.upfile_associate'}" />                                         value="$ENV{'form.upfile_associate'}" />
Line 524  sub print_upload_manager_form { Line 525  sub print_upload_manager_form {
     &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);      &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
     my $i;      my $i;
     my $keyfields;      my $keyfields;
       my $dummy;
     if ($total>=0) {      if ($total>=0) {
  my @d=(['username','Username'],   my @d=(['username','Username'],
                ['names','Last Name, First Names'],                 ['names','Last Name, First Names'],
Line 535  sub print_upload_manager_form { Line 537  sub print_upload_manager_form {
                ['sec','Group/Section'],                 ['sec','Group/Section'],
        ['ipwd','Initial Password'],         ['ipwd','Initial Password'],
                ['email','EMail Address']);                 ['email','EMail Address']);
    if($ENV{'form.noFirstLine'}){
       ($dummy,@records)=@records;
    }
   
  if ($ENV{'form.upfile_associate'} eq 'reverse') {   if ($ENV{'form.upfile_associate'} eq 'reverse') {
     &Apache::loncommon::csv_print_samples($r,\@records);      &Apache::loncommon::csv_print_samples($r,\@records);
     $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);      $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);
Line 553  sub print_upload_manager_form { Line 559  sub print_upload_manager_form {
 # ======================================================= Enroll single student  # ======================================================= Enroll single student
 sub enroll_single_student {  sub enroll_single_student {
     my $r=shift;      my $r=shift;
     # Remove whitespace from section      # Remove non alphanumeric values from section
     $ENV{'form.csec'}=~s/(\s|:)//g;      $ENV{'form.csec'}=~s/\W//g;
     #      #
     # We do the dates first because the action of making them the defaul      # We do the dates first because the action of making them the defaul
     # in the course is entirely seperate from the action of enrolling the      # in the course is entirely seperate from the action of enrolling the
Line 622  sub enroll_single_student { Line 628  sub enroll_single_student {
                 $r->print("unable to enroll: ".$login_result);                  $r->print("unable to enroll: ".$login_result);
             }              }
  } else {   } else {
             $r->print('<p><font color="#ff0000">ERROR</font>&nbsp;'.              $r->print('<p><font color="#ff0000">ERROR</font>&nbsp;');
                       'Invalid login mode or password.  '.              if ($amode =~ /^krb/) {
                       'Unable to enroll '.$ENV{'form.cuname'}.'.</p>');                  $r->print('Missing Kerberos domain information.  ');
         }                        } else {
                   $r->print('Invalid login mode or password.  ');
               }
               $r->print('<b>Unable to enroll '.$ENV{'form.cuname'}.'.</b></p>');
           }
     } else {      } else {
         $r->print('Invalid username or domain');          $r->print('Invalid username or domain');
     }          }    
Line 1197  END Line 1207  END
 sub modify_single_student {  sub modify_single_student {
     my $r = shift;      my $r = shift;
     #      #
     # Remove whitespace from the section      # Remove non alphanumeric values from the section
     $ENV{'form.section'} =~ s/(\s|:)//g;      $ENV{'form.section'} =~ s/\W//g;
     #      #
     # Do the date defaults first      # Do the date defaults first
     my ($starttime,$endtime) = &get_dates_from_form();      my ($starttime,$endtime) = &get_dates_from_form();
Line 1524  $upfile_select Line 1534  $upfile_select
 <input type=submit name="fileupload" value="Upload Courselist">  <input type=submit name="fileupload" value="Upload Courselist">
 <input type="hidden" name="action" value="upload" />  <input type="hidden" name="action" value="upload" />
 <input type="hidden" name="state"  value="got_file" />  <input type="hidden" name="state"  value="got_file" />
   <input type="checkbox" name="noFirstLine" /> Ignore First Line<br />
 </p>  </p>
 $create_classlist_help <br />  $create_classlist_help <br />
 $create_csv_help  $create_csv_help
Line 1585  sub upfile_drop_add { Line 1596  sub upfile_drop_add {
             $genpwd=$ENV{'form.locarg'};              $genpwd=$ENV{'form.locarg'};
         }          }
     }      }
       if ($amode =~ /^krb/) {
           if (! defined($genpwd) || $genpwd eq '') {
               $r->print('<font color="red" size="+1">'.
                         'Unable to enroll students:'.'</font>  '.
                         'No Kerberos domain was specified.</p>');
               $amode = ''; # This causes the loop below to be skipped
           }
       }
     unless (($domain=~/\W/) || ($amode eq '')) {      unless (($domain=~/\W/) || ($amode eq '')) {
         #######################################          #######################################
         ##         Enroll Students           ##          ##         Enroll Students           ##
Line 1630  sub upfile_drop_add { Line 1649  sub upfile_drop_add {
                             $sec=$entries{$fields{'sec'}};                              $sec=$entries{$fields{'sec'}};
                         }                          }
                     }                      }
                     # remove whitespace from section                      # remove non alphanumeric values from section
                     $sec =~ s/(\s|:)//g;                      $sec =~ s/\W//g;
                     # determine student id number                      # determine student id number
                     my $id='';                      my $id='';
                     if (defined($fields{'id'})) {                      if (defined($fields{'id'})) {

Removed from v.1.78  
changed lines
  Added in v.1.81


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