--- loncom/interface/loncreateuser.pm	2007/10/22 22:16:38	1.190
+++ loncom/interface/loncreateuser.pm	2007/11/12 15:37:47	1.194
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.190 2007/10/22 22:16:38 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.194 2007/11/12 15:37:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -447,24 +447,32 @@ sub print_user_modification_page {
         return;
     }
     my %abv_auth = &auth_abbrev();
-    my ($curr_authtype,$instsrch,$rulematch,$rules,%inst_results,
-        $curr_kerb_ver,$newuser);
+    my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser,
+        %alerts,%curr_rules);
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     if ($uhome eq 'no_host') {
         $newuser = 1;
-        $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;
+        my $checkhash;
+        my $checks = { 'username' => 1 };
+        $checkhash->{$ccuname.':'.$ccdomain} = { 'status' => 'new' };
+        &Apache::loncommon::user_rule_check($checkhash,$checks,
+                   \%alerts,\%rulematch,\%inst_results,\%curr_rules);
+        if (ref($alerts{$ccuname.':'.$ccdomain}) eq 'HASH') {
+            if ($alerts{$ccuname.':'.$ccdomain}{'username'}) {
+                my $domdesc = 
+                    &Apache::lonnet::domain($ccdomain,'description');
+                my $userchkmsg;
+                if (ref($curr_rules{$ccdomain}) eq 'HASH') {  
+                    $userchkmsg = 
+                        &Apache::loncommon::instrule_disallow_msg('username',
+                                                                 $domdesc,1).
+                        &Apache::loncommon::user_rule_formats($ccdomain,
+                            $domdesc,$curr_rules{$ccdomain}{'username'},
+                            'username');
+                }
+                &print_username_entry_form($r,$userchkmsg);
+                return;
+            }
         }
     } else {
         $newuser = 0;
@@ -766,7 +774,7 @@ $forminfo
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h3>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h3>
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 ENDTITLE
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
@@ -785,14 +793,17 @@ $lt{'hs'}: $home_server_pick
         $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
                   $lt{'lg'}.'</h3>');
         my ($fixedauth,$varauth,$authmsg); 
