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

Diff for /loncom/interface/loncreateuser.pm between versions 1.31 and 1.35

version 1.31, 2002/04/22 15:26:46 version 1.35, 2002/04/29 14:47:57
Line 85  BEGIN { Line 85  BEGIN {
 sub phase_one {  sub phase_one {
     my $r=shift;      my $r=shift;
     my $defdom=$ENV{'user.domain'};      my $defdom=$ENV{'user.domain'};
     $r->print(<<ENDDOCUMENT);      my @domains = &Apache::loncommon::get_domains();
       my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
       $r->print(<<"ENDDOCUMENT");
 <html>  <html>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
Line 94  sub phase_one { Line 96  sub phase_one {
 <h1>Create User, Change User Privileges</h1>  <h1>Create User, Change User Privileges</h1>
 <form action=/adm/createuser method=post>  <form action=/adm/createuser method=post>
 <input type=hidden name=phase value=two>  <input type=hidden name=phase value=two>
   <p>
 Username: <input type=text size=15 name=ccuname><br>  Username: <input type=text size=15 name=ccuname><br>
 Domain: <input type=text size=15 name=ccdomain value=$defdom><p>  Domain: $domform 
   </p>
 <input type=submit value="Continue">  <input type=submit value="Continue">
 </form>  </form>
 </body>  </body>
Line 165  ENDFORMINFO Line 169  ENDFORMINFO
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);      my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     my %incdomains;       my %incdomains; 
     my %inccourses;      my %inccourses;
     my %home_servers = &get_home_servers($ccdomain);    
     foreach (%Apache::lonnet::hostdom) {      foreach (%Apache::lonnet::hostdom) {
        $incdomains{$_}=1;         $incdomains{$_}=1;
     }      }
Line 176  ENDFORMINFO Line 179  ENDFORMINFO
     }      }
     if ($uhome eq 'no_host') {      if ($uhome eq 'no_host') {
         my $home_server_list=          my $home_server_list=
             '<option value="default" selected>default</option>'."\n";              '<option value="default" selected>default</option>'."\n".
         foreach (sort keys(%home_servers)) {                  &Apache::loncommon::home_server_option_list($ccdomain);
             $home_server_list.=          
                 '<option value="'.$_.'">'.$_.' '.  
                     $home_servers{$_}."</option>\n";  
         }  
  $r->print(<<ENDNEWUSER);   $r->print(<<ENDNEWUSER);
 $dochead  $dochead
 <h1>Create New User</h1>  <h1>Create New User</h1>
Line 532  ENDTHREEHEAD Line 532  ENDTHREEHEAD
  $amode='localauth';   $amode='localauth';
  $genpwd=$ENV{'form.locarg'};   $genpwd=$ENV{'form.locarg'};
  $genpwd=" " if (!$genpwd);   $genpwd=" " if (!$genpwd);
       } elsif (($ENV{'form.login'} eq 'nochange') ||
                ($ENV{'form.login'} eq ''        )) { 
           # There is no need to tell the user we did not change what they
           # did not ask us to change.
           # If they are creating a new user but have not specified login
           # information this will be caught below.
     } else {      } else {
     $r->print($error.'Invalid login mode or password'.$end);          $r->print($error.'Invalid login mode or password'.$end);    
     return;      return;
Line 552  ENDNEWUSERHEAD Line 558  ENDNEWUSERHEAD
         if (lc($desiredhost) eq 'default') {          if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;              $desiredhost = undef;
         } else {          } else {
             my %home_servers = &get_home_servers($ENV{'form.ccdomain'});                my %home_servers = &Apache::loncommon::get_home_servers
                   ($ENV{'form.ccdomain'});  
             if (! exists($home_servers{$desiredhost})) {              if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.'Invalid home server specified');                  $r->print($error.'Invalid home server specified');
                 return;                  return;
Line 570  ENDNEWUSERHEAD Line 577  ENDNEWUSERHEAD
                                                $ENV{'form.ccdomain'});                                                 $ENV{'form.ccdomain'});
         $r->print('<br>Home server: '.$home.' '.          $r->print('<br>Home server: '.$home.' '.
                   $Apache::lonnet::libserv{$home});                    $Apache::lonnet::libserv{$home});
     } elsif ($ENV{'form.login'} ne '') {      } elsif (($ENV{'form.login'} ne 'nochange') &&
                ($ENV{'form.login'} ne ''        )) {
  # Modify user privileges   # Modify user privileges
  $r->print(<<ENDMODIFYUSERHEAD);   $r->print(<<ENDMODIFYUSERHEAD);
 <h1>Change User Privileges</h1>  <h1>Change User Privileges</h1>
Line 832  ENDTABLE Line 840  ENDTABLE
 #---------------------------------------------- end functions for &phase_two  #---------------------------------------------- end functions for &phase_two
   
 #--------------------------------- functions for &phase_two and &phase_three  #--------------------------------- functions for &phase_two and &phase_three
 sub get_home_servers {  
     my $domain = shift;  
     my %home_servers;  
     foreach (keys(%Apache::lonnet::libserv)) {  
         if ($Apache::lonnet::hostdom{$_} eq $domain) {  
             $home_servers{$_} = $Apache::lonnet::hostname{$_};  
         }  
     }  
     return %home_servers;  
 }  
   
 #--------------------------end of functions for &phase_two and &phase_three  #--------------------------end of functions for &phase_two and &phase_three
   
Removed from v.1.31  
changed lines
  Added in v.1.35

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