--- loncom/interface/loncreateuser.pm	2006/11/22 21:55:53	1.136
+++ loncom/interface/loncreateuser.pm	2007/06/11 22:24:51	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.136 2006/11/22 21:55:53 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.155 2007/06/11 22:24:51 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,7 +66,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::longroup;
 use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
 my $generalrule;
@@ -122,11 +122,72 @@ sub portfolio_quota {
     my ($ccuname,$ccdomain) = @_;
     my %lt = &Apache::lonlocal::texthash(
                    'disk' => "Disk space allocated to user's portfolio files",
+                   'cuqu' => "Current quota",
+                   'cust' => "Custom quota",
+                   'defa' => "Default",
+                   'chqu' => "Change quota",
     );
-    my $output = '<h3>'.$lt{'disk'}.'</h3>'.
+    my ($currquota,$quotatype,$inststatus,$defquota) = 
+        &Apache::loncommon::get_user_quota($ccuname,$ccdomain);
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
+    my ($longinsttype,$showquota,$custom_on,$custom_off,$defaultinfo);
+    if ($inststatus ne '') {
+        if ($usertypes->{$inststatus} ne '') {
+            $longinsttype = $usertypes->{$inststatus};
+        }
+    }
+    $custom_on = ' ';
+    $custom_off = ' checked="checked" ';
+    my $quota_javascript = <<"END_SCRIPT";
+<script type="text/javascript">
+function quota_changes(caller) {
+    if (caller == "custom") {
+        if (document.cu.customquota[0].checked) {
+            document.cu.portfolioquota.value = "";
+        }
+    }
+    if (caller == "quota") {
+        document.cu.customquota[1].checked = true;
+    }
+}
+</script>
+END_SCRIPT
+    if ($quotatype eq 'custom') {
+        $custom_on = $custom_off;
+        $custom_off = ' ';
+        $showquota = $currquota;
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota would be [_1]
+                            Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota would be [_1] 
+                            Mb, as determined by the user's institutional
+                           affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    } else {
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota is [_1]
+                            Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota of [_1]
+                            Mb, is determined by the user's institutional
+                            affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    }
+    my $output = $quota_javascript.
+                 '<h3>'.$lt{'disk'}.'</h3>'.
+                 $lt{'cuqu'}.': '.$currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
+                 $defaultinfo.'<br /><span class="LC_nobreak">'.$lt{'chqu'}.
+                 ': <label>'.
+                 '<input type="radio" name="customquota" value="0" '.
+                 $custom_off.' onchange="javascript:quota_changes('."'custom'".')"
+                  />'.$lt{'defa'}.'&nbsp;('.$defquota.' Mb).</label>&nbsp;'.
+                 '&nbsp;<label><input type="radio" name="customquota" value="1" '. 
+                 $custom_on.'  onchange="javascript:quota_changes('."'custom'".')" />'.
+                 $lt{'cust'}.':</label>&nbsp;'.
                  '<input type="text" name="portfolioquota" size ="5" value="'.
-                 &Apache::loncommon::get_user_quota($ccuname,$ccdomain).
-                 '" />&nbsp;Mb';
+                 $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
+                 '/>&nbsp;Mb';
     return $output;
 }
 
