--- loncom/interface/lonmenu.pm	2009/08/20 06:04:14	1.244.2.6
+++ loncom/interface/lonmenu.pm	2010/01/18 20:28:20	1.244.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.244.2.6 2009/08/20 06:04:14 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.8 2010/01/18 20:28:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -144,6 +144,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);
 
@@ -1353,7 +1354,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')) {
@@ -1361,6 +1363,14 @@ sub check_for_rcrs {
             last;
         }
     }
+    if (!$showreqcrs) {
+        foreach my $type (@reqtypes) {
+            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
+                $showreqcrs = 1;
+                last;
+            }
+        }
+    }
     return $showreqcrs;
 }
 
@@ -1720,7 +1730,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".