--- loncom/interface/loncreateuser.pm	2007/12/21 12:41:25	1.213
+++ loncom/interface/loncreateuser.pm	2007/12/21 15:22:01	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.213 2007/12/21 12:41:25 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.216 2007/12/21 15:22:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -223,15 +223,15 @@ sub print_username_entry_form {
     my $start_page =
 	&Apache::loncommon::start_page('User Management',
 				       $jscript,{'add_entries' => \%loaditems,});
-    if ($env{'form.action'} eq 'singleuser') {
+    if ($env{'form.action'} eq 'custom') {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:backPage(document.crtuser)",
-            text=>"Single user search",
-            faq=>282,bug=>'Instructor Interface',});
-    } elsif ($env{'form.action'} eq 'custom') {
+            text=>"Pick custom role",});
+    } else {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:backPage(document.crtuser)",
-            text=>"Pick custom role",});
+            text=>"Single user search",
+            faq=>282,bug=>'Instructor Interface',});
     }
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
     my %existingroles=&Apache::lonuserutils::my_custom_roles();
@@ -245,7 +245,8 @@ sub print_username_entry_form {
                     'ecrp' => "Edit Custom Role Privileges",
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor",
-                    'mod'  => "to edit user information or add/modify roles",
+                    'mod'  => "to modify user information or add/modify roles",
+                    'enrl' => "to enroll one student",
 				       );
     my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
@@ -256,12 +257,7 @@ sub print_username_entry_form {
         $sellink = "$lt{'or'} ".$sellink;
     } 
     $r->print($start_page."\n".$crumbs);
-    if ($env{'form.action'} eq 'singleuser') {
-        $r->print("
-<h3>$lt{'srch'} $sellink $lt{'mod'}$helpsiur</h3>
-$response");
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context));
-    } elsif ($env{'form.action'} eq 'custom') {
+    if ($env{'form.action'} eq 'custom') {
         if (&Apache::lonnet::allowed('mcr','/')) {
             $r->print(<<ENDCUSTOM);
 <form action="/adm/createuser" method="post" name="docustom">
@@ -289,15 +285,25 @@ ENDCUSTOM
 }
 
 sub entry_form {
-    my ($dom,$srch,$forcenewuser,$context) = @_;
+    my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
-    my $cancreate = &Apache::lonuserutils::can_create_user($dom,$context);
-    if (!$cancreate) {
-        $forcenewuser = '';
+    my $usertype;
+    if (ref($srch) eq 'HASH') {
+        if (($srch->{'srchin'} eq 'dom') &&
+            ($srch->{'srchby'} eq 'uname') &&
+            ($srch->{'srchtype'} eq 'exact') &&
+            ($srch->{'srchdomain'} ne '') &&
+            ($srch->{'srchterm'} ne '')) {
+            my ($rules,$ruleorder) =
+                &Apache::lonnet::inst_userrules($srch->{'srchdomain'},'username');
+            $usertype = &Apache::lonuserutils::check_usertype($srch->{'srchdomain'},$srch->{'srchterm'},$rules);
+        }
     }
+    my $cancreate =
+        &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
     my $userpicker = 
        &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
-                                       'document.crtuser');
+                                       'document.crtuser',$cancreate,$usertype);
     my $srchbutton = &mt('Search');
     my $output = <<"ENDBLOCK";
 <form action="/adm/createuser" method="post" name="crtuser">
@@ -327,6 +333,7 @@ ENDBLOCK
 <input type="hidden" name="forcenewuser" value="1" />
 <input type="hidden" name="origform" value="crtusername" />
 <h3>$lt{crnu}$helpcrt</h3>
+$responsemsg
 <table>
  <tr>
   <td>$lt{'usr'}:</td>
@@ -404,8 +411,8 @@ ENDSCRIPT
                                        'firstname'      => "first name",
                                        'permanentemail' => "permanent e-mail",
                                       );
+    $r->print(&Apache::loncommon::start_page('User Management',$jscript));
     if ($operation eq 'createuser') {
-        $r->print(&Apache::loncommon::start_page('User Management',$jscript));
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"javascript:backPage(document.usersrchform,'','')",
               text=>"Create/modify user",
@@ -417,9 +424,17 @@ ENDSCRIPT
         $r->print("<b>$lt{'usrch'}</b><br />");
         $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
         $r->print('<h3>'.$lt{'usel'}.'</h3>');
-    } else {
+    } elsif ($operation eq 'enrollstudent') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"javascript:backPage(document.usersrchform,'','')",
+              text=>"Create/modify student",
+              faq=>282,bug=>'Instructor Interface',},
+             {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+              text=>"Select Student",
+              faq=>282,bug=>'Instructor Interface',});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
         $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
