--- loncom/interface/loncreateuser.pm	2006/05/18 01:08:51	1.117
+++ loncom/interface/loncreateuser.pm	2006/11/22 16:06:28	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.117 2006/05/18 01:08:51 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.135 2006/11/22 16:06:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,6 +65,8 @@ 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;
@@ -97,8 +99,8 @@ sub initialize_authen_forms {
 sub my_custom_roles {
     my %returnhash=();
     my %rolehash=&Apache::lonnet::dump('roles');
-    foreach (keys %rolehash) {
-	if ($_=~/^rolesdef\_(\w+)$/) {
+    foreach my $key (keys %rolehash) {
+	if ($key=~/^rolesdef\_(\w+)$/) {
 	    $returnhash{$1}=$1;
 	}
     }
@@ -114,6 +116,20 @@ sub authorpriv {
     return 1;
 }
 
+# ====================================================
+
+sub portfolio_quota {
+    my ($ccuname,$ccdomain) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                   'disk' => "Disk space allocated to user's portfolio files",
+    );
+    my $output = '<h3>'.$lt{'disk'}.'</h3>'.
+                 '<input type="text" name="portfolioquota" size ="5" value="'.
+                 &Apache::loncommon::get_user_quota($ccuname,$ccdomain).
+                 '" />&nbsp;Mb';
+    return $output;
+}
+
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -140,7 +156,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");
@@ -193,81 +209,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 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<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;
-                        }
-                    }
-                }
-            }
-        }
-        document.cu.submit();
-    }
 </script>
 END
 }
@@ -302,7 +243,8 @@ 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;
@@ -314,7 +256,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;
@@ -374,18 +327,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+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
+            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();
@@ -399,6 +361,36 @@ sub print_user_modification_page {
         }
         return -1;
     }
+
+    function setType() {
+        var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+        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";
@@ -409,7 +401,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);
@@ -446,15 +437,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')) {
@@ -468,8 +461,8 @@ ENDSCRIPT
                                     }
                                 }
                             }
-                            document.cu.elements[i+2].value = sections;
                         }
+                        document.cu.elements[i+2].value = sections;
                     }
                 }
             }
@@ -496,11 +489,11 @@ ENDFORMINFO
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     my %incdomains; 
     my %inccourses;
-    foreach (values(%Apache::lonnet::hostdom)) {
-       $incdomains{$_}=1;
+    foreach my $item (values(%Apache::lonnet::hostdom)) {
+       $incdomains{$item}=1;
     }
-    foreach (keys(%env)) {
-	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+    foreach my $key (keys(%env)) {
+	if ($key=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
     }
@@ -522,6 +515,11 @@ ENDFORMINFO
                     'hs'   => "Home Server",
                     'lg'   => "Login Data"
 				       );
+        my $portfolioform;
+        if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Current user has quota modification privileges
+            $portfolioform = &portfolio_quota($ccuname,$ccdomain);
+        }
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
         &initialize_authen_forms();
 	$r->print(<<ENDNEWUSER);
@@ -554,6 +552,8 @@ $lt{'hs'}: <select name="hserver" size="
 <p>$authformint </p>
 <p>$authformfsys</p>
 <p>$authformloc </p>
+<hr />
+$portfolioform
 ENDNEWUSER
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
@@ -573,30 +573,27 @@ $forminfo
 ENDCHANGEUSER
         # Get the users information
         my %userenv = &Apache::lonnet::get('environment',
-                          ['firstname','middlename','lastname','generation'],
-                          $ccdomain,$ccuname);
+                          ['firstname','middlename','lastname','generation',
+                           'portfolioquota'],$ccdomain,$ccuname);
         my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
-        $r->print(<<END);
-<hr />
-<table border="2">
-<tr>
-<th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th>
-</tr>
-<tr>
-END
-        foreach ('firstname','middlename','lastname','generation') {
+        $r->print('
+<hr />'.
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'.
+                  &Apache::loncommon::end_data_table_header_row().
+                  &Apache::loncommon::start_data_table_row());
+        foreach my $item ('firstname','middlename','lastname','generation') {
            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-              $r->print(<<"END");            
-<td><input type="text" name="c$_" value="$userenv{$_}" size="15" /></td>
+              $r->print(<<"END");
+<td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
 END
            } else {
-               $r->print('<td>'.$userenv{$_}.'</td>');
+               $r->print('<td>'.$userenv{$item}.'</td>');
            }
         }
