Diff for /loncom/interface/Attic/londropadd.pm between versions 1.154 and 1.158

version 1.154, 2006/12/21 20:07:57 version 1.158, 2007/04/17 15:45:03
Line 106  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 117  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 766  sub enroll_single_student { Line 766  sub enroll_single_student {
         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 822  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 948  sub get_student_username_domain_form { Line 949  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><th><label for="cuname">$lt{'usr'}</label>:</th>
     <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><th><label for="cudomain">$lt{'dom'}</label>:</th>
     <td>$domform</td></tr>      <td>$domform</td></tr>
 <tr><th>&nbsp;</th>  <tr><th>&nbsp;</th>
     <td>      <td>
Line 996  sub print_enroll_single_student_form { Line 997  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 1021  sub print_enroll_single_student_form { Line 1022  sub print_enroll_single_student_form {
         $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><th><label for="cfirst">$lt{'fn'}</label>:</th>
     <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><th><label for="cmiddle">$lt{'mn'}</label>:</th>
     <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><th><label for="clast">$lt{'ln'}</label>:</th>
     <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><th><label for="cgen">$lt{'gen'}</label>:</th>
     <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><th><label for="lcserver">$lt{'hs'}</label>:</th>
     <td>$homeserver_form</td></tr>      <td>$homeserver_form</td></tr>
 <tr><th>$lt{'mail'}:</th>  <tr><th><label for="emailaddress">$lt{'mail'}</label>:</th>
     <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 1061  END Line 1062  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><th><label for="cfirst">$lt{'fn'}</label>:</th>
     <td>      <td>
     <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />      <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
     </td></tr>      </td></tr>
 <tr><th>$lt{'mn'}:</th>  <tr><th><label for="cmiddle">$lt{'mn'}</label>:</th>
     <td>      <td>
     <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />      <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
     </td></tr>      </td></tr>
 <tr><th>$lt{'ln'}:</th>  <tr><th><label for="clast">$lt{'ln'}</label>:</th>
     <td>      <td>
     <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />      <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
     </td></tr>      </td></tr>
 <tr><th>$lt{'gen'}:</th>  <tr><th><label for="cgen">$lt{'gen'}</label>:</th>
     <td>      <td>
     <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />      <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
     </td></tr>      </td></tr>
 <tr><th>$lt{'mail'}:</th>  <tr><th><label for="emailaddress">$lt{'mail'}</label>:</th>
     <td>      <td>
     <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />      <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />
     </td></tr>      </td></tr>
Line 2170  sub upfile_drop_add { Line 2171  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'));

Removed from v.1.154  
changed lines
  Added in v.1.158


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