Passed
Push — release_2_0 ( a1e5a0...377107 )
by Maja
06:22
created
web/diag/magicTelepath.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
22
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
24
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
25
-$nro = filter_input(INPUT_GET,'nro', FILTER_SANITIZE_STRING);
24
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
25
+$nro = filter_input(INPUT_GET, 'nro', FILTER_SANITIZE_STRING);
26 26
 CAT_session_start();
27 27
 $languageObject = new core\common\Language();
28 28
 $languageObject->setTextDomain("diagonstics");
Please login to merge, or discard this patch.
web/diag/diag.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
     $auth->authenticate();
43 43
 }
44 44
 if (isset($_SESSION['admin_diag_auth'])) {
45
-   $admin =  1;
46
-   unset($_SESSION['admin_diag_auth']);
45
+    $admin =  1;
46
+    unset($_SESSION['admin_diag_auth']);
47 47
 }
48 48
 $Gui = new \web\lib\user\Gui();
49 49
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? CONFIG['APPEARANCE']['skins'][0]);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
 $admin = filter_input(INPUT_GET, 'admin', FILTER_VALIDATE_INT);
24 24
 $auth = new \web\lib\admin\Authentication();
25 25
 $isauth = 0;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             unset($q_el[$idx]);
34 34
             $q_r = preg_replace("/\?.*/", "", $_SERVER['REQUEST_URI']);
35 35
             if (count($q_el)) {
36
-                $q_r = $q_r . '?' . implode('&', $q_el);
36
+                $q_r = $q_r.'?'.implode('&', $q_el);
37 37
             }
38 38
             $_SERVER['REQUEST_URI'] = $q_r;
39 39
         }
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
     $auth->authenticate();
43 43
 }
44 44
 if (isset($_SESSION['admin_diag_auth'])) {
45
-   $admin =  1;
45
+   $admin = 1;
46 46
    unset($_SESSION['admin_diag_auth']);
47 47
 }
48 48
 $Gui = new \web\lib\user\Gui();
49 49
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? CONFIG['APPEARANCE']['skins'][0]);
50
-require "../skins/" . $skinObject->skin . "/diag/diag.php";
50
+require "../skins/".$skinObject->skin."/diag/diag.php";
51 51
 
52 52
 
Please login to merge, or discard this patch.
web/skins/modern/diag/diag.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@
 block discarded – undo
156 156
                         echo "0\">";
157 157
                         echo _("This service is for authenticated admins only.") . '<br>';
158 158
                         echo "<a href=\"diag.php?admin=1\">" .
159
-                             _("eduroam® admin access is needed") . "</a>";
159
+                                _("eduroam® admin access is needed") . "</a>";
160 160
                     }
161 161
                 ?>
162 162
             </div> 
Please login to merge, or discard this patch.
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 
41 41
 <?php
42 42
 $profile_list_size = 1;
43
-require_once dirname(__DIR__) . '/Divs.php';
43
+require_once dirname(__DIR__).'/Divs.php';
44 44
 $divs = new \web\skins\modern\Divs($Gui);
45 45
 $visibility = 'index';
46 46
 $operatingSystem = $Gui->detectOS();
47 47
 $Gui->loggerInstance->debug(4, $operatingSystem);
48 48
 $uiElements = new web\lib\admin\UIElements();
49 49
 if ($operatingSystem) {
50
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
50
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
51 51
 }
52
-require dirname(__DIR__) . '/user/js/cat_js.php';
52
+require dirname(__DIR__).'/user/js/cat_js.php';
53 53
 ?>
54 54
 
55 55
 </script>
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
             <?php echo $divs->div_pagetitle(_("Diagnostics site"), ""); ?>
82 82
             <div id="user_info" style='padding-top: 10px;'>
83 83
             <div id='diagnostic_choice'>
84
-                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?>
85
-                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?>   
86
-                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?>
84
+                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?>
85
+                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?>   
86
+                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?>
87 87
             </div>
88 88
             <div id='diagnostic_enduser' style='display: none;'>
89 89
                 <h2><?php echo _("Tools for End Users"); ?></h2>
