[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lon-capa-cvs
Subject:    [LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm
From:       raeburn <raeburn () source ! lon-capa ! org>
Date:       2015-06-06 14:39:42
Message-ID: cvsraeburn1433601582 () cvsserver
[Download RAW message or body]

raeburn		Sat Jun  6 14:39:42 2015 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm 
  Log:
  - Eliminate duplicate definitions.
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.163 loncom/auth/lonlogin.pm:1.164
--- loncom/auth/lonlogin.pm:1.163	Sat Jun  6 14:08:58 2015
+++ loncom/auth/lonlogin.pm	Sat Jun  6 14:39:42 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.163 2015/06/06 14:08:58 raeburn Exp $
+# $Id: lonlogin.pm,v 1.164 2015/06/06 14:39:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -395,9 +395,9 @@
 	       alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
-    my ($lonhost_in_use,$headextra);
-    my @hosts = &Apache::lonnet::current_machine_ids();
-    my $lonhost_in_use = $lonhost;
+    my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+    @hosts = &Apache::lonnet::current_machine_ids();
+    $lonhost_in_use = $lonhost;
     if (@hosts > 1) {
         foreach my $hostid (@hosts) {
             if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
@@ -406,9 +406,9 @@
             }
         }
     }
-    my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
-    my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
-    my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
+    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
+    $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
     if ($headextra) {
         my $omitextra;
         if ($headextra_exempt ne '') {


_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]