--- loncom/interface/domainprefs.pm	2009/03/18 21:30:05	1.76.2.7
+++ loncom/interface/domainprefs.pm	2008/12/26 21:48:43	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.76.2.7 2009/03/18 21:30:05 raeburn Exp $
+# $Id: domainprefs.pm,v 1.83 2008/12/26 21:48:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,7 +107,7 @@ sub handler {
         'quotas' => 
                     { text => 'User blogs, home pages and portfolios',
                       help => 'Domain_Configuration_Quotas',
-                      header => [{col1 => 'User type',
+                      header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
                                   col3 => 'Portfolio quota',}],
                     },
@@ -175,7 +175,7 @@ sub handler {
                                }],
                   },
         'serverstatuses' =>
-                 {text   => 'Access to Server Status Pages',
+                 {text   => 'Access to server status pages',
                   help   => 'Domain_Configuration_Server_Status',
                   header => [{col1 => 'Status Page',
                               col2 => 'Other named users',
@@ -817,9 +817,9 @@ sub login_choices {
             bgs => "Background colors",
             links => "Link colors",
             font => "Font color",
-            pgbg => "Page",
-            mainbg => "Main panel",
-            sidebg => "Side panel",
+            pgbg => "Header",
+            mainbg => "Page",
+            sidebg => "Login box",
             link => "Link",
             alink => "Active link",
             vlink => "Visited link",
@@ -1330,7 +1330,7 @@ sub print_quotas {
                       '</label></span>&nbsp; ';
     }
     $datatable .= '<span class="LC_nobreak">('.&mt('overrides affiliation').
-                  ')</span></td></tr>';
+                  ')</span</td></tr>';
     $$rowtotal += $typecount;
     return $datatable;
 }
@@ -1571,7 +1571,7 @@ sub print_contacts {
     my $datatable;
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails);
-    my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail');
+    my @mailings = ('errormail','packagesmail','helpdeskmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
@@ -1591,8 +1591,6 @@ sub print_contacts {
                     }
                     $otheremails{$type} = $settings->{$type}{'others'};
                 }
-            } elsif ($type eq 'lonstatusmail') {
-                $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
             }
         }
     } else {
@@ -1600,8 +1598,7 @@ sub print_contacts {
         $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
         $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
         $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
-        $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; 
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
@@ -1645,8 +1642,7 @@ sub contact_titles {
                    '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',
-                   'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
+                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to'
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -3619,12 +3615,12 @@ sub modify_quotas {
             my %newenv;
             foreach my $item (@usertools) {
                 if (ref($changes{$item}) eq 'HASH') {
-                    my $newacc =
+                    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;
+                    if ($env{'environment.availabletools.'.$item} ne $newacc) { 
+                        $newenv{'environment.availabletools.'.$item} = $newacc;
                     }
                     $resulttext .= '<li>'.$titles{$item}.'<ul>';
                     foreach my $type (@{$types},'default','_LC_adv') {
@@ -4033,7 +4029,7 @@ sub modify_contacts {
     }
     my (%others,%to);
     my @contacts = ('supportemail','adminemail');
-    my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail');
+    my @mailings = ('errormail','packagesmail','helpdeskmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -4078,7 +4074,6 @@ sub modify_contacts {
         $default{'errormail'} = 'adminemail';
         $default{'packagesmail'} = 'adminemail';
         $default{'helpdeskmail'} = 'supportemail';
-        $default{'lonstatusmail'} = 'adminemail';
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
               $changes{$item} = 1;
@@ -4766,10 +4761,8 @@ sub modify_coursecategories {
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
-        $domconfig{'coursecategories'} = {
-                                             togglecats => $env{'form.togglecats'},
-                                             categorize => $env{'form.categorize'},
-                                         };
+        $domconfig{'coursecategories'}{'togglecats'} = $env{'form.togglecats'};
+        $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
@@ -4987,15 +4980,11 @@ sub modify_serverstatuses {
     my %changes;
     foreach my $type (@pages) {
         foreach my $setting ('namedusers','machines') {
-            my (@current,@new);
+            my @current = ();
             if (ref($currserverstatus{$type}) eq 'HASH') {
-                if ($currserverstatus{$type}{$setting} ne '') {
-                    @current = split(/,/,$currserverstatus{$type}{$setting});
-                }
-            }
-            if ($newserverstatus{$type}{$setting} ne '') {
-                @new = split(/,/,$newserverstatus{$type}{$setting});
+                @current = split(/,/,$currserverstatus{$type}{$setting});
             }
+            my @new = split(/,/,$newserverstatus{$type}{$setting});
             if (@current > 0) {
                 if (@new > 0) {
                     foreach my $item (@current) {
@@ -5004,10 +4993,12 @@ sub modify_serverstatuses {
                             last;
                         }
                     }
-                    foreach my $item (@new) {
-                        if (!grep(/^\Q$item\E$/,@current)) {
-                            $changes{$type}{$setting} = 1;
-                            last;
+                    if (!$changes{$type}{$setting}) {
+                        foreach my $item (@new) {
+                            if (!grep(/^\Q$item\E$/,@current)) {
+                                $changes{$type}{$setting} = 1;
+                                last;
+                            }
                         }
                     }
                 } else {
@@ -5025,16 +5016,15 @@ sub modify_serverstatuses {
         if ($putresult eq 'ok') {
             $resulttext .= &mt('Changes made:').'<ul>';
             foreach my $type (@pages) {
-                if (ref($changes{$type}) eq 'HASH') {
+                if (defined($changes{$type})) {
                     $resulttext .= '<li>'.$titles->{$type}.'<ul>';
-                    if ($changes{$type}{'namedusers'}) {
+                    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";
                         }
-                    }
-                    if ($changes{$type}{'machines'}) {
+                    } elsif (defined($changes{$type}{'machines'})) {
                         if ($newserverstatus{$type}{'machines'} eq '') {
                             $resulttext .= '<li>'.&mt("Access terminated for all specific IP addresses").'</li>'."\n";
                         } else {