--- loncom/interface/loncreateuser.pm	2006/05/09 14:38:10	1.114
+++ loncom/interface/loncreateuser.pm	2006/08/31 02:19:50	1.125.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.114 2006/05/09 14:38:10 albertel Exp $
+# $Id: loncreateuser.pm,v 1.125.2.6 2006/08/31 02:19:50 albertel 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;
@@ -139,7 +142,7 @@ sub print_username_entry_form {
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor"
 				       );
-    my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
+    my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
@@ -192,80 +195,6 @@ sub user_modification_js {
 
     $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);
-            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();
-    }
 </script>
 END
 }
@@ -300,11 +229,12 @@ sub print_user_modification_page {
     $ccdomain=~s/\W//g;
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
-    my $nondc_setsection_code = '';
+    my $nondc_setsection_code = '';                                        
+
     my %loaditem;
 
     my $groupslist;
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     if (%curr_groups) {
         $groupslist = join('","',sort(keys(%curr_groups)));
         $groupslist = '"'.$groupslist.'"';   
@@ -312,7 +242,18 @@ sub print_user_modification_page {
 
     if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
         my $dcdom = $1;
-        $loaditem{'onload'} = "document.cu.coursedesc.value=''";
+        $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;
@@ -324,6 +265,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) { 
@@ -345,23 +287,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; 
                         }
                     }
@@ -378,11 +320,11 @@ sub print_user_modification_page {
             }
             else { 
                 var coursename = "_$dcdom"+"_"+course+"_"+userrole
-                document.cu.elements[numcourse].name = "act"+coursename
-                document.cu.elements[numcourse+4].name = "sec"+coursename
-                document.cu.elements[numcourse+4].value = section
-                document.cu.elements[numcourse+5].name = "start"+coursename
-                document.cu.elements[numcourse+6].name = "end"+coursename
+                document.cu.act.name = "act"+coursename
+                document.cu.sec.value = section
+                document.cu.sec.name = "sec"+coursename
+                document.cu.start.name = "start"+coursename
+                document.cu.end.name = "end"+coursename
             }
         }
         document.cu.submit();
@@ -396,6 +338,36 @@ sub print_user_modification_page {
         }
         return -1;
     }
+
+    function setType() {
+        var crstype = 'Course'
+        rolevals = new Array("$rolevalslist");
+        if (crstype == 'Group') {
+            if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
+                document.cu.currsec.options[0].text = "$pickgrpfirst";
+            } 
+            grprolenames = new Array("$grprolenameslist");
+            for (var i=0; i<rolevals.length; i++) {
+                if (document.cu.role.selectedIndex == i) {
+                    document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false);
+                } else {
+                    document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false);
+                }
+            }
+        } else {
+            if (document.cu.currsec.options[0].text == "$pickgrpfirst") {
+                document.cu.currsec.options[0].text = "$pickcrsfirst";
+            }
+            crsrolenames = new Array("$crsrolenameslist");
+            for (var i=0; i<rolevals.length; i++) {
+                if (document.cu.role.selectedIndex == i) {
+                    document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false);
+                } else {
+                    document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false);
+                }
+            }
+        }
+    }
 ENDSCRIPT
     } else {
         $nondc_setsection_code = <<"ENDSECCODE";
@@ -406,7 +378,6 @@ ENDSCRIPT
             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);
@@ -443,15 +414,17 @@ ENDSCRIPT
                             sections = document.cu.elements[i+1].value;
                         }
                         var newsecs = document.cu.elements[i+1].value;
+			var numsplit;
                         if (newsecs != null && newsecs != "") {
-                            var numsplit = newsecs.split(/,/g);
+                            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 {
+                        else if (numsplit != null) {
                             for (var j=0; j<numsplit.length; j++) {
                                 if ((numsplit[j] == 'all') ||
                                     (numsplit[j] == 'none')) {
@@ -465,8 +438,8 @@ ENDSCRIPT
                                     }
                                 }
                             }
-                            document.cu.elements[i+2].value = sections;
                         }
+                        document.cu.elements[i+2].value = sections;
                     }
                 }
             }