@@ -135,7 +196,6 @@ sub portfolio_quota {
 sub print_username_entry_form {
     my ($r) = @_;
     my $defdom=$env{'request.role.domain'};
-    my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $start_page =
@@ -216,11 +276,8 @@ END
 # =================================================================== Phase two
 sub print_user_modification_page {
     my $r=shift;
-    my $ccuname=$env{'form.ccuname'};
-    my $ccdomain=$env{'form.ccdomain'};
-
-    $ccuname=~s/\W//g;
-    $ccdomain=~s/\W//g;
+    my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
+    my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
 
     unless (($ccuname) && ($ccdomain)) {
 	&print_username_entry_form($r);
@@ -239,8 +296,8 @@ sub print_user_modification_page {
     $loginscript  = &Apache::loncommon::authform_header(%param);
     $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
 
-    $ccuname=~s/\W//g;
-    $ccdomain=~s/\W//g;
+    $ccuname =&LONCAPA::clean_username($ccuname);
+    $ccdomain=&LONCAPA::clean_domain($ccdomain);
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';                                        
@@ -254,7 +311,7 @@ sub print_user_modification_page {
         $groupslist = '"'.$groupslist.'"';   
     }
 
-    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+    if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) {
         my $dcdom = $1;
         $loaditem{'onload'} = "document.cu.coursedesc.value='';";
         my @rolevals = ('st','ta','ep','in','cc');
@@ -361,36 +418,6 @@ 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";
@@ -487,13 +514,9 @@ ENDSECCODE
 <input type="hidden" name="pres_marker" value="" >
 ENDFORMINFO
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
-    my %incdomains; 
     my %inccourses;
-    foreach my $item (values(%Apache::lonnet::hostdom)) {
-       $incdomains{$item}=1;
-    }
     foreach my $key (keys(%env)) {
-	if ($key=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
     }
@@ -622,13 +645,12 @@ END
                    split(/_/,$role);
 # Is this a custom role? Get role owner and title.
 	       my ($croleudom,$croleuname,$croletitle)=
-	           ($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);
-               my $bgcol='ffffff';
+	           ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
                my $allowed=0;
                my $delallowed=0;
 	       my $sortkey=$role_code;
 	       my $class='Unknown';
-               if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
+               if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
 		   $class='Course';
                    my ($coursedom,$coursedir) = ($1,$2);
 		   $sortkey.="\0$coursedom";
@@ -664,10 +686,7 @@ END
 		       }
 		   }
                    # Compute the background color based on $area
-                   $bgcol=$1.'_'.$2;
-                   $bgcol=~s/[^7-9a-e]//g;
-                   $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
-                   if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+                   if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
                        $carea.='<br />Section: '.$3;
 		       $sortkey.="\0$3";
                    }
@@ -675,7 +694,7 @@ END
                } else {
 		   $sortkey.="\0".$area;
                    # Determine if current user is able to revoke privileges
-                   if ($area=~ /^\/(\w+)\//) {
+                   if ($area=~m{^/($match_domain)/}) {
                        if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
                        (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
                            $allowed=1;
@@ -699,16 +718,15 @@ END
 		   }
                }
                if (($role_code eq 'ca') || ($role_code eq 'aa')) {
-                   $area=~/\/(\w+)\/(\w+)/;
+                   $area=~m{/($match_domain)/($match_username)};
 		   if (&authorpriv($2,$1)) {
 		       $allowed=1;
                    } else {
                        $allowed=0;
                    }
                }
-	       $bgcol='77FF77';
                my $row = '';
-               $row.='<tr bgcolor="#'.$bgcol.'"><td>';
+               $row.= '<td>';
                my $active=1;
                $active=0 if (($role_end_time) && ($now>$role_end_time));
                if (($active) && ($allowed)) {
@@ -733,7 +751,7 @@ END
                    $row.='&nbsp;';
                }
 	       my $plaintext='';
-	       unless ($croletitle) {
+	       if (!$croletitle) {
                    $plaintext=&Apache::lonnet::plaintext($role_code,$class)
 	       } else {
 	           $plaintext=
@@ -745,7 +763,7 @@ END
                                                    : '&nbsp;' ).
                       '</td><td>'.($role_end_time  ?localtime($role_end_time)
                                                    : '&nbsp;' )
-                      ."</td></tr>\n";
+                      ."</td>";
 	       $sortrole{$sortkey}=$envkey;
 	       $roletext{$envkey}=$row;
 	       $roleclass{$envkey}=$class;
@@ -758,30 +776,35 @@ END
 	       $output{$type} = '';
 	       foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 		   if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { 
-		       $output{$type}.=$roletext{$sortrole{$which}};
+		       $output{$type}.=
+                             &Apache::loncommon::start_data_table_row().
+                             $roletext{$sortrole{$which}}.
+                             &Apache::loncommon::end_data_table_row();
 		   }
 	       }
 	       unless($output{$type} eq '') {
-		   $output{$type} = "<tr bgcolor='#BBffBB'>".
-			     "<td align='center' colspan='7'>".&mt($type)."</td>".
+		   $output{$type} = '<tr class="LC_info_row">'.
+			     "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
                               $output{$type};
                    $rolesdisplay = 1;
 	       }
 	   }
            if ($rolesdisplay == 1) {
-               $r->print(<<END);
+               $r->print('
 <hr />
-<h3>$lt{'rer'}</h3>
-<table>
-<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
+<h3>'.$lt{'rer'}.'</h3>'.
+&Apache::loncommon::start_data_table("LC_createuser").
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
+'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
+'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row());
                foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
                    if ($output{$type}) {
                        $r->print($output{$type}."\n");
                    }
                }
-	       $r->print('</table>');
+	       $r->print(&Apache::loncommon::end_data_table());
            }
         }  # End of unless
 	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -965,7 +988,7 @@ ENDNOPRIV
     &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 $thisdomain (sort(&Apache::lonnet::all_domains())) {
         foreach my $role ('dc','li','dg','au','sc') {
             if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
                my $plrole=&Apache::lonnet::plaintext($role);
@@ -997,7 +1020,7 @@ ENDNOPRIV
 # Course and group levels
 #
 
-    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+    if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) {
         $r->print(&course_level_dc($1,'Course'));
         $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
     } else {
@@ -1029,7 +1052,8 @@ sub update_user_data {
 	$r->print($error.&mt('No login name specified').'.'.$end);
 	return;
     }
-    if (  $env{'form.ccuname'}  =~/\W/) {
+    if (  $env{'form.ccuname'} ne 
+	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
 	$r->print($error.&mt('Invalid login name').'.  '.
 		  &mt('Only letters, numbers, and underscores are valid').'.'.
 		  $end);
@@ -1039,9 +1063,10 @@ sub update_user_data {
 	$r->print($error.&mt('No domain specified').'.'.$end);
 	return;
     }
-    if (  $env{'form.ccdomain'} =~/\W/) {
+    if (  $env{'form.ccdomain'} ne
+	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
 	$r->print($error.&mt ('Invalid domain name').'.  '.
-		  &mt('Only letters, numbers, and underscores are valid').'.'.
+		  &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
 		  $end);
 	return;
     }
@@ -1100,8 +1125,8 @@ ENDNEWUSERHEAD
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers = &Apache::loncommon::get_library_servers
-                ($env{'form.ccdomain'});  
+            my %home_servers = 
+		&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
             if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.&mt('Invalid home server specified'));
                 return;
@@ -1118,7 +1143,7 @@ ENDNEWUSERHEAD
         my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
                                                $env{'form.ccdomain'});
         $r->print('<br />'.&mt('Home server').': '.$home.' '.
-                  $Apache::lonnet::libserv{$home});
+                  &Apache::lonnet::hostname($home));
     } elsif (($env{'form.login'} ne 'nochange') &&
              ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
@@ -1151,7 +1176,8 @@ ENDMODIFYUSERHEAD
         # Check for need to change
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
-             'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'});
+             'portfolioquota','inststatus'],$env{'form.ccdomain'},
+              $env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
@@ -1161,21 +1187,55 @@ ENDMODIFYUSERHEAD
             # Strip leading and trailing whitespace
             $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
         }
