Passed
Push — master ( 88d9e6...151819 )
by Tomasz
03:10
created
web/skins/classic/user/js/cat_js.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 <?php 
12 12
 $cat = new core\CAT();
13 13
 function escaped_echo($s) {
14
-   echo preg_replace('/"/','&quot;',$s);
14
+   echo preg_replace('/"/', '&quot;', $s);
15 15
 }
16 16
 
17 17
 $langObject = new \core\common\Language();
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     result = j.status;
71 71
     if(! result) {
72 72
       alert("<?php escaped_echo(_("no matching data found"))?>");
73
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
73
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
74 74
     }
75 75
     j = j.data;
76 76
     n = j.length;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     inst_name = j[0].idp_name;
79 79
     logo = j[0].logo;
80 80
     $("#inst_name").val(inst_name);
81
-    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"),$cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
81
+    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"), $cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
82 82
     $(".inst_name").text(inst_name);
83 83
     $("#user_page").show();
84 84
     $("#institution_name").show();
@@ -191,8 +191,8 @@  discard block
 block discarded – undo
191 191
        j1 = $.parseJSON(data);
192 192
        result = j1.status;
193 193
        if(! result) {
194
-            alert("<?php escaped_echo( _("no matching data found"))?>");
195
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
194
+            alert("<?php escaped_echo(_("no matching data found"))?>");
195
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
196 196
        }
197 197
        j = j1.data;
198 198
        if(j.description !== undefined && j.description) {
@@ -203,15 +203,15 @@  discard block
 block discarded – undo
203 203
          $("#profile_desc").text('');
204 204
        }
205 205
        if(j.local_url !== undefined && j.local_url) 
206
-         txt = txt+'<tr><td><?php escaped_echo(_("WWW:"));?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
206
+         txt = txt+'<tr><td><?php escaped_echo(_("WWW:")); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
207 207
        if(j.local_email !== undefined && j.local_email) 
208
-         txt = txt+'<tr><td><?php escaped_echo(_("email:"));?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
208
+         txt = txt+'<tr><td><?php escaped_echo(_("email:")); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
209 209
        if(j.local_phone !== undefined && j.local_phone) 
210
-         txt = txt+'<tr><td><?php escaped_echo(_("tel:"));?></td><td>'+j.local_phone+'</td></tr>';
210
+         txt = txt+'<tr><td><?php escaped_echo(_("tel:")); ?></td><td>'+j.local_phone+'</td></tr>';
211 211
        if(txt) 
212
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
212
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
213 213
         else 
214
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst)); ?>.</th></tr></table>";
214
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst)); ?>.</th></tr></table>";
215 215
       $("#user_info").html(txt);
216 216
       $("#user_info").show();
217 217
       if(j.silverbullet) {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
           $("#g_"+v.id).addClass('alertButton');
230 230
           $("#cross_icon_"+v.id).show();
231 231
           $("#"+v.id).addClass('disabledDevice');
232
-          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>");
232
+          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>");
233 233
           $("#info_b_"+v.id+",#g_info_b_"+v.id).hide();
234 234
         } else  {
235 235
           if(v.status == -1)
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
242 242
           $("#"+v.id+",#g_"+v.id).click(function(event){
243 243
             i_div = $("#info_"+$(this).attr('id'));
244
-            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue"));?></a></span>";
244
+            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue")); ?></a></span>";
245 245
             i_div.html(t);
246 246
             $(".redirect_link").click(function(event) {
247 247
                i_div.hide();
@@ -249,13 +249,13 @@  discard block
 block discarded – undo
249 249
                
250 250
           });
251 251
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
252
-          var continue_text = "<?php escaped_echo(_("Continue"));?>";
252
+          var continue_text = "<?php escaped_echo(_("Continue")); ?>";
253 253
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
254 254
           $("#"+v.id+",#g_"+v.id).click(function(event){
255 255
             i_div = $("#info_"+$(this).attr('id'));
256 256
             if(v.status > 0) {
257
-              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>";
258
-              continue_text = "<?php escaped_echo(_("Close"));?>";
257
+              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>";
258
+              continue_text = "<?php escaped_echo(_("Close")); ?>";
259 259
             } else {
260 260
             t = i_div.html();
261 261
             if(v.message != '0') {
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
   }
313 313
 
314 314
   function infoCAT(k,title) {
315
-      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php");?>', {page: k, lang: lang}, function(data) {
315
+      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php"); ?>', {page: k, lang: lang}, function(data) {
316 316
     if(data.substring(0,8) == 'no_title') {
317 317
        data = data.substring(8,data.length);
318 318
     } else {
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
    var x = getWindowHCenter() - 16;
331 331
    $("#loading_ico").css('left',x+'px');
332 332
    $("#loading_ico").show();
333
-   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE","admin/overview_user.php");?>?lang="+lang);
333
+   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE", "admin/overview_user.php"); ?>?lang="+lang);
334 334
 }
335 335
 
336 336
 /* Get horizontal center of the Browser Window */
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
     return(Math.round(windowWidth/2));
352 352
 }
353 353
 
354
-<?php if($idpId) { 
354
+<?php if ($idpId) { 
355 355
       print "front_page = 0;\n";
356 356
 } ?>
357 357
 
@@ -389,10 +389,10 @@  discard block
 block discarded – undo
389 389
     $("#download_info a").attr('href',download_link);
390 390
     $('#download_info').show();
391 391
     if( generateTimer > 0 ) {
392
-       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer);
392
+       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer);
393 393
     }
394 394
     else {
395
-       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link;
395
+       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link;
396 396
     }
397 397
   }
398 398
 }
@@ -510,13 +510,13 @@  discard block
 block discarded – undo
510 510
    "overlay":true,"cookie":true,"type":false,
511 511
    "country":true,"location":true,
512 512
    "title":"<?php escaped_echo($cat->nomenclature_inst) ?>",
513
-   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"),$cat->nomenclature_inst)) ?>",
514
-   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"),$cat->nomenclature_inst)) ?>",
515
-   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
513
+   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"), $cat->nomenclature_inst)) ?>",
514
+   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"), $cat->nomenclature_inst)) ?>",
515
+   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
516 516
    "textLocateMe": "<?php escaped_echo(_("Locate me more accurately using HTML5 Geo-Location")) ?>",
517
-   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"),$cat->nomenclature_inst)) ?>",
517
+   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"), $cat->nomenclature_inst)) ?>",
518 518
    "textAllCountries": "<?php escaped_echo(_("all countries")) ?>",
519
-   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"),$cat->nomenclature_inst)) ?>",
519
+   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"), $cat->nomenclature_inst)) ?>",
520 520
    "textShowAllCountries": "<?php escaped_echo(_("show all countries")) ?>",
521 521
    "textLimited1" : "<?php escaped_echo(_("Results limited to"))?>",
522 522
    "textLimited2" : "<?php escaped_echo(_("entries - show more"))?>",
Please login to merge, or discard this patch.