[LON-CAPA-cvs] cvs: loncom(version_2_7_X) /localize lonlocal.pm

[raeburn]

raeburn		Fri Sep 19 21:57:51 2008 EDT

  Modified files:              (Branch: version_2_7_X)
    /loncom/localize	lonlocal.pm 
  Log:
  Backport 1.50.
  
  
Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.48 loncom/localize/lonlocal.pm:1.48.2.1
--- loncom/localize/lonlocal.pm:1.48	Fri Sep 12 22:37:29 2008
+++ loncom/localize/lonlocal.pm	Fri Sep 19 21:57:50 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.48 2008/09/13 02:37:29 raeburn Exp $
+# $Id: lonlocal.pm,v 1.48.2.1 2008/09/20 01:57:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -300,6 +300,18 @@
                 $timezone = $domdefaults{'timezone_def'};
             }
         }
+    } elsif ($Apache::lonnet::env{'request.role.domain'} ne '') {
+        my %uroledomdefs = 
+            &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'request.role.domain'});
+        if ($uroledomdefs{'timezone_def'} ne '') {
+            $timezone = $uroledomdefs{'timezone_def'};
+        }
+    } elsif ($Apache::lonnet::env{'user.domain'} ne '') {
+        my %udomdefaults = 
+            &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'});
+        if ($udomdefaults{'timezone_def'} ne '') {
+            $timezone = $udomdefaults{'timezone_def'};
+        }
     }
     if ($timezone ne '') {
         if (DateTime::TimeZone->is_valid_name($timezone)) {