[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm /localize lonlocal.pm

[raeburn]

raeburn		Wed Aug  3 18:25:16 2011 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
    /loncom/localize	lonlocal.pm 
  Log:
  - No longer request domain config for domain: "public". 
    Suppress "get_dom failed - no homeserver and/or domain" logspam in lonnet.log.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1015 loncom/interface/loncommon.pm:1.1016
--- loncom/interface/loncommon.pm:1.1015	Tue Jul 26 17:14:56 2011
+++ loncom/interface/loncommon.pm	Wed Aug  3 18:25:11 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1015 2011/07/26 17:14:56 raeburn Exp $
+# $Id: loncommon.pm,v 1.1016 2011/08/03 18:25:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4456,7 +4456,10 @@
         return $env{'environment.color.'.$which};
     }
     $domain=&determinedomain($domain);
-    my %domdesign = &get_domainconf($domain);
+    my %domdesign;
+    unless ($domain eq 'public') {
+        %domdesign = &get_domainconf($domain);
+    }
     my $output;
     if ($domdesign{$domain.'.'.$which} ne '') {
         $output = $domdesign{$domain.'.'.$which};
@@ -11343,7 +11346,10 @@
 	}
 
         my %is_adv = ( is_adv => $env{'user.adv'} );
-        my %domdef = &Apache::lonnet::get_domain_defaults($domain);
+        my %domdef;
+        unless ($domain eq 'public') {
+            %domdef = &Apache::lonnet::get_domain_defaults($domain);
+        }
 
         foreach my $tool ('aboutme','blog','portfolio') {
             $userenv{'availabletools.'.$tool} = 
Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.62 loncom/localize/lonlocal.pm:1.63
--- loncom/localize/lonlocal.pm:1.62	Mon Mar 28 21:10:41 2011
+++ loncom/localize/lonlocal.pm	Wed Aug  3 18:25:16 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.62 2011/03/28 21:10:41 raeburn Exp $
+# $Id: lonlocal.pm,v 1.63 2011/08/03 18:25:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -264,7 +264,7 @@
 
     my $defdom = &Apache::lonnet::default_login_domain();
     foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
-        if ($domtype ne '') {
+        if (($domtype ne '') && ($domtype ne 'public')) {
             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
             if ($domdefs{'lang_def'} ne '') {
                 push(@languages,$domdefs{'lang_def'});
@@ -382,7 +382,8 @@
         if ($uroledomdefs{'timezone_def'} ne '') {
             $timezone = $uroledomdefs{'timezone_def'};
         }
-    } elsif ($Apache::lonnet::env{'user.domain'} ne '') {
+    } elsif (($Apache::lonnet::env{'user.domain'} ne '') && 
+             ($Apache::lonnet::env{'user.domain'} ne 'public')) {
         my %udomdefaults = 
             &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'});
         if ($udomdefaults{'timezone_def'} ne '') {