--- loncom/interface/loncreateuser.pm	2006/08/11 21:55:19	1.129
+++ loncom/interface/loncreateuser.pm	2006/11/20 23:36:40	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.129 2006/08/11 21:55:19 albertel Exp $
+# $Id: loncreateuser.pm,v 1.132 2006/11/20 23:36:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -313,18 +313,27 @@ sub print_user_modification_page {
                 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 { 
-                var coursename = "_$dcdom"+"_"+course+"_"+userrole
-                document.cu.elements[numcourse].name = "act"+coursename
-                document.cu.elements[numcourse+5].name = "sec"+coursename
-                document.cu.elements[numcourse+5].value = section
-                document.cu.elements[numcourse+7].name = "start"+coursename
-                document.cu.elements[numcourse+8].name = "end"+coursename
+            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();
@@ -604,7 +613,7 @@ END
                if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
 		   $class='Course';
                    my ($coursedom,$coursedir) = ($1,$2);
-		   $sortkey.="\0$1";
+		   $sortkey.="\0$coursedom";
                    # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
                    my %coursedata=
                        &Apache::lonnet::coursedescription($1.'_'.$2);
@@ -619,6 +628,7 @@ END
 		       $carea=&mt('Unavailable course').': '.$area;
 		       $sortkey.="\0".&mt('Unavailable course').': '.$area;
 		   }
+		   $sortkey.="\0$coursedir";
                    $inccourses{$1.'_'.$2}=1;
                    if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
                        (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
@@ -771,7 +781,7 @@ END
 		$currentauth=~/^internal:/ or
 		$currentauth=~/^localauth:/
 		) { # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+	    if (&Apache::lonnet::allowed('mau',$ccdomain)) {
                 &initialize_authen_forms();
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
@@ -794,7 +804,7 @@ $lt{'uuas'} ($currentauth). $lt{'sldb'}.
 <p>$authformloc</p>
 ENDBADAUTH
             } else { 
-                # This user is not allowed to modify the users 
+                # This user is not allowed to modify the user's 
                 # authentication scheme, so just notify them of the problem
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
@@ -803,9 +813,6 @@ ENDBADAUTH
 						   );
 		$r->print(<<ENDBADAUTH);
 <hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
 <font color="#ff0000"> $lt{'err'}: </font>
 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 <hr />
@@ -836,7 +843,7 @@ ENDBADAUTH
                     "<p>$authformint</p><p>$authformfsys</p>";
 	    }
             $authformcurrent.=' <i>(will override current values)</i><br />';
-            if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
 		# Current user has login modification privileges
 		my %lt=&Apache::lonlocal::texthash(
                                'ccld'  => "Change Current Login Data",
@@ -854,6 +861,19 @@ $loginscript
 <h3>$lt{'enld'}</h3>
 $authform_other
 ENDOTHERAUTHS
+            } else {
+                if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+                    my %lt=&Apache::lonlocal::texthash(
+                               'ccld'  => "Change Current Login Data",
+                               'yodo'  => "You do not have privileges to modify the authentication configuration for this user.",
+                               'ifch'  => "If a change is required, contact a domain coordinator for the domain",
+                    );
+                    $r->print(<<ENDNOPRIV);
+<hr />
+<h3>$lt{'ccld'}</h3>
+$lt{'yodo'} $lt{'ifch'}: $ccdomain 
+ENDNOPRIV
+                } 
             }
         }  ## End of "check for bad authentication type" logic
     } ## End of new user/old user logic
@@ -1502,7 +1522,7 @@ sub custom_role_editor {
     }
     my %lt=&Apache::lonlocal::texthash(
 		    'prv'  => "Privilege",
-		    'crl'  => "Course/Group Level",
+		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level"
 				       );
@@ -1652,7 +1672,7 @@ sub course_level_table {
             'new'  => "Define new section",
             'ssd'  => "Set Start Date",
             'sed'  => "Set End Date",
-            'crl'  => "Course/Group Level",
+            'crl'  => "Course Level",
             'act'  => "Activate",
             'rol'  => "Role",
             'ext'  => "Extent",
@@ -1797,10 +1817,10 @@ sub course_level_dc {
     my %customroles=&my_custom_roles();
     my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="dccourse" value="" />';
+                      '<input type="hidden" name="dccourse" value="'.$dcdom.'" />';
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').'</b>';
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
     my %lt=&Apache::lonlocal::texthash(
                     'typ' => "Type",
                     'rol'  => "Role",
@@ -1812,14 +1832,14 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.&mt('Course/Group Level').'</h4>'.
+    my $header = '<h4>'.&mt('Course Level').'</h4>'.
                  '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
     my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n".
                      ' <option value="">'.&mt('Please select')."\n".
                      ' <option value="Course">'.&mt('Course')."\n".
-                     ' <option value="Group">'.&mt('Group')."\n".
+                     ' <option value="Non-standard course">'.&mt('Non-standard course')."\n".
                      '</select>'."\n".
-                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','".')" /></td>'."\n".
+                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach  ('st','ta','ep','in','cc') {
         my $plrole=&Apache::lonnet::plaintext($_);