-        my ($quotachanged,$namechanged,$oldportfolioquota);
+        my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
+            $inststatus,$isdefault,$defquotatext);
+        my ($defquota,$settingstatus) = 
+            &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
         my %changeHash;
-        if (exists($userenv{'portfolioquota'})) {
+        if ($userenv{'portfolioquota'} ne '') {
             $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'};
-                    }
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
                 }
+                if ($newportfolioquota != $userenv{'portfolioquota'}) {
+                    $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+                }
+            } else {
+                $quotachanged = &quota_admin('',\%changeHash);
+                $newportfolioquota = $defquota;
+                $isdefault = 1; 
             }
         } else {
-            $oldportfolioquota = &default_quota($env{'form.ccdomain'});
+            $oldportfolioquota = $defquota;
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
+                }
+                $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+            } else {
+                $newportfolioquota = $defquota;
+                $isdefault = 1;
+            }
+        }
+        if ($isdefault) {
+            if ($settingstatus eq '') {
+                $defquotatext = &mt('(default)');
+            } else {
+                my ($usertypes,$order) = 
+                    &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
+                if ($usertypes->{$settingstatus} eq '') {
+                    $defquotatext = &mt('(default)');
+                } else { 
+                    $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});
+                }
+            }
         }
         if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && 
             ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
