--- loncom/interface/lonmenu.pm	2009/08/06 04:09:45	1.278
+++ 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.278 2009/08/06 04:09:45 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'),
@@ -617,6 +618,13 @@ if(length($annotation) > 0){
 $menuitems.="&anno-[_1]&tations[_1]&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
+            unless ($noremote) { 
+                my $showreqcrs = &check_for_rcrs();
+                if ($showreqcrs) {
+                    $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
+                                "&go('/adm/requestcourse')&Course requests\n";
+                }
+            }
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 		if (!$env{'request.enc'}) {
 		    $menuitems.=(<<ENDREALRES);
@@ -1272,22 +1280,13 @@ sub rawconfig {
                     next;
                 }
             } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
-                next if (&Apache::lonnet::allowed('mky',$requested_domain));
                 if (($prt eq 'reqcrsnsc') && ($show_course))   {
                     next;
                 }
                 if (($prt eq 'reqcrsshc') && (!$show_course)) {
                     next;
                 }
-                my $showreqcrs = 0;
-                foreach my $type ('official','unofficial','community') {
-                    if (&Apache::lonnet::usertools_access($env{'user.name'},
-                                                    $env{'user.domain'},
-                                                    $type,undef,'requestcourses')) {
-                        $showreqcrs = 1;
-                        last;
-                    }
-                }
+                my $showreqcrs = &check_for_rcrs();
                 if (!$showreqcrs) {
                     $output.=&clear($row,$col);
                     next;
@@ -1308,6 +1307,28 @@ sub rawconfig {
     return $output;
 }
 
+sub check_for_rcrs {
+    my $showreqcrs = 0;
+    my @reqtypes = ('official','unofficial','community');
+    foreach my $type (@reqtypes) {
+        if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                              $env{'user.domain'},
+                                              $type,undef,'requestcourses')) {
+            $showreqcrs = 1;
+            last;
+        }
+    }
+    if (!$showreqcrs) {
+        foreach my $type (@reqtypes) {
+            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
+                $showreqcrs = 1;
+                last;
+            }
+        }
+    }
+    return $showreqcrs;
+}
+
 # ======================================================================= Close
 
 sub close {
@@ -1668,7 +1689,7 @@ sub roles_selector {
         }
         $role_selector .= '</select>'."\n".
                '<input type="hidden" name="destinationurl" value="'.
-               $ENV{'REQUEST_URI'}.'" />'."\n".
+               &HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n".
                '<input type="hidden" name="gotorole" value="1" />'."\n".
                '<input type="hidden" name="selectrole" value="" />'."\n".
                '<input type="hidden" name="switch" value="1" />'."\n".