-        $r->print(&Apache::londropadd::single_user_entry_form($srch->{'srchdomain'},$srch));
+        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
         $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
     }
     $r->print('<form name="usersrchform" method="post">'.
@@ -465,14 +480,8 @@ ENDSCRIPT
               ' <input type="hidden" name="seludom" value="" />'."\n".
               ' <input type="hidden" name="currstate" value="select" />'."\n".
               ' <input type="hidden" name="phase" value="get_user_info" />'."\n".
-              ' <input type="hidden" name="action" value="singleuser" />'."\n");
-    $r->print($response);
-    if ($operation eq 'createuser') {
-        $r->print('</form>'.&Apache::loncommon::end_page());
-    } else {
-        $r->print('<input type="hidden" name="action" value="enrollstudent" />'."\n".
-                  '<input type="hidden" name="state" value="gotusername" />'."\n");
-    }
+              ' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
+    $r->print($response.'</form>'.&Apache::loncommon::end_page());
 }
 
 sub print_user_query_page {
@@ -484,9 +493,10 @@ sub print_user_query_page {
 }
 
 sub print_user_modification_page {
-    my ($r,$ccuname,$ccdomain,$srch,$response,$context) = @_;
+    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
     if (($ccuname eq '') || ($ccdomain eq '')) {
-        my $usermsg = &mt('No username and/or domain provided.'); 
+        my $usermsg = &mt('No username and/or domain provided.');
+        $env{'form.phase'} = '';
 	&print_username_entry_form($r,$context,$usermsg);
         return;
     }
@@ -503,6 +513,30 @@ sub print_user_modification_page {
         %alerts,%curr_rules,%got_rules);
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     if ($uhome eq 'no_host') {
+        my $usertype;
+        my ($rules,$ruleorder) =
+            &Apache::lonnet::inst_userrules($ccdomain,'username');
+            $usertype =
+                &Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules);
+        my $cancreate =
+            &Apache::lonuserutils::can_create_user($ccdomain,$context,
+                                                   $usertype);
+        if (!$cancreate) {
+            my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+            my %usertypetext = (
+                official   => 'institutional',
+                unofficial => 'non-institutional',
+            );
+            my $response;
+            if ($env{'form.origform'} eq 'crtusername') {
+                $response =  '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
+                            '</span><br />';
+            }
+            $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+            $env{'form.phase'} = '';
+            &print_username_entry_form($r,$context,$response);
+            return;
+        }
         $newuser = 1;
         my $checkhash;
         my $checks = { 'username' => 1 };
@@ -523,9 +557,10 @@ sub print_user_modification_page {
                             $domdesc,$curr_rules{$ccdomain}{'username'},
                             'username');
                     }
+                    $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$userchkmsg);
                     return;
-                } 
+                }
             }
         }
     } else {
@@ -540,7 +575,7 @@ sub print_user_modification_page {
         }
     }
     if ($response) {
-        $response = '<br />'.$response
+        $response = '<br />'.$response;
     }
     my $defdom=$env{'request.role.domain'};
 
