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

Diff for /loncom/interface/Attic/londropadd.pm between versions 1.147 and 1.162

version 1.147, 2006/08/08 19:02:04 version 1.162, 2007/07/02 21:12:06
Line 40  use Spreadsheet::WriteExcel; Line 40  use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();  use Apache::lonstathelpers();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::longroup;  use Apache::longroup;
   use LONCAPA();
   
 ###############################################################  ###############################################################
 ###############################################################  ###############################################################
Line 60  sub modifystudent { Line 61  sub modifystudent {
     # if $csec is undefined, drop the student from all the courses matching      # if $csec is undefined, drop the student from all the courses matching
     # this one.  If $csec is defined, drop them from all other sections of       # this one.  If $csec is defined, drop them from all other sections of 
     # this course and add them to section $csec      # this course and add them to section $csec
     $courseid=~s/\_/\//g;      my $cdom = $env{'course.'.$courseid.'.domain'};
     $courseid=~s/^(\w)/\/$1/;      my $cnum = $env{'course.'.$courseid.'.num'};
     my %roles = &Apache::lonnet::dump('roles',$udom,$unam);      my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
     my ($tmp) = keys(%roles);      my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles      # Bail out if we were unable to get the students roles
Line 69  sub modifystudent { Line 70  sub modifystudent {
     # Go through the roles looking for enrollment in this course      # Go through the roles looking for enrollment in this course
     my $result = '';      my $result = '';
     foreach my $course (keys(%roles)) {      foreach my $course (keys(%roles)) {
         if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {          if ($course=~m{^/\Q$cdom\E/\Q$cnum\E(?:\/)*(?:\s+)*(\w+)*\_st$}) {
             # We are in this course              # We are in this course
             my $section=$1;              my $section=$1;
             $section='' if ($course eq $courseid.'_st');              $section='' if ($course eq "/$cdom/$cnum".'_st');
             if (defined($csec) && $section eq $csec) {              if (defined($csec) && $section eq $csec) {
                 $result .= 'ok:';                  $result .= 'ok:';
             } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {              } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
Line 105  sub domain_form { Line 106  sub domain_form {
     # Set up domain and server selection forms      # Set up domain and server selection forms
     #      #
     # Get the domains      # Get the domains
     my @domains = &Apache::loncommon::get_domains();      my @domains = &Apache::lonnet::all_domains();
     # build up the menu information to be passed to       # build up the menu information to be passed to 
     # &Apache::loncommon::linked_select_forms      # &Apache::loncommon::linked_select_forms
     my %select_menus;      my %select_menus;
Line 116  sub domain_form { Line 117  sub domain_form {
         $select_menus{$dom}->{'default'}= 'default';          $select_menus{$dom}->{'default'}= 'default';
         $select_menus{$dom}->{'select2'}->{'default'} = 'default';          $select_menus{$dom}->{'select2'}->{'default'} = 'default';
         # Now build up the other items in the second menu          # Now build up the other items in the second menu
         my %servers = &Apache::loncommon::get_library_servers($dom);          my %servers = &Apache::lonnet::get_servers($dom,'library');
         foreach my $server (keys(%servers)) {          foreach my $server (keys(%servers)) {
             $select_menus{$dom}->{'select2'}->{$server}               $select_menus{$dom}->{'select2'}->{$server} 
                                             = "$server $servers{$server}";                                              = "$server $servers{$server}";
Line 135  sub print_main_menu { Line 136  sub print_main_menu {
     my ($r,$enrl_permission,$view_permission,$grp_manage_permission,      my ($r,$enrl_permission,$view_permission,$grp_manage_permission,
         $grp_view_permission)=@_;          $grp_view_permission)=@_;
     #      #
     my ($cdom,$cnum) = split/_/,$env{'request.course.id'};      my $cid =$env{'request.course.id'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my $cnum=$env{'course.'.$cid.'.num'};
     my @menu =       my @menu = 
         (           ( 
           { text => 'Upload a class list',             { text => 'Upload a class list', 
Line 177  sub print_main_menu { Line 180  sub print_main_menu {
             permission => $grp_manage_permission,              permission => $grp_manage_permission,
             url => '/adm/coursegroups?refpage=enrl&action=modify',              url => '/adm/coursegroups?refpage=enrl&action=modify',
             },              },
 #          { text => 'Delete an existing group',            { text => 'Delete an existing group',
 #            help => 'Course_Delete_Group',              help => 'Course_Delete_Group',
 #            permission => $grp_manage_permission,              permission => $grp_manage_permission,
 #            url => '/adm/coursegroups?refpage=enrl&action=delete',              url => '/adm/coursegroups?refpage=enrl&action=delete',
 #            },              },
             { text => 'Re-enable a deleted group',
               help => 'Course_Reenable_Group',
               permission => $grp_manage_permission,
               url => '/adm/coursegroups?refpage=enrl&action=reenable',
               },
           { text => 'Enter an existing group',            { text => 'Enter an existing group',
             help => 'Course_Display_Group',              help => 'Course_Display_Group',
             permission => $grp_view_permission,              permission => $grp_view_permission,
Line 250  sub print_upload_manager_header { Line 258  sub print_upload_manager_header {
     #      #
     my $javascript_validations=&javascript_validations('auth',$krbdefdom,      my $javascript_validations=&javascript_validations('auth',$krbdefdom,
                                     $password_choice);                                      $password_choice);
     my $checked=(($env{'form.noFirstLine'})?' checked="1"':'');      my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".      $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
               "<hr>\n".                "<hr>\n".
               '<h3>'.&mt('Identify fields')."</h3>\n");                '<h3>'.&mt('Identify fields')."</h3>\n");
Line 269  sub print_upload_manager_header { Line 277  sub print_upload_manager_header {
     $r->print('<input type="button" value="Reverse Association" '.      $r->print('<input type="button" value="Reverse Association" '.
               'name="'.&mt('Reverse Association').'" '.                'name="'.&mt('Reverse Association').'" '.
               'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');                'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
     $r->print('<label><input type="checkbox" name="noFirstLine" $checked />'.      $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
               &mt('Ignore First Line').'</label>');                &mt('Ignore First Line').'</label>');
     $r->print("<hr />\n".      $r->print("<hr />\n".
               '<script type="text/javascript" language="Javascript">'."\n".                '<script type="text/javascript" language="Javascript">'."\n".
Line 744  sub enroll_single_student { Line 752  sub enroll_single_student {
     }      }
   
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');      $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
     $r->print('<p>'.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".      $r->print('<p>'.&mt('Enrolling [_1] : [_2]',$env{'form.cuname'},
               $env{'form.lcdomain'}.'</p>');   $env{'form.lcdomain'}).'</p>');
     if (($env{'form.cuname'})&&($env{'form.cuname'}!~/\W/)&&      if (($env{'form.cuname'})
         ($env{'form.lcdomain'})&&($env{'form.lcdomain'}!~/\W/)) {   && ($env{'form.cuname'} 
       eq &LONCAPA::clean_username($env{'form.cuname'}))
    && ($env{'form.lcdomain'})
    && ($env{'form.lcdomain'}
       eq &LONCAPA::clean_domain($env{'form.lcdomain'}))) {
         # Deal with home server selection          # Deal with home server selection
         my $domain=$env{'form.lcdomain'};          my $domain=$env{'form.lcdomain'};
         my $desiredhost = $env{'form.lcserver'};          my $desiredhost = $env{'form.lcserver'};
         if (lc($desiredhost) eq 'default') {          if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;              $desiredhost = undef;
         } else {          } else {
             my %home_servers =&Apache::loncommon::get_library_servers($domain);              my %home_servers =&Apache::lonnet::get_servers($domain,'library');
             if (! exists($home_servers{$desiredhost})) {              if (! exists($home_servers{$desiredhost})) {
                 $r->print('<font color="#ff0000">'.&mt('Error').':</font>'.                  $r->print('<font color="#ff0000">'.&mt('Error').':</font>'.
                           &mt('Invalid home server specified'));                            &mt('Invalid home server specified'));
Line 810  sub enroll_single_student { Line 822  sub enroll_single_student {
     } else {      } else {
         $r->print(&mt('Invalid username or domain'));          $r->print(&mt('Invalid username or domain'));
     }          }    
       $r->print("<p><a href='/adm/dropadd?action=enrollstudent'>".&mt("Enroll another student")."</a></p>");
 }  }
   
 sub setup_date_selectors {  sub setup_date_selectors {
Line 873  sub date_setting_table { Line 886  sub date_setting_table {
     my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);      my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
     my $dateDefault = '<nobr>'.      my $dateDefault = '<nobr>'.
         '<label><input type="checkbox" name="makedatesdefault" /> '.          '<label><input type="checkbox" name="makedatesdefault" /> '.
         &mt('make these dates the default for future enrollment').'</label>';          &mt('make these dates the default for future enrollment').
    '</label></nobr>';
     if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {      if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = '&nbsp;';          $dateDefault = '&nbsp;';
     }      }
Line 936  sub get_student_username_domain_form { Line 950  sub get_student_username_domain_form {
 <input type="hidden" name="state"  value="gotusername" />  <input type="hidden" name="state"  value="gotusername" />
 <h3>$lt{'eos'}</h3>  <h3>$lt{'eos'}</h3>
 <table>  <table>
 <tr><th>$lt{'usr'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cuname">$lt{'usr'}</label>:</td>
     <td><input type="text" name="cuname"  size="15" /></td></tr>      <td><input type="text" name="cuname"  size="15" /></td></tr>
 <tr><th>$lt{'dom'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cudomain">$lt{'dom'}</label>:</td>
     <td>$domform</td></tr>      <td>$domform</td></tr>
 <tr><th>&nbsp;</th>  <tr><td>&nbsp;</td>
     <td>      <td>
     <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />      <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
     </td></tr>      </td></tr>
Line 957  sub print_enroll_single_student_form { Line 971  sub print_enroll_single_student_form {
     my $r=shift;      my $r=shift;
     $r->print("<h3>".&mt('Enroll One Student')."</h3>");      $r->print("<h3>".&mt('Enroll One Student')."</h3>");
     #      #
     my $username = $env{'form.cuname'};      my $username = &LONCAPA::clean_username($env{'form.cuname'});
     my $domain   = $env{'form.cudomain'};      my $domain   = &LONCAPA::clean_domain($env{'form.cudomain'});
     $username=~s/\W//gs;  
     $domain=~s/\W//gs;  
     my $home = &Apache::lonnet::homeserver($username,$domain);      my $home = &Apache::lonnet::homeserver($username,$domain);
     # $new_user flags whether we are creating a new user or using an old one      # $new_user flags whether we are creating a new user or using an old one
     my $new_user = 1;      my $new_user = 1;
Line 986  sub print_enroll_single_student_form { Line 998  sub print_enroll_single_student_form {
         #          #
         # Set up domain selection form          # Set up domain selection form
         my $homeserver_form = '';          my $homeserver_form = '';
         my %servers = &Apache::loncommon::get_library_servers($domain);          my %servers = &Apache::lonnet::get_servers($domain,'library');
         $homeserver_form = '<select name="lcserver" size="1">'."\n".          $homeserver_form = '<select name="lcserver" size="1">'."\n".
             '<option value="default" selected>default</option>'."\n";              '<option value="default" selected>default</option>'."\n";
         while (my ($servername,$serverdescription) = each (%servers)) {          while (my ($servername,$serverdescription) = each (%servers)) {
Line 1009  sub print_enroll_single_student_form { Line 1021  sub print_enroll_single_student_form {
    );     );
  my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');   my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
         $user_data_html = <<END;          $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>  <h3>$lt{'udf'} $username:$domain</h3>
 <table>  <table>
 <tr><th>$lt{'fn'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
     <td><input type="text" name="cfirst"  size="15"></td></tr>      <td><input type="text" name="cfirst"  size="15" /></td></tr>
 <tr><th>$lt{'mn'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
     <td><input type="text" name="cmiddle" size="15"></td></tr>      <td><input type="text" name="cmiddle" size="15" /></td></tr>
 <tr><th>$lt{'ln'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
     <td><input type="text" name="clast"   size="15"></td></tr>      <td><input type="text" name="clast"   size="15" /></td></tr>
 <tr><th>$lt{'gen'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
     <td><input type="text" name="cgen"    size="5"> </td></tr>      <td><input type="text" name="cgen"    size="5"  /> </td></tr>
 <tr><th>$lt{'hs'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="lcserver">$lt{'hs'}</label>:</td>
     <td>$homeserver_form</td></tr>      <td>$homeserver_form</td></tr>
 <tr><th>$lt{'mail'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
     <td><input type="text" name="emailaddress" size="20" /></td></tr>      <td><input type="text" name="emailaddress" size="20" /></td></tr>
 </table>  </table>
 <h3>$lt{'pswd'}</h3>  <h3>$lt{'pswd'}</h3>
Line 1048  END Line 1060  END
                        'mail' => "Email Address",                         'mail' => "Email Address",
    );     );
         $user_data_html = <<END;          $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>  <h3>$lt{'udf'} $username:$domain</h3>
 <input type="hidden" name="lcserver" value="default" />  <input type="hidden" name="lcserver" value="default" />
 <table>  <table>
 <tr><th>$lt{'fn'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
     <td>      <td><input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" /></td></tr>
     <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />  <tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
     </td></tr>      <td><input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" /></td></tr>
 <tr><th>$lt{'mn'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
     <td>      <td><input type="text" name="clast" value="$uenv{'lastname'}" size="15" /></td></tr>
     <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />  <tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
     </td></tr>      <td><input type="text" name="cgen" value="$uenv{'generation'}" size="5"  /> </td></tr>
 <tr><th>$lt{'ln'}:</th>  <tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
     <td>      <td><input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" /></td></tr>
     <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />  
     </td></tr>  
 <tr><th>$lt{'gen'}:</th>  
     <td>  
     <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />  
     </td></tr>  
 <tr><th>$lt{'mail'}:</th>  
     <td>  
     <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />  
     </td></tr>  
 </table>  </table>
 END  END
     }      }
Line 1132  $user_data_html Line 1134  $user_data_html
   
 <h3>$lt{'cd'}</h3>  <h3>$lt{'cd'}</h3>
   
 <p>$lt{'gs'}: <input type="text" name="csec" size="5" />  <p><label for="csec">$lt{'gs'}</label>: <input type="text" name="csec" size="5" />
 <p>  
 $date_table  
 </p>  </p>
   $date_table
 <h3>$lt{'idsn'}</h3>  <h3>$lt{'idsn'}</h3>
 <p>  <p>
 $lt{'idsn'}: <input type="text" name="cstid" size="10">  <label for="cstid">$lt{'idsn'}</label>: <input type="text" name="cstid" size="10" />
 </p><p>  </p><p>
 <label>  <label>
 <input type="checkbox" name="forceid" value="yes">   <input type="checkbox" name="forceid" value="yes" /> 
 $lt{'disn'}  $lt{'disn'}
 </label>  </label>
 </p><p>  </p><p>
 <input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}">  <input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}" />
 </p>  </p>
 END  END
     return;      return;
Line 1177  sub print_html_classlist { Line 1178  sub print_html_classlist {
     }      }
     my $status_select = &Apache::lonhtmlcommon::StatusOptions      my $status_select = &Apache::lonhtmlcommon::StatusOptions
         ($env{'form.Status'});          ($env{'form.Status'});
     my $cid=$env{'request.course.id'};      my $cid =$env{'request.course.id'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     #      #
Line 1223  sub print_html_classlist { Line 1224  sub print_html_classlist {
             $output_selector .= "\n".$option;              $output_selector .= "\n".$option;
         }          }
         $output_selector .= '</select>';          $output_selector .= '</select>';
         $r->print(&mt('Output Format: [_1]',$output_selector).('&nbsp;'x3));          $r->print('<label>'.&mt('Output Format: [_1]',$output_selector).'</label>'.('&nbsp;'x3));
     }      }
     $r->print(&mt('Student Status: [_1]',$status_select)."\n");      $r->print('<label>'.&mt('Student Status: [_1]',$status_select)."</label>\n");
     $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.      $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
               "\n</p>\n");                "\n</p>\n");
     #      #
Line 1687  $lt{'odcc'} Line 1688  $lt{'odcc'}
 <input type="hidden" name="sortby"  value="$sortby" />  <input type="hidden" name="sortby"  value="$sortby" />
 <input type="hidden" name="Status"  value="$env{'form.Status'}" />  <input type="hidden" name="Status"  value="$env{'form.Status'}" />
 <h2>$lt{'mef'} $info{'firstname'} $info{'middlename'}   <h2>$lt{'mef'} $info{'firstname'} $info{'middlename'} 
 $info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>  $info{'lastname'} $info{'generation'}, $sname:$sdom</h2>
 <p>  <p>
 <b>$lt{'sn'}</b>  <b>$lt{'sn'}</b>
 <table>  <table>
Line 1699  $info{'lastname'} $info{'generation'}, $ Line 1700  $info{'lastname'} $info{'generation'}, $
 <input type="text" name="generation" value="$info{'generation'}" /></td></tr>  <input type="text" name="generation" value="$info{'generation'}" /></td></tr>
 </table>  </table>
 </p><p>  </p><p>
 <b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>  <b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12" />
 </p><p>  </p><p>
 <label>  <label>
 <input type="checkbox" name="forceid" >   <input type="checkbox" name="forceid" /> 
 $lt{'disn'}  $lt{'disn'}
 </label>  </label>
 </p><p>  </p><p>
 <b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14"/>  <b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14" />
 </p>  </p>
 <p>$current_date_description</p>  <p>$current_date_description</p>
 <p>$date_table</p>  <p>$date_table</p>
Line 1748  sub modify_single_student { Line 1749  sub modify_single_student {
                                                   $env{'request.course.id'});                                                    $env{'request.course.id'});
     my ($tmp) = keys(%old);      my ($tmp) = keys(%old);
     if ($tmp =~ /^(con_lost|error|no_such_host)/i) {      if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
         $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");          $r->print(&mt('There was an error determining the environment values for')." $slogin : $sdom.");
         return;          return;
     }      }
     undef $tmp;      undef $tmp;
Line 1788  sub modify_single_student { Line 1789  sub modify_single_student {
                    'et'    => "End Time",                     'et'    => "End Time",
        );         );
     $r->print(<<END);      $r->print(<<END);
     <h2>$lt{'mdu'} $slogin \@ $sdom </h2>      <h2>$lt{'mdu'} $slogin : $sdom </h2>
 <h3>$lt{'si'}</h3>  <h3>$lt{'si'}</h3>
 <table rules="rows" border="1" cellpadding="3" >  <table rules="rows" border="1" cellpadding="3" >
 <tr>  <tr>
Line 1848  END Line 1849  END
                   &mt('The error reported was')." ".                    &mt('The error reported was')." ".
                   $roleresults);                    $roleresults);
         &Apache::lonnet::logthis("londropadd:failed attempt to modify student".          &Apache::lonnet::logthis("londropadd:failed attempt to modify student".
                                  " data for ".$slogin." \@ ".$sdom." by ".                                   " data for ".$slogin." : ".$sdom." by ".
                                  $env{'user.name'}." \@ ".$env{'user.domain'}.                                   $env{'user.name'}." : ".$env{'user.domain'}.
                                  ":".$roleresults);                                   ":".$roleresults);
     } else { # everything is okay!      } else { # everything is okay!
         $r->print(&mt('Student information updated successfully.')." <br />".          $r->print(&mt('Student information updated successfully.')." <br />".
Line 1870  END Line 1871  END
 sub get_enrollment_data {  sub get_enrollment_data {
     my ($sname,$sdomain) = @_;      my ($sname,$sdomain) = @_;
     my $courseid = $env{'request.course.id'};      my $courseid = $env{'request.course.id'};
     $courseid =~ s:_:/:g;      my $cdom = $env{'course.'.$courseid.'.domain'};
       my $cnum = $env{'course.'.$courseid.'.num'};
     my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);      my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
     my ($tmp) = keys(%roles);      my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles      # Bail out if we were unable to get the students roles
Line 1880  sub get_enrollment_data { Line 1882  sub get_enrollment_data {
     my $section = '';      my $section = '';
     my $count = scalar(keys(%roles));      my $count = scalar(keys(%roles));
     while (my ($course,$role) = each(%roles)) {      while (my ($course,$role) = each(%roles)) {
         if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {          if ($course=~m{^/\Q$cdom\E/\Q$cnum\E/*\s*(\w+)*_st$} ) {
             #              #
             # Get active role              # Get active role
             $section=$1;              $section=$1;
Line 2159  sub upfile_drop_add { Line 2161  sub upfile_drop_add {
     if (lc($desiredhost) eq 'default') {      if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;          $desiredhost = undef;
     } else {      } else {
         my %home_servers = &Apache::loncommon::get_library_servers($domain);          my %home_servers = &Apache::lonnet::get_servers($domain,'library');
         if (! exists($home_servers{$desiredhost})) {          if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.              $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       &mt('Invalid home server specified'));                        &mt('Invalid home server specified'));
Line 2193  sub upfile_drop_add { Line 2195  sub upfile_drop_add {
             $amode = ''; # This causes the loop below to be skipped              $amode = ''; # This causes the loop below to be skipped
         }          }
     }      }
     unless (($domain=~/\W/) || ($amode eq '')) {      if ( $domain eq &LONCAPA::clean_domain($domain)
    && ($amode ne '')) {
         #######################################          #######################################
         ##         Enroll Students           ##          ##         Enroll Students           ##
         #######################################          #######################################
Line 2227  sub upfile_drop_add { Line 2230  sub upfile_drop_add {
                         $gen=$entries{$fields{'gen'}};                          $gen=$entries{$fields{'gen'}};
                     }                      }
                 }                  }
                 if ($entries{$fields{'username'}}=~/\W/) {                  if ($entries{$fields{'username'}}
       ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
                     $r->print('<br />'.                      $r->print('<br />'.
       &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',        &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
           $entries{$fields{'username'}},$fname,$mname,$lname,$gen).            $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
Removed from v.1.147  
changed lines
  Added in v.1.162

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