--- loncom/interface/loncreateuser.pm	2006/03/19 22:15:46	1.110
+++ loncom/interface/loncreateuser.pm	2006/05/30 12:46:09	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.110 2006/03/19 22:15:46 albertel Exp $
+# $Id: loncreateuser.pm,v 1.118 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,6 +64,9 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my $loginscript; # piece of javascript used in two separate instances
 my $generalrule;
@@ -143,6 +146,7 @@ sub print_username_entry_form {
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
+$start_page
 <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="phase" value="get_user_info">
 <h2>$lt{siur}$helpsiur</h2>
@@ -169,7 +173,8 @@ ENDCUSTOM
 
 
 sub user_modification_js {
-    my ($pjump_def, $dc_setcourse_code)=@_;
+    my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_;
+    
     return <<END;
 <script type="text/javascript" language="Javascript">
 
@@ -188,8 +193,11 @@ sub user_modification_js {
         pclose();
     }
 
+    $nondc_setsection_code
+
     function setSections() {
         var re1 = /^currsec_/;
+        var groups = new Array($groupslist);
         for (var i=0;i<document.cu.elements.length;i++) {
             var str = document.cu.elements[i].name;
             var checkcurr = str.match(re1);
@@ -225,21 +233,35 @@ sub user_modification_js {
                         if (numsec > 0) {
                             if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
                                 sections = sections + "," +  document.cu.elements[i+1].value;
-                            } 
+                            }
                         }
                         else {
                             sections = document.cu.elements[i+1].value;    
                         }
-                        var newsecs = document.cu.elements[i+1].value;
-                        if (newsecs != null && newsecs != "") {
-                            var numsplit = newsecs.split(/,/g);
-                            numsec = numsec + numsplit.length;
+                        var newseclist = document.cu.elements[i+1].value;
+                        var newsecs = new Array();
+                        if (newseclist != null && newseclist != "") {
+                            newsecs = newseclist.split(/,/g);
+                            numsec = numsec + newsecs.length;
                         }
                         if ((role == 'st') && (numsec > 1)) {
                             alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")  
                             return;
                         }
-                        else { 
+                        else {
+                            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;
+                                }
+                                for (var k=0; k<groups.length; k++) {
+                                    if (newsecs[j] == groups[k]) {
+                                        alert("'"+newsecs[j]+"' may not be used as a section name, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+                                        return;
+                                    }
+                                }
+                            }
                             document.cu.elements[i+2].value = sections;
                         }
                     }
@@ -282,10 +304,19 @@ sub print_user_modification_page {
     $ccdomain=~s/\W//g;
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
-    my $loaditem;
+    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\./(\w+)/$-) {
         my $dcdom = $1;
-        $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|;
+        $loaditem{'onload'} = "document.cu.coursedesc.value=''";
         $dc_setcourse_code = <<"ENDSCRIPT";
     function setCourse() {
         var course = document.cu.dccourse.value;
@@ -297,6 +328,7 @@ sub print_user_modification_page {
             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) { 
@@ -318,13 +350,28 @@ sub print_user_modification_page {
                 else {
                     section = section + "," +  document.cu.newsec.value
                 }
-                var numsplit = document.cu.newsec.value.split(/,/g);
-                numsections = numsections + numsplit.length;
+                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 = "";
@@ -355,12 +402,89 @@ sub print_user_modification_page {
         return -1;
     }
 ENDSCRIPT
+    } else {
+        $nondc_setsection_code = <<"ENDSECCODE";
+    function setSections() {
+        var re1 = /^currsec_/;
+        var groups = new Array($groupslist);
+        for (var i=0;i<document.cu.elements.length;i++) {
+            var str = document.cu.elements[i].name;
+            var checkcurr = str.match(re1);
+            if (checkcurr != null) {
+                var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+                if (document.cu.elements[i-1].checked == true) {
+                    var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+                    match = re2.exec(str);
+                    var role = match[1];
+                    if (role == 'cc') {
+                        alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+                    }
+                    else {
+                        var sections = '';
+                        var numsec = 0;
+                        var sections;
+                        for (var j=0; j<document.cu.elements[i].length; j++) {
+                            if (document.cu.elements[i].options[j].selected == true ) {
+                                if (document.cu.elements[i].options[j].value != "") {
+                                    if (numsec == 0) {
+                                        if (document.cu.elements[i].options[j].value != "") {
+                                            sections = document.cu.elements[i].options[j].value;
+                                            numsec ++;
+                                        }
+                                    }
+                                    else {
+                                        sections = sections + "," +  document.cu.elements[i].options[j].value
+                                        numsec ++;
+                                    }
+                                }
+                            }
+                        }
+                        if (numsec > 0) {
+                            if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
+                                sections = sections + "," +  document.cu.elements[i+1].value;
+                            }
+                        }
+                        else {
+                            sections = document.cu.elements[i+1].value;
+                        }
+                        var newsecs = document.cu.elements[i+1].value;
+                        if (newsecs != null && newsecs != "") {
+                            var numsplit = newsecs.split(/,/g);
+                            numsec = numsec + numsplit.length;
+                        }
+                        if ((role == 'st') && (numsec > 1)) {
+                            alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
+                            return;
+                        }
+                        else {
+                            for (var j=0; j<numsplit.length; j++) {
+                                if ((numsplit[j] == 'all') ||
+                                    (numsplit[j] == 'none')) {
+                                    alert("'"+numsplit[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+                                    return;
+                                }
+                                for (var k=0; k<groups.length; k++) {
+                                    if (numsplit[j] == groups[k]) {
+                                        alert("'"+numsplit[j]+"' may not be used as a section name, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+                                        return;
+                                    }
+                                }
+                            }
+                            document.cu.elements[i+2].value = sections;
+                        }
+                    }
+                }
+            }
+        }
+        document.cu.submit();
     }
-
-    my $js = &user_modification_js($pjump_def, $dc_setcourse_code);
+ENDSECCODE
+    }
+    my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
+                                   $nondc_setsection_code,$groupslist);
     my $start_page = 
 	&Apache::loncommon::start_page('Create Users, Change User Privileges',
-				       $js,{'add_entries' => $loaditem,});
+				       $js,{'add_entries' => \%loaditem,});
 
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="cu">
@@ -547,7 +671,7 @@ END
                    $bgcol=~s/[^7-9a-e]//g;
                    $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
                    if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
-                       $carea.='<br />Section/Group: '.$3;
+                       $carea.='<br />Section: '.$3;
 		       $sortkey.="\0$3";
                    }
                    $area=$carea;
@@ -855,7 +979,6 @@ ENDDROW
 #
 # Course level
 #
-    my $num_sections;
 
     if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
         $r->print(&course_level_dc($1));
@@ -883,6 +1006,7 @@ sub update_user_data {
         $title='Modify User Privileges';
     }
     $r->print(&Apache::loncommon::start_page($title));
+    my %disallowed;
     # Check Inputs
     if (! $env{'form.ccuname'} ) {
 	$r->print($error.&mt('No login name specified').'.'.$end);
@@ -1104,22 +1228,23 @@ END
 			 &Apache::lonnet::critical('put:'.
                              $env{'course.'.$cid.'.domain'}.':'.
 	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                         &escape($env{'form.ccuname'}.':'.
                              $env{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
+                         &escape($now.':'),
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
 	    if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
 # Revoke custom role
-		$r->print(&mt('Revoking custom role').
+		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
                       &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
 	    }
 	} elsif ($_=~/^form\.del/) {
-	    if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
+	    if ($_=~/^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 />');
@@ -1130,16 +1255,26 @@ END
 			 &Apache::lonnet::critical('put:'.
                              $env{'course.'.$cid.'.domain'}.':'.
 	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                         &escape($env{'form.ccuname'}.':'.
                              $env{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
+                         &escape($now.':'),
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
-	    } 
+            }
+            if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\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]',
+                      $rolename,$rnam,$rdom,$url).': <b>'.
+                      &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
+                         $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
+                         0,1).'</b><br />');
+            }
 	} elsif ($_=~/^form\.ren/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
-	    if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) {
+# Re-enable standard role
+	    if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
                 my $url = $1;
                 my $role = $2;
                 my $logmsg;
@@ -1159,11 +1294,20 @@ END
                 } else {
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
                                $env{'form.ccuname'},$url,$role,0,$now);
-		    $output = &mt('Re-Enabling [_1] in [_2]: [_3]',
+		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
 			      $role,$url,$result).'<br />';
 		}
                 $r->print($output);
-	    } 
+	    }
+# Re-enable custom role
+            if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+                my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+                my $result = &Apache::lonnet::assigncustomrole(
+                               $env{'form.ccdomain'}, $env{'form.ccuname'},
+                               $url,$rdom,$rnam,$rolename,0,$now);
+                $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
+                          $rolename,$rnam,$rdom,$url,$result).'<br />');
+            }
 	} elsif ($_=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -1186,8 +1330,15 @@ END
                 if ($num_sections == 0) {
                     $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
                 } else {
-                    foreach (sort {$a cmp $b} keys %sections) {
-                        my $securl = $url.'/'.$_;
+		    my %curr_groups =
+			&Apache::longroup::coursegroups($one,$two);
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        if (($sec eq 'none') || ($sec eq 'all') || 
+                            exists($curr_groups{$sec})) {
+                            $disallowed{$sec} = $url;
+                            next;
+                        }
+                        my $securl = $url.'/'.$sec;
 		        $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
@@ -1209,10 +1360,17 @@ END
                 if ($num_sections == 0) {
                     $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                 } else {
+                    my %curr_groups = 
+			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         $sec =~ s/\W//g;
-                        if ($sec ne '') {  
+                        if ($sec ne '') {
+                            if (($sec eq 'none') || ($sec eq 'all') || 
+                                exists($curr_groups{$sec})) {
+                                $disallowed{$sec} = $url;
+                                next;
+                            }
                             my $securl = $url.'/'.$sec;
                             $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
                         } else {
@@ -1255,7 +1413,15 @@ END
 	    } else {
 		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');
             }
-	} 
+            foreach my $key (sort(keys(%disallowed))) {
+                if (($key eq 'none') || ($key eq 'all')) {  
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));
+                } else {
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));
+                }
+                $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
+            }
+	}
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
@@ -1341,7 +1507,7 @@ sub commit_studentrole {
         }
     } else {
         $$logmsg .= "Incomplete course id defined.  Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
-        $result = "Error: incomplete course id\n";
+        $result = "error: incomplete course id\n";
     }
     return $result;
 }
