--- loncom/interface/loncreateuser.pm	2009/09/14 21:50:04	1.268.4.2
+++ loncom/interface/loncreateuser.pm	2009/03/05 10:25:10	1.284
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.268.4.2 2009/09/14 21:50:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.284 2009/03/05 10:25:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,18 +124,10 @@ sub portfolio_quota {
     my ($ccuname,$ccdomain) = @_;
     my %lt = &Apache::lonlocal::texthash(
                    'usrt'      => "User Tools",
-                   'blog'      => "Personal User Blog",
-                   'aboutme'   => "Personal Information Page",
-                   'portfolio' => "Personal User Portfolio",
-                   'avai'      => "Available",
-                   'cusa'      => "availability",
-                   'chse'      => "Change setting",
                    'disk'      => "Disk space allocated to user's portfolio files",
                    'cuqu'      => "Current quota",
                    'cust'      => "Custom quota",
                    'defa'      => "Default",
-                   'usde'      => "Use default",
-                   'uscu'      => "Use custom",
                    'chqu'      => "Change quota",
     );
     my ($currquota,$quotatype,$inststatus,$defquota) = 
@@ -191,50 +183,7 @@ END_SCRIPT
                  &Apache::loncommon::start_data_table();
 
     if (&Apache::lonnet::allowed('mut',$ccdomain)) {
-        my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
-                          'tools.aboutme','tools.portfolio','tools.blog');
-        my @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);
-            if ($userenv{'tools.'.$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{'tools.'.$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="tools_'.$item.'" value="1" '.
-                       $tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
-                       '<input type="radio" name="tools_'.$item.'" value="0" '.
-                       $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
-                       &Apache::loncommon::end_data_table_row()."\n";
-        }
+        $output .= &build_tools_display($ccuname,$ccdomain,'tools');
     }
     if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
         $output .= '<tr class="LC_info_row">'."\n".
@@ -263,6 +212,76 @@ END_SCRIPT
     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 'requestcourses') {
+        %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
+                      'requestcourses.official','requestcourses.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;
+}
+
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -318,7 +337,7 @@ sub print_username_entry_form {
                     'dom'  => "Domain",
                     'ecrp' => "Edit Custom Role Privileges",
                     'nr'   => "Name of Role",
-                    'cre'  => "Custom Role Editor",
+                    'cre'  => "Next",
 				       );
     $r->print($start_page."\n".$crumbs);
     if ($env{'form.action'} eq 'custom') {
@@ -328,7 +347,7 @@ sub print_username_entry_form {
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="selected_custom_edit" />
 <h3>$lt{'ecrp'}</h3>
-$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
+$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </form>
 ENDCUSTOM
@@ -770,7 +789,7 @@ $lt{'hs'}: $home_server_pick
                     my $authtype = $rules->{$matchedrule}{'authtype'};
                     if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
                         $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
-                    } else {
+                    } else { 
                         my $authparm = $rules->{$matchedrule}{'authparm'};
                         $authmsg = $rules->{$matchedrule}{'authmsg'};
                         if ($authtype =~ /^krb(4|5)$/) {
@@ -848,9 +867,15 @@ 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,'requestcourses').
+                      &Apache::loncommon::end_data_table());
+        }
         $r->print('</div>');
         my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
