[LON-CAPA-cvs] cvs: loncom(loncapaMITrelate_1) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Wed Feb  1 18:27:10 2012 EDT

  Modified files:              (Branch: loncapaMITrelate_1)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Backport 1.1147, 1.1151, and one change in rev 1.1116 missed in 1.1056.4.31 backport for 2.10.1 (branch point got loncapaMITrelate_1). 
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1056.4.33 loncom/lonnet/perl/lonnet.pm:1.1056.4.33.2.1
--- loncom/lonnet/perl/lonnet.pm:1.1056.4.33	Wed Oct 19 16:36:02 2011
+++ loncom/lonnet/perl/lonnet.pm	Wed Feb  1 18:27:09 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1056.4.33 2011/10/19 16:36:02 raeburn Exp $
+# $Id: lonnet.pm,v 1.1056.4.33.2.1 2012/02/01 18:27:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -882,7 +882,7 @@
     my %domconfhash = &Apache::loncommon::get_domainconf($udom);
     my %servers = &get_servers($udom);
     my $lowest_load = 30000;
-    my ($login_host,$hostname,$portal_path);
+    my ($login_host,$hostname,$portal_path,$isredirect);
     foreach my $lonhost (keys(%servers)) {
         my $loginvia;
         if ($checkloginvia) {
@@ -893,12 +893,14 @@
                     &compare_server_load($lonhost, $login_host, $lowest_load);
                 if ($login_host eq $server) {
                     $portal_path = $path;
+                    $isredirect = 1;
                 }
             } else {
                 ($login_host, $lowest_load) =
                     &compare_server_load($lonhost, $login_host, $lowest_load);
                 if ($login_host eq $lonhost) {
                     $portal_path = '';
+                    $isredirect = '';
                 }
             }
         } else {
@@ -909,7 +911,7 @@
     if ($login_host ne '') {
         $hostname = &hostname($login_host);
     }
-    return ($login_host,$hostname);
+    return ($login_host,$hostname,$portal_path,$isredirect);
 }
 
 # --------------------------------------------- Try to change a user's password
@@ -1576,6 +1578,7 @@
         $domdefaults{'auth_arg_def'} = $domconfig{'defaults'}{'auth_arg_def'};
         $domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'};
         $domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'};
+        $domdefaults{'portal_def'} = $domconfig{'defaults'}{'portal_def'};
     } else {
         $domdefaults{'lang_def'} = &domain($domain,'lang_def');
         $domdefaults{'auth_def'} = &domain($domain,'auth_def');