@@ -560,165 +595,35 @@ sub print_user_modification_page {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';                                        
-
     my %loaditem;
 
-    my $groupslist;
-    my %curr_groups = &Apache::longroup::coursegroups();
-    if (%curr_groups) {
-        $groupslist = join('","',sort(keys(%curr_groups)));
-        $groupslist = '"'.$groupslist.'"';   
-    }
-
-    if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) {
-        my $dcdom = $1;
-        $loaditem{'onload'} = "document.cu.coursedesc.value='';";
-        my @rolevals = ('st','ta','ep','in','cc');
-        my (@crsroles,@grproles);
-        for (my $i=0; $i<@rolevals; $i++) {
-            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
-            $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
-        }
-        my $rolevalslist = join('","',@rolevals);
-        my $crsrolenameslist = join('","',@crsroles);
-        my $grprolenameslist = join('","',@grproles);
-        my $pickcrsfirst = '<--'.&mt('Pick course first');
-        my $pickgrpfirst = '<--'.&mt('Pick group first'); 
-        $dc_setcourse_code = <<"ENDSCRIPT";
-    function setCourse() {
-        var course = document.cu.dccourse.value;
-        if (course != "") {
-            if (document.cu.dcdomain.value != document.cu.origdom.value) {
-                alert("You must select a course in the current domain");
-                return;
-            } 
-            var userrole = document.cu.role.options[document.cu.role.selectedIndex].value
-            var section="";
-            var numsections = 0;
-            var newsecs = new Array();
-            for (var i=0; i<document.cu.currsec.length; i++) {
-                if (document.cu.currsec.options[i].selected == true ) {
-                    if (document.cu.currsec.options[i].value != "" && document.cu.currsec.options[i].value != null) { 
-                        if (numsections == 0) {
-                            section = document.cu.currsec.options[i].value
-                            numsections = 1;
-                        }
-                        else {
-                            section = section + "," +  document.cu.currsec.options[i].value
-                            numsections ++;
-                        }
-                    }
-                }
-            }
-            if (document.cu.newsec.value != "" && document.cu.newsec.value != null) {
-                if (numsections == 0) {
-                    section = document.cu.newsec.value
-                }
-                else {
-                    section = section + "," +  document.cu.newsec.value
-                }
-                newsecs = document.cu.newsec.value.split(/,/g);
-                numsections = numsections + newsecs.length;
-            }
-            if ((userrole == 'st') && (numsections > 1)) {
-                alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.")
-                return;
-            }
-            for (var j=0; j<newsecs.length; j++) {
-                if ((newsecs[j] == 'all') || (newsecs[j] == 'none')) {
-                    alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
-                    return;
-                }
-                if (document.cu.groups.value != '') {
-                    var groups = document.cu.groups.value.split(/,/g);
-                    for (var k=0; k<groups.length; k++) {
-                        if (newsecs[j] == groups[k]) {
-                            alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
-                            return; 
-                        }
-                    }
-                }
-            }
-            if ((userrole == 'cc') && (numsections > 0)) {
-                alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
-                section = "";
-            }
-            var coursename = "_$dcdom"+"_"+course+"_"+userrole
-            var numcourse = getIndex(document.cu.dccourse);
-            if (numcourse == "-1") {
-                alert("There was a problem with your course selection");
-                return
-            }
-            else {
-                document.cu.elements[numcourse].name = "act"+coursename;
-                var numnewsec = getIndex(document.cu.newsec);
-                if (numnewsec != "-1") {
-                    document.cu.elements[numnewsec].name = "sec"+coursename;
-                    document.cu.elements[numnewsec].value = section;
-                }
-                var numstart = getIndex(document.cu.start);
-                if (numstart != "-1") {
-                    document.cu.elements[numstart].name = "start"+coursename;
-                }
-                var numend = getIndex(document.cu.end);
-                if (numend != "-1") {
-                    document.cu.elements[numend].name = "end"+coursename
-                }
-            }
-        }
-        document.cu.submit();
-    }
-
-    function getIndex(caller) {
-        for (var i=0;i<document.cu.elements.length;i++) {
-            if (document.cu.elements[i] == caller) {
-                return i;
-            }
-        }
-        return -1;
-    }
-ENDSCRIPT
-    } else {
-        $nondc_setsection_code = 
-            &Apache::lonuserutils::setsections_javascript('cu',$groupslist);
-    }
-    my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
-                                   $nondc_setsection_code,$groupslist);
+    my $groupslist = &Apache::lonuserutils::get_groupslist();
 
-    my ($jsback,$elements) = &crumb_utilities();
-    my $javascript_validations;
-    if ((&Apache::lonnet::allowed('mau',$ccdomain)) || ($uhome eq 'no_host')) {
-        my ($krbdef,$krbdefdom) =
-            &Apache::loncommon::get_kerberos_defaults($ccdomain);
-        $javascript_validations = 
-            &Apache::lonuserutils::javascript_validations('auth',$krbdefdom,undef,
-                                                        undef,$ccdomain);
-    }
-    $js .= "\n".
-       '<script type="text/javascript">'."\n".$jsback."\n".
-       $javascript_validations.'</script>';
+    my $js = &validation_javascript($context,$ccdomain,$pjump_def,
+                               $groupslist,$newuser,$formname,\%loaditem);
     my $start_page = 
 	&Apache::loncommon::start_page('User Management',
 				       $js,{'add_entries' => \%loaditem,});
