--- loncom/interface/loncreateuser.pm	2007/09/12 23:26:25	1.184
+++ loncom/interface/loncreateuser.pm	2007/09/19 06:24:26	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.184 2007/09/12 23:26:25 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.187 2007/09/19 06:24:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,6 @@ use Apache::longroup;
 use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
-my $generalrule;
 my $authformnop;
 my $authformkrb;
 my $authformint;
@@ -76,14 +75,18 @@ my $authformfsys;
 my $authformloc;
 
 sub initialize_authen_forms {
+    my ($dom,$curr_authtype) = @_; 
     my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
     $krbdefdom= uc($krbdefdom);
     my %param = ( formname => 'document.cu',
-                  kerb_def_dom => $krbdefdom 
-                  );
+                  kerb_def_dom => $krbdefdom,
+                  domain => $dom,
+                );
+    if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):$/) {
+        $param{'curr_authtype'} = $curr_authtype;
+    }
 # no longer static due to configurable kerberos defaults
 #    $loginscript  = &Apache::loncommon::authform_header(%param);
-    $generalrule  = &Apache::loncommon::authform_authorwarning(%param);
     $authformnop  = &Apache::loncommon::authform_nochange(%param);
 # no longer static due to configurable kerberos defaults
 #    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
@@ -420,10 +423,32 @@ sub print_user_query_page {
 
 sub print_user_modification_page {
     my ($r,$ccuname,$ccdomain,$srch,$response) = @_;
-    unless (($ccuname) && ($ccdomain)) {
-	&print_username_entry_form($r);
+    if (($ccuname eq '') || ($ccdomain eq '')) {
+        my $usermsg = &mt('No username and/or domain provided.'); 
+	&print_username_entry_form($r,$usermsg);
         return;
     }
+    my ($curr_authtype,$instsrch,$rulematch,$rules,%inst_results);
+    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
+    if ($uhome eq 'no_host') {
+        $instsrch =
+                      {
+                         srchin => 'instd',
+                         srchby => 'uname',
+                         srchtype => 'exact',
+                         srchterm => $ccuname,
+                         srchdomain => $ccdomain,
+                       };
+        (my $usercheckmsg,$rulematch,$rules,%inst_results) = 
+            &Apache::loncommon::username_rule_check($instsrch,'new');
+        if ($usercheckmsg) {
+            &print_username_entry_form($r,$usercheckmsg);
+            return;
+        }
+    } else {
+        $curr_authtype = 
+            &Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
+    }
     if ($response) {
         $response = '<br />'.$response
     }
@@ -434,7 +459,9 @@ sub print_user_modification_page {
 
     my %param = ( formname => 'document.cu',
                   kerb_def_dom => $krbdefdom,
-                  kerb_def_auth => $krbdef
+                  kerb_def_auth => $krbdef,
+                  curr_authtype => $curr_authtype,
+                  domain => $ccdomain,
                 );
     $loginscript  = &Apache::loncommon::authform_header(%param);
     $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
@@ -675,7 +702,6 @@ ENDSECCODE
 <input type="hidden" name="pres_type"   value="" />
 <input type="hidden" name="pres_marker" value="" />
 ENDFORMINFO
-    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     my %inccourses;
     foreach my $key (keys(%env)) {
 	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
@@ -683,99 +709,136 @@ ENDFORMINFO
         }
     }
     if ($uhome eq 'no_host') {
-        my $newuser;
-        my $instsrch = {
-                         srchin => 'instd',
-                         srchby => 'uname',
-                         srchtype => 'exact',
-                       };
-        if ($env{'form.phase'} eq 'userpicked') {
-            $instsrch->{'srchterm'} = $env{'form.seluname'};
-            $instsrch->{'srchdomain'} = $env{'form.seludom'};
-        } else {
-            $instsrch->{'srchterm'} = $ccuname;
-            $instsrch->{'srchdomain'} = $ccdomain,
-        }
-        if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) {
-            $newuser = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'};
-        }
-        my (%dirsrch_results,%inst_results,$dirsrchres);
-        if ($newuser) {
-            if (&directorysrch_check($instsrch) eq 'ok') {
-                ($dirsrchres,%dirsrch_results) = &Apache::lonnet::inst_directory_query($instsrch);
-                if ($dirsrchres eq 'ok') {
-                    if (ref($dirsrch_results{$newuser}) eq 'HASH') { 
-                        %inst_results = %{$dirsrch_results{$newuser}};
-                    }
-                }
-            }
-        }
-        my $home_server_list=
-            '<option value="default" selected>default</option>'."\n".
-                &Apache::loncommon::home_server_option_list($ccdomain);
-        
 	my %lt=&Apache::lonlocal::texthash(
-                    'cnu'  => "Create New User",
-                    'nu'   => "New User",
-                    'id'   => "in domain",
-                    'pd'   => "Personal Data",
-                    'fn'   => "First Name",
-                    'mn'   => "Middle Name",
-                    'ln'   => "Last Name",
-                    'gen'  => "Generation",
-                    'mail' => "Permanent e-mail address",
-                    'idsn' => "ID/Student Number",
-                    'hs'   => "Home Server",
-                    'lg'   => "Login Data"
+                    'cnu'            => "Create New User",
+                    'nu'             => "New User",
+                    'ind'            => "in domain",
+                    'pd'             => "Personal Data",
+                    'firstname'      => "First Name",
+                    'middlename'     => "Middle Name",
+                    'lastname'       => "Last Name",
+                    'generation'     => "Generation",
+                    'permanentemail' => "Permanent e-mail address",
+                    'id'             => "ID/Student Number",
+                    'hs'             => "Home Server",
+                    'lg'             => "Login Data"
 				       );
+        my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
+        my %textboxsize = (
+                           firstname      => '15',
+                           middlename     => '15',
+                           lastname       => '15',
+                           generation     => '5',
+                           permanentemail => '25',
+                           id             => '15',
+                          );
+        my %element   = (
+                           firstname      => 'cfirst', 
+                           middlename     => 'cmiddle',
+                           lastname       => 'clast',
+                           generation     => 'cgen',
+                           permanentemail => 'cemail',
+                           id             => 'cstid',
+                          );
         my $portfolioform;
         if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
             # Current user has quota modification privileges
             $portfolioform = &portfolio_quota($ccuname,$ccdomain);
         }
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
-        &initialize_authen_forms();
-	$r->print(<<ENDNEWUSER);
+        &initialize_authen_forms($ccdomain);
+	$r->print(<<ENDTITLE);
 $start_page
 $crumbs
-<h1>$lt{'cnu'}</h1>
 $response
 $forminfo
-<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2>
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 <script type="text/javascript" language="Javascript">
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
 <h3>$lt{'pd'}</h3>
 <p>
-<table>
-<tr><td>$lt{'fn'}  </td>
-    <td><input type="text" name="cfirst" size="15" value="$inst_results{'firstname'}" /></td></tr>
-<tr><td>$lt{'mn'} </td> 
-    <td><input type="text" name="cmiddle" size="15" value="$inst_results{'middlename'}" /></td></tr>
-<tr><td>$lt{'ln'}   </td>
-    <td><input type="text" name="clast" size="15" value="$inst_results{'lastname'}" /></td></tr>
-<tr><td>$lt{'gen'}$genhelp</td>
-    <td><input type="text" name="cgen" size="5" value="$inst_results{'generation'}" /></td></tr>
-<tr><td>$lt{'mail'}</td>
-    <td><input type="text" name="cemail" size="20" value="$inst_results{'permanentemail'}" /></td></tr>
-</table>
-$lt{'idsn'} <input type="text" name="cstid" size="15" value="$inst_results{'id'}" /></p>
-$lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select>
-<hr />
-<h3>$lt{'lg'}</h3>
-<p>$generalrule </p>
-<p>$authformkrb </p>
-<p>$authformint </p>
-<p>$authformfsys</p>
-<p>$authformloc </p>
+ENDTITLE
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        foreach my $item (@userinfo) {
+            my $rowtitle = $lt{$item};
+            if ($item eq 'generation') {
+                $rowtitle = $genhelp.$rowtitle;
+            }
+            $r->print(&Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n");
+            if ($inst_results{$item} ne '') {
+                $r->print('<input type="hidden" name="'.$element{$item}.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item});
+            } else {
+                $r->print('<input type="text" name="'.$element{$item}.'" size="'.$textboxsize{$item}.'" value="" />');
+            }
+            $r->print(&Apache::lonhtmlcommon::row_closure(1));
+        }
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        my ($home_server_pick,$numlib) = 
+            &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
+                                                      'default','hide');
+        if ($numlib > 1) {
+            $r->print("
+<br />
+$lt{'hs'}: $home_server_pick
+<br />");
+        } else {
+            $r->print($home_server_pick);
+        }
+        $r->print("<hr />\n".'<h3>'.$lt{'lg'}.'</h3>');
+        my ($fixedauth,$varauth,$authmsg); 
+        if ($rulematch) {
+            if (ref($rules) eq 'HASH') {
+                if (ref($rules->{$rulematch}) eq 'HASH') {
+                    my $authtype = $rules->{$rulematch}{'authtype'};
+                    if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
+                        $r->print(&set_login($ccdomain));
+                    } else { 
+                        my $authparm = $rules->{$rulematch}{'authparm'};
+                        if ($authtype =~ /^krb(4|5)$/) {
+                            my $ver = $1;
+                            if ($authparm ne '') {
+                                $fixedauth = <<"KERB"; 
+<input type="hidden" name="login" value="krb" />
+<input type="hidden" name="krbver" value="$ver" />
+<input type="hidden" name="krbarg" value="$authparm" />
+KERB
+                                $authmsg = $rules->{$rulematch}{'authmsg'};    
+                            }
+                        } else {
+                            $fixedauth = 
+'<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
+                            if ($rules->{$rulematch}{'authparmfixed'}) {
+                                $fixedauth .=    
+'<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
+                            } else {
+                                $varauth =  
+'<input type="text" name="'.$authtype.'arg" value="" />'."\n";
+                            }
+                        }
+                    }
+                } else {
+                    $r->print(&set_login($ccdomain));
+                }
+            }
+            if ($authmsg) {
+                $r->print(<<ENDAUTH);
+$fixedauth
+$authmsg
+$varauth
+ENDAUTH
+            }
+        } else {
+            $r->print(&set_login($ccdomain)); 
+        }
+        $r->print(<<ENDPORT);
 <hr />
 $portfolioform
-ENDNEWUSER
+ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Change User Privileges",
-                    'usr'  => "User",                    
+                    'cup'  => "Change User Privileges for",
                     'id'   => "in domain",
                     'fn'   => "first name",
                     'mn'   => "middle name",
@@ -786,9 +849,8 @@ ENDNEWUSER
 	$r->print(<<ENDCHANGEUSER);
 $start_page
 $crumbs
-<h1>$lt{'cup'}</h1>
 $forminfo
-<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
+<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
         # Get the users information
         my %userenv = 
@@ -1009,24 +1071,24 @@ END
 	    $currentauth=~/^krb(4|5):(.*)/;
 	    my $krbdefdom=$2;
             my %param = ( formname => 'document.cu',
-                          kerb_def_dom => $krbdefdom 
+                          kerb_def_dom => $krbdefdom,
+                          domain => $ccdomain,
+                          curr_authtype => $currentauth, 
                           );
             $loginscript  = &Apache::loncommon::authform_header(%param);
 	}
 	# Check for a bad authentication type