-      $r->print(<<END);
-</tr>
-</table>
-END
+        $r->print(&Apache::loncommon::end_data_table_row().
+                  &Apache::loncommon::end_data_table());
         # Build up table of user roles to allow revocation of a role.
         my ($tmp) = keys(%rolesdump);
         unless ($tmp =~ /^(con_lost|error)/i) {
@@ -634,7 +631,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);
@@ -644,10 +641,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))) {
@@ -735,7 +734,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";
@@ -755,7 +754,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}}) ) { 
@@ -777,7 +776,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");
                    }
@@ -800,7 +799,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",
@@ -823,7 +822,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",
@@ -832,9 +831,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 />
@@ -865,7 +861,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",
@@ -883,6 +879,23 @@ $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
+                } 
+            }
+            if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+                # Current user has quota modification privileges
+                $r->print(&portfolio_quota($ccuname,$ccdomain));
             }
         }  ## End of "check for bad authentication type" logic
     } ## End of new user/old user logic
@@ -907,34 +920,38 @@ ENDOTHERAUTHS
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
 				       );
-       $r->print(<<ENDCOAUTH);
-<h4>$lt{'cs'}</h4>
-<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
-<th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
-<tr>
-<td><input type=checkbox name="act_$cudom\_$cuname\_ca" /></td>
-<td>$lt{'cau'}</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_ca" value='' />
-<a href=
-"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_ca" value='' />
+       $r->print('<h4>'.$lt{'cs'}.'</h4>'."\n". 
+           &Apache::loncommon::start_data_table()."\n".
+           &Apache::loncommon::start_data_table_header_row()."\n".
+           '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'.
+           '<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'.
+           '<th>'.$lt{'end'}.'</th>'."\n".
+           &Apache::loncommon::end_data_table_header_row()."\n".
+           &Apache::loncommon::start_data_table_row()."\n".
+           '<td>
+            <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+           </td>
+           <td>'.$lt{'cau'}.'</td>
+           <td>'.$cudom.'_'.$cuname.'</td>
+           <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
+             <a href=
+"javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
 <a href=
-"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'sed'}</a></td>
-</tr>
-<tr>
-<td><input type=checkbox name="act_$cudom\_$cuname\_aa" /></td>
-<td>$lt{'caa'}</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_aa" value='' />
+"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
+          &Apache::loncommon::end_data_table_row()."\n".
+          &Apache::loncommon::start_data_table_row()."\n".
+'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+<td>'.$lt{'caa'}.'</td>
+<td>'.$cudom.'_'.$cuname.'</td>
+<td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
-"javascript:pjump('date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_aa" value='' />
+"javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
-"javascript:pjump('date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'sed'}</a></td>
-</tr>
-</table>
-ENDCOAUTH
+"javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
+         &Apache::loncommon::end_data_table_row()."\n".
+         &Apache::loncommon::end_data_table());
     }
 #
 # Domain level
@@ -942,44 +959,46 @@ ENDCOAUTH
     my $num_domain_level = 0;
     my $domaintext = 
     '<h4>'.&mt('Domain Level').'</h4>'.
-    '<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'.
-    '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>';
-    foreach ( sort( keys(%incdomains))) {
-	my $thisdomain=$_;
-        foreach ('dc','li','dg','au','sc') {
-            if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {
-               my $plrole=&Apache::lonnet::plaintext($_);
+    &Apache::loncommon::start_data_table().
+    &Apache::loncommon::start_data_table_header_row().
+    '<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.
+    &mt('Extent').'</th>'.
+    '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+    &Apache::loncommon::end_data_table_header_row();
+    foreach my $thisdomain ( sort( keys(%incdomains))) {
+        foreach my $role ('dc','li','dg','au','sc') {
+            if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+               my $plrole=&Apache::lonnet::plaintext($role);
 	       my %lt=&Apache::lonlocal::texthash(
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
 				       );
                $num_domain_level ++;
-               $domaintext .= <<"ENDDROW";
-<tr>
-<td><input type=checkbox name="act_$thisdomain\_$_"></td>
-<td>$plrole</td>
-<td>$thisdomain</td>
-<td><input type=hidden name="start_$thisdomain\_$_" value=''>
+               $domaintext .= 
+&Apache::loncommon::start_data_table_row().
+'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'"></td>
+<td>'.$plrole.'</td>
+<td>'.$thisdomain.'</td>
+<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="">
 <a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$thisdomain\_$_" value=''>
+"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="">
 <a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
-</tr>
-ENDDROW
+"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
+&Apache::loncommon::end_data_table_row();
             }
         } 
     }
-    $domaintext.='</table>';
+    $domaintext.= &Apache::loncommon::end_data_table();
     if ($num_domain_level > 0) {
         $r->print($domaintext);
     }
 #
-# Course level
+# Course and group levels
 #
 
     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));