@@ -1603,7 +1769,7 @@ sub course_level_table {
             'act'  => "Activate",
             'rol'  => "Role",
             'ext'  => "Extent",
-            'grs'  => "Group/Section",
+            'grs'  => "Section",
             'sta'  => "Start",
             'end'  => "End"
     );
@@ -1619,11 +1785,11 @@ sub course_level_table {
 	$bgcol=~s/[^7-9a-e]//g;
 	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
 	my ($domain,$cnum)=split(/\//,$thiscourse);
-        my %sections_count = ();
-        my $num_sections = 0;
+        my %sections_count;
         if (defined($env{'request.course.id'})) {
             if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
-                $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+                %sections_count = 
+		    &Apache::loncommon::get_sections($domain,$cnum);
             }
         }
 	foreach  ('st','ta','ep','ad','in','cc') {
@@ -1636,8 +1802,8 @@ sub course_level_table {
 <td>$area<br />Domain: $domain</td>
 ENDEXTENT
 	        if ($_ ne 'cc') {
-                    if ($num_sections > 0) {
-                        my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_);
+                    if (%sections_count) {
+                        my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_);
                         $table .= 
                     '<td><table border="0" cellspacing="0" cellpadding="0">'.
                      '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
@@ -1677,8 +1843,8 @@ ENDTIMEENTRY
 <td>$plrole</td>
 <td>$area</td>
 END
-                if ($num_sections > 0) {
-                    my $currsec = &course_sections($num_sections,\%sections_count,$customrole);
+                if (%sections_count) {
+                    my $currsec = &course_sections(\%sections_count,$customrole);
                     $table.=
                    '<td><table border="0" cellspacing="0" cellpadding="0">'.
                    '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
@@ -1717,10 +1883,10 @@ ENDTABLE
 }
 
 sub course_sections {
-    my ($num_sections,$sections_count,$role) = @_;
+    my ($sections_count,$role) = @_;
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    if ($num_sections == 1) {
+    if (scalar(@sections) == 1) {
         $output = '<select name="currsec_'.$role.'" >'."\n".
                   '  <option value="">Select</option>'."\n".
                   '  <option value="">No section</option>'."\n".
@@ -1728,7 +1894,7 @@ sub course_sections {
     } else {
         $output = '<select name="currsec_'.$role.'" ';
         my $multiple = 4;
-        if ($num_sections <4) { $multiple = $num_sections; }
+        if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
         $output .= '"multiple" size="'.$multiple.'">'."\n";
         foreach (@sections) {
             $output .= '<option value="'.$_.'">'.$_."</option>\n";
@@ -1752,7 +1918,7 @@ sub course_level_dc {
                     'crl'  => "Course Level",
                     'crt'  => "Course Title",
                     'rol'  => "Role",
-                    'grs'  => "Group/Section",
+                    'grs'  => "Section",
                     'exs'  => "Existing sections",
                     'new'  => "Define new section", 
                     'sta'  => "Start",
@@ -1781,7 +1947,8 @@ sub course_level_dc {
                      ' <option value=""><--'.&mt('Pick course first').'</select></td>'.
                      '<td>&nbsp;&nbsp;</td>'.
                      '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
-                     '<input type="text" name="newsec" value="" /></td>'.
+                     '<input type="text" name="newsec" value="" />'.
+                     '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
 <td><input type=hidden name="start" value=''>