-        unless ($currentauth=~/^krb(4|5):/ or
-		$currentauth=~/^unix:/ or
-		$currentauth=~/^internal:/ or
-		$currentauth=~/^localauth:/
-		) { # bad authentication scheme
+        if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
+	    # bad authentication scheme
 	    if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-                &initialize_authen_forms();
+                &initialize_authen_forms($ccdomain);
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
 			       'uuas'  => "This user has an unrecognized authentication scheme",
                                'sldb'  => "Please specify login data below",
                                'ld'    => "Login Data"
 						   );
+                my $choices = &set_login($ccdomain);
 		$r->print(<<ENDBADAUTH);
 <hr />
 <script type="text/javascript" language="Javascript">
@@ -1035,11 +1097,7 @@ $loginscript
 <font color='#ff0000'>$lt{'err'}:</font>
 $lt{'uuas'} ($currentauth). $lt{'sldb'}.
 <h3>$lt{'ld'}</h3>
-<p>$generalrule</p>
-<p>$authformkrb</p>
-<p>$authformint</p>
-<p>$authformfsys</p>
-<p>$authformloc</p>
+$choices
 ENDBADAUTH
             } else { 
                 # This user is not allowed to modify the user's 
@@ -1059,28 +1117,9 @@ ENDBADAUTH
         } else { # Authentication type is valid
 	    my $authformcurrent='';
 	    my $authform_other='';
-            &initialize_authen_forms();
-	    if ($currentauth=~/^krb(4|5):/) {
-		$authformcurrent=$authformkrb;
-		$authform_other="<p>$authformint</p>\n".
-                    "<p>$authformfsys</p><p>$authformloc</p>";
-	    }
-	    elsif ($currentauth=~/^internal:/) {
-		$authformcurrent=$authformint;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformfsys</p><p>$authformloc</p>";
-	    }
-	    elsif ($currentauth=~/^unix:/) {
-		$authformcurrent=$authformfsys;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformint</p><p>$authformloc;</p>";
-	    }
-	    elsif ($currentauth=~/^localauth:/) {
-		$authformcurrent=$authformloc;
-		$authform_other="<p>$authformkrb</p>".
-                    "<p>$authformint</p><p>$authformfsys</p>";
-	    }
-            $authformcurrent.=' <i>(will override current values)</i><br />';
+            &initialize_authen_forms($ccdomain,$currentauth);
+            my ($authformcurrent,$authform_other,$can_modify) = 
+                &modify_login_block($ccdomain,$currentauth);
             if (&Apache::lonnet::allowed('mau',$ccdomain)) {
 		# Current user has login modification privileges
 		my %lt=&Apache::lonlocal::texthash(
@@ -1093,12 +1132,17 @@ ENDBADAUTH
 $loginscript
 </script>
 <h3>$lt{'ccld'}</h3>
-<p>$generalrule</p>
-<p>$authformnop</p>
-<p>$authformcurrent</p>
-<h3>$lt{'enld'}</h3>
-$authform_other
+<p>$authformnop
 ENDOTHERAUTHS
+                if ($can_modify) {
+                    $r->print('</p><p>'.$authformcurrent.'</p>');
+                } else {
+                    $r->print('&nbsp;('.$authformcurrent.')</p>'); 
+                }
+                if ($authform_other ne '') {
+                    $r->print('<h3>'.$lt{'enld'}.'</h3>'."\n".
+                              $authform_other);
+                }
             } else {
                 if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
                     my %lt=&Apache::lonlocal::texthash(
@@ -1113,11 +1157,22 @@ $lt{'yodo'} $lt{'ifch'}: $ccdomain
 ENDNOPRIV
                 } 
             }
-            if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
-                # Current user has quota modification privileges
-                $r->print(&portfolio_quota($ccuname,$ccdomain));
-            }
         }  ## End of "check for bad authentication type" logic
