--- loncom/interface/loncreateuser.pm	2009/08/19 19:01:04	1.308
+++ loncom/interface/loncreateuser.pm	2009/09/21 17:09:22	1.315
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.308 2009/08/19 19:01:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.315 2009/09/21 17:09:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,6 +110,7 @@ sub initialize_authen_forms {
 
 sub auth_abbrev {
     my %abv_auth = (
+                     krb5     => 'krb',
                      krb4     => 'krb',
                      internal => 'int',
                      localuth => 'loc',
@@ -236,7 +237,7 @@ sub build_tools_display {
                       'requestcourses.official','requestcourses.unofficial',
                       'requestcourses.community');
         @usertools = ('official','unofficial','community');
-        @options =('norequest','approve','autolimit','validate');
+        @options =('norequest','approval','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
         %reqtitles = &courserequest_titles();
         %reqdisplay = &courserequest_display();
@@ -260,20 +261,20 @@ sub build_tools_display {
         }
         if ($context eq 'requestcourses') {
             if ($userenv{$context.'.'.$item} eq '') {
-                $custom_access = &mt('Currently from default setting.'); 
+                $custom_access = &mt('Currently from default setting.');
             } else {
                 $custom_access = &mt('Currently from custom setting.');
             }
         } else {
             if ($userenv{$context.'.'.$item} eq '') {
-                $custom_access = 
+                $custom_access =
                     &mt('Availability determined currently from default setting.');
                 if (!$curr_access) {
                     $tool_off = 'checked="checked" ';
                     $tool_on = '';
                 }
             } else {
-                $custom_access = 
+                $custom_access =
                     &mt('Availability determined currently from custom setting.');
                 if ($userenv{$context.'.'.$item} == 0) {
                     $tool_off = 'checked="checked" ';
@@ -293,7 +294,11 @@ sub build_tools_display {
             }
             if ($curroption =~ /^autolimit=(\d*)$/) {
                 $currlimit = $1;
-                $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit); 
+                if ($currlimit eq '') {
+                    $currdisp = &mt('Yes, automatic creation');
+                } else {
+                    $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
+                }
             } else {
                 $currdisp = $reqdisplay{$curroption};
             }
@@ -327,16 +332,19 @@ sub build_tools_display {
                 if ($option eq 'autolimit') {
                     $custdisp .= '<input type="text" name="crsreq_'.
                                  $item.'_limit" size="1" '.
-                                 'value="'.$currlimit.'" />';
+                                 'value="'.$currlimit.'" /></span><br />'.
+                                 $reqtitles{'unlimited'};
+                 } else {
+                     $custdisp .= '</span>';
                  }
-                 $custdisp .= '</span></td></tr>';
+                 $custdisp .= '</td></tr>';
             }
             $custdisp .= '</table>';
             $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
         } else {
             $currdisp = ($curr_access?&mt('Yes'):&mt('No'));
             $custdisp = '<span class="LC_nobreak"><label>'.
-                        '<input type="radio" name="'.$context.'_'.$item.'"'. 
+                        '<input type="radio" name="'.$context.'_'.$item.'"'.
                         ' value="1"'. $tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
                         '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
                         $tool_off.'/>'.&mt('Off').'</label></span>';
@@ -371,7 +379,7 @@ sub coursereq_externaluser {
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
                       'reqcrsotherdom.community');
     @usertools = ('official','unofficial','community');
-    @options = ('approve','validate','autolimit');
+    @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
     my %reqtitles = &courserequest_titles();
@@ -379,22 +387,27 @@ sub coursereq_externaluser {
         my ($curroption,$currlimit,$tooloff);
         if ($userenv{'reqcrsotherdom.'.$item} ne '') {
             my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
-            if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
-                $curroption = $1;
-                $currlimit = $2;
-                if (!$curroption) {
-                    $curroption = 'norequest';
+            foreach my $req (@curr) {
+                if ($req =~ /^\Q$cdom\E\:($optregex)=?(\d*)$/) {
+                    $curroption = $1;
+                    $currlimit = $2;
+                    last;
                 }
             }
+            if (!$curroption) {
+                $curroption = 'norequest';
+                $tooloff = ' checked="checked"';
+            }
         } else {
             $curroption = 'norequest';
             $tooloff = ' checked="checked"';
         }
         $output.= &Apache::loncommon::start_data_table_row()."\n".
-                  '  <td><span class="LC_nobreak">'.$lt{$item}.': '.
+                  '  <td><span class="LC_nobreak">'.$lt{$item}.': </span></td><td>'.
+                  '<table><tr><td valign="top">'."\n".
                   '<label><input type="radio" name="reqcrsotherdom_'.$item.
-                  '" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.
-                  '</label>&nbsp;';
+                  '" value=""'.$tooloff.' />'.$reqtitles{'norequest'}.
+                  '</label></td>';
         foreach my $option (@options) {
             if ($option eq 'validate') {
                 my $canvalidate = 0;
@@ -409,18 +422,21 @@ sub coursereq_externaluser {
             if ($option eq $curroption) {
                 $checked = ' checked="checked"';
             }
-            $output .= '<span class="LC_nobreak"><label>'.
+            $output .= '<td valign="top"><span class="LC_nobreak"><label>'.
                        '<input type="radio" name="reqcrsotherdom_'.$item.
                        '" value="'.$option.'"'.$checked.' />'.
-                       $reqtitles{$option}.'</label>&nbsp;';
+                       $reqtitles{$option}.'</label>';
             if ($option eq 'autolimit') {
-                $output .= '<input type="text" name="reqcrsotherdom_'.
+                $output .= '&nbsp;<input type="text" name="reqcrsotherdom_'.
                            $item.'_limit" size="1" '.
-                           'value="'.$currlimit.'" />';
+                           'value="'.$currlimit.'" /></span>'.
+                           '<br />'.$reqtitles{'unlimited'};
+            } else {
+                $output .= '</span>';
             }
-            $output .= '&nbsp;'
+            $output .= '</td>';
         }
-        $output .= '</span></td>'."\n".
+        $output .= '</td></tr></table></td>'."\n".
                    &Apache::loncommon::end_data_table_row()."\n";
     }
     return $output;
@@ -432,16 +448,17 @@ sub courserequest_titles {
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    norequest  => 'Not allowed',
-                                   approve    => 'Approval by Dom. Coord.',
+                                   approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
                                    autolimit  => 'Numerical limit',
+                                   unlimited  => '(blank for unlimited)',
                  );
     return %titles;
 }
 
 sub courserequest_display {
     my %titles = &Apache::lonlocal::texthash (
-                                   approve    => 'Yes, need approval',
+                                   approval   => 'Yes, need approval',
                                    validate   => 'Yes, with validation',
                                    norequest  => 'No',
    );
@@ -635,6 +652,7 @@ sub user_modification_js {
     return <<END;
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
+
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");
@@ -746,13 +764,13 @@ ENDSCRIPT
         my ($uname,$udom) = split(/:/,$user);
         my $onclick;
         if ($context eq 'requestcrs') {
-            $onclick = 
+            $onclick =
                 'onclick="javascript:gochoose('."'$uname','$udom',".
                                                "'$srch_results->{$user}->{firstname}',".
                                                "'$srch_results->{$user}->{lastname}',".
                                                "'$srch_results->{$user}->{permanentemail}'".');"';
         } else {
-            $onclick = 
+            $onclick =
                 ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
         }
         $r->print(&Apache::loncommon::start_data_table_row().
@@ -963,7 +981,6 @@ ENDTITLE
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
-#FIXME
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
                                                       'default','hide');
@@ -1075,7 +1092,7 @@ ENDCHANGEUSER
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
-            if ($env{'request.role.domain'} eq $ccdomain) { 
+            if ($env{'request.role.domain'} eq $ccdomain) {
                 $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
             } else {
                 $r->print(&coursereq_externaluser($ccuname,$ccdomain,
@@ -1413,9 +1430,9 @@ sub display_existing_roles {
             }
             $row.= '</td><td>'.$plaintext.
                    '</td><td>'.$area.
-                   '</td><td>'.($role_start_time?localtime($role_start_time)
+                   '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
                                                 : '&nbsp;' ).
-                   '</td><td>'.($role_end_time  ?localtime($role_end_time)
+                   '</td><td>'.($role_end_time  ?&Apache::lonlocal::locallocaltime($role_end_time)
                                                 : '&nbsp;' )
                    ."</td>";
             $sortrole{$sortkey}=$envkey;
@@ -1558,8 +1575,10 @@ sub new_domain_roles {
     &mt('Extent').'</th>'.
     '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
     &Apache::loncommon::end_data_table_header_row();
+    my @allroles = &Apache::lonuserutils::roles_by_context('domain');
     foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
-        foreach my $role ('dc','li','dg','au','sc') {
+        foreach my $role (@allroles) {
+            next if ($role eq 'ad');
             if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
                my $plrole=&Apache::lonnet::plaintext($role);
                my %lt=&Apache::lonlocal::texthash(
@@ -2450,8 +2469,7 @@ sub update_user_data {
                           \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
         } else {
             &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
-                          \%userenv,
-                                  \%changeHash,\%changed,\%newaccess,\%newaccesstext);
+                          \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
         }
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
@@ -2810,19 +2828,29 @@ sub tool_changes {
         return;
     }
     if ($context eq 'reqcrsotherdom') {
-        my @options = ('approve','validate','autolimit');
+        my @options = ('approval','validate','autolimit');
         my $optregex = join('|',@options);
         my %reqdisplay = &courserequest_display();
         my $cdom = $env{'request.role.domain'};
         foreach my $tool (@{$usertools}) {
-            $oldaccesstext->{$tool} = &mt('no');
+            $oldaccesstext->{$tool} = &mt('No');
+            $newaccesstext->{$tool} = $oldaccesstext->{$tool};
             $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
+            my $newop;
+            if ($env{'form.'.$context.'_'.$tool}) {
+                $newop = $env{'form.'.$context.'_'.$tool};
+                if ($newop eq 'autolimit') {
+                    my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
+                    $limit =~ s/\D+//g;
+                    $newop .= '='.$limit;
+                }
+            }
             if ($userenv->{$context.'.'.$tool} eq '') {
-                if ($env{'form.'.$context.'_'.$tool}) {
-                    $changed->{$tool}=&tool_admin($tool,$cdom,
+                if ($newop) {
+                    $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,
                                                   $changeHash,$context);
                     if ($changed->{$tool}) {
-                        $newaccesstext->{$tool} = &mt('yes');
+                        $newaccesstext->{$tool} = &mt('Yes');
                     } else {
                         $newaccesstext->{$tool} = $oldaccesstext->{$tool};
                     }
@@ -2831,35 +2859,32 @@ sub tool_changes {
                 my @curr = split(',',$userenv->{$context.'.'.$tool});
                 my @new;
                 my $changedoms;
-                my $newop = $env{'form.'.$context.'_'.$tool};
-                if ($newop eq 'autolimit') {
-                    $newop .= '=';
-                    unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
-                        $newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
-                    }
-                }  
-                if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {
-                    $oldaccesstext->{$tool} = &mt('yes');
-                    my $oldop = $1;
-                    if ($oldop ne $newop) {
-                        $changedoms = 1;
-                        foreach my $dom (@curr) {
-                            unless ($dom eq $cdom) {
-                                push(@new,$dom);
+                foreach my $req (@curr) {
+                    if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {
+                        $oldaccesstext->{$tool} = &mt('Yes');
+                        my $oldop = $1;
+                        if ($oldop ne $newop) {
+                            $changedoms = 1;
+                            foreach my $item (@curr) {
+                                my ($reqdom,$option) = split(':',$item);
+                                unless ($reqdom eq $cdom) {
+                                    push(@new,$item);
+                                }
                             }
+                            if ($newop) {
+                                push(@new,$cdom.':'.$newop);
+                            }
+                            @new = sort(@new);
                         }
-                        if ($newop) {
-                            push(@new,$cdom.':'.$newop);
-                        }
-                        @new = sort(@new);
+                        last;
                     }
-                } elsif ($env{'form.'.$context.'_'.$tool}) {
+                }
+                if ((!$changedoms) && ($newop)) {
                     $changedoms = 1;
                     @new = sort(@curr,$cdom.':'.$newop);
                 }
-                $newaccesstext->{$tool} = $oldaccesstext->{$tool};
                 if ($changedoms) {
-                    my $newdomstr; 
+                    my $newdomstr;
                     if (@new) {
                         $newdomstr = join(',',@new);
                     }
@@ -2868,12 +2893,14 @@ sub tool_changes {
                     if ($changed->{$tool}) {
                         if ($env{'form.'.$context.'_'.$tool}) {
                             if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
-                                if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
-                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
+                                my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
+                                $limit =~ s/\D+//g;
+                                if ($limit) {
+                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit);
                                 } else {
-                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});
+                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
                                 }
-                            } else {  
+                            } else {
                                 $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
                             }
                         } else {
@@ -2892,7 +2919,7 @@ sub tool_changes {
             if ($newval eq 'autolimit') {
                 $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
             }
-        } else {  
+        } else {
             $newval = $env{'form.'.$context.'_'.$tool};
         }
         if ($userenv->{$context.'.'.$tool} ne '') {
@@ -5150,7 +5177,8 @@ sub rolechg_contexts {
                                              createcourse => 'Course Creation',
                                              course       => 'User Management in course',
                                              domain       => 'User Management in domain',
-                                             selfenroll   => 'Self-enrolled', 
+                                             selfenroll   => 'Self-enrolled',
+                                             requestcourses => 'Course Request', 
                                          );
     return %lt;
 }
@@ -5235,6 +5263,15 @@ sub user_search_result {
                                 &build_search_response($context,$srch,%srch_results);
                         } else {
                             $currstate = 'modify';
+                            my $uname = $srch->{'srchterm'};
+                            my $udom = $srch->{'srchdomain'};
+                            $srch_results{$uname.':'.$udom} =
+                                { &Apache::lonnet::get('environment',
+                                                       ['firstname',
+                                                        'lastname',
+                                                        'permanentemail'],
+                                                         $udom,$uname)
+                                };
                         }
                     } else {
                         %srch_results = &Apache::lonnet::usersearch($srch);
@@ -5559,7 +5596,7 @@ sub build_search_response {
                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
                     $response .= '<br /><br />';
                     if ($context eq 'requestcrs') {
-                        $response .= &mt("You are not authorized to defined new users in the new course's domain - [_1].",$targetdom);
+                        $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
                     } else {
                         $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
                     }