--- loncom/interface/loncreateuser.pm	2006/05/08 21:40:20	1.113
+++ 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.113 2006/05/08 21:40:20 raeburn 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;
@@ -235,25 +238,26 @@ sub user_modification_js {
                         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 {
-                            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.");
+                            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 (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.");
+                                    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;
                                     }
                                 }
@@ -302,17 +306,14 @@ sub print_user_modification_page {
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';
     my %loaditem;
-    my (%curr_groups,$groupslist,$numgroups);
-    if (exists($env{'request.course.id'})) {
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
-                                                         $cnum);
-    }
-    if ($numgroups > 0) {
+
+    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{'onload'} = "document.cu.coursedesc.value=''";
@@ -327,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) { 
@@ -348,23 +350,23 @@ 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<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.");
+            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 (numsplit[j] == groups[k]) {
-                            alert("'"+numsplit[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.");
+                        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; 
                         }
                     }
@@ -977,7 +979,6 @@ ENDDROW
 #
 # Course level
 #
-    my $num_sections;
 
     if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
         $r->print(&course_level_dc($1));
@@ -1209,7 +1210,6 @@ END
         }
     }
     ##
-    my %curr_groups;
     my $now=time;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach (keys (%env)) {
@@ -1228,9 +1228,9 @@ 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 />');
 		}
 	    } 
@@ -1243,7 +1243,8 @@ END
 		'</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 />');
@@ -1254,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;
@@ -1283,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'};
@@ -1310,8 +1330,8 @@ END
                 if ($num_sections == 0) {
                     $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
                 } else {
-                    my $numgrp=&Apache::loncommon::coursegroups(\%curr_groups,
-                                                                $one,$two);
+		    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})) {
@@ -1340,8 +1360,8 @@ END
                 if ($num_sections == 0) {
                     $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                 } else {
-                    my $numgrp=&Apache::loncommon::coursegroups(\%curr_groups,
-                                                                $one,$two);
+                    my %curr_groups = 
+			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         $sec =~ s/\W//g;
@@ -1765,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') {
@@ -1782,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 />'.
@@ -1823,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 />'.
@@ -1863,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".
@@ -1874,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";