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

[raeburn]

raeburn		Wed Aug 12 19:52:15 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/auth	lonlogin.pm 
  Log:
  - Backport 1.123, 1.124.
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.106.4.2 loncom/auth/lonlogin.pm:1.106.4.3
--- loncom/auth/lonlogin.pm:1.106.4.2	Wed Aug 12 19:44:18 2009
+++ loncom/auth/lonlogin.pm	Wed Aug 12 19:52:15 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106.4.2 2009/08/12 19:44:18 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106.4.3 2009/08/12 19:52:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token']);
+	  'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -179,8 +179,18 @@
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
+    my $tokenextras;
+    if ($env{'form.role'}) {
+        $tokenextras = '&role='.&escape($env{'form.role'});
+    }
+    if ($env{'form.symb'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&';
+        }
+        $tokenextras .= '&symb='.&escape($env{'form.symb'});
+    }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # ------------------- If we cannot talk to ourselves, we are in serious trouble