--- loncom/interface/loncreateuser.pm	2004/09/23 22:51:24	1.87
+++ loncom/interface/loncreateuser.pm	2005/06/06 00:06:12	1.102
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.87 2004/09/23 22:51:24 albertel Exp $
+# $Id: loncreateuser.pm,v 1.102 2005/06/06 00:06:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,10 +73,9 @@ my $authformint;
 my $authformfsys;
 my $authformloc;
 
-BEGIN {
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
+sub initialize_authen_forms {
+    my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
+    $krbdefdom= uc($krbdefdom);
     my %param = ( formname => 'document.cu',
                   kerb_def_dom => $krbdefdom 
                   );
@@ -109,9 +108,9 @@ sub my_custom_roles {
 
 sub authorpriv {
     my ($auname,$audom)=@_;
-    if (($auname ne $ENV{'user.name'}) ||
-        (($audom ne $ENV{'user.domain'}) &&
-         ($audom ne $ENV{'request.role.domain'}))) { return ''; }
+    if (($auname ne $env{'user.name'}) ||
+        (($audom ne $env{'user.domain'}) &&
+         ($audom ne $env{'request.role.domain'}))) { return ''; }
     unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; }
     return 1;
 }
@@ -120,9 +119,10 @@ sub authorpriv {
 
 sub print_username_entry_form {
     my $r=shift;
-    my $defdom=$ENV{'request.role.domain'};
+    my $defdom=$env{'request.role.domain'};
     my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link
@@ -142,7 +142,7 @@ sub print_username_entry_form {
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 $selscript
@@ -171,18 +171,18 @@ ENDDOCUMENT
 # =================================================================== Phase two
 sub print_user_modification_page {
     my $r=shift;
-    my $ccuname=$ENV{'form.ccuname'};
-    my $ccdomain=$ENV{'form.ccdomain'};
+    my $ccuname=$env{'form.ccuname'};
+    my $ccdomain=$env{'form.ccdomain'};
 
-    $ccuname=~s/[\W|_]//gs;
-    $ccdomain=~s/[\W|_]//gs;
+    $ccuname=~s/\W//g;
+    $ccdomain=~s/\W//g;
 
     unless (($ccuname) && ($ccdomain)) {
 	&print_username_entry_form($r);
         return;
     }
 
-    my $defdom=$ENV{'request.role.domain'};
+    my $defdom=$env{'request.role.domain'};
 
     my ($krbdef,$krbdefdom) =
        &Apache::loncommon::get_kerberos_defaults($defdom);
@@ -197,8 +197,84 @@ sub print_user_modification_page {
     $ccuname=~s/\W//g;
     $ccdomain=~s/\W//g;
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $dc_setcourse_code = '';
+    my $loaditem;
+    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+        my $dcdom = $1;
+        $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|;
+        $dc_setcourse_code = <<"ENDSCRIPT";
+    function setCourse() {
+        var course = document.cu.dccourse.value;
+        if (course != "") {
+            if (document.cu.dcdomain.value != document.cu.origdom.value) {
+                alert("You must select a course in the current domain");
+                return;
+            } 
+            var userrole = document.cu.role.options[document.cu.role.selectedIndex].value
+            var section="";
+            var numsections = 0;
+            for (var i=0; i<document.cu.currsec.length; i++) {
+                if (document.cu.currsec.options[i].selected == true ) {
+                    if (document.cu.currsec.options[i].value != "" && document.cu.currsec.options[i].value != null) { 
+                        if (numsections == 0) {
+                            section = document.cu.currsec.options[i].value
+                            numsections = 1;
+                        }
+                        else {
+                            section = section + "," +  document.cu.currsec.options[i].value
+                            numsections ++;
+                        }
+                    }
+                }
+            }
+            if (document.cu.newsec.value != "" && document.cu.newsec.value != null) {
+                if (numsections == 0) {
+                    section = document.cu.newsec.value
+                }
+                else {
+                    section = section + "," +  document.cu.newsec.value
+                }
+                var numsplit = document.cu.newsec.value.split(/,/g);
+                numsections = numsections + numsplit.length;
+            }
+            if ((userrole == 'st') && (numsections > 1)) {
+                alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.")
+                return;
+            }
+            if ((userrole == 'cc') && (numsections > 0)) {
+                alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+                section = "";
+            }
+            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
+            }
+        }
+        document.cu.submit();
+    }
+
+    function getIndex(caller) {
+        for (var i=0;i<document.cu.elements.length;i++) {
+            if (document.cu.elements[i] == caller) {
+                return i;
+            }
+        }
+        return -1;
+    }
+ENDSCRIPT
+    }
+    my $html=&Apache::lonxml::xmlbegin();
     my $dochead =<<"ENDDOCHEAD";
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script type="text/javascript" language="Javascript">
@@ -210,6 +286,7 @@ sub print_user_modification_page {
     }
 
     $pjump_def
+    $dc_setcourse_code
 
     function dateset() {
         eval("document.cu."+document.cu.pres_marker.value+
@@ -217,11 +294,71 @@ sub print_user_modification_page {
         pclose();
     }
 
+    function setSections() {
+        var re1 = /^currsec_/;
+        for (var i=0;i<document.cu.elements.length;i++) {
+            var str = document.cu.elements[i].name;
+            var checkcurr = str.match(re1);
+            if (checkcurr != null) {
+                var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+                if (document.cu.elements[i-1].checked == true) {
+                    var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
+                    match = re2.exec(str);
+                    var role = match[1];
+                    if (role == 'cc') {
+                        alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+                    }
+                    else {
+                        var sections = '';
+                        var numsec = 0;
+                        var sections;
+                        for (var j=0; j<document.cu.elements[i].length; j++) {
+                            if (document.cu.elements[i].options[j].selected == true ) {
+                                if (document.cu.elements[i].options[j].value != "") {
+                                    if (numsec == 0) {
+                                        if (document.cu.elements[i].options[j].value != "") {
+                                            sections = document.cu.elements[i].options[j].value;
+                                            numsec ++;
+                                        }
+                                    }
+                                    else {
+                                        sections = sections + "," +  document.cu.elements[i].options[j].value
+                                        numsec ++;
+                                    }
+                                }
+                            }
+                        }
+                        if (numsec > 0) {
+                            if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
+                                sections = sections + "," +  document.cu.elements[i+1].value;
+                            } 
+                        }
+                        else {
+                            sections = document.cu.elements[i+1].value;    
+                        }
+                        var newsecs = document.cu.elements[i+1].value;
+                        if (newsecs != null && newsecs != "") {
+                            var numsplit = newsecs.split(/,/g);
+                            numsec = numsec + numsplit.length;
+                        }
+                        if ((role == 'st') && (numsec > 1)) {
+                            alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")  
+                            return;
+                        }
+                        else { 
+                            document.cu.elements[i+2].value = sections;
+                        }
+                    }
+                }
+            }
+        }
+        document.cu.submit();
+    }
 </script>
 </head>
 ENDDOCHEAD
     $r->print(&Apache::loncommon::bodytag(
-                                     'Create Users, Change User Privileges'));
+                                     'Create Users, Change User Privileges',undef,$loaditem));
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="cu">
 <input type="hidden" name="phase"       value="update_user_data">
@@ -237,7 +374,7 @@ ENDFORMINFO
     foreach (values(%Apache::lonnet::hostdom)) {
        $incdomains{$_}=1;
     }
-    foreach (keys(%ENV)) {
+    foreach (keys(%env)) {
 	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
@@ -261,6 +398,7 @@ ENDFORMINFO
                     'lg'   => "Login Data"
 				       );
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
+        &initialize_authen_forms();
 	$r->print(<<ENDNEWUSER);
 $dochead
 <h1>$lt{'cnu'}</h1>
@@ -348,13 +486,7 @@ END
                     'sta'  => "Start",
                     'end'  => "End"
 				       );
-           $r->print(<<END);
-<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{'ext'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
-END
-           my (%roletext,%sortrole,%roleclass);
+           my (%roletext,%sortrole,%roleclass,%rolepriv);
 	   foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
 				    my $b1=join('_',(split('_',$b))[1,0]);
 				    return $a1 cmp $b1;
@@ -412,7 +544,7 @@ END
                    $bgcol=~s/[^7-9a-e]//g;
                    $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
                    if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
-                       $carea.='<br>Section/Group: '.$3;
+                       $carea.='<br />Section/Group: '.$3;
 		       $sortkey.="\0$3";
                    }
                    $area=$carea;
@@ -493,22 +625,40 @@ END
 	       $sortrole{$sortkey}=$envkey;
 	       $roletext{$envkey}=$row;
 	       $roleclass{$envkey}=$class;
+               $rolepriv{$envkey}=$allowed;
                #$r->print($row);
            } # end of foreach        (table building loop)
+           my $rolesdisplay = 0;
+           my %output = ();
 	   foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
-	       my $output;
+	       $output{$type} = '';
 	       foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
-		   if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
-		       $output.=$roletext{$sortrole{$which}};
+		   if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { 
+		       $output{$type}.=$roletext{$sortrole{$which}};
 		   }
 	       }
-	       if (defined($output)) {
-		   $r->print("<tr bgcolor='#BBffBB'>".
-			     "<td align='center' colspan='7'>".&mt($type)."</td>");
+	       unless($output{$type} eq '') {
+		   $output{$type} = "<tr bgcolor='#BBffBB'>".
+			     "<td align='center' colspan='7'>".&mt($type)."</td>".
+                              $output{$type};
+                   $rolesdisplay = 1;
 	       }
-	       $r->print($output);
 	   }
-	   $r->print('</table>');
+           if ($rolesdisplay == 1) {
+               $r->print(<<END);
+<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
+               foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+                   if ($output{$type}) {
+                       $r->print($output{$type}."\n");
+                   }
+               }
+	       $r->print('</table>');
+           }
         }  # End of unless
 	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
 	if ($currentauth=~/^krb(4|5):/) {
@@ -525,7 +675,8 @@ END
 		$currentauth=~/^internal:/ or
 		$currentauth=~/^localauth:/
 		) { # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+	    if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+                &initialize_authen_forms();
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
 			       'uuas'  => "This user has an unrecognized authentication scheme",
@@ -567,6 +718,7 @@ ENDBADAUTH
         } else { # Authentication type is valid
 	    my $authformcurrent='';
 	    my $authform_other='';
+            &initialize_authen_forms();
 	    if ($currentauth=~/^krb(4|5):/) {
 		$authformcurrent=$authformkrb;
 		$authform_other="<p>$authformint</p>\n".
@@ -588,7 +740,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',$env{'request.role.domain'})) {
 		# Current user has login modification privileges
 		my %lt=&Apache::lonlocal::texthash(
                                'ccld'  => "Change Current Login Data",
@@ -613,11 +765,11 @@ ENDOTHERAUTHS
 #
 # Co-Author
 # 
-    if (&authorpriv($ENV{'user.name'},$ENV{'request.role.domain'}) &&
-        ($ENV{'user.name'} ne $ccuname || $ENV{'user.domain'} ne $ccdomain)) {
+    if (&authorpriv($env{'user.name'},$env{'request.role.domain'}) &&
+        ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
         # No sense in assigning co-author role to yourself
-	my $cuname=$ENV{'user.name'};
-        my $cudom=$ENV{'request.role.domain'};
+	my $cuname=$env{'user.name'};
+        my $cudom=$env{'request.role.domain'};
 	   my %lt=&Apache::lonlocal::texthash(
 		    'cs'   => "Construction Space",
                     'act'  => "Activate",                    
@@ -650,9 +802,11 @@ ENDCOAUTH
 #
 # Domain level
 #
-    $r->print('<h4>'.&mt('Domain Level').'</h4>'.
+    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>');
+    '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>';
     foreach ( sort( keys(%incdomains))) {
 	my $thisdomain=$_;
         foreach ('dc','li','dg','au','sc') {
@@ -662,7 +816,8 @@ ENDCOAUTH
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
 				       );
-               $r->print(<<ENDDROW);
+               $num_domain_level ++;
+               $domaintext .= <<"ENDDROW";
 <tr>
 <td><input type=checkbox name="act_$thisdomain\_$_"></td>
 <td>$plrole</td>
@@ -678,86 +833,97 @@ ENDDROW
             }
         } 
     }
-    $r->print('</table>');
+    $domaintext.='</table>';
+    if ($num_domain_level > 0) {
+        $r->print($domaintext);
+    }
 #
 # Course level
 #
-    $r->print(&course_level_table(%inccourses));
-    $r->print("<hr /><input type=submit value=\"".&mt('Modify User')."\">\n");
+    my $num_sections;
+
+    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+        $r->print(&course_level_dc($1));
+        $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
+    } else {
+        $r->print(&course_level_table(%inccourses));
+        $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()">'."\n");
+    }
     $r->print("</form></body></html>");
 }
 
 # ================================================================= Phase Three
 sub update_user_data {
     my $r=shift;
-    my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                          $ENV{'form.ccdomain'});
+    my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
+                                          $env{'form.ccdomain'});
     # Error messages
     my $error     = '<font color="#ff0000">'.&mt('Error').':</font>';
     my $end       = '</body></html>';
     # Print header
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDTHREEHEAD);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
 ENDTHREEHEAD
     my $title;
-    if (exists($ENV{'form.makeuser'})) {
+    if (exists($env{'form.makeuser'})) {
 	$title='Set Privileges for New User';
     } else {
         $title='Modify User Privileges';
     }
     $r->print(&Apache::loncommon::bodytag($title));
     # Check Inputs
-    if (! $ENV{'form.ccuname'} ) {
+    if (! $env{'form.ccuname'} ) {
 	$r->print($error.&mt('No login name specified').'.'.$end);
 	return;
     }
-    if (  $ENV{'form.ccuname'}  =~/\W/) {
+    if (  $env{'form.ccuname'}  =~/\W/) {
 	$r->print($error.&mt('Invalid login name').'.  '.
 		  &mt('Only letters, numbers, and underscores are valid').'.'.
 		  $end);
 	return;
     }
-    if (! $ENV{'form.ccdomain'}       ) {
+    if (! $env{'form.ccdomain'}       ) {
 	$r->print($error.&mt('No domain specified').'.'.$end);
 	return;
     }
-    if (  $ENV{'form.ccdomain'} =~/\W/) {
+    if (  $env{'form.ccdomain'} =~/\W/) {
 	$r->print($error.&mt ('Invalid domain name').'.  '.
 		  &mt('Only letters, numbers, and underscores are valid').'.'.
 		  $end);
 	return;
     }
-    if (! exists($ENV{'form.makeuser'})) {
+    if (! exists($env{'form.makeuser'})) {
         # Modifying an existing user, so check the validity of the name
         if ($uhome eq 'no_host') {
             $r->print($error.&mt('Unable to determine home server for ').
-                      $ENV{'form.ccuname'}.&mt(' in domain ').
-                      $ENV{'form.ccdomain'}.'.');
+                      $env{'form.ccuname'}.&mt(' in domain ').
+                      $env{'form.ccdomain'}.'.');
             return;
         }
     }
     # Determine authentication method and password for the user being modified
     my $amode='';
     my $genpwd='';
-    if ($ENV{'form.login'} eq 'krb') {
+    if ($env{'form.login'} eq 'krb') {
 	$amode='krb';
-	$amode.=$ENV{'form.krbver'};
-	$genpwd=$ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+	$amode.=$env{'form.krbver'};
+	$genpwd=$env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
 	$amode='internal';
-	$genpwd=$ENV{'form.intarg'};
-    } elsif ($ENV{'form.login'} eq 'fsys') {
+	$genpwd=$env{'form.intarg'};
+    } elsif ($env{'form.login'} eq 'fsys') {
 	$amode='unix';
-	$genpwd=$ENV{'form.fsysarg'};
-    } elsif ($ENV{'form.login'} eq 'loc') {
+	$genpwd=$env{'form.fsysarg'};
+    } elsif ($env{'form.login'} eq 'loc') {
 	$amode='localauth';
-	$genpwd=$ENV{'form.locarg'};
+	$genpwd=$env{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
-    } elsif (($ENV{'form.login'} eq 'nochange') ||
-             ($ENV{'form.login'} eq ''        )) { 
+    } elsif (($env{'form.login'} eq 'nochange') ||
+             ($env{'form.login'} eq ''        )) { 
         # There is no need to tell the user we did not change what they
         # did not ask us to change.
         # If they are creating a new user but have not specified login
@@ -766,14 +932,14 @@ ENDTHREEHEAD
 	    $r->print($error.&mt('Invalid login mode or password').$end);    
 	    return;
     }
-    if ($ENV{'form.makeuser'}) {
+    if ($env{'form.makeuser'}) {
         # Create a new user
 	my %lt=&Apache::lonlocal::texthash(
                     'cru'  => "Creating user",                    
                     'id'   => "in domain"
 					   );
 	$r->print(<<ENDNEWUSERHEAD);
-<h3>$lt{'cru'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h3>
+<h3>$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h3>
 ENDNEWUSERHEAD
         # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {
@@ -781,12 +947,12 @@ ENDNEWUSERHEAD
 	    return;
 	}
         # Determine desired host
-        my $desiredhost = $ENV{'form.hserver'};
+        my $desiredhost = $env{'form.hserver'};
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
             my %home_servers = &Apache::loncommon::get_library_servers
-                ($ENV{'form.ccdomain'});  
+                ($env{'form.ccdomain'});  
             if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.&mt('Invalid home server specified'));
                 return;
@@ -794,49 +960,49 @@ ENDNEWUSERHEAD
         }
 	# Call modifyuser
 	my $result = &Apache::lonnet::modifyuser
-	    ($ENV{'form.ccdomain'},$ENV{'form.ccuname'},$ENV{'form.cstid'},
-             $amode,$genpwd,$ENV{'form.cfirst'},
-             $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},
+	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'},
+             $amode,$genpwd,$env{'form.cfirst'},
+             $env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'},
              undef,$desiredhost
 	     );
 	$r->print(&mt('Generating user').': '.$result);
-        my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                               $ENV{'form.ccdomain'});
+        my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
+                                               $env{'form.ccdomain'});
         $r->print('<br />'.&mt('Home server').': '.$home.' '.
                   $Apache::lonnet::libserv{$home});
-    } elsif (($ENV{'form.login'} ne 'nochange') &&
-             ($ENV{'form.login'} ne ''        )) {
+    } elsif (($env{'form.login'} ne 'nochange') &&
+             ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
     my %lt=&Apache::lonlocal::texthash(
                     'usr'  => "User",                    
                     'id'   => "in domain"
 				       );
 	$r->print(<<ENDMODIFYUSERHEAD);
-<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
 ENDMODIFYUSERHEAD
         if (! $amode || ! $genpwd) {
 	    $r->print($error.'Invalid login mode or password'.$end);    
 	    return;
 	}
 	# Only allow authentification modification if the person has authority
-	if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) {
+	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
                       &Apache::lonnet::modifyuserauth(
-		       $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
+		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br>'.&mt('Home server').': '.&Apache::lonnet::homeserver
-		  ($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));
+            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
 	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');    
 	}
     }
     ##
-    if (! $ENV{'form.makeuser'} ) {
+    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'});
+             $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
@@ -844,22 +1010,22 @@ ENDMODIFYUSERHEAD
         # Check to see if we need to change user information
         foreach ('firstname','middlename','lastname','generation') {
             # Strip leading and trailing whitespace
-            $ENV{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
+            $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
         }
-        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'} )) {
+        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'} )) {
             # Make the change
             my %changeHash;
-            $changeHash{'firstname'}  = $ENV{'form.cfirstname'};
-            $changeHash{'middlename'} = $ENV{'form.cmiddlename'};
-            $changeHash{'lastname'}   = $ENV{'form.clastname'};
-            $changeHash{'generation'} = $ENV{'form.cgeneration'};
+            $changeHash{'firstname'}  = $env{'form.cfirstname'};
+            $changeHash{'middlename'} = $env{'form.cmiddlename'};
+            $changeHash{'lastname'}   = $env{'form.clastname'};
+            $changeHash{'generation'} = $env{'form.cgeneration'};
             my $putresult = &Apache::lonnet::put
                 ('environment',\%changeHash,
-                 $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
+                 $env{'form.ccdomain'},$env{'form.ccuname'});
             if ($putresult eq 'ok') {
             # Tell the user we changed the name
 		my %lt=&Apache::lonlocal::texthash(
@@ -885,18 +1051,18 @@ ENDMODIFYUSERHEAD
     <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </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.cfirstname'}  </td>
+    <td>$env{'form.cmiddlename'} </td>
+    <td>$env{'form.clastname'}   </td>
+    <td>$env{'form.cgeneration'} </td></tr>
 </table>
 END
             } else { # error occurred
                 $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
-                      $ENV{'form.ccuname'}." ".&mt('in domain')." ".
-                      $ENV{'form.ccdomain'}."</h2>");
+                      $env{'form.ccuname'}." ".&mt('in domain')." ".
+                      $env{'form.ccdomain'}."</h2>");
             }
-        }  else { # End of if ($ENV ... ) logic
+        }  else { # End of if ($env ... ) logic
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
@@ -905,7 +1071,7 @@ END
                            'gen'  => "Generation"
 					       );
                 $r->print(<<"END");
-<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
+<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
@@ -914,173 +1080,304 @@ END
     ##
     my $now=time;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
-    foreach (keys (%ENV)) {
-	next if (! $ENV{$_});
+    foreach (keys (%env)) {
+	next if (! $env{$_});
 	# Revoke roles
 	if ($_=~/^form\.rev/) {
 	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role
 	        $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
-                     &Apache::lonnet::revokerole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2).'</b><br>');
+                     &Apache::lonnet::revokerole($env{'form.ccdomain'},
+                     $env{'form.ccuname'},$1,$2).'</b><br />');
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
+                             $env{'course.'.$cid.'.domain'}.':'.
+	                     $env{'course.'.$cid.'.num'}.':classlist:'.
+                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                             $env{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
+	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
 	    if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role').
                       ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
-                      &Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
-				  $ENV{'form.ccuname'},$1,$2,$3,$4).
-		'</b><br>');
+                      &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
+				  $env{'form.ccuname'},$1,$2,$3,$4).
+		'</b><br />');
 	    }
 	} elsif ($_=~/^form\.del/) {
 	    if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
 	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');
+                     &Apache::lonnet::assignrole($env{'form.ccdomain'},
+                     $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
+                             $env{'course.'.$cid.'.domain'}.':'.
+	                     $env{'course.'.$cid.'.num'}.':classlist:'.
+                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                             $env{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
+	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
 	} elsif ($_=~/^form\.ren/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
 	    if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) {
-		my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-					 $ENV{'form.ccuname'},$1,$2,0,$now);
-		$r->print(&mt('Re-Enabling [_1] in [_2]: [_3]',
-			      $2,$1,$result).'<br />');
-		if ($2 eq 'st') {
-		    $1=~/^\/(\w+)\/(\w+)/;
-		    my $cid=$1.'_'.$2;
-		    $r->print(&mt('Add to classlist').': <b>'.
-			      &Apache::lonnet::critical(
-				  'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	                           $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                                   &Apache::lonnet::escape(
-                                       $ENV{'form.ccuname'}.':'.
-                                       $ENV{'form.ccdomain'} ).'='.
-                                   &Apache::lonnet::escape(':'.$now),
-				       $ENV{'course.'.$cid.'.home'})
-			      .'</b><br>');
+                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);
+                        if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+                            $output = "Error: $result\n";
+                        } else {
+                            $output = &mt('Assigning').' '.$role.' in '.$url.
+                                      &mt('starting').' '.localtime($now).
+                                      ': <br />'.$logmsg.'<br />'.
+                                      &mt('Add to classlist').': <b>ok</b><br />';
+                        }
+                    }
+                } else {
+		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
+                               $env{'form.ccuname'},$url,$role,0,$now);
+		    $output = &mt('Re-Enabling [_1] in [_2]: [_3]',
+			      $role,$url,$result).'<br />';
 		}