@@ -631,7 +604,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);
@@ -641,10 +614,12 @@ END
                            '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
      &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
 		       $sortkey.="\0".$coursedata{'description'};
+                       $class=$coursedata{'type'};
 		   } else {
 		       $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))) {
@@ -732,7 +707,7 @@ END
                }
 	       my $plaintext='';
 	       unless ($croletitle) {
-		   $plaintext=&Apache::lonnet::plaintext($role_code);
+                   $plaintext=&Apache::lonnet::plaintext($role_code,$class)
 	       } else {
 	           $plaintext=
 		"Customrole '$croletitle' defined by $croleuname\@$croleudom";
@@ -752,7 +727,7 @@ END
            } # end of foreach        (table building loop)
            my $rolesdisplay = 0;
            my %output = ();
-	   foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+	   foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
 	       $output{$type} = '';
 	       foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 		   if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { 
@@ -774,7 +749,7 @@ END
 <tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e
 xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
 END
-               foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+               foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
                    if ($output{$type}) {
                        $r->print($output{$type}."\n");
                    }
@@ -972,12 +947,11 @@ ENDDROW
         $r->print($domaintext);
     }
 #
-# Course level
+# Course and group levels
 #
-    my $num_sections;
 
     if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
-        $r->print(&course_level_dc($1));
+        $r->print(&course_level_dc($1,'Course'));
         $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
     } else {
         $r->print(&course_level_table(%inccourses));
@@ -1224,9 +1198,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 />');
 		}
 	    } 
@@ -1239,7 +1213,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 />');
@@ -1250,23 +1225,33 @@ 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;
                 my $output;
                 if ($role eq 'st') {
                     if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
-                        my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
+                        my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
                         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
                             $output = "Error: $result\n";
                         } else {
@@ -1279,11 +1264,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'};
@@ -1304,10 +1298,10 @@ END
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
                 if ($num_sections == 0) {
-                    $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
+                    $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
                 } else {
 		    my %curr_groups =
-			&Apache::loncommon::coursegroups($one,$two);
+			&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})) {
@@ -1315,7 +1309,7 @@ END
                             next;
                         }
                         my $securl = $url.'/'.$sec;
-		        $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
+		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
 	    } elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
@@ -1334,10 +1328,10 @@ END
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
                 if ($num_sections == 0) {
-                    $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                 } else {
                     my %curr_groups = 
-			&Apache::loncommon::coursegroups($one,$two);
+			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         $sec =~ s/\W//g;
@@ -1348,13 +1342,13 @@ END
                                 next;
                             }
                             my $securl = $url.'/'.$sec;
-                            $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                     }
                 } 
 	    } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
