From b8908b0ac26aca6a88ae4f961b65fe8a32f2fb70 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 1 Aug 2014 13:47:54 +0800
Subject: [PATCH] MDL-46570 gradereport_history: Safer use of language strings

Part of MDL-46191
---
 ...-gradereport_history-userselector-debug.js | 30 +++++++++++--------
 ...le-gradereport_history-userselector-min.js |  4 +--
 ...moodle-gradereport_history-userselector.js | 30 +++++++++++--------
 .../yui/src/userselector/js/userselector.js   | 27 ++++++++++-------
 .../src/userselector/meta/userselector.json   |  3 +-
 5 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
index ca8cd42bc58..5a937732482 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
@@ -1,5 +1,6 @@
 YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
 
+var COMPONENT = 'gradereport_history';
 var USP = {
     NAME : 'User Selector Manager',
     /** Properties **/
@@ -68,7 +69,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             .append(create('<div class="'+CSS.WRAP+'"></div>')
                 .append(create('<div class="'+CSS.HEADER+' header"></div>')
                     .append(create('<div class="'+CSS.CLOSE+'"></div>'))
-                    .append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
+                    .append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
                 .append(create('<div class="'+CSS.CONTENT+'"></div>')
                     .append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
                     .append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@@ -76,12 +77,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
                             .setAttribute('src', M.util.image_url('i/loading', 'moodle')))
                         .setStyle('opacity', 0.5)))
                 .append(create('<div class="'+CSS.FOOTER+'"></div>')
-                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.str.enrol.usersearch+'</label></div>')
+                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'</label></div>')
                         .append(create('<input type="text" id="enrolusersearch" value="" />'))
-                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+M.str.enrol.usersearch+'" />'))
+                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
                     )
                     .append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
-                        .append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
+                        .append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
                     )
                 )
             )
@@ -214,7 +215,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             new M.core.exception(e);
         }
         if (!result.success) {
-            this.setContent = M.str.enrol.errajaxsearch;
+            this.setContent = M.util.get_string('errajaxsearch', 'enrol');
         }
 
         if (!args.append) {
@@ -236,9 +237,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             }
 
             if (selected === '') {
-                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
+                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
             } else {
-                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
+                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
             }
 
             node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@@ -255,12 +256,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
         }
         this.set(USP.USERCOUNT, count);
         if (!args.append) {
-            usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            if (result.response.totalusers == '1') {
+                usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
+            } else {
+                usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            }
             content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
                 .append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
                 .append(users);
             if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
-                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
+                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
                 fetchmore.on('click', this.search, this, true);
                 content.append(fetchmore);
             }
@@ -292,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.removeClass(CSS.SELECTED);
         user.one('.'+CSS.DESELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
     },
     selectUser : function(e, args) {
         var user = e.currentTarget.ancestor('.'+CSS.USER);
@@ -314,7 +319,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.addClass(CSS.SELECTED);
         user.one('.'+CSS.SELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
     },
     setContent: function(content) {
         this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);
@@ -413,11 +418,12 @@ Y.namespace('M.gradereport_history.UserSelector').init = function(cfg) {
 }, '@VERSION@', {
     "requires": [
         "dd-plugin",
+        "escape",
         "event-delegate",
         "event-key",
         "io-base",
         "json-parse",
-        "moodle-core-notification",
+        "moodle-core-notification-dialogue",
         "overlay"
     ]
 });
diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
index c6cd1b0de76..cf171d2b013 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-gradereport_history-userselector",function(e,t){var n={NAME:"User Selector Manager",BASE:"base",SEARCH:"search",SEARCHBTN:"searchbtn",PARAMS:"params",URL:"url",AJAXURL:"ajaxurl",MULTIPLE:"multiple",PAGE:"page",COURSEID:"courseid",SELECTEDUSERS:"selectedusers",USERFULLNAMES:"userfullnames",USERS:"users",USERCOUNT:"userCount",LASTSEARCH:"lastPreSearchValue",PERPAGE:"perPage"},r={PANEL:"user-selector-panel",WRAP:"usp-wrap",HEADER:"usp-header",CONTENT:"usp-content",AJAXCONTENT:"usp-ajax-content",SEARCHRESULTS:"usp-search-results",TOTALUSERS:"totalusers",USERS:"users",USER:"user",MORERESULTS:"usp-more-results",LIGHTBOX:"usp-loading-lightbox",LOADINGICON:"loading-icon",FOOTER:"usp-footer",DESELECT:"deselect",SELECT:"select",SELECTED:"selected",COUNT:"count",PICTURE:"picture",DETAILS:"details",FULLNAME:"fullname",EXTRAFIELDS:"extrafields",OPTIONS:"options",ODD:"odd",EVEN:"even",HIDDEN:"hidden",SEARCH:"usp-search",SEARCHBTN:"usp-search-btn",CLOSE:"close",CLOSEBTN:"close-button"},i=e.Node.create,s=function(){s.superclass.constructor.apply(this,arguments)};e.namespace("M.gradereport_history").UserSelector=e.extend(s,e.Base,{_searchTimeout:null,_loadingNode:null,_escCloseEvent:null,initializer:function(){var t,s;this.set(n.BASE,i('<div class="'+r.PANEL+" "+r.HIDDEN+'"></div>').append(i('<div class="'+r.WRAP+'"></div>').append(i('<div class="'+r.HEADER+' header"></div>').append(i('<div class="'+r.CLOSE+'"></div>')).append(i("<h2>"+M.str.gradereport_history.selectuser+"</h2>"))).append(i('<div class="'+r.CONTENT+'"></div>').append(i('<div class="'+r.AJAXCONTENT+'"></div>')).append(i('<div class="'+r.LIGHTBOX+" "+r.HIDDEN+'"></div>').append(i('<img alt="loading" class="'+r.LOADINGICON+'" />').setAttribute("src",M.util.image_url("i/loading","moodle"))).setStyle("opacity",.5))).append(i('<div class="'+r.FOOTER+'"></div>').append(i('<div class="'+r.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.str.enrol.usersearch+"</label></div>").append(i('<input type="text" id="enrolusersearch" value="" />')).append(i('<input type="button" id="searchbtn" class="'+r.SEARCHBTN+'" value="'+M.str.enrol.usersearch+'" />'))).append(i('<div class="'+r.CLOSEBTN+'"></div>').append(i('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />')))))),this.set(n.SEARCH,this.get(n.BASE).one("#enrolusersearch")),this.set(n.SEARCHBTN,this.get(n.BASE).one("#searchbtn")),t=e.one('input[name="userids"]').get("value").split(","),t[0]===""&&(t=[]),this.set(n.SELECTEDUSERS,t),t=[],this.get(n.USERFULLNAMES)!==null&&e.each(this.get(n.USERFULLNAMES),function(e,n){t[n]=e}),this.set(n.USERFULLNAMES,t),e.all(".gradereport_history_plugin input").each(function(e){e.hasClass("selectortrigger")&&e.on("click",this.show,this)},this),this.get(n.BASE).one("."+r.HEADER+" ."+r.CLOSE).on("click",this.hide,this),this.get(n.BASE).one("."+r.FOOTER+" ."+r.CLOSEBTN+" input").on("click",this.hide,this),this._loadingNode=this.get(n.BASE).one("."+r.CONTENT+" ."+r.LIGHTBOX),s=this.get(n.PARAMS),s.id=this.get(n.COURSEID),this.set(n.PARAMS,s),e.on("key",this.preSearch,this.get(n.SEARCH),"down:13",this),this.get(n.SEARCHBTN).on("click",this.preSearch,this),e.one(document.body).append(this.get(n.BASE));var o=this.get(n.BASE);o.plug(e.Plugin.Drag),o.dd.addHandle("."+r.HEADER+" h2"),o.one("."+r.HEADER+" h2").setStyle("cursor","move")},preSearch:function(e){this.search(null,!1)},show:function(t){t.preventDefault(),t.halt();var i=this.get(n.BASE);i.removeClass(r.HIDDEN);var s=(i.get("winWidth")-400)/2,o=(parseInt(i.get("winHeight"),10)-i.get("offsetHeight"))/2+parseInt(i.get("docScrollY"),10);o<parseInt(i.get("winHeight"),10)*.1&&(o=parseInt(i.get("winHeight"),10)*.1),i.setXY([s,o]),this.get(n.USERS)===null&&this.search(t,!1),this._escCloseEvent=e.on("key",this.hide,document.body,"down:27",this)},hide:function(e){this._escCloseEvent&&(this._escCloseEvent.detach(),this._escCloseEvent=null),this.get(n.BASE).addClass(r.HIDDEN)},search:function(t,r){t&&(t.halt(),t.preventDefault());var i;r?this.set(n.PAGE,this.get(n.PAGE)+1):(this.set(n.USERCOUNT,0),this.set(n.PAGE,0)),i=this.get(n.PARAMS),i.sesskey=M.cfg.sesskey,i.action="searchusers",i.search=this.get(n.SEARCH).get("value"),i.page=this.get(n.PAGE),i.perpage=this.get(n.PERPAGE),e.io(M.cfg.wwwroot+this.get(n.AJAXURL),{method:"POST",data:build_querystring(i),on:{start:this.displayLoading,complete:this.processSearchResults,end:this.removeLoading},context:this,arguments:{append:r}})},displayLoading:function(){this._loadingNode.removeClass(r.HIDDEN)},removeLoading:function(){this._loadingNode.addClass(r.HIDDEN)},processSearchResults:function(t,s,o){var u=!1,a,f,l,c,h,p,d,v,m;try{u=e.JSON.parse(s.responseText);if(u.error)return new M.core.ajaxException(u)}catch(g){new M.core.exception(g)}u.success||(this.setContent=M.str.enrol.errajaxsearch),o.append?a=this.get(n.BASE).one("."+r.SEARCHRESULTS+" ."+r.USERS):a=i('<div class="'+r.USERS+'"></div>'),f=this.get(n.USERCOUNT),l="";for(c in u.response.users)f++,user=u.response.users[c],this.get(n.SELECTEDUSERS).indexOf(user.userid)>=0?l=" "+r.SELECTED:l="",l===""?h=i('<input type="button" class="'+r.SELECT+'" value="'+M.str.moodle.select+'" />'):h=i('<input type="button" class="'+r.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'),p=i('<div class="'+r.USER+l+' clearfix" rel="'+user.userid+'"></div>').addClass(f%2?r.ODD:r.EVEN).append(i('<div class="'+r.COUNT+'">'+f+"</div>")).append(i('<div class="'+r.PICTURE+'"></div>').append(i(user.picture))).append(i('<div class="'+r.DETAILS+'"></div>').append(i('<div class="'+r.FULLNAME+'">'+user.fullname+"</div>")).append(i('<div class="'+r.EXTRAFIELDS+'">'+user.extrafields+"</div>"))).append(i('<div class="'+r.OPTIONS+'"></div>').append(h)),a.append(p);this.set(n.USERCOUNT,f),o.append?u.response.totalusers<=(this.get(n.PAGE)+1)*this.get(n.PERPAGE)&&this.get(n.BASE).one("."+r.MORERESULTS).remove():(d=u.response.totalusers=="1"?M.str.enrol.ajaxoneuserfound:M.util.get_string("ajaxxusersfound"
-,"enrol",u.response.totalusers),v=i('<div class="'+r.SEARCHRESULTS+'"></div>').append(i('<div class="'+r.TOTALUSERS+'">'+d+"</div>")).append(a),u.response.totalusers>(this.get(n.PAGE)+1)*this.get(n.PERPAGE)&&(m=i('<div class="'+r.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+"</a></div>"),m.on("click",this.search,this,!0),v.append(m)),this.setContent(v),e.delegate("click",this.selectUser,a,"."+r.USER+" ."+r.SELECT,this,o),e.delegate("click",this.deselectUser,a,"."+r.USER+" ."+r.DESELECT,this,o))},deselectUser:function(t,s){var o=t.currentTarget.ancestor("."+r.USER),u=this.get(n.SELECTEDUSERS),a=u.indexOf(o.getAttribute("rel"));a!=-1&&u.splice(a,1),this.set(n.SELECTEDUSERS,u),e.one('input[name="userids"]').set("value",u.join());var f=this.get(n.USERFULLNAMES);delete f[o.getAttribute("rel")],this.set(n.USERFULLNAMES,f),this.setnamedisplay(),o.removeClass(r.SELECTED),o.one("."+r.DESELECT).remove(),o.one("."+r.OPTIONS).append(i('<input type="button" class="'+r.SELECT+'" value="'+M.str.moodle.select+'" />'))},selectUser:function(t,s){var o=t.currentTarget.ancestor("."+r.USER),u=this.get(n.SELECTEDUSERS);u.push(o.getAttribute("rel")),this.set(n.SELECTEDUSERS,u);var a=o.one(".fullname").get("innerHTML"),f=this.get(n.USERFULLNAMES);f[o.getAttribute("rel")]=a,this.set(n.USERFULLNAMES,f),this.setnamedisplay(),e.one('input[name="userids"]').set("value",u.join()),o.addClass(r.SELECTED),o.one("."+r.SELECT).remove(),o.one("."+r.OPTIONS).append(i('<input type="button" class="'+r.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'))},setContent:function(e){this.get(n.BASE).one("."+r.CONTENT+" ."+r.AJAXCONTENT).setContent(e)},setnamedisplay:function(){var t=this.get(n.USERFULLNAMES);t=t.filter(function(e){return e}),e.one(".felement .selectednames").set("innerHTML",t.join(", ")),e.one('input[name="userfullnames"]').set("value",t.join())}},{NAME:n.NAME,ATTRS:{url:{validator:e.Lang.isString},ajaxurl:{validator:e.Lang.isString},base:{setter:function(t){var r=e.one(t);return r||e.fail(n.NAME+": invalid base node set"),r}},users:{validator:e.Lang.isArray,value:null},selectedusers:{validator:e.Lang.isArray,value:null},userfullnames:{validator:e.Lang.isObject,value:null},courseid:{value:null},params:{validator:e.Lang.isArray,value:[]},multiple:{validator:e.Lang.isBool,value:!1},page:{validator:e.Lang.isNumber,value:0},userCount:{value:0,validator:e.Lang.isNumber},requiresRefresh:{value:!1,validator:e.Lang.isBool},search:{setter:function(t){var r=e.one(t);return r||e.fail(n.NAME+": invalid search node set"),r}},lastPreSearchValue:{value:"",validator:e.Lang.isString},strings:{value:{},validator:e.Lang.isObject},perPage:{value:25,Validator:e.Lang.isNumber}}}),e.augment(e.namespace("M.gradereport_history").UserSelector,e.EventTarget),e.namespace("M.gradereport_history.UserSelector").init=function(e){return new s(e)}},"@VERSION@",{requires:["dd-plugin","event-delegate","event-key","io-base","json-parse","moodle-core-notification","overlay"]});
+YUI.add("moodle-gradereport_history-userselector",function(e,t){var n="gradereport_history",r={NAME:"User Selector Manager",BASE:"base",SEARCH:"search",SEARCHBTN:"searchbtn",PARAMS:"params",URL:"url",AJAXURL:"ajaxurl",MULTIPLE:"multiple",PAGE:"page",COURSEID:"courseid",SELECTEDUSERS:"selectedusers",USERFULLNAMES:"userfullnames",USERS:"users",USERCOUNT:"userCount",LASTSEARCH:"lastPreSearchValue",PERPAGE:"perPage"},i={PANEL:"user-selector-panel",WRAP:"usp-wrap",HEADER:"usp-header",CONTENT:"usp-content",AJAXCONTENT:"usp-ajax-content",SEARCHRESULTS:"usp-search-results",TOTALUSERS:"totalusers",USERS:"users",USER:"user",MORERESULTS:"usp-more-results",LIGHTBOX:"usp-loading-lightbox",LOADINGICON:"loading-icon",FOOTER:"usp-footer",DESELECT:"deselect",SELECT:"select",SELECTED:"selected",COUNT:"count",PICTURE:"picture",DETAILS:"details",FULLNAME:"fullname",EXTRAFIELDS:"extrafields",OPTIONS:"options",ODD:"odd",EVEN:"even",HIDDEN:"hidden",SEARCH:"usp-search",SEARCHBTN:"usp-search-btn",CLOSE:"close",CLOSEBTN:"close-button"},s=e.Node.create,o=function(){o.superclass.constructor.apply(this,arguments)};e.namespace("M.gradereport_history").UserSelector=e.extend(o,e.Base,{_searchTimeout:null,_loadingNode:null,_escCloseEvent:null,initializer:function(){var t,o;this.set(r.BASE,s('<div class="'+i.PANEL+" "+i.HIDDEN+'"></div>').append(s('<div class="'+i.WRAP+'"></div>').append(s('<div class="'+i.HEADER+' header"></div>').append(s('<div class="'+i.CLOSE+'"></div>')).append(s("<h2>"+M.util.get_string("selectuser",n)+"</h2>"))).append(s('<div class="'+i.CONTENT+'"></div>').append(s('<div class="'+i.AJAXCONTENT+'"></div>')).append(s('<div class="'+i.LIGHTBOX+" "+i.HIDDEN+'"></div>').append(s('<img alt="loading" class="'+i.LOADINGICON+'" />').setAttribute("src",M.util.image_url("i/loading","moodle"))).setStyle("opacity",.5))).append(s('<div class="'+i.FOOTER+'"></div>').append(s('<div class="'+i.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+e.Escape.html(M.util.get_string("usersearch","enrol"))+"</label></div>").append(s('<input type="text" id="enrolusersearch" value="" />')).append(s('<input type="button" id="searchbtn" class="'+i.SEARCHBTN+'" value="'+e.Escape.html(M.util.get_string("usersearch","enrol"))+'" />'))).append(s('<div class="'+i.CLOSEBTN+'"></div>').append(s('<input type="button" value="'+e.Escape.html(M.util.get_string("finishselectingusers",n))+'" />')))))),this.set(r.SEARCH,this.get(r.BASE).one("#enrolusersearch")),this.set(r.SEARCHBTN,this.get(r.BASE).one("#searchbtn")),t=e.one('input[name="userids"]').get("value").split(","),t[0]===""&&(t=[]),this.set(r.SELECTEDUSERS,t),t=[],this.get(r.USERFULLNAMES)!==null&&e.each(this.get(r.USERFULLNAMES),function(e,n){t[n]=e}),this.set(r.USERFULLNAMES,t),e.all(".gradereport_history_plugin input").each(function(e){e.hasClass("selectortrigger")&&e.on("click",this.show,this)},this),this.get(r.BASE).one("."+i.HEADER+" ."+i.CLOSE).on("click",this.hide,this),this.get(r.BASE).one("."+i.FOOTER+" ."+i.CLOSEBTN+" input").on("click",this.hide,this),this._loadingNode=this.get(r.BASE).one("."+i.CONTENT+" ."+i.LIGHTBOX),o=this.get(r.PARAMS),o.id=this.get(r.COURSEID),this.set(r.PARAMS,o),e.on("key",this.preSearch,this.get(r.SEARCH),"down:13",this),this.get(r.SEARCHBTN).on("click",this.preSearch,this),e.one(document.body).append(this.get(r.BASE));var u=this.get(r.BASE);u.plug(e.Plugin.Drag),u.dd.addHandle("."+i.HEADER+" h2"),u.one("."+i.HEADER+" h2").setStyle("cursor","move")},preSearch:function(e){this.search(null,!1)},show:function(t){t.preventDefault(),t.halt();var n=this.get(r.BASE);n.removeClass(i.HIDDEN);var s=(n.get("winWidth")-400)/2,o=(parseInt(n.get("winHeight"),10)-n.get("offsetHeight"))/2+parseInt(n.get("docScrollY"),10);o<parseInt(n.get("winHeight"),10)*.1&&(o=parseInt(n.get("winHeight"),10)*.1),n.setXY([s,o]),this.get(r.USERS)===null&&this.search(t,!1),this._escCloseEvent=e.on("key",this.hide,document.body,"down:27",this)},hide:function(e){this._escCloseEvent&&(this._escCloseEvent.detach(),this._escCloseEvent=null),this.get(r.BASE).addClass(i.HIDDEN)},search:function(t,n){t&&(t.halt(),t.preventDefault());var i;n?this.set(r.PAGE,this.get(r.PAGE)+1):(this.set(r.USERCOUNT,0),this.set(r.PAGE,0)),i=this.get(r.PARAMS),i.sesskey=M.cfg.sesskey,i.action="searchusers",i.search=this.get(r.SEARCH).get("value"),i.page=this.get(r.PAGE),i.perpage=this.get(r.PERPAGE),e.io(M.cfg.wwwroot+this.get(r.AJAXURL),{method:"POST",data:build_querystring(i),on:{start:this.displayLoading,complete:this.processSearchResults,end:this.removeLoading},context:this,arguments:{append:n}})},displayLoading:function(){this._loadingNode.removeClass(i.HIDDEN)},removeLoading:function(){this._loadingNode.addClass(i.HIDDEN)},processSearchResults:function(t,o,u){var a=!1,f,l,c,h,p,d,v,m,g;try{a=e.JSON.parse(o.responseText);if(a.error)return new M.core.ajaxException(a)}catch(y){new M.core.exception(y)}a.success||(this.setContent=M.util.get_string("errajaxsearch","enrol")),u.append?f=this.get(r.BASE).one("."+i.SEARCHRESULTS+" ."+i.USERS):f=s('<div class="'+i.USERS+'"></div>'),l=this.get(r.USERCOUNT),c="";for(h in a.response.users)l++,user=a.response.users[h],this.get(r.SELECTEDUSERS).indexOf(user.userid)>=0?c=" "+i.SELECTED:c="",c===""?p=s('<input type="button" class="'+i.SELECT+'" value="'+e.Escape.html(M.util.get_string("select","moodle"))+'" />'):p=s('<input type="button" class="'+i.DESELECT+'" value="'+e.Escape.html(M.util.get_string("deselect",n))+'" />'),d=s('<div class="'+i.USER+c+' clearfix" rel="'+user.userid+'"></div>').addClass(l%2?i.ODD:i.EVEN).append(s('<div class="'+i.COUNT+'">'+l+"</div>")).append(s('<div class="'+i.PICTURE+'"></div>').append(s(user.picture))).append(s('<div class="'+i.DETAILS+'"></div>').append(s('<div class="'+i.FULLNAME+'">'+user.fullname+"</div>")).append(s('<div class="'+i.EXTRAFIELDS+'">'+user.extrafields+"</div>"))).append(s('<div class="'+i.OPTIONS+'"></div>').append(p)),f.append(d);this.set(r.USERCOUNT,l),u.append?a.response.totalusers<=(this.get(r.PAGE)+1
+)*this.get(r.PERPAGE)&&this.get(r.BASE).one("."+i.MORERESULTS).remove():(a.response.totalusers=="1"?v=M.util.get_string("ajaxoneuserfound","enrol"):v=M.util.get_string("ajaxxusersfound","enrol",a.response.totalusers),m=s('<div class="'+i.SEARCHRESULTS+'"></div>').append(s('<div class="'+i.TOTALUSERS+'">'+v+"</div>")).append(f),a.response.totalusers>(this.get(r.PAGE)+1)*this.get(r.PERPAGE)&&(g=s('<div class="'+i.MORERESULTS+'"><a href="#">'+M.util.get_string("ajaxnext25","enrol")+"</a></div>"),g.on("click",this.search,this,!0),m.append(g)),this.setContent(m),e.delegate("click",this.selectUser,f,"."+i.USER+" ."+i.SELECT,this,u),e.delegate("click",this.deselectUser,f,"."+i.USER+" ."+i.DESELECT,this,u))},deselectUser:function(t,n){var o=t.currentTarget.ancestor("."+i.USER),u=this.get(r.SELECTEDUSERS),a=u.indexOf(o.getAttribute("rel"));a!=-1&&u.splice(a,1),this.set(r.SELECTEDUSERS,u),e.one('input[name="userids"]').set("value",u.join());var f=this.get(r.USERFULLNAMES);delete f[o.getAttribute("rel")],this.set(r.USERFULLNAMES,f),this.setnamedisplay(),o.removeClass(i.SELECTED),o.one("."+i.DESELECT).remove(),o.one("."+i.OPTIONS).append(s('<input type="button" class="'+i.SELECT+'" value="'+e.Escape.html(M.util.get_string("select","moodle"))+'" />'))},selectUser:function(t,o){var u=t.currentTarget.ancestor("."+i.USER),a=this.get(r.SELECTEDUSERS);a.push(u.getAttribute("rel")),this.set(r.SELECTEDUSERS,a);var f=u.one(".fullname").get("innerHTML"),l=this.get(r.USERFULLNAMES);l[u.getAttribute("rel")]=f,this.set(r.USERFULLNAMES,l),this.setnamedisplay(),e.one('input[name="userids"]').set("value",a.join()),u.addClass(i.SELECTED),u.one("."+i.SELECT).remove(),u.one("."+i.OPTIONS).append(s('<input type="button" class="'+i.DESELECT+'" value="'+e.Escape.html(M.util.get_string("deselect",n))+'" />'))},setContent:function(e){this.get(r.BASE).one("."+i.CONTENT+" ."+i.AJAXCONTENT).setContent(e)},setnamedisplay:function(){var t=this.get(r.USERFULLNAMES);t=t.filter(function(e){return e}),e.one(".felement .selectednames").set("innerHTML",t.join(", ")),e.one('input[name="userfullnames"]').set("value",t.join())}},{NAME:r.NAME,ATTRS:{url:{validator:e.Lang.isString},ajaxurl:{validator:e.Lang.isString},base:{setter:function(t){var n=e.one(t);return n||e.fail(r.NAME+": invalid base node set"),n}},users:{validator:e.Lang.isArray,value:null},selectedusers:{validator:e.Lang.isArray,value:null},userfullnames:{validator:e.Lang.isObject,value:null},courseid:{value:null},params:{validator:e.Lang.isArray,value:[]},multiple:{validator:e.Lang.isBool,value:!1},page:{validator:e.Lang.isNumber,value:0},userCount:{value:0,validator:e.Lang.isNumber},requiresRefresh:{value:!1,validator:e.Lang.isBool},search:{setter:function(t){var n=e.one(t);return n||e.fail(r.NAME+": invalid search node set"),n}},lastPreSearchValue:{value:"",validator:e.Lang.isString},strings:{value:{},validator:e.Lang.isObject},perPage:{value:25,Validator:e.Lang.isNumber}}}),e.augment(e.namespace("M.gradereport_history").UserSelector,e.EventTarget),e.namespace("M.gradereport_history.UserSelector").init=function(e){return new o(e)}},"@VERSION@",{requires:["dd-plugin","escape","event-delegate","event-key","io-base","json-parse","moodle-core-notification-dialogue","overlay"]});
diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
index ca8cd42bc58..5a937732482 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
@@ -1,5 +1,6 @@
 YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
 
+var COMPONENT = 'gradereport_history';
 var USP = {
     NAME : 'User Selector Manager',
     /** Properties **/
@@ -68,7 +69,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             .append(create('<div class="'+CSS.WRAP+'"></div>')
                 .append(create('<div class="'+CSS.HEADER+' header"></div>')
                     .append(create('<div class="'+CSS.CLOSE+'"></div>'))
-                    .append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
+                    .append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
                 .append(create('<div class="'+CSS.CONTENT+'"></div>')
                     .append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
                     .append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@@ -76,12 +77,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
                             .setAttribute('src', M.util.image_url('i/loading', 'moodle')))
                         .setStyle('opacity', 0.5)))
                 .append(create('<div class="'+CSS.FOOTER+'"></div>')
-                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.str.enrol.usersearch+'</label></div>')
+                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'</label></div>')
                         .append(create('<input type="text" id="enrolusersearch" value="" />'))
-                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+M.str.enrol.usersearch+'" />'))
+                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
                     )
                     .append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