@@ -1219,16 +1279,24 @@ ENDMODIFYUSERHEAD
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </td>
-    <td>$oldportfolioquota</td>
+    <td>$oldportfolioquota Mb</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>
-    <td>$env{'form.portfolioquota'} Mb</td></tr>
+    <td>$newportfolioquota Mb $defquotatext </td></tr>
 </table>
 END
+                if (($env{'form.ccdomain'} eq $env{'user.domain'}) && 
+                    ($env{'form.ccuname'} eq $env{'user.name'})) {
+                    my %newenvhash;
+                    foreach my $key (keys(%changeHash)) {
+                        $newenvhash{'environment.'.$key} = $changeHash{$key};
+                    }
+                    &Apache::lonnet::appenv(%newenvhash);
+                }
             } else { # error occurred
                 $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
                       $env{'form.ccuname'}." ".&mt('in domain')." ".
@@ -1255,8 +1323,10 @@ END
 <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>');
+                if ($oldportfolioquota != $newportfolioquota) {
+                    $r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. 
+                              $defquotatext.'</h4>');
+                    &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'});
                 }
             }
         }
@@ -1274,7 +1344,7 @@ END
                      &Apache::lonnet::revokerole($env{'form.ccdomain'},
                      $env{'form.ccuname'},$1,$2).'</b><br />');
 		if ($2 eq 'st') {
-		    $1=~/^\/(\w+)\/(\w+)/;
+		    $1=~m{^/($match_domain)/($match_courseid)};
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
@@ -1286,10 +1356,10 @@ END
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
-	    if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role:').
-                      ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
+                      ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
                       &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
@@ -1301,7 +1371,7 @@ END
                      &Apache::lonnet::assignrole($env{'form.ccdomain'},
                      $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
 		if ($2 eq 'st') {
-		    $1=~/^\/(\w+)\/(\w+)/;
+		    $1=~m{^/($match_domain)/($match_courseid)};
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
@@ -1313,7 +1383,7 @@ END
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
             }
-            if ($key=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\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]',
@@ -1332,7 +1402,7 @@ END
                 my $logmsg;
                 my $output;
                 if ($role eq 'st') {
-                    if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
+                    if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
                         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";
@@ -1352,7 +1422,7 @@ END
                 $r->print($output);
 	    }
 # Re-enable custom role
-            if ($key=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+	    if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
@@ -1363,7 +1433,7 @@ END
 	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
-	    if ($key=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
+	    if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
@@ -1394,7 +1464,7 @@ END
 		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
-	    } elsif ($key=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
+	    } elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) {
 		# 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);
@@ -1481,6 +1551,17 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub quota_admin {
+    my ($setquota,$changeHash) = @_;
+    my $quotachanged;
+    if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+        # Current user has quota modification privileges
+        $quotachanged = 1;
+        $changeHash->{'portfolioquota'} = $setquota;
+    }
+    return $quotachanged;
+}
+
 sub build_roles {
     my ($sectionstr,$sections,$role) = @_;
     my $num_sections = 0;
@@ -1493,7 +1574,7 @@ sub build_roles {
         } else {
             foreach my $sec (@secnums) {
                 $sec =~ ~s/\W//g;
-                unless ($sec eq "") {
+                if (!($sec eq "")) {
                     if (exists($$sections{$sec})) {
                         $$sections{$sec} ++;
                     } else {
@@ -1526,35 +1607,35 @@ sub custom_role_editor {
 
     $rolename=~s/[^A-Za-z0-9]//gs;
 
-    unless ($rolename) {
+    if (!$rolename) {
 	&print_username_entry_form($r);
         return;
     }
-
-    $r->print(&Apache::loncommon::start_page('Custom Role Editor'));
+# ------------------------------------------------------- What can be assigned?
+    my %full=();
+    my %courselevel=();
+    my %courselevelcurrent=();
     my $syspriv='';
     my $dompriv='';
     my $coursepriv='';
+    my $body_top;
+    my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
     my ($rdummy,$roledef)=
 			 &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 # ------------------------------------------------------- Does this role exist?
-    $r->print('<h2>');
+    $body_top .= '<h2>';
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {
-	$r->print(&mt('Existing Role').' "');
+	$body_top .= &mt('Existing Role').' "';
 # ------------------------------------------------- Get current role privileges
 	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
     } else {
-	$r->print(&mt('New Role').' "');
+	$body_top .= &mt('New Role').' "';
 	$roledef='';
     }
-    $r->print($rolename.'"</h2>');
-# ------------------------------------------------------- What can be assigned?
-    my %full=();
-    my %courselevel=();
-    my %courselevelcurrent=();
+    $body_top .= $rolename.'"</h2>';
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict='F'; }
+        if (!$restrict) { $restrict='F'; }
         $courselevel{$priv}=$restrict;
         if ($coursepriv=~/\:$priv/) {
 	    $courselevelcurrent{$priv}=1;
@@ -1565,7 +1646,7 @@ sub custom_role_editor {
     my %domainlevelcurrent=();
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict='F'; }
+        if (!$restrict) { $restrict='F'; }
         $domainlevel{$priv}=$restrict;
         if ($dompriv=~/\:$priv/) {
 	    $domainlevelcurrent{$priv}=1;
@@ -1576,21 +1657,35 @@ sub custom_role_editor {
     my %systemlevelcurrent=();
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict='F'; }
+        if (!$restrict) { $restrict='F'; }
         $systemlevel{$priv}=$restrict;
         if ($syspriv=~/\:$priv/) {
 	    $systemlevelcurrent{$priv}=1;
 	}
 	$full{$priv}=1;
     }
+    my $button_code = "\n";
+    my $head_script = "\n";
+    $head_script .= '<script type="text/javascript">'."\n";
+    my @template_roles = ("cc","in","ta","ep","st");
+    foreach my $role (@template_roles) {
+        $head_script .= &make_script_template($role);
+        $button_code .= &make_button_code($role);
+    }
+    $head_script .= '</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
+    $r->print($body_top);
     my %lt=&Apache::lonlocal::texthash(
 		    'prv'  => "Privilege",
 		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
-                    'ssl'  => "System Level"
-				       );
+                    'ssl'  => "System Level");
+    $r->print('Select a Template<br />');
+    $r->print('<form action="">');
+    $r->print($button_code);
+    $r->print('</form>');
     $r->print(<<ENDCCF);
-<form method="post">
+<form name=form1 method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />
 <input type="hidden" name="rolename" value="$rolename" />
 ENDCCF
@@ -1603,22 +1698,93 @@ ENDCCF
         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" '.
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
     ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '.
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
     ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
     ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
     '</td>'.
              &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
-   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+   '<input type="reset" value="Reset" /><input type="submit" value="'.&mt('Define Role').'" /></form>'.
 	      &Apache::loncommon::end_page());
 }
-
+# --------------------------------------------------------
+sub make_script_template {
+    my ($role) = @_;
+    my %full_c=();
+    my %full_d=();
+    my %full_s=();
+    my $return_script;
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_c{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_d{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_s{$priv}=1;
+    }
+    $return_script .= 'function set_'.$role.'() {'."\n";
+    my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'});
+    my %role_c;
+    foreach my $priv (@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_c{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_c)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_c{$priv})) {
+            $return_script .= "document.form1.$priv"."_c.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_c.checked = false;\n";
+        }
+    }
+    my %role_d;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':d'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_d{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_d)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_d{$priv})) {
+            $return_script .= "document.form1.$priv"."_d.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_d.checked = false;\n";
+        }
+    }
+    my %role_s;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':s'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_s{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_s)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_s{$priv})) {
+            $return_script .= "document.form1.$priv"."_s.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_s.checked = false;\n";
+        }
+    }
+    $return_script .= '}'."\n";
+    return ($return_script);
+}
+# ----------------------------------------------------------
+sub make_button_code {
+    my ($role) = @_;
+    my $label = &Apache::lonnet::plaintext($role);
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';    
+    return ($button_code);
+}
 # ---------------------------------------------------------- Call to definerole
 sub set_custom_role {
     my ($r) = @_;
@@ -1627,7 +1793,7 @@ sub set_custom_role {
 
     $rolename=~s/[^A-Za-z0-9]//gs;
 
-    unless ($rolename) {
+    if (!$rolename) {
 	&print_username_entry_form($r);
         return;
     }
@@ -1651,24 +1817,24 @@ sub set_custom_role {
 
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict=''; }
-        if ($env{'form.'.$priv.':c'}) {
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_c'}) {
 	    $courole.=':'.$item;
 	}
     }
 
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict=''; }
-        if ($env{'form.'.$priv.':d'}) {
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_d'}) {
 	    $domrole.=':'.$item;
 	}
     }
 
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
 	my ($priv,$restrict)=split(/\&/,$item);
