--- loncom/interface/loncreateuser.pm	2008/07/16 12:32:11	1.249.2.4
+++ loncom/interface/loncreateuser.pm	2009/02/03 05:28:00	1.276
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.249.2.4 2008/07/16 12:32:11 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.276 2009/02/03 05:28:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,11 +33,13 @@ package Apache::loncreateuser;
 
 =head1 NAME
 
-Apache::loncreateuser - handler to create users and custom roles
+Apache::loncreateuser.pm
 
 =head1 SYNOPSIS
 
-Apache::loncreateuser provides an Apache handler for creating users,
+    Handler to create users and custom roles
+
+    Provides an Apache handler for creating users,
     editing their login parameters, roles, and removing roles, and
     also creating and assigning custom roles.
 
@@ -120,11 +122,12 @@ sub auth_abbrev {
 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",
+                   'usrt'      => "User Tools",
+                   'disk'      => "Disk space allocated to user's portfolio files",
+                   'cuqu'      => "Current quota",
+                   'cust'      => "Custom quota",
+                   'defa'      => "Default",
+                   'chqu'      => "Change quota",
     );
     my ($currquota,$quotatype,$inststatus,$defquota) = 
         &Apache::loncommon::get_user_quota($ccuname,$ccdomain);
@@ -173,27 +176,108 @@ END_SCRIPT
                                " affiliation ([_2]).",$defquota,$longinsttype);
         }
     }
-    my $output = $quota_javascript.
-                 '<h3>'.$lt{'disk'}.'</h3>'.
-                 &Apache::loncommon::start_data_table().
-                 &Apache::loncommon::start_data_table_row().
-                 '<td>'.$lt{'cuqu'}.': '.$currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
-                 $defaultinfo.'</td>'.
-                 &Apache::loncommon::end_data_table_row().
-                 &Apache::loncommon::start_data_table_row().
-                 '<td><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="'.
-                 $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
-                 '/>&nbsp;Mb</span></td>'.
-                 &Apache::loncommon::end_data_table_row().
-                 &Apache::loncommon::end_data_table();
+
+    my $output = $quota_javascript."\n".
+                 '<h3>'.$lt{'usrt'}.'</h3>'."\n".
+                 &Apache::loncommon::start_data_table();
+
+    if (&Apache::lonnet::allowed('mut',$ccdomain)) {
+        $output .= &build_tools_display($ccuname,$ccdomain,'tools');
+    }
+    if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+        $output .= '<tr class="LC_info_row">'."\n".
+                   '    <td>'.$lt{'disk'}.'</td>'."\n".
+                   '  </tr>'."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td>'.$lt{'cuqu'}.': '.
+                   $currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
+                   $defaultinfo.'</td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td><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="'.
+                   $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
+                   '/>&nbsp;Mb</span></td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n";
+    }  
+    $output .= &Apache::loncommon::end_data_table();
+    return $output;
+}
+
+sub build_tools_display {
+    my ($ccuname,$ccdomain,$context) = @_;
+    my (@usertools,%userenv,$output);
+    my %lt = &Apache::lonlocal::texthash (
+                   'blog'       => "Personal User Blog",
+                   'aboutme'    => "Personal Information Page",
+                   'portfolio'  => "Personal User Portfolio",
+                   'avai'       => "Available",
+                   'cusa'       => "availability",
+                   'chse'       => "Change setting",
+                   'usde'       => "Use default",
+                   'uscu'       => "Use custom",
+                   'official'   => 'Can request creation of official courses',
+                   'unofficial' => 'Can request creation of unofficial courses',  
+    );
+    if ($context eq 'requestcourse') {
+        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
+                      'requestcourse.official','requestcourse.unofficial');
+        @usertools = ('official','unofficial');
+    } else {
+        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
+                          'tools.aboutme','tools.portfolio','tools.blog');
+        @usertools = ('aboutme','blog','portfolio');
+    }
+    foreach my $item (@usertools) {
+        my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
+        $cust_off = 'checked="checked" ';
+        $tool_on = 'checked="checked" ';
+        $curr_access =  
+            &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+                                              $context);
+        if ($userenv{$context.'.'.$item} eq '') {
+            $custom_access = 'default';
+            if (!$curr_access) {
+                $tool_off = 'checked="checked" ';
+                $tool_on = '';
+            }
+        } else {
+            $custom_access = 'custom';
+            $cust_on = ' checked="checked" ';
+            $cust_off = '';
+            if ($userenv{$context.'.'.$item} == 0) {
+                $tool_off = 'checked="checked" ';
+                $tool_on = '';
+            }
+        }
+        $output .= '  <tr class="LC_info_row">'."\n".
+                   '   <td>'.$lt{$item}.'</td>'."\n".
+                   '  </tr>'."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access).
+                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'avai'}.': '.
+                   ($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n".
+                   &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
+                   '<input type="radio" name="custom'.$item.'" value="0" '.
+                   $cust_off.'/>'.$lt{'usde'}.'</label>&nbsp;&nbsp;&nbsp;'.
+                    '<label><input type="radio" name="custom'.$item.'" value="1" '.
+                   $cust_on.'/>'.$lt{'uscu'}.'</label>&nbsp;&nbsp;--&nbsp;&nbsp;'.
+                   $lt{'cusa'}.':&nbsp;<label>'.
+                   '<input type="radio" name="'.$context.'_'.$item.'" value="1" '.
+                   $tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
+                   '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
+                   $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n";
+    }
     return $output;
 }
 
@@ -649,8 +733,9 @@ ENDFORMINFO
     }
     if ($newuser) {
         my $portfolioform;
-        if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
-            # Current user has quota modification privileges
+        if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
+            (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
+            # Current user has quota or user tools modification privileges
             $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);
         }
         &initialize_authen_forms($ccdomain,$formname);
@@ -705,6 +790,7 @@ $lt{'hs'}: $home_server_pick
                         $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
                     } else { 
                         my $authparm = $rules->{$matchedrule}{'authparm'};
+                        $authmsg = $rules->{$matchedrule}{'authmsg'};
                         if ($authtype =~ /^krb(4|5)$/) {
                             my $ver = $1;
                             if ($authparm ne '') {
@@ -713,7 +799,6 @@ $lt{'hs'}: $home_server_pick
 <input type="hidden" name="krbver" value="$ver" />
 <input type="hidden" name="krbarg" value="$authparm" />
 KERB
-                                $authmsg = $rules->{$matchedrule}{'authmsg'};    
                             }
                         } else {
                             $fixedauth = 
@@ -722,8 +807,16 @@ KERB
                                 $fixedauth .=    
 '<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
                             } else {
-                                $varauth =  
+                                if ($authtype eq 'int') {
+                                    $varauth = '<br />'.
+&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+                                } elsif ($authtype eq 'loc') {
+                                    $varauth = '<br />'.
+&mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
+                                } else {
+                                    $varauth =
 '<input type="text" name="'.$authtype.'arg" value="" />'."\n";
+                                }
                             }
                         }
                     }
@@ -773,37 +866,70 @@ ENDCHANGEUSER
         if ($showforceid) {
             $r->print(&Apache::lonuserutils::forceid_change($context));
         }
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            $r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
+                      &Apache::loncommon::start_data_table().
+                      &build_tools_display($ccuname,$ccdomain,'requestcourse').
+                      &Apache::loncommon::end_data_table());
+        }
         $r->print('</div>');
         my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
