--- loncom/interface/domainprefs.pm	2008/12/09 04:46:02	1.73
+++ loncom/interface/domainprefs.pm	2009/01/27 15:59:30	1.85
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.73 2008/12/09 04:46:02 raeburn Exp $
+# $Id: domainprefs.pm,v 1.85 2009/01/27 15:59:30 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@ use Apache::lonlocal;
 use Apache::lonmsg();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
-use LONCAPA::loncgi();
+use LONCAPA::lonauthcgi();
 use File::Copy;
 use Locale::Language;
 use DateTime::TimeZone;
@@ -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',
@@ -271,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>');
@@ -819,7 +819,7 @@ sub login_choices {
             font => "Font color",
             pgbg => "Header",
             mainbg => "Page",
-            sidebg => "Container",
+            sidebg => "Login box",
             link => "Link",
             alink => "Active link",
             vlink => "Visited link",
@@ -1246,10 +1246,12 @@ sub print_quotas {
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
             my $currdefquota;
-            if (ref($settings->{defaultquota}) eq 'HASH') {
-                $currdefquota = $settings->{defaultquota}->{$type}; 
-            } else {
-                $currdefquota = $settings->{$type};
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{defaultquota}) eq 'HASH') {
+                    $currdefquota = $settings->{defaultquota}->{$type}; 
+                } else {
+                    $currdefquota = $settings->{$type};
+                }
             }
             if (defined($usertypes->{$type})) {
                 $typecount ++;
@@ -1259,9 +1261,11 @@ sub print_quotas {
                               '<td class="LC_left_item">';
                 foreach my $item (@usertools) {
                     my $checked = 'checked="checked" ';
-                    if (ref($settings->{$item}) eq 'HASH') {
-                        if ($settings->{$item}->{$type} == 0) {
-                            $checked = '';
+                    if (ref($settings) eq 'HASH') {
+                        if (ref($settings->{$item}) eq 'HASH') {
+                            if ($settings->{$item}->{$type} == 0) {
+                                $checked = '';
+                            }
                         }
                     }
                     $datatable .= '<span class="LC_nobreak"><label>'.
@@ -1291,9 +1295,11 @@ sub print_quotas {
                   '<td class="LC_left_item">';
     foreach my $item (@usertools) {
         my $checked = 'checked="checked" ';
-        if (ref($settings->{$item}) eq 'HASH') {
-            if ($settings->{$item}->{'default'} == 0) {
-                $checked = '';
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{$item}) eq 'HASH') {
+                if ($settings->{$item}->{'default'} == 0) {
+                    $checked = '';
+                }
             }
         }
         $datatable .= '<span class="LC_nobreak"><label>'.
@@ -1311,9 +1317,11 @@ sub print_quotas {
                   '<td class="LC_left_item" colspan="2"><br />';
     foreach my $item (@usertools) {
         my $checked = 'checked="checked" ';
-        if (ref($settings->{$item}) eq 'HASH') {
-            if ($settings->{$item}->{'_LC_adv'} == 0) {
-                $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>'.
@@ -1321,7 +1329,8 @@ sub print_quotas {
                       '" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
                       '</label></span>&nbsp; ';
     }
-    $datatable .= '('.&mt('overrides affiliation').')</td></tr>';
+    $datatable .= '<span class="LC_nobreak">('.&mt('overrides affiliation').
+                  ')</span></td></tr>';
     $$rowtotal += $typecount;
     return $datatable;
 }
@@ -1885,7 +1894,7 @@ sub usercreation_types {
                     any        => 'Any',
                     official   => 'Institutional only ',
                     unofficial => 'Non-institutional only',
-                    email      => 'Email address',
+                    email      => 'E-mail address',
                     login      => 'Institutional Login',
                     sso        => 'SSO', 
                     none       => 'None',
@@ -2364,7 +2373,7 @@ sub print_serverstatuses {
             }
         }
     }
-    my $titles= &LONCAPA::loncgi::serverstatus_titles();
+    my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
     my $rownum = 0;
     my $css_class;
     foreach my $type (@pages) {
@@ -2874,7 +2883,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
-            pgbg => "Header",
+            pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
             link => "Link",
@@ -3603,10 +3612,16 @@ sub modify_quotas {
                 }
                 $resulttext .= '</ul></li>';
             }
+            my %newenv;
             foreach my $item (@usertools) {
                 if (ref($changes{$item}) eq 'HASH') {
-                    my $hashid = $env{'user.name'}.':'.$env{'user.domain'};
-                    &Apache::lonnet::devalidate_cache_new('usertools.'.$item,$hashid);
+                    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}) {
@@ -3627,6 +3642,9 @@ sub modify_quotas {
                 }
             }
             $resulttext .= '</ul>';
+            if (keys(%newenv)) {
+                &Apache::lonnet::appenv(\%newenv);
+            }
         } else {
             $resulttext = &mt('No changes made to availability of home pages, blogs, portfolios or default quotas');
         }
@@ -4959,58 +4977,57 @@ sub modify_serverstatuses {
     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 $setting ('namedusers','machines') {
+            my (@current,@new);
+            if (ref($currserverstatus{$type}) eq 'HASH') {
+                if ($currserverstatus{$type}{$setting} ne '') { 
+                    @current = split(/,/,$currserverstatus{$type}{$setting});
                 }
             }
-            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 ($newserverstatus{$type}{$setting} ne '') {
+                @new = split(/,/,$newserverstatus{$type}{$setting});
+            }
+            if (@current > 0) {
+                if (@new > 0) {
+                    foreach my $item (@current) {
+                        if (!grep(/^\Q$item\E$/,@new)) {
+                            $changes{$type}{$setting} = 1;
+                            last;
+                        }
+                    }
+                    foreach my $item (@new) {
+                        if (!grep(/^\Q$item\E$/,@current)) {
+                            $changes{$type}{$setting} = 1;
+                            last;
+                        }
+                    }
+                } else {
+                    $changes{$type}{$setting} = 1;
                 }
+            } elsif (@new > 0) {
+                $changes{$type}{$setting} = 1;
             }
-
         }
     }
     if (keys(%changes) > 0) {
-        my $titles= &LONCAPA::loncgi::serverstatus_titles();
+        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})) {
+                if (ref($changes{$type}) eq 'HASH') {
                     $resulttext .= '<li>'.$titles->{$type}.'<ul>';
-                    if (defined($changes{$type}{'namedusers'})) {
+                    if ($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 ($changes{$type}{'machines'}) {
                         if ($newserverstatus{$type}{'machines'} eq '') {
                             $resulttext .= '<li>'.&mt("Access terminated for all specific IP addresses").'</li>'."\n";
                         } else {