+                $r->print($output);
 	    } 
 	} elsif ($_=~/^form\.act/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
 	    if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
 		my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
-		$ENV{'form.sec_'.$full}=~s/\W//g;
-		if ($ENV{'form.sec_'.$full}) {
-		    $url.='/'.$ENV{'form.sec_'.$full};
-		}
-
-		my $start = ( $ENV{'form.start_'.$full} ? 
-			      $ENV{'form.start_'.$full} : 
-			      $now );
-		my $end   = ( $ENV{'form.end_'.$full} ? 
-			      $ENV{'form.end_'.$full} :
-			      0 );
 
-    $r->print(&mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
-                         ($start?', '.&mt('starting').' '.localtime($start):'').
-                         ($end?', ending '.localtime($end):'').': <b>'.
-	      &Apache::lonnet::assigncustomrole(
-	$ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$three,$four,$five,$end,$start).
-	      '</b><br>');
-	    } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) {
+                my $start = ( $env{'form.start_'.$full} ?
+                              $env{'form.start_'.$full} :
+                              $now );
+                my $end   = ( $env{'form.end_'.$full} ?
+                              $env{'form.end_'.$full} :
+                              0 );
+                                                                                     
+                # split multiple sections
+                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));
+                } else {
+                    foreach (sort {$a cmp $b} keys %sections) {
+                        my $securl = $url.'/'.$_;
+		        $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
+                    }
+                }
+	    } elsif ($_=~/^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);
-		my $start = ( $ENV{'form.start_'.$one.'_'.$two.'_'.$three} ? 
-			      $ENV{'form.start_'.$one.'_'.$two.'_'.$three} : 
+		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.start_'.$one.'_'.$two.'_'.$three} : 
 			      $now );
