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

[raeburn]

raeburn		Fri Mar  6 20:39:22 2015 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm 
  Log:
  - Reinstate changes in rev 1.159, which were removed in rev. 1.160
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.161 loncom/auth/lonlogin.pm:1.162
--- loncom/auth/lonlogin.pm:1.161	Tue Mar  3 22:06:55 2015
+++ loncom/auth/lonlogin.pm	Fri Mar  6 20:39:22 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.161 2015/03/03 22:06:55 raeburn Exp $
+# $Id: lonlogin.pm,v 1.162 2015/03/06 20:39:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,7 +113,10 @@
     my %sessiondata;
     if ($env{'form.iptoken'}) {
         %sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'});
-        my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
+        unless ($sessiondata{'sessionserver'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'});
+            delete($env{'form.iptoken'});
+        }
     }
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
@@ -223,6 +226,12 @@
         }
         $tokenextras .= '&symb='.&escape($env{'form.symb'});
     }
+    if ($env{'form.iptoken'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&&';
+        }
+        $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'});
+    }
     my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);