@@ -93,24 +93,24 @@  discard block
 block discarded – undo
93 93
                 ?>
94 94
                 </p>
95 95
                 <?php
96
-                    echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>';
96
+                    echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>';
97 97
                     echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<b>realm.tld</b>):");
98 98
                 ?>
99 99
                 <input type='text' name='user_realm' id='user_realm' value=''>
100 100
                 <?php
101
-                    echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>';
102
-                    echo _("You can select your home institution from the following list") . '<br/>';
101
+                    echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>';
102
+                    echo _("You can select your home institution from the following list").'<br/>';
103 103
                     echo '<div id="select_idp_country"><a href="" id="idp_countries_list">';    
104
-                    echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>';
104
+                    echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>';
105 105
                 ?>
106 106
                 <div id="select_idp_area" style="display:none;">
107 107
                 </div>
108 108
                 </div>
109 109
                 <div id="position_info">
110 110
                     <?php
111
-                        echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>';
111
+                        echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>';
112 112
                         echo '<div id="select_sp_country"><a href="" id="sp_countries_list">';    
113
-                        echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>';
113
+                        echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>';
114 114
                     ?>
115 115
                     <div id="select_sp_area" style="display:none;">
116 116
                     </div>
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
                             echo 'none';
144 144
                         }
145 145
                         echo ";'>";
146
-                        echo '<h3>' . _("Which problem are you reporting?") . '</h3>';
146
+                        echo '<h3>'._("Which problem are you reporting?").'</h3>';
147 147
                         echo '<input type="radio" name="problem_type" value="1">';
148
-                        echo _("SP contacting IdP due to technical problems or abuse") . '<br>';
148
+                        echo _("SP contacting IdP due to technical problems or abuse").'<br>';
149 149
                         echo '<input type="radio" name="problem_type" value="2">';
150 150
                         echo _("IdP contacting SP due to technical problems");
151 151
                         echo "<div id='idp_contact_area'></div>";
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
154 154
                         echo "</div>"; 
155 155
                     } else {
156 156
                         echo "0\">";
157
-                        echo _("This service is for authenticated admins only.") . '<br>';
158
-                        echo "<a href=\"diag.php?admin=1\">" .
159
-                             _("eduroam® admin access is needed") . "</a>";
157
+                        echo _("This service is for authenticated admins only.").'<br>';
158
+                        echo "<a href=\"diag.php?admin=1\">".
159
+                             _("eduroam® admin access is needed")."</a>";
160 160
                     }
161 161
                 ?>