-        if ($rulematch) {
+        if (ref($rulematch{$ccuname.':'.$ccdomain}) eq 'HASH') {
+            my $matchedrule = $rulematch{$ccuname.':'.$ccdomain}{'username'};
+            my ($rules,$ruleorder) = 
+                &Apache::lonnet::inst_userrules($ccdomain,'username');
             if (ref($rules) eq 'HASH') {
-                if (ref($rules->{$rulematch}) eq 'HASH') {
-                    my $authtype = $rules->{$rulematch}{'authtype'};
+                if (ref($rules->{$matchedrule}) eq 'HASH') {
+                    my $authtype = $rules->{$matchedrule}{'authtype'};
                     if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
                         $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
                     } else { 
-                        my $authparm = $rules->{$rulematch}{'authparm'};
+                        my $authparm = $rules->{$matchedrule}{'authparm'};
                         if ($authtype =~ /^krb(4|5)$/) {
                             my $ver = $1;
                             if ($authparm ne '') {
@@ -801,12 +812,12 @@ $lt{'hs'}: $home_server_pick
 <input type="hidden" name="krbver" value="$ver" />
 <input type="hidden" name="krbarg" value="$authparm" />
 KERB
-                                $authmsg = $rules->{$rulematch}{'authmsg'};    
+                                $authmsg = $rules->{$matchedrule}{'authmsg'};    
                             }
                         } else {
                             $fixedauth = 
 '<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
-                            if ($rules->{$rulematch}{'authparmfixed'}) {
+                            if ($rules->{$matchedrule}{'authparmfixed'}) {
                                 $fixedauth .=    
 '<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
                             } else {
@@ -835,14 +846,14 @@ ENDAUTH
 ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Existing user ",
+                    'cup'  => "Modify existing user: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
 $crumbs
 $forminfo
-<h3>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h3>
+<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
@@ -886,7 +897,7 @@ ENDNOPORTPRIV
         unless ($tmp =~ /^(con_lost|error)/i) {
            my $now=time;
 	   my %lt=&Apache::lonlocal::texthash(
-		    'rer'  => "Revoke Existing Roles",
+		    'rer'  => "Existing Roles",
                     'rev'  => "Revoke",                    
                     'del'  => "Delete",
 		    'ren'  => "Re-Enable",
@@ -1450,8 +1461,8 @@ sub update_user_data {
                                           $env{'form.ccdomain'});
     # Error messages
     my $error     = '<span class="LC_error">'.&mt('Error').': ';
-    my $end       = '</span><br /><br />'.
-                    '<a href="javascript:backPage(document.userupdate,'.
+    my $end       = '</span><br /><br />';
+    my $rtnlink   = '<a href="javascript:backPage(document.userupdate,'.
                     "'$env{'form.prevphase'}','modify')".'" />'.
                     &mt('Return to previous page').'</a>'.&Apache::loncommon::end_page();
     my $title;
@@ -1489,25 +1500,25 @@ sub update_user_data {
     $r->print(&update_result_form($uhome));
     # Check Inputs
     if (! $env{'form.ccuname'} ) {
-	$r->print($error.&mt('No login name specified').'.'.$end);
+	$r->print($error.&mt('No login name specified').'.'.$end.$rtnlink);
 	return;
     }
     if (  $env{'form.ccuname'} ne 
 	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
 	$r->print($error.&mt('Invalid login name').'.  '.
 		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
-		  $end);
+		  $end.$rtnlink);
 	return;
     }
     if (! $env{'form.ccdomain'}       ) {
-	$r->print($error.&mt('No domain specified').'.'.$end);
+	$r->print($error.&mt('No domain specified').'.'.$end.$rtnlink);
 	return;
     }
     if (  $env{'form.ccdomain'} ne
 	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
 	$r->print($error.&mt ('Invalid domain name').'.  '.
 		  &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
-		  $end);
+		  $end.$rtnlink);
 	return;
     }
     if (! exists($env{'form.makeuser'})) {
@@ -1543,19 +1554,19 @@ sub update_user_data {
         # If they are creating a new user but have not specified login
         # information this will be caught below.
     } else {
-	    $r->print($error.&mt('Invalid login mode or password').$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
     }
 
 
     $r->print('<h3>'.&mt('User [_1] in domain [_2]',
 			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
-
+    my (%alerts,%rulematch,%inst_results,%curr_rules);
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {
-	    $r->print($error.&mt('Invalid login mode or password').$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
 	}
         # Determine desired host
@@ -1566,13 +1577,39 @@ sub update_user_data {
             my %home_servers = 
 		&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
             if (! exists($home_servers{$desiredhost})) {
-                $r->print($error.&mt('Invalid home server specified'));
+                $r->print($error.&mt('Invalid home server specified').$end.$rtnlink);
+                return;
+            }
+        }
+        # Check ID format
+        my %checkhash;
+        my %checks = ('id' => 1);
+        %{$checkhash{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}} = (
+            'status' => 'new', 
+            'id' => $env{'form.cid'}
+        );
+        &Apache::loncommon::user_rule_check(\%checkhash,\%checks,\%alerts,
+                                      \%rulematch,\%inst_results,\%curr_rules);
+        if (ref($alerts{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}) eq 'HASH') {
+            if ($alerts{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}{'id'}) {
+                my $domdesc =
+                    &Apache::lonnet::domain($env{'form.ccdomain'},'description');
+                my $userchkmsg;
+                if (ref($curr_rules{$env{'form.ccdomain'}}) eq 'HASH') {
+                    $userchkmsg  = 
+                        &Apache::loncommon::instrule_disallow_msg('id',
+                                                                  $domdesc,1).
+                        &Apache::loncommon::user_rule_formats($env{'form.ccdomain'},
+                            $domdesc,$curr_rules{$env{'form.ccdomain'}}{'id'},'id');
+                } 
+                $r->print($error.&mt('Invalid ID format').$end.
+                          $userchkmsg.$rtnlink);
                 return;
             }
         }
 	# Call modifyuser
 	my $result = &Apache::lonnet::modifyuser
-	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'},
+	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'},
              $amode,$genpwd,$env{'form.cfirstname'},
              $env{'form.cmiddlename'},$env{'form.clastname'},
              $env{'form.cgeneration'},undef,$desiredhost,
@@ -1586,7 +1623,7 @@ sub update_user_data {
              ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
         if (! $amode || ! $genpwd) {
-	    $r->print($error.'Invalid login mode or password'.$end);    
+	    $r->print($error.'Invalid login mode or password'.$end.$rtnlink);    
 	    return;
 	}
 	# Only allow authentification modification if the person has authority
@@ -1599,7 +1636,7 @@ sub update_user_data {
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
 	}
     }
     ##
@@ -1766,6 +1803,7 @@ END
     }
     ##
     my $now=time;
+    my $rolechanges = 0;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach my $key (keys (%env)) {
 	next if (! $env{$key});
@@ -1795,6 +1833,7 @@ END
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
 	    }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
@@ -1820,6 +1859,7 @@ END
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1).'</b><br />');
             }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.ren/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -1858,6 +1898,7 @@ END
                 $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
                           $rolename,$rnam,$rdom,$url,$result).'<br />');
             }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -1971,10 +2012,14 @@ END
                 }
                 $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
             }
+            $rolechanges ++;
 	}
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
+    if (!$rolechanges) {
+        $r->print(&mt('No roles to modify'));
+    }
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -2434,12 +2479,13 @@ sub handler {
     } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
         my $phase = $env{'form.phase'};
         my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+	&Apache::loncreateuser::restore_prev_selections();
+	my $srch;
+	foreach my $item (@search) {
+	    $srch->{$item} = $env{'form.'.$item};
+	}
 
         if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
-            my $srch;
-            foreach my $item (@search) {
-                $srch->{$item} = $env{'form.'.$item};
-            }
             if ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) = 
                     &user_search_result($srch);
@@ -2480,7 +2526,7 @@ sub handler {
         } elsif ($env{'form.phase'} eq 'update_user_data') {
             &update_user_data($r);
         } else {
-            &print_username_entry_form($r);
+            &print_username_entry_form($r,undef,$srch);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -2489,21 +2535,30 @@ sub handler {
             &custom_role_editor($r);
         }
     } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
-        $r->print(&header());
+        my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
+        my $formname = 'studentform';
+        if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+            ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
+                &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                        $formname);
+            my $js = &add_script($jscript).$cb_jscript;
+            my $loadcode = 
+                &Apache::lonuserutils::course_selector_loadcode($formname);
+            if ($loadcode ne '') {
+                $r->print(&header($js,{'onload' => $loadcode,}));
+            } else {
+                $r->print(&header($js));
+            }
+        } else {
+            $r->print(&header());
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=listusers',
-              text=>"List Users' Roles"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users' Roles",
+              text=>"List Users"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
                                                       'User_Management_List'));