+        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+            # Current user has quota modification privileges
+            $r->print(&portfolio_quota($ccuname,$ccdomain));
+        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { 
+            my %lt=&Apache::lonlocal::texthash(
+                'dska'  => "Disk space allocated to user's portfolio files",
+                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
+            );
+            $r->print(<<ENDNOPORTPRIV);
+<hr />
+<h3>$lt{'dska'}</h3>
+$lt{'youd'} $lt{'ichr'}: $ccdomain
+ENDNOPORTPRIV
+        }
     } ## End of new user/old user logic
     $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>');
 #
@@ -1230,6 +1285,86 @@ ENDNOPRIV
     $r->print("</form>".&Apache::loncommon::end_page());
 }
 
+sub set_login {
+    my ($dom) = @_;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    my $response;
+    my ($authnum,%can_assign) = 
+        &Apache::loncommon::get_assignable_auth($dom);
+    if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+        $response .= "<p>$authformkrb </p>\n";
+    }
+    if ($can_assign{'int'}) {
+        $response .= "<p>$authformint </p>\n"
+    }
+    if ($can_assign{'loc'}) {
+        $response .= "<p>$authformloc </p>\n";
+    }
+    return $response;
+}
+
+sub modify_login_block {
+    my ($dom,$currentauth) = @_;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    my ($authnum,%can_assign) =
+        &Apache::loncommon::get_assignable_auth($dom);
+    my ($authformcurrent,$authform_other,$show_override_msg);
+    if ($currentauth=~/^krb(4|5):/) {
+        $authformcurrent=$authformkrb;
+        if ($can_assign{'int'}) {
+            $authform_other = "<p>$authformint </p>\n"
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= "<p>$authformloc </p>\n";
+        }
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^internal:/) {
+        $authformcurrent=$authformint;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = "<p>$authformkrb </p>\n"
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= "<p>$authformloc </p>\n";
+        }
+        if ($can_assign{'int'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^unix:/) {
+        $authformcurrent=$authformfsys;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = "<p>$authformkrb </p>\n"
+        }
+        if ($can_assign{'int'}) {
+            $authform_other .= "<p>$authformint </p>\n"
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= "<p>$authformloc </p>\n";
+        }
+        if ($can_assign{'fsys'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^localauth:/) {
+        $authformcurrent=$authformloc;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = "<p>$authformkrb </p>\n"
+        }
+        if ($can_assign{'int'}) {
+            $authform_other .= "<p>$authformint </p>\n"
+        }
+        if ($can_assign{'loc'}) {
+            $show_override_msg = 1;
+        }
+    }
+    if ($show_override_msg) {
+        $authformcurrent.= ' <span class="LC_cusr_emph">'.
+                            &mt('will override current values').
+                            '</span><br />';
+    }
+    return ($authformcurrent,$authform_other,$show_override_msg); 
+}
+
 # ================================================================= Phase Three
 sub update_user_data {
     my ($r) = @_; 
@@ -2494,7 +2629,6 @@ sub directorysrch_check {
     }
 }
 
-
 sub get_courseusers {
     my %advhash;
     my $classlist = &Apache::loncoursedata::get_classlist();