-		my $end   = ( $ENV{'form.end_'.$one.'_'.$two.'_'.$three} ? 
-			      $ENV{'form.end_'.$one.'_'.$two.'_'.$three} :
+		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.end_'.$one.'_'.$two.'_'.$three} :
 			      0 );
 		my $url='/'.$one.'/'.$two;
-		$ENV{'form.sec_'.$one.'_'.$two.'_'.$three}=~s/\W//g;
-		if ($ENV{'form.sec_'.$one.'_'.$two.'_'.$three}) {
-		    $url.='/'.$ENV{'form.sec_'.$one.'_'.$two.'_'.$three};
-		}
-		# Assign the role and report it
-		$r->print(&mt('Assigning').' '.$three.' in '.$url.
-                         ($start?', '.&mt('starting').' '.localtime($start):'').
-                         ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
-                          &Apache::lonnet::assignrole(
-                              $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                              $url,$three,$end,$start).
-			  '</b><br>');
-		# Handle students differently
-		if ($three eq 'st') {
-		    $url=~/^\/(\w+)\/(\w+)/;
-		    my $cid=$one.'_'.$two;
-		    $r->print(&mt('Add to classlist').': <b>'.
-			      &Apache::lonnet::critical(
-				  'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	                           $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                                   &Apache::lonnet::escape(
-                                       $ENV{'form.ccuname'}.':'.
-                                       $ENV{'form.ccdomain'} ).'='.
-                                   &Apache::lonnet::escape($end.':'.$start),
-				       $ENV{'course.'.$cid.'.home'})
-			      .'</b><br>');
-		}
+                my $type = 'three';
+                # split multiple sections
+                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,''));
+                } else {
+                    my $emptysec = 0;
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        $sec =~ s/\W//g;
+                        if ($sec ne '') {  
+                            my $securl = $url.'/'.$sec;
+                            $r->print(&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,''));
+                    }
+                } 
 	    } elsif ($_=~/^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} ? 
