--- loncom/interface/lonmenu.pm 2012/08/16 18:35:47 1.385
+++ loncom/interface/lonmenu.pm 2012/09/04 20:47:56 1.386
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.385 2012/08/16 18:35:47 raeburn Exp $
+# $Id: lonmenu.pm,v 1.386 2012/09/04 20:47:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1479,8 +1479,22 @@ sub roles_selector {
} else {
$ccrole = 'cc';
}
- my $priv;
+ my ($priv,$gotsymb,$destsymb);
my $destinationurl = $ENV{'REQUEST_URI'};
+ if ($destinationurl =~ /\?symb=/) {
+ $gotsymb = 1;
+ } elsif ($destinationurl =~ m{^/enc/}) {
+ my $plainurl = &Apache::lonenc::unencrypted($destinationurl);
+ if ($plainurl =~ /\?symb=/) {
+ $gotsymb = 1;
+ }
+ }
+ unless ($gotsymb) {
+ $destsymb = &Apache::lonnet::symbread();
+ if ($destsymb ne '') {
+ $destsymb = &Apache::lonenc::check_encrypt($destsymb);
+ }
+ }
my $reqprivs = &required_privs();
if (ref($reqprivs) eq 'HASH') {
my $destination = $destinationurl;
@@ -1568,7 +1582,12 @@ sub roles_selector {
$role_selector .= "\n".'';
}
}
- $role_selector .= ''."\n".
+ $role_selector .= ''."\n";
+ if ($destsymb ne '') {
+ $role_selector .= ''."\n";
+ }
+ $role_selector .=
''."\n".
''."\n".