-        if (! exists($env{'form.state'})) {
-            &Apache::lonuserutils::print_html_classlist($r,undef,$permission);
-        } elsif ($env{'form.state'} eq 'csv') {
-            &Apache::lonuserutils::print_html_classlist($r,'csv',$permission);
-        } elsif ($env{'form.state'} eq 'excel') {
-            &Apache::lonuserutils::print_html_classlist($r,'excel',$permission);
-        } else {
-            &Apache::lonuserutils::print_html_classlist($r,undef,$permission);
-        }
+        &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
+                     $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
         $r->print(&header());
@@ -2539,6 +2594,11 @@ sub header {
     return $start_page;
 }
 
+sub add_script {
+    my ($js) = @_;
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
 ###############################################################
 ###############################################################
 #  Menu Phase One
@@ -2546,22 +2606,22 @@ sub print_main_menu {
     my ($permission) = @_;
     my @menu =
         (
-          { text => 'Upload a File of Users to Set Roles',
+          { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
             help => 'User_Management_Upload',
             action => 'upload',
             permission => $permission->{'cusr'},
             },
-          { text => 'Set User Roles for an Individual User',
+          { text => 'Create User/Set User Roles for a single user',
             help => 'User_Management_Single_User',
             action => 'singleuser',
             permission => $permission->{'cusr'},
             },
-#          { text => 'Display User Roles for Multiple Users',
-#            help => 'User_Management_List',
-#            action => 'listusers',
-#            permission => $permission->{'view'},
-#            },
-#          { text => 'Expire User Roles ',
+          { text => 'Display Lists of Users',
+            help => 'User_Management_List',
+            action => 'listusers',
+            permission => $permission->{'view'},
+            },
+#          { text => 'Expire User Roles',
 #            help => 'User_Management_Drops',
 #            action => 'expire',
 #            permission => $permission->{'cusr'},
@@ -2763,7 +2823,8 @@ sub user_search_result {
 					{&Apache::lonnet::get('environment',
 							     ['firstname',
 							      'lastname',
-							      'permanentemail'])};
+							      'permanentemail'],
+							      $cudomain,$cuname)};
                                 }
                             }
                         }