-			      $ENV{'form.start_'.$1.'_'.$2} : 
+		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
+			      $env{'form.start_'.$1.'_'.$2} : 
 			      $now );
-		my $end   = ( $ENV{'form.end_'.$1.'_'.$2} ? 
-			      $ENV{'form.end_'.$1.'_'.$2} :
+		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
+			      $env{'form.end_'.$1.'_'.$2} :
 			      0 );
 		my $url='/'.$1.'/';
-		# Assign the role and report it.
-		$r->print(&mt('Assigning').' '.$2.' in '.$url.': '.
-                         ($start?', '.&mt('starting').' '.localtime($start):'').
-                         ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
-                          &Apache::lonnet::assignrole(
-                              $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                              $url,$2,$end,$start)
-			  .'</b><br>');
+                # split multiple sections
+                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,''));
+                } 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));
+                        } else {
+                            $emptysec = 1;
+                        }
+                    }
+                    if ($emptysec) {
+                        $r->print(&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>'.$_.'</tt></p><br />');
             }
 	} 
-    } # End of foreach (keys(%ENV))
+    } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
     $r->print('</body></html>');
 }
 
+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;
+    if ($sectionstr=~ /,/) {
+        my @secnums = split/,/,$sectionstr;
+        if ($role eq 'st') {
+            $secnums[0] =~ s/\W//g;
+            $$sections{$secnums[0]} = 1;
+            $num_sections = 1;
+        } else {
+            foreach my $sec (@secnums) {
+                $sec =~ ~s/\W//g;
+                unless ($sec eq "") {
+                    if (exists($$sections{$sec})) {
+                        $$sections{$sec} ++;
+                    } else {
+                        $$sections{$sec} = 1;
+                        $num_sections ++;
+                    }
+                }
+            }
+        }
+    } else {
+        $sectionstr=~s/\W//g;
+        unless ($sectionstr eq '') {
+            $$sections{$sectionstr} = 1;
+            $num_sections ++;
+        }
+    }
+                                                                                     
+    return $num_sections;
+}
+
 # ========================================================== Custom Role Editor
 
 sub custom_role_editor {
     my $r=shift;
-    my $rolename=$ENV{'form.rolename'};
+    my $rolename=$env{'form.rolename'};
 
     if ($rolename eq 'make new role') {
-	$rolename=$ENV{'form.newrolename'};
+	$rolename=$env{'form.newrolename'};
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
@@ -1176,7 +1473,7 @@ ENDCCF
 sub set_custom_role {
     my $r=shift;
 
-    my $rolename=$ENV{'form.rolename'};
+    my $rolename=$env{'form.rolename'};
 
     $rolename=~s/[^A-Za-z0-9]//gs;
 
@@ -1205,7 +1502,7 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':c'}) {
+        if ($env{'form.'.$priv.':c'}) {
 	    $courole.=':'.$_;
 	}
     }
@@ -1213,7 +1510,7 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':d'}) {
+        if ($env{'form.'.$priv.':d'}) {
 	    $domrole.=':'.$_;
 	}
     }