162 162
             </div> 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         if (type === 'idp' || type === 'sp') {
181 181
             shtml = '<table><tbody><tr id="row_'+type+'_country"></tr>';
182 182
             shtml = shtml + '<tr id="row_'+type+'_institution" style="visibility: collapse;">';
183
-            shtml = shtml + '<td>' + <?php echo '"' . _("Select institiution:") . '"'; ?> + '</td><td></td></tr>';
183
+            shtml = shtml + '<td>' + <?php echo '"'._("Select institiution:").'"'; ?> + '</td><td></td></tr>';
184 184
             if (type === 'idp') {
185 185
                 shtml = shtml + '<tr id="row_idp_realm"></tr>';
186 186
             }
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
         var options = '';
207 207
         var selecthead = '';
208 208
         if (type1 === 'sp' || type1 === 'idp') {
209
-            selecthead = <?php echo '"<td>' . _("Select country or region:") . ' </td>"'; ?>;
209
+            selecthead = <?php echo '"<td>'._("Select country or region:").' </td>"'; ?>;
210 210
             selecthead = selecthead + '<td>\n';
211 211
         }
212 212
         var select = '<select id="' + type1 + '_country" name="' + type1 + '_country" style="margin-left:0px; width:400px;">';
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
             options = ($('#'+type2+'_country').html());
215 215
             countryAddSelect(selecthead, select + options + '</select>', type1);
216 216
         } else {
217
-            var comment = <?php echo '"<br><br>' . _("Fetching country/region list") . '..."'; ?>;
217
+            var comment = <?php echo '"<br><br>'._("Fetching country/region list").'..."'; ?>;
218 218
             inProgress(1, comment);
219 219
             $.ajax({
220 220
                 url: "findRealm.php",
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         return false;
249 249
     }
250 250
     function testSociopath(realm, answer) {
251
-        var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; 
251
+        var comment = <?php echo '"'._("Testing realm").'..."'; ?>; 
252 252
         inProgress(1, comment);
253 253
         if ($('#tested_realm').length == 0) {
254 254
             $('<input>').attr({
@@ -273,9 +273,9 @@  discard block
 block discarded – undo
273 273
                                 query = '<input type="hidden" id="tested_realm" value="' + realm + '">';
274 274
                             }    
275 275
                             query = query + '<div id="current_query">'+data['TEXT']+'</div>';
276
-                            query = query + '<div><button id="answer_yes">' + <?php echo '"' . _("Yes") . '"'; ?> + '</button>';
277
-                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"' . _("No") . '"'; ?> + '</button>';
278
-                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"' . _("I don't know") . '"'; ?> + '</button></div>';
276
+                            query = query + '<div><button id="answer_yes">' + <?php echo '"'._("Yes").'"'; ?> + '</button>';
277
+                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"'._("No").'"'; ?> + '</button>';
278
+                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"'._("I don't know").'"'; ?> + '</button></div>';
279 279
                             $('#sociopath_queries').html(query);
280 280
                             $('#sociopath_query_area').show();
281 281
                         }
@@ -306,55 +306,55 @@  discard block
 block discarded – undo
306 306
        }); 
307 307
     }
308 308
     function finalVerdict(realm, verdict) {
309
-        var title = <?php echo '"' . _("Diagnostic tests results for selected realm") . '"'; ?>;
309
+        var title = <?php echo '"'._("Diagnostic tests results for selected realm").'"'; ?>;
310 310
         result = '<div class="padding">';
311 311
         result = result + '<div><h3>';
312
-        result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm;
312
+        result = result + <?php echo '"'._("The result for tested realm:").' "'; ?> + realm;
313 313
         result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">';
314
-        result = result + <?php echo '"' . _("The system identified") . '" '; ?>  + ' ';
314
+        result = result + <?php echo '"'._("The system identified").'" '; ?>  + ' ';
315 315
         result = result + Object.keys(verdict).length + ' ';
316
-        result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>';
317
-        result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>;
316
+        result = result + <?php echo '"'._("suspected areas which potentially can cause a problem.").'"'; ?> + '<br>';
317
+        result = result + <?php echo '"'._("Next to the problem description we show a speculated probability of this event.").'"'; ?>;
318 318
         result = result + '</div><div style="padding: 5px;"><table>';
319 319
         k = 1;
320 320
         for (key in verdict) {
321 321
             result = result + '<tr><td>' + k + '.</td>';
322 322
             k = k + 1;
323 323
             if (key === 'INFRA_DEVICE') {
324
-                result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"'; ?> + '</td>';
324
+                result = result + '<td>' + <?php echo '"'._("Your device configuration is broken").'"'; ?> + '</td>';
325 325
             }
326 326
             if (key === 'INFRA_SP_80211') {
327
-                result = result + '<td>' + <?php echo '"' . _("The Wi-Fi network in your vicinity has quality issues") . '"'; ?> + '</td>';
327
+                result = result + '<td>' + <?php echo '"'._("The Wi-Fi network in your vicinity has quality issues").'"'; ?> + '</td>';
328 328
             }
329 329
             if (key === 'INFRA_SP_LAN') {
330
-                result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"'; ?> + '</td>';
330
+                result = result + '<td>' + <?php echo '"'._("The network environment around you is broken").'"'; ?> + '</td>';
331 331
             }
332 332
             if (key === 'INFRA_SP_RADIUS') {
333
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your service provider is the source of the problem") . '"'; ?> + '</td>';
333
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your service provider is the source of the problem").'"'; ?> + '</td>';
334 334
             }
335 335
             if (key === 'INFRA_IDP_AUTHBACKEND') {
336
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server in your home institution is currently unable to authenticate you") . '"'; ?> + '</td>';
336
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server in your home institution is currently unable to authenticate you").'"'; ?> + '</td>';
337 337
             }
338 338
             if (key === 'INFRA_NRO_SP') {
339
-                result = result + '<td>' + <?php echo '"' . _("The national server in the country/region you are visiting is not functioning correctly") . '"'; ?> + '</td>';
339
+                result = result + '<td>' + <?php echo '"'._("The national server in the country/region you are visiting is not functioning correctly").'"'; ?> + '</td>';
340 340
             }
341 341
             if (key === 'INFRA_LINK_ETLR_NRO_SP') {
342
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of the country/region you are visiting and the top-level server is broken") . '"'; ?> + '</td>';
342
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of the country/region you are visiting and the top-level server is broken").'"'; ?> + '</td>';
343 343
             }
344 344
             if (key === 'INFRA_LINK_ETLR_NRO_IdP') {
345
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of your home country/region and the top-level server is broken") . '"'; ?> + '</td>';
345
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of your home country/region and the top-level server is broken").'"'; ?> + '</td>';
346 346
             }
347 347
             if (key === 'INFRA_ETLR') {
348
-                result = result + '<td>' + <?php echo '"' . _("The communication to the top-level server is down") . '"'; ?> + '</td>';
348
+                result = result + '<td>' + <?php echo '"'._("The communication to the top-level server is down").'"'; ?> + '</td>';
349 349
             }
350 350
             if (key === 'INFRA_NRO_IdP') {
351
-                result = result + '<td>' + <?php echo '"' . _("The national server in your home country/region is not functioning properly.") . '"'; ?> + '</td>';
351
+                result = result + '<td>' + <?php echo '"'._("The national server in your home country/region is not functioning properly.").'"'; ?> + '</td>';
352 352
             }
353 353
             if (key === 'INFRA_IdP_RADIUS') {
354
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your home institution is the source of the problem") . '"'; ?> + '</td>';
354
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your home institution is the source of the problem").'"'; ?> + '</td>';
355 355
             }
356 356
             if (key === 'INFRA_NONEXISTENTREALM') {
357
-                result = result + '<td>' + <?php echo '"' . _("This realm does not exist") . '"'; ?> + '</td>';
357
+                result = result + '<td>' + <?php echo '"'._("This realm does not exist").'"'; ?> + '</td>';
358 358
             }
359 359
             result = result + '<td style="padding-left: 5px;">' + (verdict[key] * 100).toFixed(2) + "%</td></tr>";
360 360
         }
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
         return false;
467 467
     });
