[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonroles.pm

[raeburn]

raeburn		Thu Aug  4 18:53:27 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    - Backport 1.312
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.23 loncom/auth/lonroles.pm:1.269.2.24
--- loncom/auth/lonroles.pm:1.269.2.23	Mon Apr 20 12:11:02 2015
+++ loncom/auth/lonroles.pm	Thu Aug  4 18:53:26 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.23 2015/04/20 12:11:02 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.24 2016/08/04 18:53:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -753,7 +753,7 @@
         $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);
@@ -1766,10 +1766,11 @@
 }
 
 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[
@@ -1786,11 +1787,11 @@
             }
         }
         else {
-            alert("$lt{'plsu'}");
+            alert("$js_lt{'plsu'}");
         }
     }
     else {
-        alert("$lt{'youc'}")
+        alert("$js_lt{'youc'}")
     }
 }
 function getIndex(caller) {