@@ -1221,21 +1518,21 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':s'}) {
+        if ($env{'form.'.$priv.':s'}) {
 	    $sysrole.=':'.$_;
 	}
     }
     $r->print('<br />Defining Role: '.
 	   &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
-    if ($ENV{'request.course.id'}) {
-        my $url='/'.$ENV{'request.course.id'};
+    if ($env{'request.course.id'}) {
+        my $url='/'.$env{'request.course.id'};
         $url=~s/\_/\//g;
 	$r->print('<br />'.&mt('Assigning Role to Self').': '.
-	      &Apache::lonnet::assigncustomrole($ENV{'user.domain'},
-						$ENV{'user.name'},
+	      &Apache::lonnet::assigncustomrole($env{'user.domain'},
+						$env{'user.name'},
 						$url,
-						$ENV{'user.domain'},
-						$ENV{'user.name'},
+						$env{'user.domain'},
+						$env{'user.name'},
 						$rolename));
     }
     $r->print('</body></html>');
@@ -1251,28 +1548,28 @@ sub handler {
        return OK;
     }
 
-    if ((&Apache::lonnet::allowed('cta',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cin',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('ccr',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) {
+    if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
+        (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || 
+        (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || 
+        (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
+        (&Apache::lonnet::allowed('cca',$env{'request.role.domain'})) ||
+        (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
-       unless ($ENV{'form.phase'}) {
+       unless ($env{'form.phase'}) {
 	   &print_username_entry_form($r);
        }
-       if ($ENV{'form.phase'} eq 'get_user_info') {
+       if ($env{'form.phase'} eq 'get_user_info') {
            &print_user_modification_page($r);
-       } elsif ($ENV{'form.phase'} eq 'update_user_data') {
+       } elsif ($env{'form.phase'} eq 'update_user_data') {
            &update_user_data($r);
-       } elsif ($ENV{'form.phase'} eq 'selected_custom_edit') {
+       } elsif ($env{'form.phase'} eq 'selected_custom_edit') {
            &custom_role_editor($r);
-       } elsif ($ENV{'form.phase'} eq 'set_custom_roles') {
+       } elsif ($env{'form.phase'} eq 'set_custom_roles') {
 	   &set_custom_role($r);
        }
    } else {
-      $ENV{'user.error.msg'}=
+      $env{'user.error.msg'}=
         "/adm/createuser:mau:0:0:Cannot modify user data";
       return HTTP_NOT_ACCEPTABLE; 
    }
@@ -1281,11 +1578,24 @@ sub handler {
 
 #-------------------------------------------------- functions for &phase_two
 sub course_level_table {
-    my %inccourses = @_;
+    my (%inccourses) = @_;
     my $table = '';
 # Custom Roles?
 
     my %customroles=&my_custom_roles();
+    my %lt=&Apache::lonlocal::texthash(
+            'exs'  => "Existing sections",
+            'new'  => "Define new section",
+            'ssd'  => "Set Start Date",
+            'sed'  => "Set End Date",
+            'crl'  => "Course Level",
+            'act'  => "Activate",
+            'rol'  => "Role",
+            'ext'  => "Extent",
+            'grs'  => "Group/Section",
+            'sta'  => "Start",
+            'end'  => "End"
+    );
 
     foreach (sort( keys(%inccourses))) {
 	my $thiscourse=$_;
@@ -1297,7 +1607,14 @@ sub course_level_table {
 	my $bgcol=$thiscourse;
 	$bgcol=~s/[^7-9a-e]//g;
 	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
-	my ($domain)=split(/\//,$thiscourse);
+	my ($domain,$cnum)=split(/\//,$thiscourse);
+        my %sections_count = ();
+        my $num_sections = 0;
+        if (defined($env{'request.course.id'})) {
+            if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
+                $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+            }
+        }
 	foreach  ('st','ta','ep','ad','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
@@ -1308,18 +1625,25 @@ sub course_level_table {
 <td>$area<br />Domain: $domain</td>
 ENDEXTENT
 	        if ($_ ne 'cc') {
-		    $table .= <<ENDSECTION;
-<td><input type="text" size="5" name="sec_$protectedcourse\_$_"></td>
-ENDSECTION
+                    if ($num_sections > 0) {
+                        my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_);
+                        $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="hidden" '.
+                     'name="sec_'.$protectedcourse.'_'.$_.'"></td>'.
+                     '</tr></table></td>';
+                    } else {
+                        $table .= '<td><input type="text" size="10" '.
+                     'name="sec_'.$protectedcourse.'_'.$_.'"></td>';
+                    }
                 } else { 
-		    $table .= <<ENDSECTION;
-<td>&nbsp</td> 
-ENDSECTION
+		    $table .= '<td>&nbsp</td>';
                 }
-		my %lt=&Apache::lonlocal::texthash(
-                               'ssd'  => "Set Start Date",
-                               'sed'  => "Set End Date"
-						   );
 		$table .= <<ENDTIMEENTRY;
 <td><input type=hidden name="start_$protectedcourse\_$_" value=''>
 <a href=
@@ -1334,18 +1658,31 @@ ENDTIMEENTRY
         foreach (sort keys %customroles) {
 	    if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
 		my $plrole=$_;
-                my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}.
-		    '_'.$ENV{'user.name'}.'_'.$plrole;
-		my %lt=&Apache::lonlocal::texthash(
-                               'ssd'  => "Set Start Date",
-                               'sed'  => "Set End Date"
-						   );
-		$table .= <<ENDENTRY;
+                my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
+		    '_'.$env{'user.name'}.'_'.$plrole;
+		$table .= <<END;
 <tr bgcolor="#$bgcol">
 <td><input type="checkbox" name="act_$customrole"></td>
 <td>$plrole</td>
 <td>$area</td>
-<td><input type="text" size="5" name="sec_$customrole"></td>
+END
+                if ($num_sections > 0) {
+                    my $currsec = &course_sections($num_sections,\%sections_count,$customrole);
+                    $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_'.$customrole.'" value="" /></td>'.
+                   '<input type="hidden" '.
+                   'name="sec_'.$customrole.'"></td>'.
+                   '</tr></table></td>';
+                } else {
+                    $table .= '<td><input type="text" size="10" '.
+                     'name="sec_'.$customrole.'"></td>';
+                }
+                $table .= <<ENDENTRY;
 <td><input type=hidden name="start_$customrole" value=''>
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
@@ -1358,15 +1695,6 @@ ENDENTRY
     }
     return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table
-    my %lt=&Apache::lonlocal::texthash(
-		    'crl'  => "Course Level",
-                    'act'  => "Activate",
-                    'rol'  => "Role",
-                    'ext'  => "Extent",
-                    'grs'  => "Group/Section",
-                    'sta'  => "Start",
-                    'end'  => "End"
-				       );
     my $result = <<ENDTABLE;
 <h4>$lt{'crl'}</h4>
 <table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
@@ -1376,6 +1704,86 @@ $table
 ENDTABLE
     return $result;
 }
+
+sub course_sections {
+    my ($num_sections,$sections_count,$role) = @_;
+    my $output = '';
+    my @sections = (sort {$a <=> $b} keys %{$sections_count});
+    if ($num_sections == 1) {
+        $output = '<select name="currsec_'.$role.'" >'."\n".
+                  '  <option value="">Select</option>'."\n".
+                  '  <option value="">No section</option>'."\n".
+                  '  <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n";
+    } else {
+        $output = '<select name="currsec_'.$role.'" ';
+        my $multiple = 4;
+        if ($num_sections <4) { $multiple = $num_sections; }
+        $output .= '"multiple" size="'.$multiple.'">'."\n";
+        foreach (@sections) {
+            $output .= '<option value="'.$_.'">'.$_."</option>\n";
+        }
+    }
+    $output .= '</select>'; 
+    return $output;
+}
+
+sub course_level_dc {
+    my ($dcdom) = @_;
+    my %customroles=&my_custom_roles();
+    my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
+                      '<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);
+    my %lt=&Apache::lonlocal::texthash(
+                    'crl'  => "Course Level",
+                    'crt'  => "Course Title",
+                    'rol'  => "Role",
+                    'grs'  => "Group/Section",
+                    'exs'  => "Existing sections",
+                    'new'  => "Define new section", 
+                    'sta'  => "Start",
+                    'end'  => "End",
+                    '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>'.
+                     '<td><select name="role">'."\n";
+    foreach  ('st','ta','ep','ad','in','cc') {
+        my $plrole=&Apache::lonnet::plaintext($_);
+        $otheritems .= '  <option value="'.$_.'">'.$plrole;
+    }
+    if ( keys %customroles > 0) {
+        foreach (sort keys %customroles) {
+            my $custrole='cr_cr_'.$env{'user.domain'}.
+                    '_'.$env{'user.name'}.'_'.$_;
+            $otheritems .= '  <option value="'.$custrole.'">'.$_;
+        }
+    }
+    $otheritems .= '</select></td><td>'.
+                     '<table border="0" cellspacing="0" cellpadding="0">'.
+                     '<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.
+                     ' <option value=""><--'.&mt('Pick course first').'</select></td>'.
+                     '<td>&nbsp;&nbsp;</td>'.
+                     '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
+                     '<input type="text" name="newsec" value="" /></td>'.
+                     '</tr></table></td>';
+    $otheritems .= <<ENDTIMEENTRY;
+<td><input type=hidden name="start" value=''>
+<a href=
+"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type=hidden name="end" value=''>
+<a href=
+"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
+ENDTIMEENTRY
+    $otheritems .= "</tr></table>\n";
+    return $cb_jscript.$header.$hiddenitems.$otheritems;
+}
+
 #---------------------------------------------- end functions for &phase_two
 
 #--------------------------------- functions for &phase_two and &phase_three