--- loncom/interface/domainprefs.pm	2008/07/19 02:28:44	1.64
+++ loncom/interface/domainprefs.pm	2008/12/25 02:22:08	1.76.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.64 2008/07/19 02:28:44 raeburn Exp $
+# $Id: domainprefs.pm,v 1.76.2.4 2008/12/25 02:22:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,11 +37,13 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
+use LONCAPA::lonauthcgi();
 use File::Copy;
 use Locale::Language;
 use DateTime::TimeZone;
+use DateTime::Locale;
 
 sub handler {
     my $r=shift;
@@ -72,15 +74,15 @@ sub handler {
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
                 'quotas','autoenroll','autoupdate','directorysrch',
                 'usercreation','usermodification','contacts','defaults',
-                'scantron','coursecategories'],$dom);
+                'scantron','coursecategories','serverstatuses'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'coursecategories');
+                       'coursecategories','serverstatuses');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
-                     help => 'Default_Color_Schemes',
+                     help => 'Domain_Configuration_Color_Schemes',
                      header => [{col1 => 'Student Settings',
                                  col2 => '',},
                                 {col1 => 'Coordinator Settings',
@@ -92,31 +94,32 @@ sub handler {
                     },
         'login' =>  
                     { text => 'Log-in page options',
-                      help => 'Domain_Log-in_Page',
+                      help => 'Domain_Configuration_Login_Page',
                       header => [{col1 => 'Item',
                                   col2 => '',}],
                     },
         'defaults' => 
                     { text => 'Default authentication/language/timezone',
-                      help => '',
+                      help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'Default quotas for user portfolios',
-                      help => 'Default_User_Quota',
+                    { text => 'User blogs, home pages and portfolios',
+                      help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User type',
-                                  col2 => 'Default quota'}],
+                                  col2 => 'Available tools',
+                                  col3 => 'Portfolio quota',}],
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
-                     help => 'Domain_Auto_Enrollment',
+                     help => 'Domain_Configuration_Auto_Enrollment',
                      header => [{col1 => 'Configuration setting',
                                  col2 => 'Value(s)'}],
                    },
         'autoupdate' => 
                    { text => 'Auto-update settings',
-                     help => 'Domain_Auto_Update',
+                     help => 'Domain_Configuration_Auto_Updates',
                      header => [{col1 => 'Setting',
                                  col2 => 'Value',},
                                 {col1 => 'User population',
@@ -124,20 +127,20 @@ sub handler {
                   },
         'directorysrch' => 
                   { text => 'Institutional directory searches',
-                    help => 'Domain_Directory_Search',
+                    help => 'Domain_Configuration_InstDirectory_Search',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
                   },
         'contacts' =>
                   { text => 'Contact Information',
-                    help => 'Domain_Contact_Information',
+                    help => 'Domain_Configuration_Contact_Info',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
                   },
 
         'usercreation' => 
                   { text => 'User creation',
-                    help => 'Domain_User_Creation',
+                    help => 'Domain_Configuration_User_Creation',
                     header => [{col1 => 'Format rule type',
                                 col2 => 'Format rules in force'},
                                {col1 => 'User account creation',
@@ -145,9 +148,9 @@ sub handler {
                                {col1 => 'Context',
                                 col2 => 'Assignable authentication types'}],
                   },
-        'usermodification' => 
+        'usermodification' =>
                   { text => 'User modification',
-                    help => 'Domain_User_Modification',
+                    help => 'Domain_Configuration_User_Modification',
                     header => [{col1 => 'Target user has role',
                                 col2 => 'User information updateable in author context'},
                                {col1 => 'Target user has role',
@@ -155,22 +158,30 @@ sub handler {
                                {col1 => "Status of user",
                                 col2 => 'Information settable when self-creating account (if directory data blank)'}],
                   },
-        'scantron' => 
+        'scantron' =>
                   { text => 'Scantron format file',
-                    help => 'Domain_Scantron_Formats',
+                    help => 'Domain_Configuration_Scantron_Format',
                     header => [ {col1 => 'Item',
                                  col2 => '',
                               }],
                   },
-        'coursecategories' => 
+        'coursecategories' =>
                   { text => 'Cataloging of courses',
-                    help => 'Domain_Course_Catalog',
-                    header => [{col1 => 'Category settings',  
+                    help => 'Domain_Configuration_Cataloging_Courses',
+                    header => [{col1 => 'Category settings',
                                 col2 => '',},
                                {col1 => 'Categories',
                                 col2 => '',
                                }],
-                  }
+                  },
+        'serverstatuses' =>
+                 {text   => 'Access to Server Status Pages',
+                  help   => 'Domain_Configuration_Server_Status',
+                  header => [{col1 => 'Status Page',
+                              col2 => 'Other named users',
+                              col3 => 'Specific IPs',
+                            }],
+                 },
     );
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
@@ -260,7 +271,7 @@ sub handler {
             $r->print('<input type="hidden" name="phase" value="" />'.
                       '<input type="hidden" name="numcols" value="'.
                       $env{'form.numcols'}.'" />'."\n".
-                      '<span clas="LC_error">'.&mt('No settings chosen').
+                      '<span class="LC_error">'.&mt('No settings chosen').
                       '</span>');
         }
         $r->print('</form>');
@@ -319,7 +330,10 @@ sub handler {
         }
         $count = 0;
         foreach my $item (@prefs_order) {
-            $r->print('<h4><label><input type="checkbox" name="actions" value="'.$item.'" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
+            $r->print('<h4>'.
+                      &Apache::loncommon::help_open_topic($prefs{$item}->{'help'}).
+                      '<label><input type="checkbox" name="actions" value="'.$item.
+                      '" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
             $count ++;
             if ((!$seconddiv) && ($count >= $midpoint)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
@@ -368,6 +382,8 @@ sub process_changes {
         $output = &modify_scantron($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursecategories') {
         $output = &modify_coursecategories($dom,%domconfig);
+    } elsif ($action eq 'serverstatuses') {
+        $output = &modify_serverstatuses($dom,%domconfig);
     }
     return $output;
 }
@@ -382,13 +398,10 @@ sub print_config_box {
     $output .= 
          '<table class="LC_nested_outer">
           <tr>
-           <th align="left"><span class="LC_nobreak">'.&mt($item->{text}).
-           '&nbsp;</span></th></tr>';
-# 
-# FIXME - put the help link back in when the help files exist
-#           <th>'.&mt($item->{text}).'&nbsp;'.
-#           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
-#          </tr>');
+           <th align="left" valign="middle"><span class="LC_nobreak">'.
+           &mt($item->{text}).'&nbsp;'.
+           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
+          '</tr>';
     $rowtotal ++;
     if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
         ($action eq 'usercreation') || ($action eq 'usermodification') ||
@@ -405,7 +418,7 @@ sub print_config_box {
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
               <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
-             $rowtotal ++;
+        $rowtotal ++;
         if ($action eq 'autoupdate') {
             $output .= &print_autoupdate('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'usercreation') {
@@ -470,8 +483,10 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
+              <td class="LC_left_item"'.$colspan.' valign="top">'.
+               &mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item" valign="top">'.
+               &mt($item->{'header'}->[2]->{'col2'}).'</td>
              </tr>'.
             &print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -496,13 +511,35 @@ sub print_config_box {
         if (($action eq 'login') || ($action eq 'directorysrch')) {
             $output .= '  
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+        } elsif ($action eq 'serverstatuses') {
+            $output .= '
+              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).
+              '<br />('.&mt('Automatic access for Dom. Coords.').')</td>';
+
         } else {
             $output .= '
-              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         }
-        $output .= '
-              <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
-             </tr>';
+        if (defined($item->{'header'}->[0]->{'col3'})) {
+            $output .= '<td class="LC_left_item" valign="top">'.
+                       &mt($item->{'header'}->[0]->{'col2'});
+            if ($action eq 'serverstatuses') {
+                $output .= '<br />(<tt>'.&mt('user1:domain1,user2:domain2 etc.').'</tt>)';
+            } 
+        } else {
+            $output .= '<td class="LC_right_item" valign="top">'.
+                       &mt($item->{'header'}->[0]->{'col2'});
+        }
+        $output .= '</td>';
+        if ($item->{'header'}->[0]->{'col3'}) {
+            $output .= '<td class="LC_right_item" valign="top">'.
+                       &mt($item->{'header'}->[0]->{'col3'});
+            if ($action eq 'serverstatuses') {
+                $output .= '<br />(<tt>'.&mt('IP1,IP2 etc.').'</tt>)';
+            }
+            $output .= '</td>';
+        }
+        $output .= '</tr>';
         $rowtotal ++;
         if ($action eq 'login') {
             $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
@@ -518,6 +555,8 @@ sub print_config_box {
             $output .= &print_defaults($dom,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'serverstatuses') {
+            $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -661,6 +700,7 @@ sub print_login {
                    );
     foreach my $item (@images) {
         $defaults{$item} = $defaultdesign{'login.'.$item};
+        $defaults{'showlogo'}{$item} = 1;
     }
     foreach my $item (@bgs) {
         $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item};
@@ -682,10 +722,13 @@ sub print_login {
             }
         }
         foreach my $item (@images) {
-            if ($settings->{$item} ne '') {
+            if (defined($settings->{$item})) {
                 $designs{$item} = $settings->{$item};
                 $is_custom{$item} = 1;
             }
+            if (defined($settings->{'showlogo'}{$item})) {
+                $designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item};
+            }
         }
         foreach my $item (@logintext) {
             if ($settings->{$item} ne '') {
@@ -879,20 +922,27 @@ sub display_color_options {
 	$itemcount ++;
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
-                      '<td>'.$choices->{$img}.'</td>';
+                      '<td>'.$choices->{$img};
         my ($imgfile,$img_import,$login_hdr_pick,$logincolors);
+        if ($role eq 'login') {
+            if ($img eq 'login') {
+                $login_hdr_pick =
+                    &login_header_options($img,$role,$defaults,$is_custom,$choices,
+                                          $loginheader);
+                $logincolors =
+                    &login_text_colors($img,$role,$logintext,$phase,$choices,
+                                            $designs);
+            } elsif ($img ne 'domlogo') {
+                $datatable.= &logo_display_options($img,$defaults,$designs);
+            }
+        }
+        $datatable .= '</td>';
         if ($designs->{$img} ne '') {
             $imgfile = $designs->{$img};
 	    $img_import = ($imgfile =~ m{^/adm/});
         } else {
             $imgfile = $defaults->{$img};
         }
-        if ($img eq 'login') {
-            $login_hdr_pick = &login_header_options($img,$role,$defaults,$is_custom,$choices,
-                                                    $loginheader);
-            $logincolors =
-                &login_text_colors($img,$role,$logintext,$phase,$choices,$designs);
-        }
         if ($imgfile) {
             my ($showfile,$fullsize);
             if ($imgfile =~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
@@ -981,7 +1031,7 @@ sub display_color_options {
     my $bgs_def;
     foreach my $item (@{$bgs}) {
         if (!$is_custom->{$item}) {
-            $bgs_def .= '<td>'.$choices->{$item}.'&nbsp;<span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
+            $bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span>&nbsp;<span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
         }
     }
     if ($bgs_def) {
@@ -1032,6 +1082,32 @@ sub display_color_options {
     return $datatable;
 }
 
+sub logo_display_options {
+    my ($img,$defaults,$designs) = @_;
+    my $checkedon;
+    if (ref($defaults) eq 'HASH') {
+        if (ref($defaults->{'showlogo'}) eq 'HASH') {
+            if ($defaults->{'showlogo'}{$img}) {
+                $checkedon = 'checked="checked" ';     
+            }
+        } 
+    }
+    if (ref($designs) eq 'HASH') {
+        if (ref($designs->{'showlogo'}) eq 'HASH') {
+            if (defined($designs->{'showlogo'}{$img})) {
+                if ($designs->{'showlogo'}{$img} == 0) {
+                    $checkedon = '';
+                } elsif ($designs->{'showlogo'}{$img} == 1) {
+                    $checkedon = 'checked="checked" ';
+                }
+            }
+        }
+    }
+    return '<br /><label>&nbsp;&nbsp;<input type="checkbox" name="'.
+           'login_showlogo_'.$img.'" value="1" '.$checkedon.'/>'.
+           &mt('show').'</label>'."\n";
+}
+
 sub login_header_options  {
     my ($img,$role,$defaults,$is_custom,$choices,$loginheader) = @_;
     my $image_checked = ' checked="checked" ';
@@ -1083,7 +1159,7 @@ sub image_changes {
     my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
     my $output;
     if (!$is_custom) {
-        if ($img eq 'login') {
+        if ($img ne 'domlogo') {
             $output .= &mt('Default image:').'<br />';
         } else {
             $output .= &mt('Default in use:').'<br />';
@@ -1165,23 +1241,50 @@ sub print_quotas {
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my $typecount = 0;
     my $css_class;
+    my @usertools = ('aboutme','blog','portfolio');
+    my %titles = &tool_titles();
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
+            my $currdefquota;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{defaultquota}) eq 'HASH') {
+                    $currdefquota = $settings->{defaultquota}->{$type}; 
+                } else {
+                    $currdefquota = $settings->{$type};
+                }
+            }
             if (defined($usertypes->{$type})) {
                 $typecount ++;
                 $css_class = $typecount%2?' class="LC_odd_row"':'';
-                $datatable .= '<tr'.$css_class.'>'. 
+                $datatable .= '<tr'.$css_class.'>'.
                               '<td>'.$usertypes->{$type}.'</td>'.
-                              '<td class="LC_right_item"><span class="LC_nobreak">'.
+                              '<td class="LC_left_item">';
+                foreach my $item (@usertools) {
+                    my $checked = 'checked="checked" ';
+                    if (ref($settings) eq 'HASH') {
+                        if (ref($settings->{$item}) eq 'HASH') {
+                            if ($settings->{$item}->{$type} == 0) {
+                                $checked = '';
+                            }
+                        }
+                    }
+                    $datatable .= '<span class="LC_nobreak"><label>'.
+                                  '<input type="checkbox" name="tools_'.$item.
+                                  '" value="'.$type.'" '.$checked.'/>'.$titles{$item}.
+                                  '</label></span>&nbsp; ';
+                }
+                $datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
-                              '" value="'.$settings->{$type}.
+                              '" value="'.$currdefquota.
                               '" size="5" /> Mb</span></td></tr>';
             }
         }
     }
     my $defaultquota = '20';
     if (ref($settings) eq 'HASH') {
-        if (defined($settings->{'default'})) {
+        if (ref($settings->{'defaultquota'}) eq 'HASH') {
+            $defaultquota = $settings->{'defaultquota'}->{'default'};
+        } elsif (defined($settings->{'default'})) {
             $defaultquota = $settings->{'default'};
         }
     }
@@ -1189,9 +1292,44 @@ sub print_quotas {
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.$othertitle.'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<td class="LC_left_item">';
+    foreach my $item (@usertools) {
+        my $checked = 'checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{$item}) eq 'HASH') {
+                if ($settings->{$item}->{'default'} == 0) {
+                    $checked = '';
+                }
+            }
+        }
+        $datatable .= '<span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="tools_'.$item.
+                      '" value="default" '.$checked.'/>'.$titles{$item}.
+                      '</label></span>&nbsp; ';
+    }
+    $datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.
                   '<input type="text" name="defaultquota" value="'.
                   $defaultquota.'" size="5" /> Mb</span></td></tr>';
+    $typecount ++;
+    $css_class = $typecount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr'.$css_class.'>'.
+                  '<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.
+                  '<td class="LC_left_item" colspan="2"><br />';
+    foreach my $item (@usertools) {
+        my $checked = 'checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{$item}) eq 'HASH') {
+                if ($settings->{$item}->{'_LC_adv'} == 0) {
+                    $checked = '';
+                }
+            }
+        }
+        $datatable .= '<span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="tools_'.$item.
+                      '" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
+                      '</label></span>&nbsp; ';
+    }
+    $datatable .= '('.&mt('overrides affiliation').')</td></tr>';
     $$rowtotal += $typecount;
     return $datatable;
 }
@@ -1465,24 +1603,17 @@ sub print_contacts {
     my $rownum = 0;
     my $css_class;
     foreach my $item (@contacts) {
-        if ($rownum%2) {
-            $css_class = '';
-        } else {
-            $css_class = ' class="LC_odd_row" ';
-        }
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'. 
                   '<td><span class="LC_nobreak">'.$titles->{$item}.
                   '</span></td><td class="LC_right_item">'.
                   '<input type="text" name="'.$item.'" value="'.
                   $to{$item}.'" /></td></tr>';
-        $rownum ++;
     }
     foreach my $type (@mailings) {
-        if ($rownum%2) {
-            $css_class = '';
-        } else {
-            $css_class = ' class="LC_odd_row" ';
-        }
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td><span class="LC_nobreak">'.
                       $titles->{$type}.': </span></td>'.
@@ -1499,7 +1630,6 @@ sub print_contacts {
                       '<input type="text" name="'.$type.'_others" '.
                       'value="'.$otheremails{$type}.'"  />'.
                       '</td></tr>'."\n";
-        $rownum ++;
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -1508,7 +1638,7 @@ sub print_contacts {
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
                    'supportemail' => 'Support E-mail address',
-                   'adminemail'    => 'Default Server Admin E-mail address',
+                   'adminemail'   => 'Default Server Admin E-mail address',
                    'errormail'    => 'Error reports to be e-mailed to',
                    'packagesmail' => 'Package update alerts to be e-mailed to',
                    'helpdeskmail' => 'Helpdesk requests to be e-mailed to'
@@ -1520,6 +1650,15 @@ sub contact_titles {
     return (\%titles,\%short_titles);
 }
 
+sub tool_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                                              aboutme   => 'Personal Home Page',
+                                              blog      => 'Blog',
+                                              portfolio => 'Portfolio',
+                                             );
+    return %titles;
+}
+
 sub print_usercreation {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my $numinrow = 4;
@@ -1823,7 +1962,8 @@ sub print_usermodification {
 
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+                 'datelocale_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my $titles = &defaults_titles();
     my $rownum = 0;
@@ -1858,6 +1998,9 @@ sub print_defaults {
         } elsif ($item eq 'timezone_def') {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
+        } elsif ($item eq 'datelocale_def') {
+            my $includeempty = 1;
+            $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
         } else {
             $datatable .= '<input type="text" name="'.$item.'" value="'.
                           $domdefaults{$item}.'" />';
@@ -1875,6 +2018,7 @@ sub defaults_titles {
                    'auth_arg_def'  => 'Default authentication argument',
                    'lang_def'      => 'Default language',
                    'timezone_def'  => 'Default timezone',
+                   'datelocale_def' => 'Default locale for dates',
                  );
     return (\%titles);
 }
@@ -1985,14 +2129,15 @@ sub print_scantronformat {
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>';
     if (!$is_custom) {
-        $datatable .= '<td>'.&mt('Default in use:').'<br />';
+        $datatable .= '<td>'.&mt('Default in use:').'<br />'.
+                      '<span class="LC_nobreak">';
         if ($scantronurl) {
             $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
                           &mt('Default scantron format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
-        $datatable .= '</td>';
+        $datatable .= '</span></td>';
         if (keys(%error) == 0) { 
             $datatable .= '<td valign="bottom">';
             if (!$switchserver) {
@@ -2013,19 +2158,21 @@ sub print_scantronformat {
             } 
             $datatable .= '<td>'.$errorstr.'</td><td>&nbsp;';
         } elsif ($scantronurl) {
-            $datatable .= '<td><a href="'.$scantronurl.'" target="_blank">'
-                          .&mt('Custom scantron format file').'</a>'
-                          .'<span class="LC_nobreak"><label>'
-                          .'<input type="checkbox" name="scantronformat_del"'
-                          .'" value="1" />'.&mt('Delete?').'</label></td>'
-                          .'<td>'.&mt('Replace:').'</span><br />';
+            $datatable .= '<td><span class="LC_nobreak">'.
+                          '<a href="'.$scantronurl.'" target="_blank">'.
+                          &mt('Custom scantron format file').'</a><label>'.
+                          '<input type="checkbox" name="scantronformat_del"'.
+                          '" value="1" />'.&mt('Delete?').'</label></span></td>'.
+                          '<td><span class="LC_nobreak">&nbsp;'.
+                          &mt('Replace:').'</span><br />';
         }
     }
     if (keys(%error) == 0) {
         if ($switchserver) {
             $datatable .= &mt('Upload to library server: [_1]',$switchserver);
         } else {
-            $datatable .='&nbsp;<input type="file" name="scantronformat" />';
+            $datatable .='<span class="LC_nobreak">&nbsp;'.
+                         '<input type="file" name="scantronformat" /></span>';
         }
     }
     $datatable .= '</td></tr>';
@@ -2201,6 +2348,58 @@ sub print_coursecategories {
     return $datatable;
 }
 
+sub print_serverstatuses {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $datatable;
+    my @pages = &serverstatus_pages();
+    my (%namedaccess,%machineaccess);
+    foreach my $type (@pages) {
+        $namedaccess{$type} = '';
+        $machineaccess{$type}= '';
+    }
+    if (ref($settings) eq 'HASH') {
+        foreach my $type (@pages) {
+            if (exists($settings->{$type})) {
+                if (ref($settings->{$type}) eq 'HASH') {
+                    foreach my $key (keys(%{$settings->{$type}})) {
+                        if ($key eq 'namedusers') {
+                            $namedaccess{$type} = $settings->{$type}->{$key};
+                        } elsif ($key eq 'machines') {
+                            $machineaccess{$type} = $settings->{$type}->{$key};
+                        }
+                    }
+                }
+            }
+        }
+    }
+    my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
+    my $rownum = 0;
+    my $css_class;
+    foreach my $type (@pages) {
+        $rownum ++;
+        $css_class = $rownum%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td><span class="LC_nobreak">'.
+                      $titles->{$type}.'</span></td>'.
+                      '<td class="LC_left_item">'.
+                      '<input type="text" name="'.$type.'_namedusers" '.
+                      'value="'.$namedaccess{$type}.'" size="30" /></td>'.
+                      '<td class="LC_right_item">'.
+                      '<span class="LC_nobreak">'.
+                      '<input type="text" name="'.$type.'_machines" '.
+                      'value="'.$machineaccess{$type}.'" size="10" />'.
+                      '</td></tr>'."\n";
+    }
+    $$rowtotal += $rownum;
+    return $datatable;
+}
+
+sub serverstatus_pages {
+    return ('userstatus','lonstatus','loncron','server-status','codeversions',
+            'clusterstatus','metadata_keywords','metadata_harvest',
+            'takeoffline','takeonline','showenv');
+}
+
 sub coursecategories_javascript {
     my ($settings) = @_;
     my ($output,$jstext,$cathash);
@@ -2759,6 +2958,13 @@ sub modify_colors {
             $domconfig->{$role} = {};
         }
         foreach my $img (@images) {
+            if (($role eq 'login') && (($img eq 'img') || ($img eq 'logo'))) {  
+                if (defined($env{'form.login_showlogo_'.$img})) {
+                    $confhash->{$role}{'showlogo'}{$img} = 1;
+                } else { 
+                    $confhash->{$role}{'showlogo'}{$img} = 0;
+                }
+            } 
 	    if ( ! $env{'form.'.$role.'_'.$img.'.filename'} 
 		 && !defined($domconfig->{$role}{$img})
 		 && !$env{'form.'.$role.'_del_'.$img}
@@ -2833,7 +3039,19 @@ sub modify_colors {
                             $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
-                }  
+                    if (($role eq 'login') && (($img eq 'logo') || ($img eq 'img'))) {
+                        if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') {
+                            if ($confhash->{$role}{'showlogo'}{$img} ne 
+                                $domconfig->{$role}{'showlogo'}{$img}) {
+                                $changes{$role}{'showlogo'}{$img} = 1; 
+                            }
+                        } else {
+                            if ($confhash->{$role}{'showlogo'}{$img} == 0) {
+                                $changes{$role}{'showlogo'}{$img} = 1;
+                            }
+                        }
+                    }
+                }
                 if ($domconfig->{$role}{'font'} ne '') {
                     if ($confhash->{$role}{'font'} ne $domconfig->{$role}{'font'}) {
                         $changes{$role}{'font'} = 1;
@@ -2925,6 +3143,11 @@ sub default_change_checker {
             $confhash->{$role}{$img} = '';
             $changes->{$role}{'images'}{$img} = 1;
         }
+        if ($role eq 'login') {
+            if ($confhash->{$role}{'showlogo'}{$img} == 0) {
+                $changes->{$role}{'showlogo'}{$img} = 1;
+            }
+        }
     }
     if ($confhash->{$role}{'font'}) {
         $changes->{$role}{'font'} = 1;
@@ -2956,7 +3179,13 @@ sub display_colorchgs {
                         $resulttext .= '<li>'.&mt($choices{$key}).':<ul>';
                     }
                     foreach my $item (sort(keys(%{$changes->{$role}{$key}}))) {
-                        if ($confhash->{$role}{$item} eq '') {
+                        if (($role eq 'login') && ($key eq 'showlogo')) {
+                            if ($confhash->{$role}{$key}{$item}) {
+                                $resulttext .= '<li>'.&mt("$choices{$item} set to be displayed").'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt("$choices{$item} set to not be displayed").'</li>';
+                            }
+                        } elsif ($confhash->{$role}{$item} eq '') {
                             $resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>';
                         } else {
                             my $newitem = $confhash->{$role}{$item};
@@ -3275,57 +3504,148 @@ END
 
 sub modify_quotas {
     my ($dom,%domconfig) = @_;
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my ($resulttext,%changes);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    my %formhash;
+    my @usertools = ('aboutme','blog','portfolio');
+    my %titles = &tool_titles();
+    my (%confhash,%toolshash);
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.quota_(.+)$/) {
-            $formhash{$1} = $env{$key};
+            $confhash{'defaultquota'}{$1} = $env{$key};
+        } elsif ($key =~ /^form\.tools_(.+)$/) {
+            @{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key);
         }
     }
-    $formhash{'default'} = $env{'form.defaultquota'};
-    if (ref($domconfig{'quotas'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'quotas'}})) {
-            if (exists($formhash{$key})) {
-                if ($formhash{$key} ne $domconfig{'quotas'}{$key}) {
-                    $changes{$key} = 1;
+    $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
+    foreach my $item (@usertools) {
+        foreach my $type (@{$types},'default','_LC_adv') {
+            if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
+                $confhash{$item}{$type} = 1;
+            } else {
+                $confhash{$item}{$type} = 0;
+            }
+            if (ref($domconfig{'quotas'}) eq 'HASH') {
+                if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
+                    if ($domconfig{'quotas'}{$item}{$type} ne $confhash{$item}{$type}) {
+                        $changes{$item}{$type} = 1;
+                    }
+                } else {
+                    if (!$confhash{$item}{$type}) {
+                        $changes{$item}{$type} = 1;
+                    }
                 }
             } else {
-                $formhash{$key} = $domconfig{'quotas'}{$key};
+                if (!$confhash{$item}{$type}) {
+                    $changes{$item}{$type} = 1;
+                }
             }
         }
     }
-    foreach my $key (keys(%formhash)) {
-        if ($formhash{$key} ne '') {
+    if (ref($domconfig{'quotas'}) eq 'HASH') {
+        if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
+            foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
+                if (exists($confhash{'defaultquota'}{$key})) {
+                    if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{'defaultquota'}{$key}) {
+                        $changes{'defaultquota'}{$key} = 1;
+                    }
+                } else {
+                    $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{'defaultquota'}{$key};
+                }
+            }
+        } else {
+            foreach my $key (keys(%{$domconfig{'quotas'}})) {
+                if (exists($confhash{'defaultquota'}{$key})) {
+                    if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{$key}) {
+                        $changes{'defaultquota'}{$key} = 1;
+                    }
+                } else {
+                    $confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{$key};
+                }
+            }
+        }
+    }
+    if (ref($confhash{'defaultquota'}) eq 'HASH') {
+        foreach my $key (keys(%{$confhash{'defaultquota'}})) {
             if (ref($domconfig{'quotas'}) eq 'HASH') {
-                if (!exists($domconfig{'quotas'}{$key})) {
-                    $changes{$key} = 1;
+                if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
+                    if (!exists($domconfig{'quotas'}{'defaultquota'}{$key})) {
+                        $changes{'defaultquota'}{$key} = 1;
+                    }
+                } else {
+                    if (!exists($domconfig{'quotas'}{$key})) {
+                        $changes{'defaultquota'}{$key} = 1;
+                    }
                 }
             } else {
-                $changes{$key} = 1;
+                $changes{'defaultquota'}{$key} = 1;
             }
         }
     }
+
+    foreach my $key (keys(%confhash)) {
+        $domdefaults{$key} = $confhash{$key};
+    }
+   
     my %quotahash = (
-                      quotas => {%formhash},
+                      quotas => { %confhash }
                     );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%quotahash,
                                              $dom);
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
+            my $cachetime = 24*60*60;
+            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+
             $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $type (@{$types},'default') {
-                if (defined($changes{$type})) { 
-                    my $typetitle = $usertypes->{$type};
-                    if ($type eq 'default') {
-                        $typetitle = $othertitle;
+            if (ref($changes{'defaultquota'}) eq 'HASH') {
+                $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
+                foreach my $type (@{$types},'default') {
+                    if (defined($changes{'defaultquota'}{$type})) {
+                        my $typetitle = $usertypes->{$type};
+                        if ($type eq 'default') {
+                            $typetitle = $othertitle;
+                        }
+                        $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
+                    }
+                }
+                $resulttext .= '</ul></li>';
+            }
+            my %newenv;
+            foreach my $item (@usertools) {
+                if (ref($changes{$item}) eq 'HASH') {
+                    my $newacc =
+                        &Apache::lonnet::usertools_access($env{'user.name'},
+                                                          $env{'user.domain'},
+                                                          $item,'reload');
+                    if ($env{'environment.availabletools.'.$item} ne $newacc) {
+                            $newenv{'environment.availabletools.'.$item} = $newacc;
+                    }
+                    $resulttext .= '<li>'.$titles{$item}.'<ul>';
+                    foreach my $type (@{$types},'default','_LC_adv') {
+                        if ($changes{$item}{$type}) {
+                            my $typetitle = $usertypes->{$type};
+                            if ($type eq 'default') {
+                                $typetitle = $othertitle;
+                            } elsif ($type eq '_LC_adv') {
+                                $typetitle = 'LON-CAPA Advanced Users'; 
+                            }
+                            if ($confhash{$item}{$type}) {
+                                $resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
+                            }
+                        }
                     }
-                    $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$formhash{$type}).'</li>';
+                    $resulttext .= '</ul></li>';
                 }
             }
             $resulttext .= '</ul>';
+            if (keys(%newenv)) {
+                &Apache::lonnet::appenv(\%newenv);
+            }
         } else {
-            $resulttext = &mt('No changes made to default quotas');
+            $resulttext = &mt('No changes made to availability of home pages, blogs, portfolios or default quotas');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -4248,7 +4568,7 @@ sub modify_defaults {
     my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -4275,20 +4595,24 @@ sub modify_defaults {
                     push(@errors,$item);   
                 }
             }
+        } elsif ($item eq 'datelocale_def') {
+            if ($newvalues{$item} ne '') {
+                my @datelocale_ids = DateTime::Locale->ids();
+                if (!grep(/^\Q$newvalues{$item}\E$/,@datelocale_ids)) {
+                    push(@errors,$item);
+                }
+            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
         } elsif ($domdefaults{$item} ne $newvalues{$item}) {
             $changes{$item} = 1;
         }
+        $domdefaults{$item} = $newvalues{$item};
     }
     my %defaults_hash = (
-                         defaults => { auth_def => $newvalues{'auth_def'},
-                                       auth_arg_def => $newvalues{'auth_arg_def'},
-                                       lang_def => $newvalues{'lang_def'},
-                                       timezone_def => $newvalues{'timezone_def'},
-                                     }
-                       );
+                         defaults => \%newvalues,
+                        );
     my $title = &defaults_titles();
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash,
                                              $dom);
@@ -4317,9 +4641,8 @@ sub modify_defaults {
             $resulttext .= '</ul>';
             $mailmsgtext .= "\n";
             my $cachetime = 24*60*60;
-            &Apache::lonnet::do_cache_new('domdefaults',$dom,
-                                          $defaults_hash{'defaults'},$cachetime);
-            if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'}) {
+            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
                 my $sysmail = $r->dir_config('lonSysEMail');
                 &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
             }
@@ -4600,6 +4923,132 @@ sub modify_coursecategories {
     }
     return $resulttext;
 }
+
+sub modify_serverstatuses {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%changes,%currserverstatus,%newserverstatus);
+    if (ref($domconfig{'serverstatuses'}) eq 'HASH') {
+        %currserverstatus = %{$domconfig{'serverstatuses'}};
+    }
+    my @pages = &serverstatus_pages();
+    foreach my $type (@pages) {
+        $newserverstatus{$type}{'namedusers'} = '';
+        $newserverstatus{$type}{'machines'} = '';
+        if (defined($env{'form.'.$type.'_namedusers'})) {
+            my @users = split(/,/,$env{'form.'.$type.'_namedusers'});
+            my @okusers;
+            foreach my $user (@users) {
+                my ($uname,$udom) = split(/:/,$user);
+                if (($udom =~ /^$match_domain$/) &&   
+                    (&Apache::lonnet::domain($udom)) &&
+                    ($uname =~ /^$match_username$/)) {
+                    if (!grep(/^\Q$user\E/,@okusers)) {
+                        push(@okusers,$user);
+                    }
+                }
+            }
+            if (@okusers > 0) {
+                 @okusers = sort(@okusers);
+                 $newserverstatus{$type}{'namedusers'} = join(',',@okusers);
+            }
+        }
+        if (defined($env{'form.'.$type.'_machines'})) {
+            my @machines = split(/,/,$env{'form.'.$type.'_machines'});
+            my @okmachines;
+            foreach my $ip (@machines) {
+                my @parts = split(/\./,$ip);
+                next if (@parts < 4);
+                my $badip = 0;
+                for (my $i=0; $i<4; $i++) {
+                    if (!(($parts[$i] >= 0) && ($parts[$i] <= 255))) {
+                        $badip = 1;
+                        last;
+                    }
+                }
+                if (!$badip) {
+                    push(@okmachines,$ip);     
+                }
+            }
+            @okmachines = sort(@okmachines);
+            $newserverstatus{$type}{'machines'} = join(',',@okmachines);
+        }
+    }
+    my %serverstatushash =  (
+                                serverstatuses => \%newserverstatus,
+                            );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%serverstatushash,
+                                             $dom);
+    my %changes;
+    foreach my $type (@pages) {
+        if (ref($currserverstatus{$type}) eq 'HASH') {
+            my @currnamed = split(/,/,$currserverstatus{$type}{'namedusers'});
+            my @newusers = split(/,/,$newserverstatus{$type}{'namedusers'});
+            foreach my $item (@currnamed) {
+                if (!grep(/^\Q$item\E$/,@newusers)) {
+                    $changes{$type}{'namedusers'} = 1;
+                    last;
+                }
+            }
+            foreach my $item (@newusers) {
+                if (!grep(/^\Q$item\E$/,@currnamed)) {
+                    $changes{$type}{'namedusers'} = 1;
+                    last;
+                }
+            }
+            my @currmachines = split(/,/,$currserverstatus{$type}{'machines'});
+            my @newmachines = split(/,/,$newserverstatus{$type}{'machines'});
+            foreach my $item (@currmachines) {
+                if (!grep(/^\Q$item\E$/,@newmachines)) {
+                    $changes{$type}{'machines'} = 1;
+                    last;
+                }
+            }
+            foreach my $item (@newmachines) {
+                if (!grep(/^\Q$item\E$/,@currmachines)) {
+                    $changes{$type}{'machines'} = 1;
+                    last;
+                }
+            }
+
+        }
+    }
+    if (keys(%changes) > 0) {
+        my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
+        my $putresult = &Apache::lonnet::put_dom('configuration',
+                                                 \%serverstatushash,$dom);
+        if ($putresult eq 'ok') {
+            $resulttext .= &mt('Changes made:').'<ul>';
+            foreach my $type (@pages) {
+                if (defined($changes{$type})) {
+                    $resulttext .= '<li>'.$titles->{$type}.'<ul>';
+                    if (defined($changes{$type}{'namedusers'})) {
+                        if ($newserverstatus{$type}{'namedusers'} eq '') {
+                            $resulttext .= '<li>'.&mt("Access terminated for all specific (named) users").'</li>'."\n";
+                        } else {
+                            $resulttext .= '<li>'.&mt("Access available for the following specified users: ").$newserverstatus{$type}{'namedusers'}.'</li>'."\n";
+                        }
+                    } elsif (defined($changes{$type}{'machines'})) {
+                        if ($newserverstatus{$type}{'machines'} eq '') {
+                            $resulttext .= '<li>'.&mt("Access terminated for all specific IP addresses").'</li>'."\n";
+                        } else {
+                            $resulttext .= '<li>'.&mt("Access available for the following specified IP addresses: ").$newserverstatus{$type}{'machines'}.'</li>'."\n";
+                        }
+
+                    }
+                    $resulttext .= '</ul></li>';
+                }
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = '<span class="LC_error">'.
+                          &mt('An error occurred saving access settings for server status pages: [_1].',$putresult).'</span>';
+
+        }
+    } else {
+        $resulttext = &mt('No changes made to access to server status pages');
+    }
+    return $resulttext;
+}
 
 sub recurse_check {
     my ($chkcats,$categories,$depth,$name) = @_;