--- loncom/interface/loncreateuser.pm	2007/07/30 22:44:04	1.163
+++ loncom/interface/loncreateuser.pm	2007/08/10 23:00:13	1.169
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.163 2007/07/30 22:44:04 albertel Exp $
+# $Id: loncreateuser.pm,v 1.169 2007/08/10 23:00:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,7 +204,7 @@ sub print_username_entry_form {
     my ($jsback,$elements) = &crumb_utilities();
 
     my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
-        '<script type"text/javascript">'."\n".
+        '<script type="text/javascript">'."\n".
         &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
         '</script>'."\n";
 
@@ -216,7 +216,7 @@ sub print_username_entry_form {
 				       $jscript,{'add_entries' => \%loaditems,});
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.crtuser)",
-       text=>"User/custom role search",
+       text=>"User modify/custom role",
        faq=>282,bug=>'Instructor Interface',});
 
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
@@ -232,6 +232,7 @@ sub print_username_entry_form {
                     'ecrp' => "Edit Custom Role Privileges",
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor",
+                    'mod'  => "to add/modify roles",
 				       );
     my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
@@ -244,7 +245,7 @@ sub print_username_entry_form {
 $start_page
 $crumbs
 <h2>$lt{siur}$helpsiur</h2>
-<h3>$lt{'srch'} $sellink</h3>
+<h3>$lt{'srch'} $sellink $lt{'mod'}</h3>
 $response");
     $r->print(&entry_form($defdom,$srch,$forcenewuser));
     if (&Apache::lonnet::allowed('mcr','/')) {
@@ -328,7 +329,7 @@ $jsback
 ENDSCRIPT
 
     my %lt=&Apache::lonlocal::texthash(
-                                       'srch'           => "User Search",
+                                       'srch'           => "User Search to add/modify roles of",
                                        'username'       => "username",
                                        'domain'         => "domain",
                                        'lastname'       => "last name",
@@ -338,7 +339,7 @@ ENDSCRIPT
     $r->print(&Apache::loncommon::start_page('Create Users, Change User Privileges',$jscript));
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:backPage(document.usersrchform,'','')",
-          text=>"User/custom role search",
+          text=>"User modify/custom role edit",
           faq=>282,bug=>'Instructor Interface',},
          {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
           text=>"Select User",
@@ -346,7 +347,7 @@ ENDSCRIPT
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
     $r->print("<b>$lt{'srch'}</b><br />");
     $r->print(&entry_form($srch->{'srchdomain'},$srch));
-    $r->print('<h3>'.&mt('Select a user').'</h3>');
+    $r->print('<h3>'.&mt('Select a user to add/modify roles of').'</h3>');
     $r->print('<form name="usersrchform" method="post">'.
               &Apache::loncommon::start_data_table()."\n".
               &Apache::loncommon::start_data_table_header_row()."\n".
@@ -359,11 +360,13 @@ ENDSCRIPT
     $r->print(&Apache::loncommon::end_data_table_header_row());
 
     my @sorted_users = sort {
-        lc($srch_results->{$a}->{$sortby})  cmp lc($srch_results->{$b}->{$sortby})
+        lc($srch_results->{$a}->{$sortby})   cmp lc($srch_results->{$b}->{$sortby})
             ||
-        lc($srch_results->{$a}->{lastname}) cmp lc($srch_results->{$b}->{lastname})
+        lc($srch_results->{$a}->{lastname})  cmp lc($srch_results->{$b}->{lastname})
             ||
         lc($srch_results->{$a}->{firstname}) cmp lc($srch_results->{$b}->{firstname})
+	    ||
+	lc($a) cmp lc($b)
         } (keys(%$srch_results));
 
     foreach my $user (@sorted_users) {
@@ -630,7 +633,7 @@ ENDSECCODE
 				       $js,{'add_entries' => \%loaditem,});
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.cu)",
-       text=>"User/custom role search",
+       text=>"User modify/custom role edit",
        faq=>282,bug=>'Instructor Interface',});
 
     if ($env{'form.phase'} eq 'userpicked') {
@@ -1133,7 +1136,7 @@ ENDNOPRIV
            <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
              <a href=
 "javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
           &Apache::loncommon::end_data_table_row()."\n".
@@ -1141,10 +1144,10 @@ ENDNOPRIV
 '<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
 <td>'.$lt{'caa'}.'</td>
 <td>'.$cudom.'_'.$cuname.'</td>
-<td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
+<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
 "javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
          &Apache::loncommon::end_data_table_row()."\n".
@@ -1176,10 +1179,10 @@ ENDNOPRIV
 '<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>
-<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="" />
+<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
 "javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="" />
+<td><input type="hidden" name="end_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
 &Apache::loncommon::end_data_table_row();
@@ -1230,7 +1233,7 @@ sub update_user_data {
     $r->print(&Apache::loncommon::start_page($title,$jscript));
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>"javascript:backPage(document.userupdate)",
-         text=>"User/custom role search",
+         text=>"User modify/custom role edit",
          faq=>282,bug=>'Instructor Interface',});
     if ($env{'form.prevphase'} eq 'userpicked') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -1307,15 +1310,13 @@ sub update_user_data {
 	    $r->print($error.&mt('Invalid login mode or password').$end);    
 	    return;
     }
+
+
+    $r->print('<h2>'.&mt('User [_1] in domain [_2]',
+			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h2>');
+
     if ($env{'form.makeuser'}) {
-        # Create a new user
-	my %lt=&Apache::lonlocal::texthash(
-                    'cru'  => "Creating user",                    
-                    'id'   => "in domain"
-					   );
-	$r->print(<<ENDNEWUSERHEAD);
-<h3>$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h3>
-ENDNEWUSERHEAD
+	$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);    
@@ -1348,13 +1349,6 @@ ENDNEWUSERHEAD
     } elsif (($env{'form.login'} ne 'nochange') &&
              ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
-    my %lt=&Apache::lonlocal::texthash(
-                    'usr'  => "User",                    
-                    'id'   => "in domain"
-				       );
-	$r->print(<<ENDMODIFYUSERHEAD);
-<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
-ENDMODIFYUSERHEAD
         if (! $amode || ! $genpwd) {
 	    $r->print($error.'Invalid login mode or password'.$end);    
 	    return;
@@ -1518,16 +1512,11 @@ END
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
-                           'usr'  => "User",                    
-                           'id'   => "in domain",
-                           'gen'  => "Generation",
                            'mail' => "Permanent e-mail",
                            'disk' => "Disk space allocated to user's portfolio files",
 					       );
             $r->print(<<"END");
-<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
-<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
-<h4>$lt{'gen'}: $userenv{'generation'}</h4>
+<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}</h4>
 <h4>$lt{'mail'}: $userenv{'permanentemail'}</h4>
 END
             if ($putresult eq 'ok') {
@@ -1897,7 +1886,7 @@ sub custom_role_editor {
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.form1,'','')",
-       text=>"User/custom role search",
+       text=>"User modify/custom role edit",
        faq=>282,bug=>'Instructor Interface',},
       {href=>"javascript:backPage(document.form1,'','')",
          text=>"Edit custom role",
@@ -2037,7 +2026,7 @@ sub set_custom_role {
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:backPage(document.customresult,'','')",
-          text=>"User/custom role search",
+          text=>"User modify/custom role edit",
           faq=>282,bug=>'Instructor Interface',},
          {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
           text=>"Edit custom role",
@@ -2250,20 +2239,24 @@ sub user_search_result {
                             &build_search_response($srch,%srch_results);
                     }
                 } else {
-                    my %courseusers = &get_courseusers();
+                    my $courseusers = &get_courseusers();
                     if ($srch->{'srchtype'} eq 'exact') {
-                        if (exists($courseusers{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
+                        if (exists($courseusers->{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
                             $state = 'modify';
                         } else {
                             ($state,$response,$forcenewuser) =
                                 &build_search_response($srch,%srch_results);
                         }
                     } else {
-                        foreach my $user (keys(%courseusers)) {
+                        foreach my $user (keys(%$courseusers)) {
                             my ($cuname,$cudomain) = split(/:/,$user);
                             if ($cudomain eq $srch->{'srchdomain'}) {
                                 if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) {
-                                    $srch_results{$user} = '';
+                                    $srch_results{$user} = 
+					{&Apache::lonnet::get('environment',
+							     ['firstname',
+							      'lastname',
+							      'permanentemail'])};
                                 }
                             }
                         }
@@ -2285,8 +2278,8 @@ sub user_search_result {
             ($state,$response,$forcenewuser) = 
                 &build_search_response($srch,%srch_results); 
         } elsif ($srch->{'srchin'} eq 'crs') {
-            my %courseusers = &get_courseusers(); 
-            foreach my $user (keys(%courseusers)) {
+            my $courseusers = &get_courseusers(); 
+            foreach my $user (keys(%$courseusers)) {
                 my ($uname,$udom) = split(/:/,$user);
                 my %names = &Apache::loncommon::getnames($uname,$udom);
                 my %emails = &Apache::loncommon::getemails($uname,$udom);
@@ -2377,11 +2370,11 @@ sub directorysrch_check {
         return &mt('Directory search has not been configured for domain: [_1]',$srch->{'srchdomain'});
     }
     my %longtext = &Apache::lonlocal::texthash (
-                       uname => 'username',
+                       uname     => 'username',
                        lastfirst => 'last name, first name',
-                       lastname => 'last name',
-                       contains => 'is contained in',
-                       exact => 'as exact match to'
+                       lastname  => 'last name',
+                       contains  => 'is contained in',
+                       exact     => 'as exact match to'
                    );
     if ($can_search) {
         if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
@@ -2405,15 +2398,16 @@ sub directorysrch_check {
 
 sub get_courseusers {
     my %advhash;
+    my $classlist = &Apache::loncoursedata::get_classlist();
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
     foreach my $role (sort(keys(%coursepersonnel))) {
         foreach my $user (split(/\,/,$coursepersonnel{$role})) {
-            $advhash{$user} = '';
+	    if (!exists($classlist->{$user})) {
+		$classlist->{$user} = [];
+	    }
         }
     }
-    my $classlist = &Apache::loncoursedata::get_classlist();
-    my %combined = (%advhash, %{$classlist});
-    return %combined;
+    return $classlist;
 }
 
 sub build_search_response {
@@ -2465,7 +2459,6 @@ sub build_search_response {
                         }
                     }
                 }
-                $response .= '<br />'.&mt("To add as a new user:").'<ul><li>'.&mt("Enter the proposed username in the <i>'Search for'</i> box").'</li><li>'.&mt("Set <i>'Make new user if no match found</i>' to <b>Yes</b>").'</li><li>'.&mt("Click <i>'Search'</i>").'</li></ul>'.&mt("Note: you can only create new users in the domain of your current role - [_1]",$env{'request.role.domain'}).'<br /><br />';
             }
         }
     }
@@ -2476,7 +2469,7 @@ sub crumb_utilities {
     my %elements = (
        crtuser => {
            srchterm => 'text',
-           srchin => 'selectbox',
+           srchin => 'radio',
            srchby => 'selectbox',
            srchtype => 'selectbox',
            srchdomain => 'selectbox',
@@ -2561,10 +2554,10 @@ sub course_level_table {
 		    $table .= '<td>&nbsp</td>';
                 }
 		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
@@ -2597,10 +2590,10 @@ ENDTIMEENTRY
                      'name="sec_'.$customrole.'" /></td>';
                 }
                 $table .= <<ENDENTRY;
-<td><input type=hidden name="start_$customrole" value='' />
+<td><input type="hidden" name="start_$customrole" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$customrole" value='' />
+<td><input type="hidden" name="end_$customrole" value='' />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDENTRY
@@ -2692,10 +2685,10 @@ sub course_level_dc {
                      '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start" value='' />
+<td><input type="hidden" name="start" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end" value='' />
+<td><input type="hidden" name="end" value='' />
 <a href=
 "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY