--- loncom/interface/lonmenu.pm 2009/08/12 18:38:04 1.279
+++ loncom/interface/lonmenu.pm 2009/09/27 11:05:06 1.282
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.279 2009/08/12 18:38:04 raeburn Exp $
+# $Id: lonmenu.pm,v 1.282 2009/09/27 11:05:06 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -137,6 +137,7 @@ use Apache::loncommon();
use Apache::lonenc();
use Apache::lonlocal;
use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
@@ -149,7 +150,7 @@ my @inlineremote;
sub initlittle {
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
- 'nav' => 'Navigate Contents',
+ 'nav' => 'Course Contents',
'main' => 'Main Menu',
'roles' => (&Apache::loncommon::show_course()?
'Courses':'Roles'),
@@ -1308,7 +1309,8 @@ sub rawconfig {
sub check_for_rcrs {
my $showreqcrs = 0;
- foreach my $type ('official','unofficial','community') {
+ my @reqtypes = ('official','unofficial','community');
+ foreach my $type (@reqtypes) {
if (&Apache::lonnet::usertools_access($env{'user.name'},
$env{'user.domain'},
$type,undef,'requestcourses')) {
@@ -1316,6 +1318,14 @@ sub check_for_rcrs {
last;
}
}
+ if (!$showreqcrs) {
+ foreach my $type (@reqtypes) {
+ if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
+ $showreqcrs = 1;
+ last;
+ }
+ }
+ }
return $showreqcrs;
}
@@ -1679,7 +1689,7 @@ sub roles_selector {
}
$role_selector .= ''."\n".
''."\n".
+ &HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n".
''."\n".
''."\n".
''."\n".