-        my $user_quota_text;
-        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+        my ($user_quota_text,$user_tools_text,$user_reqcrs_text);
+        if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
+            (&Apache::lonnet::allowed('mut',$ccdomain))) {
             # Current user has quota modification privileges
             $user_quota_text = &portfolio_quota($ccuname,$ccdomain);
-        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
-            # Get the user's portfolio information
-            my %portq = &Apache::lonnet::get('environment',['portfolioquota'],
-                                             $ccdomain,$ccuname);
-
-            my %lt=&Apache::lonlocal::texthash(
-                'dska'  => "Disk space allocated to user's portfolio files",
-                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
-                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
-            );
-            $user_quota_text = <<ENDNOPORTPRIV;
+        }
+        if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {
+            if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+                # Get the user's portfolio information
+                my %portq = &Apache::lonnet::get('environment',['portfolioquota'],
+                                                 $ccdomain,$ccuname);
+                my %lt=&Apache::lonlocal::texthash(
+                    'dska'  => "Disk space allocated to user's portfolio files",
+                    'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                    'ichr'  => "If a change is required, contact a domain coordinator for the domain",
+                );
+                $user_quota_text = <<ENDNOPORTPRIV;
 <h3>$lt{'dska'}</h3>
 $lt{'youd'} $lt{'ichr'}: $ccdomain
 ENDNOPORTPRIV
+            }
+        }
+        if (!&Apache::lonnet::allowed('mut',$ccdomain)) {
+            if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
+                my %lt=&Apache::lonlocal::texthash(
+                    'utav'  => "User Tools Availability",
+                    'yodo'  => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.",
+                    'ifch'  => "If a change is required, contact a domain coordinator for the domain",
+                );
+                $user_tools_text = <<ENDNOTOOLSPRIV;
+<h3>$lt{'utav'}</h3>
+$lt{'yodo'} $lt{'ifch'}: $ccdomain
+ENDNOTOOLSPRIV
+            }
         }
         if ($user_auth_text ne '') {
             $r->print('<div class="LC_left_float">'.$user_auth_text);
             if ($user_quota_text ne '') {
                 $r->print($user_quota_text);
             }
+            if ($user_tools_text ne '') {
+                $r->print($user_tools_text);
+            }
             if ($env{'form.action'} eq 'singlestudent') {
                 $r->print(&date_sections_select($context,$newuser,$formname));
             }
         } elsif ($user_quota_text ne '') {
             $r->print('<div class="LC_left_float">'.$user_quota_text);
+            if ($user_tools_text ne '') {
+                $r->print($user_tools_text);
+            }
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print(&date_sections_select($context,$newuser,$formname));
+            }
+        } elsif ($user_tools_text ne '') {
+            $r->print('<div class="LC_left_float">'.$user_tools_text);
             if ($env{'form.action'} eq 'singlestudent') {
                 $r->print(&date_sections_select($context,$newuser,$formname));
             }
@@ -833,10 +959,10 @@ ENDNOPORTPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
-            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
-                $r->print('<br /><input type="button" value="'.&mt('Modify User').'"');
+                $r->print('<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
                     $r->print(' onClick="auth_check()" \>'."\n");
                 } else {
@@ -848,7 +974,7 @@ ENDNOPORTPRIV
             }
         } else {
             $r->print(&course_level_table(%inccourses));
-            $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections(this.form)" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -967,7 +1093,7 @@ sub display_existing_roles {
                 if (defined($coursedata{'description'})) {
                     $carea=$coursedata{'description'}.
                         '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
-     &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
+     &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
                     $sortkey.="\0".$coursedata{'description'};
                     $class=$coursedata{'type'};
                 } else {
@@ -1397,30 +1523,22 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
-    my ($output,$showforceid,%userenv,%canmodify,@inststatuses);
+    my ($output,$showforceid,%userenv,%canmodify);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
     my $editable = 0;
-    if ($context eq 'selfcreate') {
-        if (ref($inst_results) eq 'HASH') {
-            @inststatuses = &get_inststatuses($inst_results);
-            if (@inststatuses == 0) {
-                @inststatuses = ('default');
-            }
-            $rolesarray = \@inststatuses;
-        }
-    }
     if (!$newuser) {
         # Get the users information
         %userenv = &Apache::lonnet::get('environment',
                    ['firstname','middlename','lastname','generation',
                     'permanentemail','id'],$ccdomain,$ccuname);
-    }
-    if ((!$newuser) || ($context eq 'selfcreate')) {
         %canmodify =
             &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
                                                        \@userinfo,$rolesarray);
+    } elsif ($context eq 'selfcreate') {
+        %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
+                                           $inst_results,$rolesarray);
     }
     my %lt=&Apache::lonlocal::texthash(
                 'pd'             => "Personal Data",
@@ -1429,7 +1547,7 @@ sub personal_data_display {
                 'lastname'       => "Last Name",
                 'generation'     => "Generation",
                 'permanentemail' => "Permanent e-mail address",
-                'id'             => "ID/Student Number",
+                'id'             => "Student/Employee ID",
                 'lg'             => "Login Data"
     );
     my %textboxsize = (
@@ -1456,7 +1574,7 @@ sub personal_data_display {
                     $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
                 } else {
                     if ($context eq 'selfcreate') {
-                        if ($canmodify{$item}) {
+                        if ($canmodify{$item}) { 
                             $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
                             $editable ++;
                         } else {
@@ -1506,6 +1624,21 @@ sub personal_data_display {
     }
 }
 
+sub selfcreate_canmodify {
+    my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
+    if (ref($inst_results) eq 'HASH') {
+        my @inststatuses = &get_inststatuses($inst_results);
+        if (@inststatuses == 0) {
+            @inststatuses = ('default');
+        }
+        $rolesarray = \@inststatuses;
+    }
+    my %canmodify =
+        &Apache::lonuserutils::can_modify_userinfo($context,$dom,$userinfo,
+                                                   $rolesarray);
+    return %canmodify;
+}
+
 sub get_inststatuses {
     my ($insthashref) = @_;
     my @inststatuses = ();
@@ -1638,6 +1771,8 @@ sub update_user_data {
     $r->print('<h3>'.&mt('User [_1] in domain [_2]',
 			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
     my (%alerts,%rulematch,%inst_results,%curr_rules);
+    my @usertools = ('aboutme','blog','portfolio');
+    my @requestcourses = ('official','unofficial');
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
@@ -1697,26 +1832,42 @@ sub update_user_data {
 	$r->print(&mt('Generating user').': '.$result);
         $uhome = &Apache::lonnet::homeserver($env{'form.ccuname'},
                                                $env{'form.ccdomain'});
-        if (($uhome ne 'no_host') && ($env{'form.customquota'} == 1)) {
-            my (%changeHash,$newportfolioquota);
-            if ($env{'form.portfolioquota'} eq '') {
-                $newportfolioquota = 0;
-            } else {
-                $newportfolioquota = $env{'form.portfolioquota'};
-                $newportfolioquota =~ s/[^\d\.]//g;
+        my (%changeHash,%newcustom,%changed);
+        if ($uhome ne 'no_host') {
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newcustom{'quota'} = 0;
+                } else {
+                    $newcustom{'quota'} = $env{'form.portfolioquota'};
+                    $newcustom{'quota'} =~ s/[^\d\.]//g;
+                }
+                $changed{'quota'} = &quota_admin($newcustom{'quota'},\%changeHash);
+            }
+            foreach my $item (@usertools) {
+                if ($env{'form.custom'.$item} == 1) {
+                    $newcustom{$item} = $env{'form.tools_'.$item};
+                    $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                                 \%changeHash,'tools');
+                }
             }
-            my $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
-            if ($quotachanged) {
+            if (&Apache::lonnet::allowed('ccc',$env{'request.domain'})) {
+                foreach my $item (@requestcourses) {
+                    $newcustom{$item} = $env{'form.requestcourse_'.$item};
+                    $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                                  \%changeHash,'requestcourse');
+                }
+            }
+            if (keys(%changed)) {
                 $changeHash{'firstname'}  = $env{'form.cfirstname'};
                 $changeHash{'middlename'} = $env{'form.cmiddlename'};
                 $changeHash{'lastname'}   = $env{'form.clastname'};
                 $changeHash{'generation'} = $env{'form.cgeneration'};
                 $changeHash{'id'}         = $env{'form.cid'};
                 $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
-                my $quotachgresult =
-                    &Apache::lonnet::put('environment',\%changeHash,
-                                         $env{'form.ccdomain'},$env{'form.ccuname'});
-            }
+                my $chgresult =
+                     &Apache::lonnet::put('environment',\%changeHash,
+                                          $env{'form.ccdomain'},$env{'form.ccuname'});
+            } 
         }
         $r->print('<br />'.&mt('Home server').': '.$uhome.' '.
                   &Apache::lonnet::hostname($uhome));
@@ -1749,7 +1900,9 @@ sub update_user_data {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
-             'id','permanentemail','portfolioquota','inststatus'],
+             'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
+             'tools.blog','tools.portfolio','requestcourse.official',
+             'requestcourse.unofficial'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -1840,7 +1993,7 @@ sub update_user_data {
                 $env{'form.c'.$item} = $userenv{$item};
             }
         }
-        # Check to see if we can change the ID/student number
+        # Check to see if we can change the Student/Employee ID
         my $forceid = $env{'form.forceid'};
         my $recurseid = $env{'form.recurseid'};
         my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
@@ -1851,7 +2004,10 @@ sub update_user_data {
             (!$forceid)) {
             if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
                 $env{'form.cid'} = $userenv{'id'};
-                $no_forceid_alert = &mt('New student/employeeID does not match existing ID for this user.').'<br />'.&mt('Change is not permitted without checking the \'Force ID change\' checkbox on the previous page.').'<br />'."\n";        
+                $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
+                                   .'<br />'
+                                   .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
+                                   .'<br />'."\n";
             }
         }
         if ($env{'form.cid'} ne $userenv{'id'}) {
@@ -1871,14 +2027,20 @@ sub update_user_data {
         }
         my ($quotachanged,$oldportfolioquota,$newportfolioquota,
             $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
-            $newdefquotatext);
+            $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext);
         my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
-        my $showquota;
+        my ($showquota,$showtools,$showrequestcourses);
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $showquota = 1;
         }
-        my %changeHash;
+        if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
+            $showtools = 1;
+        }
+        if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
+            $showrequestcourses = 1;
+        }
+        my (%changeHash,%changed);
         $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
         if ($userenv{'portfolioquota'} ne '') {
             $oldportfolioquota = $userenv{'portfolioquota'};
@@ -1890,10 +2052,10 @@ sub update_user_data {
                     $newportfolioquota =~ s/[^\d\.]//g;
                 }
                 if ($newportfolioquota != $oldportfolioquota) {
-                    $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+                    $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
                 }
             } else {
-                $quotachanged = &quota_admin('',\%changeHash);
+                $changed{'quota'} = &quota_admin('',\%changeHash);
                 $newportfolioquota = $defquota;
                 $newisdefault = 1; 
             }
@@ -1907,7 +2069,7 @@ sub update_user_data {
                     $newportfolioquota = $env{'form.portfolioquota'};
                     $newportfolioquota =~ s/[^\d\.]//g;
                 }
-                $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+                $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
             } else {
                 $newportfolioquota = $defquota;
                 $newisdefault = 1;
@@ -1919,6 +2081,10 @@ sub update_user_data {
         if ($newisdefault) {
             $newdefquotatext = &get_defaultquota_text($settingstatus);
         }
+        &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
+                      \%changeHash,\%changed,\%newaccess,\%newaccesstext);
+        &tool_changes('requestcourse',\@requestcourses,\%oldaccess,\%oldaccesstext,
+                      \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
             $env{'form.clastname'}   ne $userenv{'lastname'}   ||
@@ -1927,18 +2093,41 @@ sub update_user_data {
             $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} ) {
             $namechanged = 1;
         }
-        if ($namechanged || $quotachanged) {
+        if (($namechanged) || (keys(%changed) > 0)) {
             $changeHash{'firstname'}  = $env{'form.cfirstname'};
             $changeHash{'middlename'} = $env{'form.cmiddlename'};
             $changeHash{'lastname'}   = $env{'form.clastname'};
             $changeHash{'generation'} = $env{'form.cgeneration'};
             $changeHash{'id'}         = $env{'form.cid'};
             $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
-            my ($quotachgresult,$namechgresult);
-            if ($quotachanged) {
-                $quotachgresult = 
+            my ($chgresult,$namechgresult);
+            if (keys(%changed) > 0) {
+                $chgresult = 
                     &Apache::lonnet::put('environment',\%changeHash,
                                   $env{'form.ccdomain'},$env{'form.ccuname'});
+                if ($chgresult eq 'ok') {
+                    if (($env{'user.name'} eq $env{'form.ccuname'}) &&
+                        ($env{'user.domain'} eq $env{'form.ccdomain'})) {
+                        my %newenvhash;
+                        foreach my $key (keys(%changed)) {
+                            if (($key eq 'official') || ($key eq 'unofficial')) {
+                                $newenvhash{'environment.canrequest.'.$key} =
+                                    $changeHash{'requestcourse.'.$key};
+                                $newenvhash{'environment.canrequest.'.$key} =
+                                    $changeHash{'requestcourse.'.$key};
+
+                            } elsif ($key ne 'quota') {
+                                $newenvhash{'environment.tools.'.$key} = 
+                                    $changeHash{'tools.'.$key};
+                                $newenvhash{'environment.availabletools.'.$key} =
+                                    $changeHash{'tools.'.$key};
+                            }
+                        }
+                        if (keys(%newenvhash)) {
+                            &Apache::lonnet::appenv(\%newenvhash);
+                        }
+                    }
+                }
             }
             if ($namechanged) {
             # Make the change
@@ -1957,19 +2146,24 @@ sub update_user_data {
                              );
             }
             if (($namechanged && $namechgresult eq 'ok') || 
-                ($quotachanged && $quotachgresult eq 'ok')) {
+                ((keys(%changed) > 0) && $chgresult eq 'ok')) {
             # Tell the user we changed the name
 		my %lt=&Apache::lonlocal::texthash(
-                             'uic'  => "User Information Changed",             
-                             'frst' => "first",
-                             'mddl' => "middle",
-                             'lst'  => "last",
-			     'gen'  => "generation",
-                             'id'   => "ID/Student number",
-                             'mail' => "permanent e-mail",
-                             'disk' => "disk space allocated to portfolio files",
-                             'prvs' => "Previous",
-                             'chto' => "Changed To"
+                             'uic'        => "User Information Changed",             
+                             'frst'       => "First",
+                             'mddl'       => "Middle",
+                             'lst'        => "Last",
+			     'gen'        => "Generation",
+                             'id'         => "Student/Employee ID",
+                             'mail'       => "Permanent E-mail",
+                             'disk'       => "Disk space allocated to portfolio files",
+                             'blog'       => "Blog Availability",
+                             'aboutme'    => "Home Page Availability",
+                             'portfolio'  => "Portfolio Availability",
+                             'official'   => "Can Request Official Courses",
+                             'unofficial' => "Can Request Unofficial Courses",
+                             'prvs'       => "Previous",
+                             'chto'       => "Changed To"
 						   );
                 $r->print('<h4>'.$lt{'uic'}.'</h4>'.
                           &Apache::loncommon::start_data_table().
@@ -1983,10 +2177,22 @@ sub update_user_data {
     <th>$lt{'id'}</th>
     <th>$lt{'mail'}</th>
 END
+                if ($showrequestcourses) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <th>$lt{$item}</th>\n");
+                    }
+                }
                 if ($showquota) {
                     $r->print("
     <th>$lt{'disk'}</th>\n");
                 }
+                if ($showtools) {
+                    foreach my $item (@usertools) {
+                        $r->print("
+    <th>$lt{$item}</th>\n");
+                    }
+                }
                 $r->print(&Apache::loncommon::end_data_table_header_row().
                           &Apache::loncommon::start_data_table_row());
                 $r->print(<<"END");
@@ -1998,14 +2204,26 @@ END
     <td>$userenv{'id'}</td>
     <td>$userenv{'permanentemail'} </td>
 END
+                if ($showrequestcourses) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
+                    }
+                }
                 if ($showquota) {
                     $r->print("
     <td>$oldportfolioquota Mb $olddefquotatext </td>\n");
                 }
+                if ($showtools) {
+                    foreach my $item (@usertools) {
+                        $r->print("
+    <td>$oldaccess{$item} $oldaccesstext{$item} </td>\n");
+                    }
+                }
                 $r->print(&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::start_data_table_row());
                 $r->print(<<"END");
-    <td><b>$lt{'chto'}</b></td>
+    <td><span class="LC_nobreak"><b>$lt{'chto'}</b></span></td>
     <td>$env{'form.cfirstname'}  </td>
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
@@ -2013,10 +2231,22 @@ END
     <td>$env{'form.cid'} </td>
     <td>$env{'form.cpermanentemail'} </td>
 END
+                if ($showrequestcourses) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
+                    }
+                }
                 if ($showquota) {
                     $r->print("
     <td>$newportfolioquota Mb $newdefquotatext </td>\n");
                 }
+                if ($showtools) {
+                    foreach my $item (@usertools) {
+                        $r->print("
+    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
+                    }
+                }
                 $r->print(&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().'<br />');
                 if ($env{'form.cid'} ne $userenv{'id'}) {
@@ -2045,12 +2275,18 @@ END
                       $env{'form.ccdomain'}.'</span><br />');
             }
         }  else { # End of if ($env ... ) logic
-            # They did not want to change the users name or quota but we can
-            # still tell them what the name and quota are 
+            # They did not want to change the users name, quota, tool availability,
+            # or ability to request creation of courses, 
+            # but we can still tell them what the name and quota and availabilities are  
 	    my %lt=&Apache::lonlocal::texthash(
-                           'id'   => "ID/Student number",
-                           'mail' => "Permanent e-mail",
-                           'disk' => "Disk space allocated to user's portfolio files",
+                           'id'         => "Student/Employee ID",
+                           'mail'       => "Permanent e-mail",
+                           'disk'       => "Disk space allocated to user's portfolio files",
+                           'blog'       => "Blog Availability",
+                           'aboutme'    => "Home Page Availability",
+                           'portfolio'  => "Portfolio Availability",
+                           'official'   => "Can Request Official Courses",
+                           'unofficial' => "Can Request Unofficial Course",
 					       );
             $r->print(<<"END");
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
@@ -2059,8 +2295,20 @@ END
                 $r->print('<br />['.$lt{'mail'}.': '.
                           $userenv{'permanentemail'}.']');
             }
+            if ($showrequestcourses) {
+                foreach my $item (@requestcourses) {
+                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
+                              $newaccesstext{$item}.']'."\n");
+                }
+            }
+            if ($showtools) {
+                foreach my $item (@usertools) {
+                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
+                              $newaccesstext{$item}.']'."\n");
+                }
+            }
             if ($showquota) {
-                $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. 
+                $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '.
                           $olddefquotatext.']');
             }
             $r->print('</h4>');
@@ -2091,8 +2339,10 @@ END
             $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
                       &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
         }
-        $r->print($no_forceid_alert.
-                  &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules));
+        $r->print('<span class="LC_warning">'
+                  .$no_forceid_alert
+                  .&Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules)
+                  .'</span>');
     }
     if ($env{'form.action'} eq 'singlestudent') {
         &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
@@ -2129,6 +2379,83 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub tool_changes {
+    my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash,
+        $changed,$newaccess,$newaccesstext) = @_;
+    if (!((ref($usertools) eq 'ARRAY') && (ref($oldaccess) eq 'HASH') &&
+          (ref($oldaccesstext) eq 'HASH') && (ref($userenv) eq 'HASH') &&
+          (ref($changeHash) eq 'HASH') && (ref($changed) eq 'HASH') &&
+          (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
+        return;
+    }
+    foreach my $tool (@{$usertools}) {
+        if ($userenv->{$context.'.'.$tool} ne '') {
+            $oldaccess->{$tool} = &mt('custom');
+            if ($userenv->{$context.'.'.$tool}) {
+                $oldaccesstext->{$tool} = &mt("availability set to 'on'");
+            } else {
+                $oldaccesstext->{$tool} = &mt("availability set to 'off'");
+            }
+            $changeHash->{$context.'.'.$tool} = $userenv->{'tools.'.$tool};
+            if ($env{'form.custom'.$tool} == 1) {
+                if ($env{'form.'.$context.'_'.$tool} ne $userenv->{'tools.'.$tool}) {
+                    $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+                                                  $changeHash,$context);
+                    if ($changed->{$tool}) {
+                        $newaccess->{$tool} = &mt('custom');
+                        if ($env{'form.'.$context.'_'.$tool}) {
+                            $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                        } else {
+                            $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                        }
+                    } else {
+                        $newaccess->{$tool} = $oldaccess->{$tool};
+                        if ($userenv->{$context.'.'.$tool}) {
+                            $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                        } else {
+                            $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                        }
+                    }
+                } else {
+                    $newaccess->{$tool} = $oldaccess->{$tool};
+                    $newaccesstext->{$tool} = $oldaccesstext->{$tool};
+                }
+            } else {
+                $changed->{$tool} = &tool_admin($tool,'',$changeHash,$context);
+                if ($changed->{$tool}) {
+                    $newaccess->{$tool} = &mt('default');
+                } else {
+                    $newaccess->{$tool} = $oldaccess->{$tool};
+                    if ($userenv->{$context.'.'.$tool}) {
+                         $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                    } else {
+                         $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                    }
+                }
+            }
+        } else {
+            $oldaccess->{$tool} = &mt('default');
+            if ($env{'form.custom'.$tool} == 1) {
+                $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+                                                $changeHash,$context);
+                if ($changed->{$tool}) {
+                    $newaccess->{$tool} = &mt('custom');
+                    if ($env{'form.'.$context.'_'.$tool}) {
+                        $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                    } else {
+                        $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                    }
+                } else {
+                    $newaccess->{$tool} = $oldaccess->{$tool};
+                }
+            } else {
+                $newaccess->{$tool} = $oldaccess->{$tool};
+            }
+        }
+    }
+    return;
+}
+
 sub update_roles {
     my ($r,$context) = @_;
     my $now=time;
@@ -2234,8 +2561,8 @@ sub update_roles {
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
                                $env{'form.ccuname'},$url,$role,0,$now,'','',
                                $context);
-		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
-			      $role,$url,$result).'<br />';
+		    $output = &mt('Re-enabling [_1] in [_2]: [_3]',
+			      $role,$url,'<b>'.$result.'</b>').'<br />';
 		}
                 $r->print($output);
                 if (!grep(/^\Q$role\E$/,@rolechanges)) {
@@ -2248,8 +2575,8 @@ sub update_roles {
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
                                $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
-                $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
-                          $rolename,$rnam,$rdom,$url,$result).'<br />');
+                $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]',
+                          $rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />');
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
                 }