-        my ($user_quota_text,$user_tools_text);
+        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
@@ -1562,15 +1587,11 @@ sub personal_data_display {
                 }
             } else {
                 if ($context eq 'selfcreate') {
-                    if (($item eq 'permanentemail') && ($newuser eq 'email')) {
-                        $row .= $ccuname;
+                    if ($canmodify{$item}) {
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                        $editable ++;
                     } else {
-                        if ($canmodify{$item}) {
-                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-                            $editable ++;
-                        } else {
-                            $hiderow = 1;
-                        }
+                        $hiderow = 1;
                     }
                 } else {
                     $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
@@ -1703,7 +1724,7 @@ sub update_user_data {
     }
     if (  $env{'form.ccdomain'} ne
 	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
-	$r->print($error.&mt ('Invalid domain name.').'  '.
+	$r->print($error.&mt('Invalid domain name.').'  '.
 		  &mt('Only letters, numbers, periods, dashes, and underscores are valid.').
 		  $end.$rtnlink);
 	return;
@@ -1752,6 +1773,7 @@ sub update_user_data {
 			 $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
@@ -1825,9 +1847,15 @@ sub update_user_data {
             foreach my $item (@usertools) {
                 if ($env{'form.custom'.$item} == 1) {
                     $newcustom{$item} = $env{'form.tools_'.$item};
-                    $changed{$item} = &tool_admin($item,$newcustom{$item},\%changeHash);
+                    $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                                 \%changeHash,'tools');
                 }
             }
+            foreach my $item (@requestcourses) {
+                $newcustom{$item} = $env{'form.requestcourses_'.$item};
+                $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                              \%changeHash,'requestcourses');
+            }
             if (keys(%changed)) {
                 $changeHash{'firstname'}  = $env{'form.cfirstname'};
                 $changeHash{'middlename'} = $env{'form.cmiddlename'};
@@ -1872,7 +1900,8 @@ sub update_user_data {
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
              'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
-             'tools.blog','tools.portfolio'],
+             'tools.blog','tools.portfolio','requestcourses.official',
+             'requestcourses.unofficial'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -2000,13 +2029,16 @@ sub update_user_data {
             $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext);
         my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
-        my ($showquota,$showtools);
+        my ($showquota,$showtools,$showrequestcourses);
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $showquota = 1;
         }
         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 '') {
@@ -2024,7 +2056,7 @@ sub update_user_data {
             } else {
                 $changed{'quota'} = &quota_admin('',\%changeHash);
                 $newportfolioquota = $defquota;
-                $newisdefault = 1; 
+                $newisdefault = 1;
             }
         } else {
             $oldisdefault = 1;
@@ -2048,73 +2080,10 @@ sub update_user_data {
         if ($newisdefault) {
             $newdefquotatext = &get_defaultquota_text($settingstatus);
         }
-        
-        foreach my $tool (@usertools) {
-            if ($userenv{'tools.'.$tool} ne '') {
-                $oldaccess{$tool} = &mt('custom');
-                if ($userenv{'tools_'.$tool}) {
-                    $oldaccesstext{$tool} = &mt("availability set to 'on'");
-                } else {
-                    $oldaccesstext{$tool} = &mt("availability set to 'off'");
-                }
-                $changeHash{'tools.'.$tool} = $userenv{'tools.'.$tool};
-                if ($env{'form.custom'.$tool} == 1) {
-                    if ($env{'form.tools_'.$tool} ne $userenv{'tools.'.$tool}) {
-                        $changed{$tool} = &tool_admin($tool,$env{'form.tools_'.$tool},
-                                                      \%changeHash);
-                        if ($changed{$tool}) {
-                            $newaccess{$tool} = &mt('custom');
-                            if ($env{'form.tools_'.$tool}) { 
-                                $newaccesstext{$tool} = &mt("availability set to 'on'");
-                            } else {
-                                $newaccesstext{$tool} = &mt("availability set to 'off'");
-                            }
-                        } else {
-                            $newaccess{$tool} = $oldaccess{$tool};
-                            if ($userenv{'tools.'.$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);
-                    if ($changed{$tool}) {
-                        $newaccess{$tool} = &mt('default');
-                    } else {
-                        $newaccess{$tool} = $oldaccess{$tool};
-                        if ($userenv{'tools.'.$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.tools_'.$tool},
-                                                  \%changeHash);
-                    if ($changed{$tool}) {
-                        $newaccess{$tool} = &mt('custom');
-                        if ($env{'form.tools_'.$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};
-                }
-            }
-        }
-
+        &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
+                      \%changeHash,\%changed,\%newaccess,\%newaccesstext);
+        &tool_changes('requestcourses',\@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'}   ||
@@ -2140,11 +2109,27 @@ sub update_user_data {
                         ($env{'user.domain'} eq $env{'form.ccdomain'})) {
                         my %newenvhash;
                         foreach my $key (keys(%changed)) {
-                            if ($key ne 'quota') {
+                            if (($key eq 'official') || ($key eq 'unofficial')) {
+                                $newenvhash{'environment.requestcourses.'.$key} =
+                                    $changeHash{'requestcourses.'.$key};
+                                if ($changeHash{'requestcourses.'.$key} ne '') {
+                                    $newenvhash{'environment.canrequest.'.$key} =
+                                        $changeHash{'requestcourses.'.$key};
+                                } else {
+                                    $newenvhash{'environment.canrequest.'.$key} =
+          &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
+                                            $key,'reload','requestcourses');
+                                }
+                            } elsif ($key ne 'quota') {
                                 $newenvhash{'environment.tools.'.$key} = 
                                     $changeHash{'tools.'.$key};
-                                $newenvhash{'environment.availabletools.'.$key} =
-                                    $changeHash{'tools.'.$key};
+                                if ($changeHash{'tools.'.$key} ne '') {
+                                    $newenvhash{'environment.availabletools.'.$key} =
+                                        $changeHash{'tools.'.$key};
+                                } else {
+                                    $newenvhash{'environment.availabletools.'.$key} =
+          &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},                                            $key,'reload','tools');
+                                }
                             }
                         }
                         if (keys(%newenvhash)) {
@@ -2173,19 +2158,21 @@ sub update_user_data {
                 ((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'        => "Student/Employee ID",
-                             'mail'      => "Permanent E-mail",
-                             'disk'      => "Disk space allocated to portfolio files",
-                             'blog'      => "Blog Availability",
-                             'aboutme'   => "Home Page Availability",
-                             'portfolio' => "Portfolio Availability",
-                             'prvs'      => "Previous",
-                             'chto'      => "Changed To"
+                             'uic'        => 'User Information Changed',
+                             'frst'       => 'First Name',
+                             'mddl'       => 'Middle Name',
+                             'lst'        => 'Last Name',
+                             'gen'        => 'Generation',
+                             'id'         => 'Student/Employee ID',
+                             'mail'       => 'Permanent e-mail address',
+                             'disk'       => 'Disk space allocated to portfolio files',
+                             'blog'       => 'Blog Availability',
+                             'aboutme'    => 'Personal Information Page Availability',
+                             'portfolio'  => 'Portfolio Availability',
+                             'official'   => 'Can Request Official Courses',
+                             'unofficial' => 'Can Request Unofficial Courses',
+                             'prvs'       => 'Previous Value:',
+                             'chto'       => 'Changed To:'
 						   );
                 $r->print('<h4>'.$lt{'uic'}.'</h4>'.
                           &Apache::loncommon::start_data_table().
@@ -2199,6 +2186,12 @@ 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");
@@ -2220,6 +2213,12 @@ 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");
@@ -2241,6 +2240,12 @@ 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");
@@ -2279,15 +2284,18 @@ END
                       $env{'form.ccdomain'}.'</span><br />');
             }
         }  else { # End of if ($env ... ) logic
-            # They did not want to change the users name, quota or tool availability,
+            # 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'        => "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",
+                           'id'         => "Student/Employee ID",
+                           'mail'       => "Permanent e-mail address",
+                           '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'}
@@ -2296,6 +2304,12 @@ 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}.' '.
@@ -2374,6 +2388,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->{$context.'.'.$tool};
+            if ($env{'form.custom'.$tool} == 1) {
+                if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$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;
@@ -2616,12 +2707,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))
@@ -2732,13 +2829,21 @@ sub quota_admin {
 }
 
 sub tool_admin {
-    my ($tool,$settool,$changeHash) = @_;
-    my $toolchanged;
-    if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
+    my ($tool,$settool,$changeHash,$context) = @_;
+    my $canchange = 0; 
+    if ($context eq 'requestcourses') {
+        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->{'tools.'.$tool} = $settool;
+            $changeHash->{$context.'.'.$tool} = $settool;
         }
     }
     return $toolchanged;
@@ -2912,7 +3017,7 @@ ENDCCF
    '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
    '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".   
    '<input type="reset" value="'.&mt("Reset").'" />'."\n".
-   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+   '<input type="submit" value="'.&mt('Save').'" /></form>'.
 	      &Apache::loncommon::end_page());
 }
 # --------------------------------------------------------
@@ -3401,108 +3506,137 @@ 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'},
-               });
-            if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
-               push(@courselinks,
-                    {text => 'Enrollment Requests',
-                     action => 'selfenrollqueue',
-                     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 ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
+            push(@{ $menu[1]->{items} },
+                    {   linktext => 'Enrollment Requests',
+                        icon => 'selfenrl-queue.png',
+                        #help => 'Course_Approve_Selfenroll',
+                        url => '/adm/createuser?action=selfenrollqueue',
+                        permission => $permission->{'cusr'},
+                        linktitle =>'Approve or reject enrollment requests.',
+                });
+        }
+		
+        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 {
@@ -3708,7 +3842,7 @@ ENDSCRIPT
             $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
         } else {
             $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
-                       .$visactions->{'yous'}.
+                      .$visactions->{'yous'}.
                        '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
             if (ref($vismsgs) eq 'ARRAY') {
                 $output .= '<br />'.$visactions->{'make'}.'<ul>';
@@ -3892,7 +4026,7 @@ ENDSCRIPT
                 }
                 if (@ccs) {
                     $output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').'&nbsp;'.&Apache::loncommon::start_data_table().
-                    &Apache::loncommon::start_data_table_row();
+                               &Apache::loncommon::start_data_table_row();
                     my $count = 0;
                     my $numcols = 4;
                     foreach my $cc (sort(@ccs)) {
@@ -3914,7 +4048,7 @@ ENDSCRIPT
                     my $rem = $count%$numcols;
                     if ($rem) {
                         my $emptycols = $numcols - $rem;
-                        for (my $i=0; $i<$emptycols; $i++) {
+                        for (my $i=0; $i<$emptycols; $i++) { 
                             $output .= '<td>&nbsp;</td>';
                         }
                     }
@@ -3934,7 +4068,7 @@ ENDSCRIPT
                 } elsif ($currlim eq 'selfenrolled') {
                     $crslimit = ' ';
                     $selflimit = ' checked="checked" ';
-                    $nolimit = ' ';
+                    $nolimit = ' '; 
                 } else {
                     $crslimit = ' ';
                     $selflimit = ' ';
@@ -3956,7 +4090,7 @@ ENDSCRIPT
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box().
                '<br /><input type="button" name="selfenrollconf" value="'
-               .&mt('Save changes').'" onclick="validate_types(this.form);" />'
+               .&mt('Save').'" onclick="validate_types(this.form);" />'
                .'<input type="hidden" name="action" value="selfenroll" /></form>';
     $r->print($output);
     return;
@@ -4017,7 +4151,7 @@ sub display_selfenroll_queue {
         $r->print(&Apache::loncommon::end_data_table().
                   '<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>');
     } else {
-        $r->print(&mt('There are currently no enrollment requests.'));
+        $r->print(&mt('There are currently no enrollment requests.'));  
     }
     return;
 }
@@ -4028,7 +4162,7 @@ sub update_selfenroll_queue {
     my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
     my $access_start =  $env{'course.'.$cid.'.internal.selfenroll_start_access'};
     my $access_end =  $env{'course.'.$cid.'.internal.selfenroll_end_access'};
-    my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'};
+    my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; 
     my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
     my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
     my $namespace = 'selfenrollrequests';
@@ -4050,7 +4184,7 @@ sub update_selfenroll_queue {
                         mt => 'Visit [_1], to log-in and access the course',
                         args => [$protocol.'://'.$hostname],
                       }];
-
+                      
     my $rejectedmsg =  [{
                          mt => 'Your request for enrollment has not been approved.',
                        }];
@@ -4059,7 +4193,7 @@ sub update_selfenroll_queue {
         my $uhome = &Apache::lonnet::homeserver($uname,$udom);
         if ($uhome ne 'no_host') {
             if (exists($requesthash{$uname.':'.$udom})) {
-
+               
                 if (exists($classlist->{$uname.':'.$udom})) {
                     if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
                         if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
@@ -4085,7 +4219,7 @@ sub update_selfenroll_queue {
                         last;
                     }
                 }
-                my $result =
+                my $result = 
                     &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
                 if ($result eq 'ok') {
                     push(@enrolled,$uname.':'.$udom);
@@ -4101,7 +4235,7 @@ sub update_selfenroll_queue {
                            status      => 'approved',
                        }
                     );
-                    my $userresult =
+                    my $userresult = 
                         &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
                     if ($userresult ne 'ok') {
                         push(@warn_approves,$uname.':'.$udom);
@@ -4123,11 +4257,11 @@ sub update_selfenroll_queue {
             my %userrequest = (
                 $cdom.'_'.$cnum => {
                     timestamp   => $now,
-                    adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+                    adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, 
                     status      => 'rejected',
                 }
             );
-            my $userresult =
+            my $userresult = 
                 &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
             if ($userresult ne 'ok') {
                 push(@warn_rejects,$user);
@@ -4137,7 +4271,7 @@ sub update_selfenroll_queue {
     if (@changes) {
         my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);
         if ($delresult eq 'ok') {
-            my $namelink =
+            my $namelink = 
                 &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
             my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
             my ($approvedlist,$rejectedlist);
@@ -4145,8 +4279,8 @@ sub update_selfenroll_queue {
                 $approvedlist = join("\n",@enrolled);
                 $r->print('<p>'.&mt('The following were enrolled in the course:').'<ul>');
                 foreach my $user (@enrolled) {
-                    my ($uname,$udom) = split(/:/,$user);
-                    my $userlink =
+                    my ($uname,$udom) = split(/:/,$user); 
+                    my $userlink = 
                         &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
                     $r->print('<li>'.$userlink.'</li>');
                 }
@@ -4245,7 +4379,7 @@ sub visible_in_cat {
                    miss => 'Your course does not currently appear in the Course Catalog for this domain.',
                    yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
                    coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
-                   make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:',
+                   make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
                    take => 'Take the following action to ensure the course appears in the Catalog:',
                    dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
                    dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
@@ -5445,11 +5579,11 @@ sub update_selfenroll_config {
                             }
                             $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.');
+                            $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;
+                        $changes{'internal.selfenroll_limit'} = $newlimit; 
                     }
                 } elsif ($currlimit ne 'none') {
                     if ($newcap =~ /^\d+$/) {
@@ -5478,7 +5612,7 @@ sub update_selfenroll_config {
                             $changes{'internal.selfenroll_notifylist'} = '';
                         }
                     } else {
-                        my @differences =
+                        my @differences =  
                             &compare_arrays(\@currnotified,\@newnotified);
                         if (@differences > 0) {
                             if (@newnotified > 0) {
@@ -5509,7 +5643,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';
@@ -5581,7 +5715,7 @@ sub update_selfenroll_config {
                             }
                             if ($changes{'internal.selfenroll_limit'} eq 'none') {
                                 $newval = &mt('No limit');
-                            } elsif ($changes{'internal.selfenroll_limit'} eq
+                            } 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') {
@@ -5602,7 +5736,7 @@ sub update_selfenroll_config {
                             my ($newval,$newnotify);
                             if (exists($changes{'internal.selfenroll_notifylist'})) {
                                 $newnotify = $changes{'internal.selfenroll_notifylist'};
-                            } else {
+                            } else {   
                                 $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
                             }
                             if ($changes{'internal.selfenroll_approval'}) {
@@ -5610,7 +5744,7 @@ sub update_selfenroll_config {
                             } elsif ($changes{'internal.selfenroll_approval'} eq '0') {
                                 $newval = &mt('No');
                             } else {
-                                my $currapproval =
+                                my $currapproval = 
                                     $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
                                 if ($currapproval) {
                                     $newval = &mt('Yes');
@@ -5684,7 +5818,7 @@ sub compare_arrays {
     my (@difference,%count);
     @difference = ();
     %count = ();
-    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
+    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) {