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

[raeburn]

raeburn		Fri Jan 24 04:38:14 2014 EDT

  Modified files:              
    /loncom/auth	lonacc.pm 
  Log:
  - Don't set $env{'form.origurl'} to the requested uri, to avoid
    unwanted redirects from the roles page for newly authenticated users.
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.151 loncom/auth/lonacc.pm:1.152
--- loncom/auth/lonacc.pm:1.151	Sat Jan  4 23:21:22 2014
+++ loncom/auth/lonacc.pm	Fri Jan 24 04:38:14 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.151 2014/01/04 23:21:22 raeburn Exp $
+# $Id: lonacc.pm,v 1.152 2014/01/24 04:38:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -365,7 +365,7 @@
                 }
             }
             unless ($info{'symb'}) {
-                unless ($r->uri eq '/adm/roles') {
+                unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
                     $info{'origurl'} = $r->uri; 
                 }
             }
@@ -530,6 +530,10 @@
             if ($otherserver ne '') {
                 $env{'form.otherserver'} = $otherserver;
             }
+            unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') ||
+                    ($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) {
+                $env{'form.origurl'} = $r->uri;
+            }
         }
 
 # ---------------------------------------------------------------- Check access