-        unless ($restrict) { $restrict=''; }
-        if ($env{'form.'.$priv.':s'}) {
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_s'}) {
 	    $sysrole.=':'.$item;
 	}
     }
@@ -1707,7 +1873,7 @@ sub handler {
         (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
-       unless ($env{'form.phase'}) {
+       if (!$env{'form.phase'}) {
 	   &print_username_entry_form($r);
        }
        if ($env{'form.phase'} eq 'get_user_info') {
@@ -1774,8 +1940,9 @@ sub course_level_table {
                     if (%sections_count) {
                         my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
                         $table .= 
-                    '<td><table border="0" cellspacing="0" cellpadding="0">'.
-                     '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
+                    '<td><table class="LC_createuser">'.
+                     '<tr class="LC_section_row">
+                        <td valign="top">'.$lt{'exs'}.'<br />'.
                         $currsec.'</td>'.
                      '<td>&nbsp;&nbsp;</td>'.
                      '<td valign="top">&nbsp;'.$lt{'new'}.'<br />'.
@@ -1867,7 +2034,7 @@ sub course_sections {
         $output = '<select name="currsec_'.$role.'" ';
         my $multiple = 4;
         if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
-        $output .= '"multiple" size="'.$multiple.'">'."\n";
+        $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
         foreach my $sec (@sections) {
             $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
         }
@@ -1886,7 +2053,6 @@ sub course_level_dc {
             ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
     my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
     my %lt=&Apache::lonlocal::texthash(
-                    'typ' => "Type",
                     'rol'  => "Role",
                     'grs'  => "Section",
                     'exs'  => "Existing sections",
@@ -1899,14 +2065,9 @@ sub course_level_dc {
     my $header = '<h4>'.&mt('Course Level').'</h4>'.
                  &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row().
-                 '<th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+                 '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
-    my $otheritems = &Apache::loncommon::start_data_table_row().
-                     '<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".
+    my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
                      '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach  my $role ('st','ta','ep','in','cc') {