-                        .append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
+                        .append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
                     )
                 )
             )
@@ -214,7 +215,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             new M.core.exception(e);
         }
         if (!result.success) {
-            this.setContent = M.str.enrol.errajaxsearch;
+            this.setContent = M.util.get_string('errajaxsearch', 'enrol');
         }
 
         if (!args.append) {
@@ -236,9 +237,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             }
 
             if (selected === '') {
-                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
+                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
             } else {
-                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
+                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
             }
 
             node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@@ -255,12 +256,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
         }
         this.set(USP.USERCOUNT, count);
         if (!args.append) {
-            usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            if (result.response.totalusers == '1') {
+                usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
+            } else {
+                usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            }
             content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
                 .append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
                 .append(users);
             if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
-                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
+                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
                 fetchmore.on('click', this.search, this, true);
                 content.append(fetchmore);
             }
@@ -292,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.removeClass(CSS.SELECTED);
         user.one('.'+CSS.DESELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
     },
     selectUser : function(e, args) {
         var user = e.currentTarget.ancestor('.'+CSS.USER);
@@ -314,7 +319,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.addClass(CSS.SELECTED);
         user.one('.'+CSS.SELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
     },
     setContent: function(content) {
         this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);
@@ -413,11 +418,12 @@ Y.namespace('M.gradereport_history.UserSelector').init = function(cfg) {
 }, '@VERSION@', {
     "requires": [
         "dd-plugin",
+        "escape",
         "event-delegate",
         "event-key",
         "io-base",
         "json-parse",
-        "moodle-core-notification",
+        "moodle-core-notification-dialogue",
         "overlay"
     ]
 });
