--- loncom/auth/lonroles.pm	2015/03/01 22:21:00	1.310
+++ loncom/auth/lonroles.pm	2015/06/09 21:22:44	1.312
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.310 2015/03/01 22:21:00 raeburn Exp $
+# $Id: lonroles.pm,v 1.312 2015/06/09 21:22:44 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -657,6 +657,7 @@ ENDENTERKEY
 				    }
 				}
                                 # Are we allowed to look at the first resource?
+                                my $access;
                                 if ($furl =~ m{^(/adm/wrapper|)/ext/}) {
                                     # If it's an external resource,
                                     # strip off the symb argument and possible query
@@ -664,14 +665,16 @@ ENDENTERKEY
                                     # Unencode $symb
                                     $symb = &unescape($symb);
                                     # Then check for permission
-                                    if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) {
-                                        $furl = &Apache::lonpageflip::first_accessible_resource();
-                                    }
+                                    $access = &Apache::lonnet::allowed('bre',$exturl,$symb);
                                 # For other resources just check for permission
-                                } elsif (!&Apache::lonnet::allowed('bre',$furl)) {
+                                } else {
+                                    $access = &Apache::lonnet::allowed('bre',$furl);
+                                }
+                                if (!$access) {
                                     $furl = &Apache::lonpageflip::first_accessible_resource();
+                                } elsif ($access eq 'B') {
+                                    $furl = '/adm/navmaps?showOnlyHomework=1';
                                 }
- 
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
@@ -744,7 +747,7 @@ ENDENTERKEY
         $cattype = $domdefs{'catauth'};
     }
     my $funcs = &get_roles_functions($showcount,$cattype);
-    $standby=~s/\n/\\n/g;
+    &js_escape(\$standby);
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
@@ -1757,10 +1760,11 @@ sub courselink {
 }
 
 sub coursepick_jscript {
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                   plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
                   youc => 'You can only use this screen to select courses and communities in the current domain.',
              );
+    &js_escape(\%js_lt);
     my $verify_script = <<"END";
 <script type="text/javascript">
 // <![CDATA[
@@ -1777,11 +1781,11 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("$lt{'plsu'}");
+            alert("$js_lt{'plsu'}");
         }
     }
     else {
-        alert("$lt{'youc'}")
+        alert("$js_lt{'youc'}")
     }
 }
 function getIndex(caller) {