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

[raeburn]

raeburn		Sat Oct 22 23:53:46 2011 EDT

  Modified files:              
    /loncom/auth	lonlogout.pm 
  Log:
  - Append domain, if URL for log-in link is /adm/login.
  
  
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.42 loncom/auth/lonlogout.pm:1.43
--- loncom/auth/lonlogout.pm:1.42	Mon Jun 13 17:41:01 2011
+++ loncom/auth/lonlogout.pm	Sat Oct 22 23:53:46 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42 2011/06/13 17:41:01 raeburn Exp $
+# $Id: lonlogout.pm,v 1.43 2011/10/22 23:53:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,6 +122,9 @@
                      if ($server && $lonhost) {
                          $login_url = $Apache::lonnet::protocol{$lonhost}.
                                       '://'.$server.$path;
+                         if ($path eq '/adm/login' && $domain ne '') {
+                             $login_url .= '?domain='.$domain;
+                         }
                      }
                  }
             }