diff --git a/grade/report/history/yui/src/userselector/js/userselector.js b/grade/report/history/yui/src/userselector/js/userselector.js
index 768f1c904cd..627823ee6a2 100644
--- a/grade/report/history/yui/src/userselector/js/userselector.js
+++ b/grade/report/history/yui/src/userselector/js/userselector.js
@@ -1,3 +1,4 @@
+var COMPONENT = 'gradereport_history';
 var USP = {
     NAME : 'User Selector Manager',
     /** Properties **/
@@ -66,7 +67,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             .append(create('<div class="'+CSS.WRAP+'"></div>')
                 .append(create('<div class="'+CSS.HEADER+' header"></div>')
                     .append(create('<div class="'+CSS.CLOSE+'"></div>'))
-                    .append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
+                    .append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
                 .append(create('<div class="'+CSS.CONTENT+'"></div>')
                     .append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
                     .append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@@ -74,12 +75,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
                             .setAttribute('src', M.util.image_url('i/loading', 'moodle')))
                         .setStyle('opacity', 0.5)))
                 .append(create('<div class="'+CSS.FOOTER+'"></div>')
-                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.str.enrol.usersearch+'</label></div>')
+                    .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'</label></div>')
                         .append(create('<input type="text" id="enrolusersearch" value="" />'))