468 468
     $(document).on('change', '#idp_country, #sp_country, #asp_country' , function() {
469
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
469
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
470 470
         var id = $(this).attr('id');
471 471
         var k = id.indexOf('_');
472 472
         var type = id.substr(0,k);
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
                         var shtml = '';
485 485
                         var select = '';
486 486
                         if (type !== 'asp') {
487
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
487
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
488 488
                         }
489 489
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
490 490
                         for (var i in institutions) {
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
             $('#start_test_area').hide();
525 525
             return false;
526 526
         }
527
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
527
+        var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>;
528 528
         inProgress(1, comment);
529 529
         $.ajax({
530 530
             url: "findRealm.php",
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
                     var realms = data.realms;
537 537
                     var realmselect = '';
538 538
                     if (realms.length > 1) {
539
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
539
+                        realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>;
540 540
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
541 541
                         for (var i in realms) {
542 542
                             realmselect = realmselect + '<input type="radio" name="realm" ';
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
                         }
549 549
                         realmselect = realmselect + '</span></td>';
550 550
                     } else {
551
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
551
+                        realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>;
552 552
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
553 553
                         realmselect = realmselect + realms[0] + '</span>';
554 554
                         realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">';
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
             });
604 604
             t = 1;
605 605
         }
606
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
606
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
607 607
         inProgress(1, comment);
608 608
         /*waiting(comment);*/
609 609
         $.ajax({
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
                             }
648 648
                         });
649 649
                         $('#sp_questions > tbody').append('<tr class="error_row"><td>' +
650
-                                <?php echo '"' . _("Realm is not registered with the eduroam database:") . '"'; ?> +
650
+                                <?php echo '"'._("Realm is not registered with the eduroam database:").'"'; ?> +
651 651
                                 '</td><td>' + realm + '</td></tr>');
652 652
                         $('#admin_realm').val('');
653 653
                     }    
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
         testSociopath('', answer);
672 672
     });
673 673
     $('#realmtest').click(function(event){
674
-        var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>;
674
+        var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>;
675 675
         inProgress(1, comment);
676 676
         $('#start_test_area').hide();
677 677
         if ($('#select_sp_area').is(':hidden')) {
@@ -719,13 +719,13 @@  discard block
 block discarded – undo
719 719
                         reset_footer();
720 720
                         testSociopath(realm, 0);
721 721
                     } else {
722
-                        var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>;
723
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>;
722
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
723
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>;
724 724
                         result = result + '</h3>'
725 725
                         if (r.length == 1) {
726
-                            result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>;
726
+                            result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>;
727 727
                         } else {    
728
-                            result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>;
728
+                            result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>;
729 729
                         }
730 730
                         result = result + ': '
731 731
                         for (var i=0; i < r.length; i++) {
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
                             result = result + r[i];
736 736
                         }
737 737
                         result = result + '.<br>';
738
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
738
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
739 739
                         result = result + '</div>';
740 740
                         $('#after_stage_1').hide();
741 741
                         $('#before_stage_1').show();
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
                 });
789 789
             });
790 790
         });
791
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
791
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
792 792
         inProgress(1, comment);
793 793
         $.ajax({
794 794
             url: "findRealm.php",
@@ -859,29 +859,29 @@  discard block
 block discarded – undo
859 859
             success:function(data) {
860 860
                 if (data.status === 1) {
861 861
                     var result = '';
862
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
862
+                    var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>;
863 863
                     result = '<div class="padding">';
864 864
                     if (type == 'idp_send') {
865
-                        result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
865
+                        result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>';
866 866
                         result = result + '<table>';
867
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
868
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
869
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>';
870
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
871
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
872
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
867
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
868
+                        result = result + '<tr><td>' + <?php echo '"'._("SP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
869
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email(s)").'"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>';
870
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
871
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
872
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
873 873
                     }
874 874
                     if (type == 'sp_send') {
875
-                        result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>';
875
+                        result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>';
876 876
                         result = result + '<table>';
877
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
878
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>';
879
-                        result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
880
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
881
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
882
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
883
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
884
-                        result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
877
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
878
+                        result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>';
879
+                        result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
880
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
881
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
882
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
883
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
884
+                        result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
885 885
                     }
886 886
                     result = result + '</div>';
887 887
                     showInfo(result, title);
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
         if ($('#mac').val().length > 0) {
899 899
             if ($('#mac').val().length != 17) {
900 900
                 $('#mac').addClass('error_input');
901
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
901
+                $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>);
902 902
             } else {
903 903
                 $('#mac').removeClass('error_input'); 
904 904
                 $('#mac').attr('title', '');
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
         if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
908 908
             if (!isEmail($(this).val())) {
909 909
                 $('#email').addClass('error_input');
910
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
910
+                $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
911 911
             } else {
912 912
                 $('#email').removeClass('error_input');
913 913
                 $('#email').attr('title', '');
@@ -916,7 +916,7 @@  discard block
 block discarded – undo
916 916
         if ($(this).attr('id') == 'outer_id' &&  $(this).val().length > 0) {
917 917
             if (!isEmail($(this).val(), true)) {
918 918
                 $('#outer_id').addClass('error_input');
919
-                $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>);
919
+                $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>);
920 920
             } else {
921 921
                 $('#outer_id').removeClass('error_input');
922 922
                 $('#outer_id').attr('title', '');
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
         if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) {
926 926
             if (!isOperatorName($(this).val())) {
927 927
                 $('#opname').addClass('error_input');
928
-                $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>);
928
+                $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>);
929 929
                 $('#spmanually').show();
930 930
             } else {
931 931
                 $('#opname').removeClass('error_input');
Please login to merge, or discard this patch.