+    my %breadcrumb_text = &singleuser_breadcrumb();
     &Apache::lonhtmlcommon::add_breadcrumb
-     ({href=>"javascript:backPage(document.cu)",
-       text=>"Create/modify user",
+     ({href=>"javascript:backPage($form)",
+       text=>$breadcrumb_text{'search'},
        faq=>282,bug=>'Instructor Interface',});
 
     if ($env{'form.phase'} eq 'userpicked') {
         &Apache::lonhtmlcommon::add_breadcrumb
-     ({href=>"javascript:backPage(document.cu,'get_user_info','select')",
-       text=>"Select a user",
+     ({href=>"javascript:backPage($form,'get_user_info','select')",
+       text=>$breadcrumb_text{'userpicked'},
        faq=>282,bug=>'Instructor Interface',});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
-      ({href=>"javascript:backPage(document.cu,'$env{'form.phase'}','modify')",
-        text=>"Set user role",
+      ({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')",
+        text=>$breadcrumb_text{'modify'},
         faq=>282,bug=>'Instructor Interface',});
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
 
     my $forminfo =<<"ENDFORMINFO";
-<form action="/adm/createuser" method="post" name="cu">
+<form action="/adm/createuser" method="post" name="$formname">
 <input type="hidden" name="phase" value="update_user_data" />
 <input type="hidden" name="ccuname" value="$ccuname" />
 <input type="hidden" name="ccdomain" value="$ccdomain" />
@@ -732,7 +637,7 @@ ENDFORMINFO
 	    $inccourses{$1.'_'.$2}=1;
         }
     }
-    if ($uhome eq 'no_host') {
+    if ($newuser) {
         my $portfolioform;
         if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
             # Current user has quota modification privileges
@@ -755,7 +660,7 @@ $forminfo
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
 ENDTITLE
         if ($env{'form.action'} eq 'singlestudent') {
             $r->print(' ('.$lt{'ast'}.')');
@@ -826,8 +731,13 @@ ENDAUTH
         } else {
             $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
         }
-        $r->print('</h2>'."\n".'<div class="LC_left_float">');
-    } else { # user already exist-
+        $r->print($portfolioform);
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print(&date_sections_select($context,$newuser,$formname,
+                                            $permission));
+        }
+        $r->print('</div><div class="LC_clear_float_footer"></div>');
+    } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Modify existing user: ",
                     'ens'  => "Enroll one student: ",
@@ -1252,6 +1162,37 @@ sub date_sections_select {
     return $output;
 }
 
+sub validation_javascript {
+    my ($context,$ccdomain,$pjump_def,$groupslist,$newuser,$formname,
+        $loaditem) = @_;
+    my $dc_setcourse_code = '';
+    my $nondc_setsection_code = '';
+    if ($context eq 'domain') {
+        my $dcdom = $env{'request.role.domain'};
+        $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
+        $dc_setcourse_code = &Apache::lonuserutils::dc_setcourse_js('cu','singleuser');
+    } else {
+        $nondc_setsection_code =
+            &Apache::lonuserutils::setsections_javascript($formname,$groupslist);
+    }
+    my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
+                                   $nondc_setsection_code,$groupslist);
+
+    my ($jsback,$elements) = &crumb_utilities();
+    my $javascript_validations;
+    if ((&Apache::lonnet::allowed('mau',$ccdomain)) || ($newuser)) {
+        my ($krbdef,$krbdefdom) =
+            &Apache::loncommon::get_kerberos_defaults($ccdomain);
+        $javascript_validations =
+            &Apache::lonuserutils::javascript_validations('createuser',$krbdefdom,undef,
+                                                          undef,$ccdomain);
+    }
+    $js .= "\n".
+           '<script type="text/javascript">'."\n".$jsback."\n".
+           $javascript_validations.'</script>';
+    return $js;
+}
+
 sub user_authentication {
     my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -2754,8 +2695,14 @@ sub handler {
                     $currstate = $env{'form.currstate'};
                 }
                 if ($currstate eq 'select') {
+                    my $operation; 
+                    if ($env{'form.action'} eq 'singleuser') {
+                        $operation = 'createuser';
+                    } elsif ($env{'form.action'} eq 'singlestudent') {
+                        $operation = 'enrollstudent';
+                    }
                     &print_user_selection_page($r,$response,$srch,$results,
-                                               'createuser',\@search,$context);
+                                               $operation,\@search,$context);
                 } elsif ($currstate eq 'modify') {
                     my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') &&