[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface domainprefs.pm

raeburn raeburn@source.lon-capa.org
Thu, 25 Dec 2008 02:22:09 -0000


raeburn		Thu Dec 25 02:22:09 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - Backport 1.81.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.76.2.3 loncom/interface/domainprefs.pm:1.76.2.4
--- loncom/interface/domainprefs.pm:1.76.2.3	Thu Dec 18 17:06:00 2008
+++ loncom/interface/domainprefs.pm	Thu Dec 25 02:22:08 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.76.2.3 2008/12/18 17:06:00 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
 #
@@ -39,7 +39,7 @@
 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;
@@ -2372,7 +2372,7 @@
             }
         }
     }
-    my $titles= &LONCAPA::loncgi::serverstatus_titles();
+    my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
     my $rownum = 0;
     my $css_class;
     foreach my $type (@pages) {
@@ -3618,10 +3618,8 @@
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
                                                           $item,'reload');
-                    if ($env{'environment.tools.'.$item} ne '') {
-                        if ($env{'environment.availabletools.'.$item} ne $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') {
@@ -5015,7 +5013,7 @@
         }
     }
     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') {