@@ -1131,24 +1150,42 @@ ENDMODIFYUSERHEAD
     if (! $env{'form.makeuser'} ) {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
-            ('environment',['firstname','middlename','lastname','generation'],
-             $env{'form.ccdomain'},$env{'form.ccuname'});
+            ('environment',['firstname','middlename','lastname','generation',
+             'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
         }
         # Check to see if we need to change user information
-        foreach ('firstname','middlename','lastname','generation') {
+        foreach my $item ('firstname','middlename','lastname','generation') {
             # Strip leading and trailing whitespace
-            $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
+            $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
+        }
+        my ($quotachanged,$namechanged,$oldportfolioquota);
+        my %changeHash;
+        if (exists($userenv{'portfolioquota'})) {
+            $oldportfolioquota = $userenv{'portfolioquota'};
+            if (exists($env{'form.portfolioquota'})) {
+                if ($env{'form.portfolioquota'} ne $userenv{'portfolioquota'}) {
+                    if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+                        # Current user has quota modification privileges
+                        $quotachanged = 1;
+                        $changeHash{'portfolioquota'} = $env{'form.portfolioquota'};
+                    }
+                }
+            }
+        } else {
+            $oldportfolioquota = &default_quota($env{'form.ccdomain'});
         }
         if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && 
             ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
              $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
              $env{'form.clastname'}   ne $userenv{'lastname'}   ||
              $env{'form.cgeneration'} ne $userenv{'generation'} )) {
+            $namechanged = 1;
+        }
+        if ($namechanged) {
             # Make the change
-            my %changeHash;
             $changeHash{'firstname'}  = $env{'form.cfirstname'};
             $changeHash{'middlename'} = $env{'form.cmiddlename'};
             $changeHash{'lastname'}   = $env{'form.clastname'};
@@ -1164,6 +1201,7 @@ ENDMODIFYUSERHEAD
                              'mddl' => "middle",
                              'lst'  => "last",
 			     'gen'  => "generation",
+                             'disk' => "disk space allocated to portfolio files",
                              'prvs' => "Previous",
                              'chto' => "Changed To"
 						   );
@@ -1174,17 +1212,21 @@ ENDMODIFYUSERHEAD
     <th>$lt{'frst'}</th>
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
-    <th>$lt{'gen'}</th></tr>
+    <th>$lt{'gen'}</th>
+    <th>$lt{'disk'}<th></tr>
 <tr><td>$lt{'prvs'}</td>
     <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
-    <td>$userenv{'generation'} </td></tr>
+    <td>$userenv{'generation'} </td>
+    <td>$oldportfolioquota</td>
+</tr>
 <tr><td>$lt{'chto'}</td>
     <td>$env{'form.cfirstname'}  </td>
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
-    <td>$env{'form.cgeneration'} </td></tr>
+    <td>$env{'form.cgeneration'} </td>
+    <td>$env{'form.portfolioquota'} Mb</td></tr>
 </table>
 END
             } else { # error occurred
@@ -1193,28 +1235,40 @@ END
                       $env{'form.ccdomain'}."</h2>");
             }
         }  else { # End of if ($env ... ) logic
+            my $putresult;
+            if ($quotachanged) {
+                $putresult = &Apache::lonnet::put
+                                 ('environment',\%changeHash,
+                                  $env{'form.ccdomain'},$env{'form.ccuname'});
+            }
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
                            'usr'  => "User",                    
                            'id'   => "in domain",
-                           'gen'  => "Generation"
+                           'gen'  => "Generation",
+                           'disk' => "Disk space allocated to user's portfolio files",
 					       );
-                $r->print(<<"END");
+            $r->print(<<"END");
 <h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
 <h4>$lt{'gen'}: $userenv{'generation'}</h4>
 END
+            if ($putresult eq 'ok') {
+                if ($oldportfolioquota ne $env{'form.portfolioquota'}) {
+                    $r->print('<h4>'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb</h4>');
+                }
+            }
         }
     }
     ##
     my $now=time;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
-    foreach (keys (%env)) {
-	next if (! $env{$_});
+    foreach my $key (keys (%env)) {
+	next if (! $env{$key});
 	# Revoke roles
-	if ($_=~/^form\.rev/) {
-	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
+	if ($key=~/^form\.rev/) {
+	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role
 	        $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
                      &Apache::lonnet::revokerole($env{'form.ccdomain'},
@@ -1226,13 +1280,13 @@ 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+)$/) {
+	    if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
@@ -1240,8 +1294,8 @@ END
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
 	    }
-	} elsif ($_=~/^form\.del/) {
-	    if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
+	} elsif ($key=~/^form\.del/) {
+	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
 	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
                      &Apache::lonnet::assignrole($env{'form.ccdomain'},
@@ -1253,13 +1307,13 @@ 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+)$/) {
+            if ($key=~/^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]',
@@ -1268,18 +1322,18 @@ END
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1).'</b><br />');
             }
