[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonroles.pm

[raeburn]

raeburn		Thu Dec 13 21:11:17 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    - Backport 1.277
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.3 loncom/auth/lonroles.pm:1.269.2.4
--- loncom/auth/lonroles.pm:1.269.2.3	Tue Sep 25 22:51:43 2012
+++ loncom/auth/lonroles.pm	Thu Dec 13 21:11:17 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.3 2012/09/25 22:51:43 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.4 2012/12/13 21:11:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -601,13 +601,13 @@
                                                 if ($env{'request.role.adv'}) {
                                                     $dest = &Apache::lonenc::unencrypted($dest);
                                                     if ($destsymb eq '') {
-                                                        ($destsymb) = ($dest =~ /\?symb=([^\&]*)/);
+                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); 
                                                         $destsymb = &unescape($destsymb);
                                                     }
                                                 }
                                             } else {
                                                 if ($destsymb eq '') {
-                                                    ($destsymb) = ($dest =~ /\?symb=([^\&]+)/);
+                                                    ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/);
                                                     $destsymb = &unescape($destsymb);
                                                 }
                                                 unless ($env{'request.role.adv'}) {
@@ -626,7 +626,7 @@
                                                 }
                                             }
                                         }
-                                        unless (($dest =~ m{^/enc/}) || ($dest =~ /\?symb=.+___\d+___.+/)) {
+                                        unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { 
                                             if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {
                                                 my $esc_symb = &escape($destsymb);
                                                 $dest .= '?symb='.$esc_symb;