@@ -2371,12 +2698,18 @@ sub update_roles {
 		$r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />');
             }
             foreach my $key (sort(keys(%disallowed))) {
+                $r->print('<p class="LC_warning">');
                 if (($key eq 'none') || ($key eq 'all')) {  
-                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));
+                    $r->print(&mt('[_1] may not be used as the name for a section, as it is a reserved word.','<tt>'.$key.'</tt>'));
                 } else {
-                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));
+                    $r->print(&mt('[_1] may not be used as the name for a section, as it is the name of a course group.','<tt>'.$key.'</tt>'));
                 }
-                $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
+                $r->print('</p><p>'
+                         .&mt('Please [_1]go back[_2] and choose a different section name.'
+                             ,'<a href="javascript:history.go(-1)'
+                             ,'</a>')
+                         .'</p><br />'
+                );
             }
 	}
     } # End of foreach (keys(%env))
@@ -2478,12 +2811,35 @@ sub quota_admin {
     my $quotachanged;
     if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
         # Current user has quota modification privileges
-        $quotachanged = 1;
-        $changeHash->{'portfolioquota'} = $setquota;
+        if (ref($changeHash) eq 'HASH') {
+            $quotachanged = 1;
+            $changeHash->{'portfolioquota'} = $setquota;
+        }
     }
     return $quotachanged;
 }
 
