--- loncom/interface/loncreateuser.pm	2008/11/17 14:31:33	1.262
+++ loncom/interface/loncreateuser.pm	2009/01/05 15:37:21	1.273
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.262 2008/11/17 14:31:33 schafran Exp $
+# $Id: loncreateuser.pm,v 1.273 2009/01/05 15:37:21 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,20 @@ 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",
+                   '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) = 
         &Apache::loncommon::get_user_quota($ccuname,$ccdomain);
@@ -173,27 +184,81 @@ 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)) {
+        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";
+        }
+    }
+    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;
 }
 
@@ -649,8 +714,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);
@@ -703,8 +769,9 @@ $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)$/) {
                             my $ver = $1;
                             if ($authparm ne '') {
@@ -713,7 +780,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 +788,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";
+                                }
                             }
                         }
                     }
@@ -775,35 +849,62 @@ ENDCHANGEUSER
         }
         $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);
+        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));
             }
@@ -1645,6 +1746,7 @@ 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');
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
@@ -1704,26 +1806,34 @@ 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);
             }
-            my $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
-            if ($quotachanged) {
+            foreach my $item (@usertools) {
+                if ($env{'form.custom'.$item} == 1) {
+                    $newcustom{$item} = $env{'form.tools_'.$item};
+                    $changed{$item} = &tool_admin($item,$newcustom{$item},\%changeHash);
+                }
+            }
+            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));
@@ -1756,7 +1866,8 @@ 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'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -1881,14 +1992,17 @@ 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);
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $showquota = 1;
         }
-        my %changeHash;
+        if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
+            $showtools = 1;
+        }
+        my (%changeHash,%changed);
         $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
         if ($userenv{'portfolioquota'} ne '') {
             $oldportfolioquota = $userenv{'portfolioquota'};
@@ -1900,10 +2014,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; 
             }
@@ -1917,7 +2031,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;
@@ -1929,6 +2043,73 @@ 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};
+                }
+            }
+        }
+
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
             $env{'form.clastname'}   ne $userenv{'lastname'}   ||
@@ -1937,18 +2118,35 @@ 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 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
@@ -1967,19 +2165,22 @@ 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'   => "Student/Employee ID",
-                             '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",
+                             'prvs'      => "Previous",
+                             'chto'      => "Changed To"
 						   );
                 $r->print('<h4>'.$lt{'uic'}.'</h4>'.
                           &Apache::loncommon::start_data_table().
@@ -1997,6 +2198,12 @@ END
                     $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");
@@ -2012,10 +2219,16 @@ END
                     $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>
@@ -2027,6 +2240,12 @@ END
                     $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'}) {
@@ -2055,12 +2274,15 @@ 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 or tool availability,
+            # 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",
+                           '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",
 					       );
             $r->print(<<"END");
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
@@ -2069,8 +2291,14 @@ END
                 $r->print('<br />['.$lt{'mail'}.': '.
                           $userenv{'permanentemail'}.']');
             }
+            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>');
@@ -2246,8 +2474,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)) {
@@ -2260,8 +2488,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');
                 }
@@ -2490,12 +2718,27 @@ 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) = @_;
+    my $toolchanged;
+    if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
+        # Current user has quota modification privileges
+        if (ref($changeHash) eq 'HASH') {
+            $toolchanged = 1;
+            $changeHash->{'tools.'.$tool} = $settool;
+        }
+    }
+    return $toolchanged;
+}
+
 sub build_roles {
     my ($sectionstr,$sections,$role) = @_;
     my $num_sections = 0;
@@ -2605,7 +2848,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));
@@ -2625,10 +2868,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" />
@@ -2688,34 +2936,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})) {
@@ -2731,7 +2980,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
@@ -3124,102 +3373,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 {
@@ -4418,10 +4692,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 />';
                 }
             }
         }