--- loncom/interface/loncreateuser.pm	2007/08/02 01:02:56	1.166
+++ loncom/interface/loncreateuser.pm	2007/08/16 21:16:39	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.166 2007/08/02 01:02:56 albertel Exp $
+# $Id: loncreateuser.pm,v 1.173 2007/08/16 21:16:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -216,7 +216,7 @@ sub print_username_entry_form {
 				       $jscript,{'add_entries' => \%loaditems,});
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.crtuser)",
-       text=>"User modify/custom role",
+       text=>"User modify/custom role edit",
        faq=>282,bug=>'Instructor Interface',});
 
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
@@ -329,7 +329,7 @@ $jsback
 ENDSCRIPT
 
     my %lt=&Apache::lonlocal::texthash(
-                                       'srch'           => "User Search to add/modify roles of",
+                                       'srch'           => "User Search to add/modify roles",
                                        'username'       => "username",
                                        'domain'         => "domain",
                                        'lastname'       => "last name",
@@ -347,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 to add/modify roles of').'</h3>');
+    $r->print('<h3>'.&mt('Select a user to add/modify roles').'</h3>');
     $r->print('<form name="usersrchform" method="post">'.
               &Apache::loncommon::start_data_table()."\n".
               &Apache::loncommon::start_data_table_header_row()."\n".
@@ -360,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) {
@@ -781,7 +783,7 @@ ENDCHANGEUSER
 '<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th><th>'.$lt{'email'}.'</th>'.
                   &Apache::loncommon::end_data_table_header_row().
                   &Apache::loncommon::start_data_table_row());
-        foreach my $item ('firstname','middlename','lastname','generation','permenanentemail') {
+        foreach my $item ('firstname','middlename','lastname','generation','permanentemail') {
            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
               $r->print(<<"END");
 <td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
@@ -1134,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".
@@ -1142,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".
@@ -1177,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();
@@ -1469,6 +1471,7 @@ sub update_user_data {
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
     <th>$lt{'gen'}</th>
+    <th>$lt{'mail'}</th>
     <th>$lt{'disk'}<th></tr>
 <tr><td>$lt{'prvs'}</td>
     <td>$userenv{'firstname'}  </td>
@@ -1535,23 +1538,20 @@ END
 	if ($key=~/^form\.rev/) {
 	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role
-	        $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
-                     &Apache::lonnet::revokerole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2).'</b><br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
-		    my $result = 
-			&Apache::lonnet::cput('classlist',
-					      { $user => $now },
-					      $env{'course.'.$cid.'.domain'},
-					      $env{'course.'.$cid.'.num'});
-		    $r->print(&mt('Drop from classlist: [_1]',
-				  '<b>'.$result.'</b>').'<br />');
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role);
+	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
+			      $role,$scope,'<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
+						 $env{'form.ccdomain'},$now);
+		    $r->print($result);
 		}
 	    } 
-	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
@@ -1562,26 +1562,23 @@ END
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
-	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
-		    my $result = 
-			&Apache::lonnet::cput('classlist',
-					      { $user => $now },
-					      $env{'course.'.$cid.'.domain'},
-					      $env{'course.'.$cid.'.num'});
-		    $r->print(&mt('Drop from classlist: [_1]',
-				  '<b>'.$result.'</b>').'<br />');
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role,$now,0,1);
+	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
+			      '<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
+						 $env{'form.ccdomain'},$now);
+		    $r->print($result);
 		}
             }
 	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
 # Delete custom role
-                $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',
+                $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
                       $rolename,$rnam,$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
@@ -1758,6 +1755,30 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub classlist_drop {
+    my ($scope,$uname,$udom,$now) = @_;
+    my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+    my $cid=$cdom.'_'.$cnum;
+    my $user = $uname.':'.$udom;
+    if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+	my $result = 
+	    &Apache::lonnet::cput('classlist',
+				  { $user => $now },
+				  $env{'course.'.$cid.'.domain'},
+				  $env{'course.'.$cid.'.num'});
+	return &mt('Drop from classlist: [_1]',
+		   '<b>'.$result.'</b>').'<br />';
+    }
+}
+
+sub active_student_roles {
+    my ($cnum,$cdom,$uname,$udom) = @_;
+    my %roles = 
+	&Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+				      ['future','active'],['st']);
+    return exists($roles{"$cnum:$cdom:st"});
+}
+
 sub quota_admin {
     my ($setquota,$changeHash) = @_;
     my $quotachanged;
@@ -2237,20 +2258,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'])};
                                 }
                             }
                         }
@@ -2272,8 +2297,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);
@@ -2364,16 +2389,16 @@ 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  => 'contains',
+                       exact     => 'as exact match to'
                    );
     if ($can_search) {
         if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
             if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {
-                return &mt('Directory search in domain: [_1] is not available for searching by [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});
+                return &mt('Directory search in domain: [_1] is not available for searching by "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});
             }
         } else {
             return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'});
@@ -2384,7 +2409,7 @@ sub directorysrch_check {
             ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {
             return 'ok';
         } else {    
-            return &mt('Directory search in domain [_1] is not available for the requested search type: [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});
+            return &mt('Directory search in domain [_1] is not available for the requested search type: "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});
         }
     }
 }
@@ -2392,15 +2417,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 {
@@ -2452,7 +2478,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 />';
             }
         }
     }
@@ -2548,10 +2573,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
@@ -2584,10 +2609,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
@@ -2679,10 +2704,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