+sub tool_admin {
+    my ($tool,$settool,$changeHash,$context) = @_;
+    my $canchange = 0; 
+    if ($context eq 'requestcourse') {
+        if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
+            $canchange = 1;
+        }
+    } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
+        # Current user has quota modification privileges
+        $canchange = 1;
+    }
+    my $toolchanged;
+    if ($canchange) {
+        if (ref($changeHash) eq 'HASH') {
+            $toolchanged = 1;
+            $changeHash->{$context.'.'.$tool} = $settool;
+        }
+    }
+    return $toolchanged;
+}
+
 sub build_roles {
     my ($sectionstr,$sections,$role) = @_;
     my $num_sections = 0;
@@ -2593,7 +2949,7 @@ sub custom_role_editor {
     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);
+        $button_code .= &make_button_code($role).' ';
     }
     $head_script .= "\n".$jsback."\n".'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
@@ -2613,10 +2969,15 @@ sub custom_role_editor {
 		    'crl'  => "Course Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
-    $r->print(&mt('Select a Template').'<br />');
-    $r->print('<form action="">');
-    $r->print($button_code);
-    $r->print('</form>');
+
+    $r->print('<div>'
+             .'<form action=""><fieldset>'
+             .'<legend>'.&mt('Select a Template').'</legend>'
+             .$button_code
+             .'</fieldset></form>'
+             .'</div>'
+    );
+
     $r->print(<<ENDCCF);
 <form name="form1" method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />
@@ -2676,34 +3037,35 @@ sub make_script_template {
         my ($priv_item, $dummy) = split(/\&/,$priv);
         $role_c{$priv_item} = 1;
     }
+    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;
+    }
+    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_c)) {
         my ($priv, $dummy) = split(/\&/,$priv_item);
-        if (exists($role_c{$priv})) {
+        if ((exists($role_c{$priv})) || (exists($role_d{$priv})) || 
+            (exists($role_s{$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})) {
+        if ((exists($role_d{$priv})) || (exists($role_s{$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})) {
@@ -2719,7 +3081,7 @@ sub make_script_template {
 sub make_button_code {
     my ($role) = @_;
     my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';    
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3112,102 +3474,127 @@ sub print_main_menu {
                                    listusers => 'Display Co-authors and Manage Multiple Users',
                                  },
                        course => {
-                                   upload => 'Upload a File of Course Users',
-                                   singleuser => 'Add/Modify a Single Course User',
-                                   listusers => 'Display Class Lists and Manage Multiple Users',
+                                   upload => 'File of Course Users',
+                                   singleuser => 'Single Course User',
+                                   listusers => 'Course User Lists',
                                  },
                      );
-    my @menu =
-        (
-          { text => $links{$context}{'upload'},
-            help => 'Course_Create_Class_List',
-            action => 'upload',
-            permission => $permission->{'cusr'},
-            },
-          { text => $links{$context}{'singleuser'}, 
-            help => 'Course_Change_Privileges',
-            action => 'singleuser',
-            permission => $permission->{'cusr'},
-            },
-          { text => $links{$context}{'listusers'},
-            help => 'Course_View_Class_List',
-            action => 'listusers',
-            permission => ($permission->{'view'} || $permission->{'cusr'}),
-          },
-        );
-    if ($context eq 'domain' || $context eq 'course') {
-        my $customlink =  { text => 'Edit Custom Roles',
-                            help => 'Course_Editing_Custom_Roles',
-                            action => 'custom',
-                            permission => $permission->{'custom'},
-                          };
-        push(@menu,$customlink);
-    }
-    if ($context eq 'course') {
-        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-        my @courselinks =
-            (
-              { text => 'Enroll a Single Student',
-                 help => 'Course_Add_Student',
-                 action => 'singlestudent',
-                 permission => $permission->{'cusr'},
-                 },
-              { text => 'Drop Students',
-                help => 'Course_Drop_Student',
-                action => 'drop',
-                permission => $permission->{'cusr'},
-              });
-        if (!exists($permission->{'cusr_section'})) {
-            push(@courselinks,
-               { text => 'Automated Enrollment Manager',
-                 help => 'Course_Automated_Enrollment',
-                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                && $permission->{'cusr'}),
-                 url  => '/adm/populate',
-                 },
-               { text => 'Configure User Self-enrollment',
-                 help => 'Course_Self_Enrollment',
-                 action => 'selfenroll',
-                 permission => $permission->{'cusr'},    
-               });
-        }
-        push(@courselinks,
-               { text => 'Manage Course Groups',
-                 help => 'Course_Manage_Group',
-                 permission => $permission->{'grp_manage'},
-                 url => '/adm/coursegroups?refpage=cusr',
-               },
-               { text => 'View Change Logs',
-                 help => 'Course_User_Logs',
-                 action => 'changelogs',
-                 permission => $permission->{'cusr'},
-               },);
+  my @menu = ( {categorytitle => 'Add Users',
+	     items =>
+	     [{
+	         linktext => $links{$context}{'upload'},
+	         icon => 'sctr.png',
+	         #help => 'Course_Create_Class_List',
+	         url => '/adm/createuser?action=upload',
+	         permission => $permission->{'cusr'},
+	         linktitle => 'Upload a CSV or a text file containing users.',
+	     },
+	     {
+	         linktext => $links{$context}{'singleuser'},
+	         icon => 'edit-redo.png',
+	         #help => 'Course_Change_Privileges',
+	         url => '/adm/createuser?action=singleuser',
+	         permission => $permission->{'cusr'},
+	         linktitle => 'Add a user with a certain role to this course.',
+	     }]},
+	     {categorytitle => 'Administration',
+	     items =>
+	     [{	
+	         linktext => $links{$context}{'listusers'},
+                 icon => 'edit-find.png',
+                 #help => 'Course_View_Class_List',
+                 url => '/adm/createuser?action=listusers',
+	         permission => ($permission->{'view'} || $permission->{'cusr'}),
+	         linktitle => 'Show and manage users of this course.',
+	     }]},
+	     {categorytitle => 'Configuration',
+	     items =>
+	     [
+	     ]},
+	   );
+			
+    if ($context eq 'domain'){
+		
+		push(@{ $menu[1]->{items} },
+		{	linktext => 'Custom Roles',
+			icon => 'emblem-photos.png',
+			#help => 'Course_Editing_Custom_Roles',
+			url => '/adm/createuser?action=custom',
+			permission => $permission->{'custom'},
+			linktitle => 'Configure a custom role.',
+		});
+		
+    }elsif ($context eq 'course'){
+    	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+	
+        push(@{ $menu[0]->{items} },
+		{	linktext => 'Single Student',
+            		#help => 'Course_Add_Student',
+			icon => 'list-add.png',
+            		url => '/adm/createuser?action=singlestudent',
+			permission => $permission->{'cusr'},
+            		linktitle => 'Add a user with the role student to this course.',
+        	});
+		
+        push(@{ $menu[1]->{items} },  
+		{	linktext => 'Drop Students',
+			icon => 'edit-undo.png',
+           		#help => 'Course_Drop_Student',
+           		url => '/adm/createuser?action=drop',
+			permission => $permission->{'cusr'},
+           		linktitle =>'Remove a student from this course.',
+        	},
+		{	linktext => 'Custom Roles',
+			icon => 'emblem-photos.png',
+           		#help => 'Course_Editing_Custom_Roles',
+           		url => '/adm/createuser?action=custom',
+			permission => $permission->{'custom'},
+			linktitle => 'Configure a custom role.',
+        	});
+		
+        if (!exists($permission->{'cusr_section'})){
+        	
+		push(@{ $menu[2]->{items} },
+		{	linktext => 'Automated Enrollment',
+			icon => 'roles.png',
+         		#help => 'Course_Automated_Enrollment',
+        		permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                	&& $permission->{'cusr'}),
+			url  => '/adm/populate',
+			linktitle => 'Automated enrollment manager.',
+		},
+		{	linktext => 'User Self-Enrollment',
+			icon => 'cstr.png',
+	       		#help => 'Course_Self_Enrollment',
+			url => '/adm/createuser?action=selfenroll',
+			permission => $permission->{'cusr'},
+			linktitle => 'Configure user self enrollment.',
+       		});
+		
+	}
+
+	push(@{ $menu[2]->{items} },
+	{	linktext => 'Course Groups',
+		icon => 'conf.png',
+        	#help => 'Course_Manage_Group',
+           	url => '/adm/coursegroups?refpage=cusr',
+		permission => $permission->{'grp_manage'},
+		linktitle => 'Manage course groups.',
+        },
+        {	linktext => 'Change Logs',
+		icon => 'document-properties.png',
+        	#help => 'Course_User_Logs',
+        	url => '/adm/createuser?action=changelogs',
+		permission => $permission->{'cusr'},
+		linktitle => 'View change log.',
+        });
+    };
+return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
 #                 action => 'logins',
 #                 permission => $permission->{'cusr'},
 #               });
-        push(@menu,@courselinks);
-    }
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-        next if (! $menu_item->{'permission'});
-        $menu_html.='<p>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='<font size="+1">';
-        if (exists($menu_item->{'url'})) {
-            $menu_html.=qq{<a href="$menu_item->{'url'}">};
-        } else {
-            $menu_html.=
-                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
-        }
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        $menu_html.='</p>';
-    }
-    return $menu_html;
 }
 
 sub restore_prev_selections {
@@ -3565,6 +3952,95 @@ ENDSCRIPT
                            '<input type="hidden" name="sections" value="" />'."\n".
                            '<input type="hidden" name="state" value="done" />'."\n".
                            '</td></tr></table>'."\n";
+            } elsif ($item eq 'approval') {
+                my ($appon,$appoff);
+                my $cid = $env{'request.course.id'};
+                my $currnotified = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
+                if ($env{'course.'.$cid.'.internal.selfenroll_approval'}) {
+                    $appon = ' checked="checked" ';
+                    $appoff = ' ';
+                } else {
+                    $appon = ' ';
+                    $appoff = ' checked="checked" ';
+                }
+                $output .= '<label>'.
+                           '<input type="radio" name="selfenroll_approval" value="1"'.$appon.'/>'.
+                           &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
+                           '<input type="radio" name="selfenroll_approval" value="0"'.$appoff.'/>'.
+                           &mt('No').'</label>';
+                my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
+                my (@ccs,%notified);
+                if ($advhash{'cc'}) {
+                    @ccs = split(/,/,$advhash{'cc'});
+                }
+                if ($currnotified) {
+                    foreach my $current (split(/,/,$currnotified)) {
+                        $notified{$current} = 1;
+                        if (!grep(/^\Q$current\E$/,@ccs)) {
+                            push(@ccs,$current);
+                        }
+                    }
+                }
+                if (@ccs) {
+                    $output .= '<br />'.&mt('Personnel to be notified when a self-enrollment request needs approval, or has been approved:').'&nbsp;'.&Apache::loncommon::start_data_table().
+                               &Apache::loncommon::start_data_table_row();
+                    my $count = 0;
+                    my $numcols = 4;
+                    foreach my $cc (sort(@ccs)) {
+                        my $notifyon;
+                        my ($ccuname,$ccudom) = split(/:/,$cc);
+                        if ($notified{$cc}) {
+                            $notifyon = ' checked="checked" ';
+                        }
+                        if ($count && !$count%$numcols) {
+                            $output .= &Apache::loncommon::end_data_table_row().
+                                       &Apache::loncommon::start_data_table_row()
+                        }
+                        $output .= '<td><span class="LC_nobreak"><label>'.
+                                   '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'.
+                                   &Apache::loncommon::plainname($ccuname,$ccudom).
+                                   '</label></span></td>';
+                        $count;
+                    }
+                    my $rem = $count%$numcols;
+                    if ($rem) {
+                        my $emptycols = $numcols - $rem;
+                        for (my $i=0; $i<$emptycols; $i++) { 
+                            $output .= '<td>&nbsp;</td>';
+                        }
+                    }
+                    $output .= &Apache::loncommon::end_data_table_row().
+                               &Apache::loncommon::end_data_table();
+                }
+            } elsif ($item eq 'limit') {
+                my ($crslimit,$selflimit,$nolimit);
+                my $cid = $env{'request.course.id'};
+                my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'};
+                my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
+                my $nolimit = ' checked="checked" ';
+                if ($currlim eq 'allstudents') {
+                    $crslimit = ' checked="checked" ';
+                    $selflimit = ' ';
+                    $nolimit = ' ';
+                } elsif ($currlim eq 'selfenrolled') {
+                    $crslimit = ' ';
+                    $selflimit = ' checked="checked" ';
+                    $nolimit = ' '; 
+                } else {
+                    $crslimit = ' ';
+                    $selflimit = ' ';
+                }
+                $output .= '<table><tr><td><label>'.
+                           '<input type="radio" name="selfenroll_limit" value="0"'.$nolimit.'/>'.
+                           &mt('No limit').'</label></td><td><label>'.
+                           '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'.
+                           &mt('Limit by total students').'</label></td><td><label>'.
+                           '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'.
+                           &mt('Limit by total self-enrolled students').
+                           '</td></tr><tr>'.
+                           '<td>&nbsp;</td><td colspan="2"><span class="LC_nobreak">'.
+                           ('&nbsp;'x3).&mt('Maximum number allowed: ').
+                           '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>';
             }
             $output .= &Apache::lonhtmlcommon::row_closure(1);
         }
@@ -3597,9 +4073,9 @@ sub visible_in_cat {
                    dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
                    dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
     );
-    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/parmset?action=crsenv">','</a>');
-    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','<a href="/adm/parmset?action=crsenv">','</a>');
-    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','<a href="/adm/parmset?action=crsenv">','</a>');
+    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','"<a href="/adm/parmset?action=crsenv">','</a>"');
+    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/parmset?action=crsenv">','</a>"');
+    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','"<a href="/adm/parmset?action=crsenv">','</a>"');
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
             $settable{'togglecats'} = 1;
@@ -3609,16 +4085,16 @@ sub visible_in_cat {
         }
         $cathash = $domconf{'coursecategories'}{'cats'};
     }
-    if ($settable{'togglecats'} && $settable{'categories'}) {
-        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
+    if ($settable{'togglecats'} && $settable{'categorize'}) {
+        $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');   
     } elsif ($settable{'togglecats'}) {
-        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
-    } elsif ($settable{'categories'}) {
-        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
+        $cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.'); 
+    } elsif ($settable{'categorize'}) {
+        $cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');  
     } else {
-        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
+        $cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.'); 
     }
-
+     
     my %currsettings =
         &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
                              $cdom,$cnum);
@@ -3628,7 +4104,7 @@ sub visible_in_cat {
             $cathash = $domconf{'coursecategories'}{'cats'};
             if (ref($cathash) eq 'HASH') {
                 if ($cathash->{'instcode::0'} eq '') {
-                    push(@vismsgs,'dc_addinst');
+                    push(@vismsgs,'dc_addinst'); 
                 } else {
                     $visible = 1;
                 }
@@ -3667,7 +4143,7 @@ sub visible_in_cat {
                         }
                     }
                     if (!$matched) {
-                        if ($settable{'categories'}) {
+                        if ($settable{'categorize'}) { 
                             push(@vismsgs,'chgcat');
                         } else {
                             push(@vismsgs,'dc_chgcat');
@@ -3678,9 +4154,9 @@ sub visible_in_cat {
         }
     } else {
         if (ref($cathash) eq 'HASH') {
-            if ((keys(%{$cathash}) > 1) ||
+            if ((keys(%{$cathash}) > 1) || 
                 (keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
-                if ($settable{'categories'}) {
+                if ($settable{'categorize'}) {
                     push(@vismsgs,'addcat');
                 } else {
                     push(@vismsgs,'dc_addcat');
@@ -3738,13 +4214,14 @@ sub selfenroll_inst_types {
                 $output .= '</tr><tr>';
             }
             if (defined($usertypes->{$type})) {
+                my $esc_type = &escape($type);
                 $output .= '<td><span class="LC_nobreak"><label><input type = "checkbox" value="'.
-                           $type.'" ';
+                           $esc_type.'" ';
                 if (ref($currinsttypes) eq 'ARRAY') {
                     if (@{$currinsttypes} > 0) {
                         if (grep(/^any$/,@{$currinsttypes})) {
                             $output .= 'checked="checked"';
-                        } elsif (grep(/^\Q$type\E$/,@{$currinsttypes})) {
+                        } elsif (grep(/^\Q$esc_type\E$/,@{$currinsttypes})) {
                             $output .= 'checked="checked"';
                         }
                     } else {
@@ -4405,10 +4882,30 @@ sub build_search_response {
                     &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context);
                 if ($cancreate) {
                     my $showdom = &display_domain_info($env{'request.role.domain'}); 
-                    $response .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />';
+                    $response .= '<br /><br />'
+                                .'<b>'.&mt('To add a new user:').'</b>'
+                                .'<br />'
+                                .&mt("(You can only create new users in your current role's domain - [_1])"
+                                    ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
+                                .'<ul><li>'
+                                .&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')
+                                .'</li><li>'
+                                .&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')
+                                .'</li><li>'
+                                .&mt('Provide the proposed username')
+                                .'</li><li>'
+                                .&mt("Click 'Search'")
+                                .'</li></ul><br />';
                 } else {
                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
-                    $response .= '<br /><br />'.&mt("You are not authorized to create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>.",$env{'request.role.domain'}).'<br />'.&mt('Contact the <a[_1]>helpdesk</a> if you need to create a new user.',$helplink).'<br /><br />';
+                    $response .= '<br /><br />'
+                                .&mt("You are not authorized to create new users in your current role's domain - [_1]."
+                                    ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
+                                .'<br />'
+                                .&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.'
+                                    ,' <a'.$helplink.'>'
+                                    ,'</a>')
+                                .'<br /><br />';
                 }
             }
         }
@@ -4734,8 +5231,9 @@ sub update_selfenroll_config {
                             my $othervalue = 'any';
                             if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
                                 if (@{$types} > 0) {
+                                    my @esc_types = map { &escape($_); } @{$types};
                                     $othervalue = 'other';
-                                    $typestr = join(',',(@{$types},$othervalue));
+                                    $typestr = join(',',(@esc_types,$othervalue));
                                 }
                                 $typestr = $othervalue;
                             } else {
@@ -4750,6 +5248,74 @@ sub update_selfenroll_config {
                         $changes{'internal.selfenroll_types'} = $selfenroll_types;
                     }
                 }
+            } elsif ($item eq 'limit') {
+                my $newlimit = $env{'form.selfenroll_limit'};
+                my $newcap = $env{'form.selfenroll_cap'};
+                $newcap =~s/\s+//g;
+                my $currlimit =  $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+                $currlimit = 'none' if ($currlimit eq '');
+                my $currcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+                if ($newlimit ne $currlimit) {
+                    if ($newlimit ne 'none') {
+                        if ($newcap =~ /^\d+$/) {
+                            if ($newcap ne $currcap) {
+                                $changes{'internal.selfenroll_cap'} = $newcap;
+                            }
+                            $changes{'internal.selfenroll_limit'} = $newlimit;
+                        } else {
+                            $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); 
+                        }
+                    } elsif ($currcap ne '') {
+                        $changes{'internal.selfenroll_cap'} = '';
+                        $changes{'internal.selfenroll_limit'} = $newlimit; 
+                    }
+                } elsif ($currlimit ne 'none') {
+                    if ($newcap =~ /^\d+$/) {
+                        if ($newcap ne $currcap) {
+                            $changes{'internal.selfenroll_cap'} = $newcap;
+                        }
+                    } else {
+                        $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
+                    }
+                }
+            } elsif ($item eq 'approval') {
+                my (@currnotified,@newnotified);
+                my $currapproval = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
+                my $currnotifylist = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+                if ($currnotifylist ne '') {
+                    @currnotified = split(/,/,$currnotifylist);
+                    @currnotified = sort(@currnotified);
+                }
+                my $newapproval = $env{'form.selfenroll_approval'};
+                @newnotified = &Apache::loncommon::get_env_multiple('form.selfenroll_notify');
+                @newnotified = sort(@newnotified);
+                if ($newapproval ne $currapproval) {
+                    $changes{'internal.selfenroll_approval'} = $newapproval;
+                    if (!$newapproval) {
+                        if ($currnotifylist ne '') {
+                            $changes{'internal.selfenroll_notifylist'} = '';
+                        }
+                    } else {
+                        my @differences =  
+                            &compare_arrays(\@currnotified,\@newnotified);
+                        if (@differences > 0) {
+                            if (@newnotified > 0) {
+                                $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+                            } else {
+                                $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+                            }
+                        }
+                    }
+                } else {
+                    my @differences = &compare_arrays(\@currnotified,\@newnotified);
+                    if (@differences > 0) {
+                        if (@newnotified > 0) {
+                            $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
+                        } else {
+                            $changes{'internal.selfenroll_notifylist'} = '';
+                        }
+                    }
+                }
             } else {
                 my $curr_val = 
                     $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
@@ -4761,7 +5327,7 @@ sub update_selfenroll_config {
                         $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct');
                     } elsif ($newval eq 'all') {
                         $newval = $curr_val;
-                        $warning{$item} = &mt("Section for self-enrolled users unchanged, as 'all' is a reserved section name.");
+                        $warning{$item} = &mt('Section for self-enrolled users unchanged, as "all" is a reserved section name.');
                     }
                     if ($newval eq '') {
                         $newval = 'none';
@@ -4822,6 +5388,62 @@ sub update_selfenroll_config {
                                           $title,$type,$newdate).'</li>');
                             }
                         }
+                    } elsif ($item eq 'limit') {
+                        if ((exists($changes{'internal.selfenroll_limit'})) ||
+                            (exists($changes{'internal.selfenroll_cap'}))) {
+                            my ($newval,$newcap);
+                            if ($changes{'internal.selfenroll_cap'} ne '') {
+                                $newcap = $changes{'internal.selfenroll_cap'}
+                            } else {
+                                $newcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+                            }
+                            if ($changes{'internal.selfenroll_limit'} eq 'none') {
+                                $newval = &mt('No limit');
+                            } elsif ($changes{'internal.selfenroll_limit'} eq 
+                                     'allstudents') {
+                                $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
+                            } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
+                                $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap);
+                            } else {
+                                my $currlimit =  $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+                                if ($currlimit eq 'allstudents') {
+                                    $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
+                                } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
+                                    $newval =  &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap);
+                                }
+                            }
+                            $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");
+                        }
+                    } elsif ($item eq 'approval') {
+                        if ((exists($changes{'internal.selfenroll_approval'})) ||
+                            (exists($changes{'internal.selfenroll_notifylist'}))) {
+                            my ($newval,$newnotify);
+                            if (exists($changes{'internal.selfenroll_notifylist'})) {
+                                $newnotify = $changes{'internal.selfenroll_notifylist'};
+                            } else {   
+                                $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+                            }
+                            if ($changes{'internal.selfenroll_approval'}) {
+                                $newval = &mt('Yes');
+                            } elsif ($changes{'internal.selfenroll_approval'} eq '0') {
+                                $newval = &mt('No');
+                            } else {
+                                my $currapproval = 
+                                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
+                                if ($currapproval) {
+                                    $newval = &mt('Yes');
+                                } else {
+                                    $newval = &mt('No');
+                                }
+                            }
+                            $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval));
+                            if ($newnotify) {
+                                $r->print('<br />'.&mt('The following will be notified when a self-enrollment request needs approval, or has been approved: [_1].',$newnotify));
+                            } else {
+                                $r->print('<br />'.&mt('No notifications sent when a self-enrollment request needs approval, or has been approved.'));
+                            }
+                            $r->print('</li>'."\n");
+                        }
                     } else {
                         if (exists($changes{'internal.selfenroll_'.$item})) {
                             my $newval = $changes{'internal.selfenroll_'.$item};
@@ -4871,18 +5493,37 @@ sub update_selfenroll_config {
             }
             $r->print($cansetvis);
         }
-    }
+    } 
     return;
 }
 
+sub compare_arrays {
+    my ($arrayref1,$arrayref2) = @_;
+    my (@difference,%count);
+    @difference = ();
+    %count = ();
+    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { 
+        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
+        foreach my $element (keys(%count)) {
+            if ($count{$element} == 1) {
+                push(@difference,$element);
+            }
+        }
+    }
+    return @difference;
+}
+
 sub get_selfenroll_titles {
-    my @row = ('types','registered','enroll_dates','access_dates','section');
+    my @row = ('types','registered','enroll_dates','access_dates','section',
+               'approval','limit');
     my %lt = &Apache::lonlocal::texthash (
                 types        => 'Users allowed to self-enroll in this course',
                 registered   => 'Restrict self-enrollment to students officially registered for the course',
                 enroll_dates => 'Dates self-enrollment available',
                 access_dates => 'Course access dates assigned to self-enrolling users',
                 section      => 'Section assigned to self-enrolling users',
+                approval     => 'Self-enrollment requests need approval?',
+                limit        => 'Enrollment limit',
              );
     return (\@row,\%lt);
 }