-                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+M.str.enrol.usersearch+'" />'))
+                            .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
                     )
                     .append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
-                        .append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
+                        .append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
                     )
                 )
             )
@@ -212,7 +213,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             new M.core.exception(e);
         }
         if (!result.success) {
-            this.setContent = M.str.enrol.errajaxsearch;
+            this.setContent = M.util.get_string('errajaxsearch', 'enrol');
         }
 
         if (!args.append) {
@@ -234,9 +235,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
             }
 
             if (selected === '') {
-                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
+                actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
             } else {
-                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
+                actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
             }
 
             node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@@ -253,12 +254,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
         }
         this.set(USP.USERCOUNT, count);
         if (!args.append) {
-            usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            if (result.response.totalusers == '1') {
+                usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
+            } else {
+                usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
+            }
             content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
                 .append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
                 .append(users);
             if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
-                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
+                fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
                 fetchmore.on('click', this.search, this, true);
                 content.append(fetchmore);
             }
@@ -290,7 +295,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.removeClass(CSS.SELECTED);
         user.one('.'+CSS.DESELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
     },
     selectUser : function(e, args) {
         var user = e.currentTarget.ancestor('.'+CSS.USER);
@@ -312,7 +317,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
 
         user.addClass(CSS.SELECTED);
         user.one('.'+CSS.SELECT).remove();
-        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
+        user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
     },
     setContent: function(content) {
         this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);
diff --git a/grade/report/history/yui/src/userselector/meta/userselector.json b/grade/report/history/yui/src/userselector/meta/userselector.json
index 04855878b61..a600ed04c01 100644
--- a/grade/report/history/yui/src/userselector/meta/userselector.json
+++ b/grade/report/history/yui/src/userselector/meta/userselector.json
@@ -2,11 +2,12 @@
     "moodle-gradereport_history-userselector": {
         "requires": [
             "dd-plugin",
+            "escape",
             "event-delegate",
             "event-key",
             "io-base",
             "json-parse",
-            "moodle-core-notification",
+            "moodle-core-notification-dialogue",
             "overlay"
         ]
     }