@@ -1371,19 +1365,19 @@ END
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
                 if ($num_sections == 0) {
-                    $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
                 } else {
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         if ($sec ne '') {
                             my $securl = $url.'/'.$sec;
-                            $r->print(&commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
                     }
                 }
 	    } else {
@@ -1405,89 +1399,6 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
-sub commit_customrole {
-    my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-    my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
-                         ($start?', '.&mt('starting').' '.localtime($start):'').
-                         ($end?', ending '.localtime($end):'').': <b>'.
-              &Apache::lonnet::assigncustomrole(
-                 $udom,$uname,$url,$three,$four,$five,$end,$start).
-                 '</b><br />';
-    return $output;
-}
-
-sub commit_standardrole {
-    my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
-    my $output;
-    my $logmsg;
-    if ($three eq 'st') {
-        my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
-        if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
-            $output = "Error: $result\n"; 
-        } else {
-            $output = &mt('Assigning').' '.$three.' in '.$url.
-               ($start?', '.&mt('starting').' '.localtime($start):'').
-               ($end?', '.&mt('ending').' '.localtime($end):'').
-               ': <b>'.$result.'</b><br />'.
-               &mt('Add to classlist').': <b>ok</b><br />';
-        }
-    } else {
-        $output = &mt('Assigning').' '.$three.' in '.$url.
-               ($start?', '.&mt('starting').' '.localtime($start):'').
-               ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
-               &Apache::lonnet::assignrole(
-                   $udom,$uname,$url,$three,$end,$start).
-                   '</b><br />';
-    }
-    return $output;
-}
-
-sub commit_studentrole {
-    my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
-    my $linefeed =  '<br />'."\n";
-    my $result;
-    if (defined($one) && defined($two)) {
-        my $cid=$one.'_'.$two;
-        my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
-        my $secchange = 0;
-        my $expire_role_result;
-        my $modify_section_result;
-        unless ($oldsec eq '-1') {
-            unless ($sec eq $oldsec) {
-                $secchange = 1;
-                my $uurl='/'.$cid;
-                $uurl=~s/\_/\//g;
-                if ($oldsec) {
-                    $uurl.='/'.$oldsec;
-                }
-                $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
-                $result = $expire_role_result;
-            }
-        }
-        if (($expire_role_result eq 'ok') || ($secchange == 0)) {
-            $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
-            if ($modify_section_result =~ /^ok/) {
-                if ($secchange == 1) {
-                    $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
-                } elsif ($oldsec eq '-1') {
-                    $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
-                } else {
-                    $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
-                }
-            } else {
-                $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
-            }
-            $result = $modify_section_result;
-        } elsif ($secchange == 1) {
-            $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
-        }
-    } 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";
-    }
-    return $result;
-}
-
 sub build_roles {
     my ($sectionstr,$sections,$role) = @_;
     my $num_sections = 0;
@@ -1517,7 +1428,7 @@ sub build_roles {
             $num_sections ++;
         }
     }
-                                                                                     
+
     return $num_sections;
 }
 
@@ -1604,16 +1515,17 @@ sub custom_role_editor {
 <tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
 <th>$lt{'ssl'}</th></tr>
 ENDCCF
-    foreach (sort keys %full) {
-	$r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
-    ($courselevel{$_}?'<input type="checkbox" name="'.$_.':c" '.
-    ($courselevelcurrent{$_}?'checked="1"':'').' />':'&nbsp;').
+    foreach my $priv (sort keys %full) {
+        my $privtext = &Apache::lonnet::plaintext($priv);
+	$r->print('<tr><td>'.$privtext.'</td><td>'.
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
+    ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($domainlevel{$_}?'<input type="checkbox" name="'.$_.':d" '.
-    ($domainlevelcurrent{$_}?'checked="1"':'').' />':'&nbsp;').
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '.
+    ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($systemlevel{$_}?'<input type="checkbox" name="'.$_.':s" '.
-    ($systemlevelcurrent{$_}?'checked="1"':'').' />':'&nbsp;').
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td></tr>');
     }
     $r->print(
@@ -1756,19 +1668,20 @@ sub course_level_table {
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
 	my $area=$coursedata{'description'};
+        my $type=$coursedata{'type'};
 	if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }
 	my $bgcol=$thiscourse;
 	$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') {
+	foreach  ('st','ta','ep','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
 		$table .= <<ENDEXTENT;
@@ -1778,8 +1691,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 />'.
@@ -1819,8 +1732,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 />'.
@@ -1859,10 +1772,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".
@@ -1870,7 +1783,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";
@@ -1887,12 +1800,10 @@ sub course_level_dc {
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse" value="" />';
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-                     ('cu','dccourse','dcdomain','coursedesc').'</b>';
-                                                                                      
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);
     my %lt=&Apache::lonlocal::texthash(
-                    'crl'  => "Course Level",
-                    'crt'  => "Course Title",
+                    'typ' => "Type",
                     'rol'  => "Role",
                     'grs'  => "Section",
                     'exs'  => "Existing sections",
@@ -1902,11 +1813,11 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.$lt{'crl'}.'</h4>'.
+    my $header = '<h4>'.&mt('Course Level').'</h4>'.
                  '<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
-    my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'".'cu'."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."',''".')" /></td>'.
+    my $otheritems = '<tr><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','ad','in','cc') {
+    foreach  ('st','ta','ep','in','cc') {
         my $plrole=&Apache::lonnet::plaintext($_);
         $otheritems .= '  <option value="'.$_.'">'.$plrole;
     }