-	} elsif ($_=~/^form\.ren/) {
+	} elsif ($key=~/^form\.ren/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
 # Re-enable standard role
-	    if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
+	    if ($key=~/^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 {
@@ -1298,7 +1352,7 @@ END
                 $r->print($output);
 	    }
 # Re-enable custom role
-            if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+            if ($key=~/^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'},
@@ -1306,10 +1360,10 @@ END
                 $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/) {
+	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
-	    if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
+	    if ($key=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
@@ -1326,7 +1380,7 @@ 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::longroup::coursegroups($one,$two);
@@ -1337,10 +1391,10 @@ 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+)\_([^\_]+)$/) {
+	    } elsif ($key=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
 		# Activate roles for sections with 3 id numbers
 		# set start, end times, and the url for the class
 		my ($one,$two,$three)=($1,$2,$3);
@@ -1356,7 +1410,7 @@ 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::longroup::coursegroups($one,$two);
@@ -1370,16 +1424,16 @@ 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\_([^\_]+)\_([^\_]+)$/) {
+	    } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
 		# Activate roles for sections with two id numbers
 		# set start, end times, and the url for the class
 		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
@@ -1393,23 +1447,23 @@ 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 {
-		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');
+		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></p><br />');
             }
             foreach my $key (sort(keys(%disallowed))) {
                 if (($key eq 'none') || ($key eq 'all')) {  
@@ -1427,89 +1481,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;
@@ -1539,7 +1510,7 @@ sub build_roles {
             $num_sections ++;
         }
     }
-                                                                                     
+
     return $num_sections;
 }
 
@@ -1581,8 +1552,8 @@ sub custom_role_editor {
     my %full=();
     my %courselevel=();
     my %courselevelcurrent=();
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict='F'; }
         $courselevel{$priv}=$restrict;
         if ($coursepriv=~/\:$priv/) {
@@ -1592,8 +1563,8 @@ sub custom_role_editor {
     }
     my %domainlevel=();
     my %domainlevelcurrent=();
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict='F'; }
         $domainlevel{$priv}=$restrict;
         if ($dompriv=~/\:$priv/) {
@@ -1603,8 +1574,8 @@ sub custom_role_editor {
     }
     my %systemlevel=();
     my %systemlevelcurrent=();
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict='F'; }
         $systemlevel{$priv}=$restrict;
         if ($syspriv=~/\:$priv/) {
@@ -1622,24 +1593,29 @@ sub custom_role_editor {
 <form method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />
 <input type="hidden" name="rolename" value="$rolename" />
-<table border="2">
-<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;').
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row(). 
+'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
+'</th><th>'.$lt{'ssl'}.'</th>'.
+              &Apache::loncommon::end_data_table_header_row());
+    foreach my $priv (sort keys %full) {
+        my $privtext = &Apache::lonnet::plaintext($priv);
+        $r->print(&Apache::loncommon::start_data_table_row().
+	          '<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;').
-    '</td></tr>');
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td>'.
+             &Apache::loncommon::end_data_table_row());
     }
-    $r->print(
-   '<table><input type="submit" value="'.&mt('Define Role').'" /></form>'.
+    $r->print(&Apache::loncommon::end_data_table().
+   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
 	      &Apache::loncommon::end_page());
 }
 
@@ -1673,27 +1649,27 @@ sub set_custom_role {
     my $domrole='';
     my $courole='';
 
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict=''; }
         if ($env{'form.'.$priv.':c'}) {
-	    $courole.=':'.$_;
+	    $courole.=':'.$item;
 	}
     }
 
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict=''; }
         if ($env{'form.'.$priv.':d'}) {
-	    $domrole.=':'.$_;
+	    $domrole.=':'.$item;
 	}
     }
 
