[LON-CAPA-cvs] cvs: loncom(loncapaMITrelate_1) /auth lonlogout.pm

[raeburn]

raeburn		Mon Feb 13 17:03:59 2012 EDT

  Modified files:              (Branch: loncapaMITrelate_1)
    /loncom/auth	lonlogout.pm 
  Log:
  - Customization for MITrelate
   - Backport 1.45.
   - If this is the user's homeserver, "Log-in again" links to /adm/login 
     (to support aliases).
  
  
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.42.2.2.2.3 loncom/auth/lonlogout.pm:1.42.2.2.2.4
--- loncom/auth/lonlogout.pm:1.42.2.2.2.3	Fri Feb 10 19:20:29 2012
+++ loncom/auth/lonlogout.pm	Mon Feb 13 17:03:59 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42.2.2.2.3 2012/02/10 19:20:29 raeburn Exp $
+# $Id: lonlogout.pm,v 1.42.2.2.2.4 2012/02/13 17:03:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,10 +127,12 @@
                                       '://'.$server.$path;
                          if (($path eq '') && (!$isredirect)) {
                              my $serverhomeID =
-                                 &Apache::lonnet::get_server_homeID($lonhost);
+                                 &Apache::lonnet::get_server_homeID($server);
                              my $serverhomedom =
                                  &Apache::lonnet::host_domain($serverhomeID);
-                             if ($serverhomedom ne $domain) {
+                             if ($serverhomedom eq $domain) {
+                                 $login_url = '/adm/login';
+                             } else {
                                  $path = '/adm/login';
                                  $login_url .= $path;
                              }