-    foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
-	my ($priv,$restrict)=split(/\&/,$_);
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
         unless ($restrict) { $restrict=''; }
         if ($env{'form.'.$priv.':s'}) {
-	    $sysrole.=':'.$_;
+	    $sysrole.=':'.$item;
 	}
     }
     $r->print('<br />Defining Role: '.
@@ -1772,13 +1748,13 @@ sub course_level_table {
             'end'  => "End"
     );
 
-    foreach (sort( keys(%inccourses))) {
-	my $thiscourse=$_;
-	my $protectedcourse=$_;
+    foreach my $protectedcourse (sort( keys(%inccourses))) {
+	my $thiscourse=$protectedcourse;
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
 	my $area=$coursedata{'description'};
-	if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }
+        my $type=$coursedata{'type'};
+	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
 	my $bgcol=$thiscourse;
 	$bgcol=~s/[^7-9a-e]//g;
 	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
@@ -1790,49 +1766,49 @@ sub course_level_table {
 		    &Apache::loncommon::get_sections($domain,$cnum);
             }
         }
-	foreach  ('st','ta','ep','ad','in','cc') {
-	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
-		my $plrole=&Apache::lonnet::plaintext($_);
+	foreach my $role ('st','ta','ep','in','cc') {
+	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+		my $plrole=&Apache::lonnet::plaintext($role);
 		$table .= <<ENDEXTENT;
 <tr bgcolor="#$bgcol">
-<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
+<td><input type="checkbox" name="act_$protectedcourse\_$role"></td>
 <td>$plrole</td>
 <td>$area<br />Domain: $domain</td>
 ENDEXTENT
-	        if ($_ ne 'cc') {
+	        if ($role ne 'cc') {
                     if (%sections_count) {
-                        my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_);
+                        my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
                         $table .= 
                     '<td><table border="0" cellspacing="0" cellpadding="0">'.
                      '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
                         $currsec.'</td>'.
                      '<td>&nbsp;&nbsp;</td>'.
                      '<td valign="top">&nbsp;'.$lt{'new'}.'<br />'.
-                     '<input type="text" name="newsec_'.$protectedcourse.'_'.$_.'" value="" /></td>'.
+                     '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" /></td>'.
                      '<input type="hidden" '.
-                     'name="sec_'.$protectedcourse.'_'.$_.'"></td>'.
+                     'name="sec_'.$protectedcourse.'_'.$role.'"></td>'.
                      '</tr></table></td>';
                     } else {
                         $table .= '<td><input type="text" size="10" '.
-                     'name="sec_'.$protectedcourse.'_'.$_.'"></td>';
+                     'name="sec_'.$protectedcourse.'_'.$role.'"></td>';
                     }
                 } else { 
 		    $table .= '<td>&nbsp</td>';
                 }
 		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
+<td><input type=hidden name="start_$protectedcourse\_$role" value=''>
 <a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type=hidden name="end_$protectedcourse\_$role" value=''>
 <a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
                 $table.= "</tr>\n";
             }
         }
-        foreach (sort keys %customroles) {
+        foreach my $cust (sort keys %customroles) {
 	    if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
-		my $plrole=$_;
+		my $plrole=$cust;
                 my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
 		    '_'.$env{'user.name'}.'_'.$plrole;
 		$table .= <<END;
@@ -1894,8 +1870,8 @@ sub course_sections {
         my $multiple = 4;
         if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
         $output .= '"multiple" size="'.$multiple.'">'."\n";
-        foreach (@sections) {
-            $output .= '<option value="'.$_.'">'.$_."</option>\n";
+        foreach my $sec (@sections) {
+            $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
         }
     }
     $output .= '</select>'; 
@@ -1909,12 +1885,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,'currsec','cu');
     my %lt=&Apache::lonlocal::texthash(
-                    'crl'  => "Course Level",
-                    'crt'  => "Course Title",
+                    'typ' => "Type",
                     'rol'  => "Role",
                     'grs'  => "Section",
                     'exs'  => "Existing sections",
@@ -1924,19 +1898,24 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.$lt{'crl'}.'</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 $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="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><select name="role">'."\n";
-    foreach  ('st','ta','ep','ad','in','cc') {
-        my $plrole=&Apache::lonnet::plaintext($_);
-        $otheritems .= '  <option value="'.$_.'">'.$plrole;
+    foreach  my $role ('st','ta','ep','in','cc') {
+        my $plrole=&Apache::lonnet::plaintext($role);
+        $otheritems .= '  <option value="'.$role.'">'.$plrole;
     }
     if ( keys %customroles > 0) {
-        foreach (sort keys %customroles) {
+        foreach my $cust (sort keys %customroles) {
             my $custrole='cr_cr_'.$env{'user.domain'}.
-                    '_'.$env{'user.name'}.'_'.$_;
-            $otheritems .= '  <option value="'.$custrole.'">'.$_;
+                    '_'.$env{'user.name'}.'_'.$cust;
+            $otheritems .= '  <option value="'.$custrole.'">'.$cust;
         }
     }
     $otheritems .= '</select></td><td>'.