GEANT /
CAT
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 74 | 74 | $root = $dom->createElement($rootname); |
| 75 | 75 | $dom->appendChild($root); |
| 76 | - $ns = $dom->createAttributeNS( null, 'xmlns' ); |
|
| 76 | + $ns = $dom->createAttributeNS(null, 'xmlns'); |
|
| 77 | 77 | $ns->value = "http://www.microsoft.com/networking/WLAN/profile/v1"; |
| 78 | 78 | $root->appendChild($ns); |
| 79 | 79 | \core\DeviceXMLmain::marshalObject($dom, $root, 'WLANprofile', $this->getWLANprofile(), '', true); |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $node->appendChild($childNode); |
| 212 | 212 | } |
| 213 | 213 | if (!empty($namespace)) { |
| 214 | - $ns = $domElement->createAttributeNS(null,'xmlns'); |
|
| 214 | + $ns = $domElement->createAttributeNS(null, 'xmlns'); |
|
| 215 | 215 | $ns->value = $namespace; |
| 216 | 216 | $childNode->appendChild($ns); |
| 217 | 217 | } |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | $nextChild = $domElement->createElement($nameC, $cl); |
| 239 | 239 | $childNode->appendChild($nextChild); |
| 240 | 240 | if (!empty($namespaceC)) { |
| 241 | - $ns = $domElement->createAttributeNS(null,'xmlns'); |
|
| 241 | + $ns = $domElement->createAttributeNS(null, 'xmlns'); |
|
| 242 | 242 | $ns->value = $namespaceC; |
| 243 | 243 | $nextChild->appendChild($ns); |
| 244 | 244 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | $childNode->appendChild($nextChild); |
| 261 | 261 | } |
| 262 | 262 | if (!empty($namespaceC)) { |
| 263 | - $ns = $domElement->createAttributeNS(null,'xmlns'); |
|
| 263 | + $ns = $domElement->createAttributeNS(null, 'xmlns'); |
|
| 264 | 264 | $ns->value = $namespaceC; |
| 265 | 265 | $nextChild->appendChild($ns); |
| 266 | 266 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | ?> |
| 22 | 22 | <?php |
| 23 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 23 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 24 | 24 | |
| 25 | 25 | $auth = new \web\lib\admin\Authentication(); |
| 26 | 26 | $languageInstance = new \core\common\Language(); |
@@ -34,9 +34,9 @@ |
||
| 34 | 34 | $skinObject = new \web\lib\user\Skinjob("classic"); |
| 35 | 35 | /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT |
| 36 | 36 | $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."), \config\Master::APPEARANCE['productname'])."<p>". |
| 37 | - sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | - "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | - "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 37 | + sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | + "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | + "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 40 | 40 | \config\Master::APPEARANCE['productname'], |
| 41 | 41 | \config\ConfAssistant::CONSORTIUM['display_name'], |
| 42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |
@@ -42,24 +42,24 @@ |
||
| 42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |
| 43 | 43 | \config\Master::APPEARANCE['productname'], |
| 44 | 44 | \config\Master::APPEARANCE['productname']); |
| 45 | -$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>"; |
|
| 46 | -$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>"; |
|
| 45 | +$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>"; |
|
| 46 | +$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>"; |
|
| 47 | 47 | foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
| 48 | - $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>"; |
|
| 48 | + $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>"; |
|
| 49 | 49 | } |
| 50 | 50 | $out .= "</tr>"; |
| 51 | 51 | foreach (\devices\Devices::listDevices() as $index => $onedevice) { |
| 52 | 52 | if (isset($onedevice['options'])) { |
| 53 | - if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
| 53 | + if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) { |
|
| 54 | 54 | continue; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | - $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png"); |
|
| 57 | + $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png"); |
|
| 58 | 58 | $vendorImg = ""; |
| 59 | 59 | if ($vendor !== FALSE) { |
| 60 | 60 | $vendorImg = "<img src='$vendor' alt='logo'>"; |
| 61 | 61 | } |
| 62 | - $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>"; |
|
| 62 | + $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>"; |
|
| 63 | 63 | $device_instance = new \core\DeviceFactory($index); |
| 64 | 64 | foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) { |
| 65 | 65 | $out .= "<td>"; |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * It works on two CAs, the RSA and ECDSA variant. There is a separate temp |
| 29 | 29 | * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ). |
| 30 | 30 | */ |
| 31 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 31 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 32 | 32 | |
| 33 | 33 | /* If the RADIUS server is supposed to generate meaningful (temporally stable, |
| 34 | 34 | * per user, per SP identifiers, then it needs to compute them on the username, |
@@ -159,7 +159,7 @@ |
||
| 159 | 159 | echo "0\">"; |
| 160 | 160 | echo _("This service is for authenticated admins only.") . '<br>'; |
| 161 | 161 | echo "<a href=\"diag.php?admin=1\">" . |
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 162 | + _("eduroam® admin access is needed") . "</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -47,9 +47,9 @@ discard block |
||
| 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 | $cssUrl = $Gui->skinObject->findResourceUrl("CSS", "cat-user.css.php"); |
| 54 | 54 | ?> |
| 55 | 55 | </script> |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | <?php |
| 64 | 64 | echo $divs->divHeading($visibility); |
| 65 | 65 | $Gui->languageInstance->setTextDomain("diagnostics"); |
| 66 | -require dirname(__DIR__) . '/diag/js/diag_js.php'; |
|
| 66 | +require dirname(__DIR__).'/diag/js/diag_js.php'; |
|
| 67 | 67 | ?> |
| 68 | 68 | <div id="main_page"> |
| 69 | 69 | <div id="loading_ico"> |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | </div> |
| 80 | 80 | <div id="main_body"> |
| 81 | 81 | <div id="user_page"> |
| 82 | - <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?> |
|
| 82 | + <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?> |
|
| 83 | 83 | <div id="user_info" style='padding-top: 10px;'> |
| 84 | 84 | <div id='diagnostic_choice'> |
| 85 | - <?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") . ' '; ?> |
|
| 86 | - <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?> |
|
| 87 | - <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?> |
|
| 85 | + <?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").' '; ?> |
|
| 86 | + <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?> |
|
| 87 | + <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?> |
|
| 88 | 88 | </div> |
| 89 | 89 | <div id='diagnostic_enduser' style='display: none;'> |
| 90 | 90 | <h2><?php echo _("Tools for End Users"); ?></h2> |
@@ -94,24 +94,24 @@ discard block |
||
| 94 | 94 | ?> |
| 95 | 95 | </p> |
| 96 | 96 | <?php |
| 97 | - echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>'; |
|
| 97 | + echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>'; |
|
| 98 | 98 | echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<strong>realm.tld</strong>'):"); |
| 99 | 99 | ?> |
| 100 | 100 | <input type='text' name='user_realm' id='user_realm' value=''> |
| 101 | 101 | <?php |
| 102 | - echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>'; |
|
| 103 | - echo _("You can select your home institution from the following list") . '<br/>'; |
|
| 102 | + echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>'; |
|
| 103 | + echo _("You can select your home institution from the following list").'<br/>'; |
|
| 104 | 104 | echo '<div id="select_idp_country"><a href="" id="idp_countries_list">'; |
| 105 | - echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>'; |
|
| 105 | + echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>'; |
|
| 106 | 106 | ?> |
| 107 | 107 | <div id="select_idp_area" style="display:none;"> |
| 108 | 108 | </div> |
| 109 | 109 | </div> |
| 110 | 110 | <div id="position_info"> |
| 111 | 111 | <?php |
| 112 | - echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>'; |
|
| 112 | + echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>'; |
|
| 113 | 113 | echo '<div id="select_sp_country"><a href="" id="sp_countries_list">'; |
| 114 | - echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>'; |
|
| 114 | + echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>'; |
|
| 115 | 115 | ?> |
| 116 | 116 | <div id="select_sp_area" style="display:none;"> |
| 117 | 117 | </div> |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | echo 'none'; |
| 145 | 145 | } |
| 146 | 146 | echo ";'>"; |
| 147 | - echo '<h3>' . _("What is the nature of the problem?") . '</h3>'; |
|
| 148 | - echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>'; |
|
| 149 | - echo _("I suspect a technical problem at a particular IdP") . '<br>'; |
|
| 147 | + echo '<h3>'._("What is the nature of the problem?").'</h3>'; |
|
| 148 | + echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>'; |
|
| 149 | + echo _("I suspect a technical problem at a particular IdP").'<br>'; |
|
| 150 | 150 | echo '<input type="radio" name="problem_type" value="1">'; |
| 151 | - echo _("I want to report abuse of network resources by a roaming user") . '<br>'; |
|
| 151 | + echo _("I want to report abuse of network resources by a roaming user").'<br>'; |
|
| 152 | 152 | echo '<input type="radio" name="problem_type" value="2">'; |
| 153 | 153 | echo _("I suspect a technical problem for one of my users at a particular SP"); |
| 154 | 154 | echo "<div id='idp_contact_area'></div>"; |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | echo "</div>"; |
| 158 | 158 | } else { |
| 159 | 159 | echo "0\">"; |
| 160 | - echo _("This service is for authenticated admins only.") . '<br>'; |
|
| 161 | - echo "<a href=\"diag.php?admin=1\">" . |
|
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 160 | + echo _("This service is for authenticated admins only.").'<br>'; |
|
| 161 | + echo "<a href=\"diag.php?admin=1\">". |
|
| 162 | + _("eduroam® admin access is needed")."</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | return false; |
| 238 | 238 | }); |
| 239 | 239 | $(document).on('change', '#idp_country' , function() { |
| 240 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 240 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 241 | 241 | var id = $(this).attr('id'); |
| 242 | 242 | var k = id.indexOf('_'); |
| 243 | 243 | var type = id.substr(0,k); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | var shtml = ''; |
| 256 | 256 | var select = ''; |
| 257 | 257 | if (type !== 'asp') { |
| 258 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 258 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 259 | 259 | } |
| 260 | 260 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 261 | 261 | for (var i in institutions) { |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | } else { |
| 277 | 277 | if (data.status === 0) { |
| 278 | 278 | inProgress(0); |
| 279 | - var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 279 | + var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 280 | 280 | alert(msg); |
| 281 | 281 | $('#select_idp_country').show(); |
| 282 | 282 | $('#select_idp_area').hide(); |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | }, |
| 286 | 286 | error:function() { |
| 287 | 287 | inProgress(0); |
| 288 | - var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 288 | + var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 289 | 289 | alert(msg); |
| 290 | 290 | $('#select_idp_country').show(); |
| 291 | 291 | $('#select_idp_area').hide(); |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | }); |
| 302 | 302 | $(document).on('change', '#select_sp_problem' , function() { |
| 303 | 303 | if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') { |
| 304 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>); |
|
| 304 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>); |
|
| 305 | 305 | } else { |
| 306 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>); |
|
| 306 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>); |
|
| 307 | 307 | } |
| 308 | 308 | $('#realm_in_db_admin').hide(); |
| 309 | 309 | $('#admin_realm').val(''); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | clear_sp_question(); |
| 312 | 312 | }); |
| 313 | 313 | $(document).on('change', '#sp_country, #asp_country' , function() { |
| 314 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 314 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 315 | 315 | var id = $(this).attr('id'); |
| 316 | 316 | var k = id.indexOf('_'); |
| 317 | 317 | var type = id.substr(0,k); |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | var shtml = ''; |
| 330 | 330 | var select = ''; |
| 331 | 331 | if (type !== 'asp') { |
| 332 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 332 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 333 | 333 | } |
| 334 | 334 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 335 | 335 | for (var i in hotspots) { |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | inProgress(0); |
| 353 | 353 | var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">'; |
| 354 | 354 | var shtml = '<td></td><td>'; |
| 355 | - select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>'; |
|
| 355 | + select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>'; |
|
| 356 | 356 | if (type !== 'asp') { |
| 357 | 357 | $('#row_' + type + '_institution').html(''); |
| 358 | 358 | $('#row_' + type + '_institution').append(shtml + select); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $('#start_test_area').hide(); |
| 387 | 387 | return false; |
| 388 | 388 | } |
| 389 | - var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>; |
|
| 389 | + var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>; |
|
| 390 | 390 | inProgress(1, comment); |
| 391 | 391 | co = $("#idp_country option:selected").val(); |
| 392 | 392 | $.ajax({ |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | var realms = data.realms; |
| 400 | 400 | var realmselect = ''; |
| 401 | 401 | if (realms.length > 1) { |
| 402 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 402 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 403 | 403 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 404 | 404 | for (var i in realms) { |
| 405 | 405 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | realmselect = realmselect + '</span></td>'; |
| 413 | 413 | } else { |
| 414 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 414 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 415 | 415 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 416 | 416 | realmselect = realmselect + realms[0] + '</span>'; |
| 417 | 417 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | clear_sp_question(); |
| 470 | 470 | t = 1; |
| 471 | 471 | } |
| 472 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 472 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 473 | 473 | inProgress(1, comment); |
| 474 | 474 | /*waiting(comment);*/ |
| 475 | 475 | $.ajax({ |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | testSociopath('', answer); |
| 532 | 532 | }); |
| 533 | 533 | $('#realmtest').click(function(event){ |
| 534 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 534 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 535 | 535 | inProgress(1, comment); |
| 536 | 536 | $('#start_test_area').hide(); |
| 537 | 537 | if ($('#select_sp_area').is(':hidden')) { |
@@ -579,13 +579,13 @@ discard block |
||
| 579 | 579 | reset_footer(); |
| 580 | 580 | testSociopath(realm, 0); |
| 581 | 581 | } else { |
| 582 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 583 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occurred") . '"'; ?>; |
|
| 582 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 583 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>; |
|
| 584 | 584 | result = result + '</h3>' |
| 585 | 585 | if (r.length == 1) { |
| 586 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 586 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 587 | 587 | } else { |
| 588 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 588 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 589 | 589 | } |
| 590 | 590 | result = result + ': ' |
| 591 | 591 | for (var i=0; i < r.length; i++) { |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | result = result + r[i]; |
| 596 | 596 | } |
| 597 | 597 | result = result + '.<br>'; |
| 598 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 598 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 599 | 599 | result = result + '</div>'; |
| 600 | 600 | $('#after_stage_1').hide(); |
| 601 | 601 | $('#before_stage_1').show(); |
@@ -663,43 +663,43 @@ discard block |
||
| 663 | 663 | success:function(data) { |
| 664 | 664 | if (data.status === 1) { |
| 665 | 665 | var result = ''; |
| 666 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 666 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 667 | 667 | result = '<div class="padding">'; |
| 668 | 668 | if (type == 'idp_send') { |
| 669 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 669 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 670 | 670 | result = result + '<table>'; |
| 671 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 672 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 673 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 674 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 675 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 676 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 671 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 672 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 673 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 674 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 675 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 676 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 677 | 677 | if (data.tests_result == 1) { |
| 678 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 678 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 679 | 679 | } else { |
| 680 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 680 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 681 | 681 | } |
| 682 | 682 | result = result + '</td></tr>'; |
| 683 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 684 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 683 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 684 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 685 | 685 | if (data.emailsent == 1) { |
| 686 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 686 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 687 | 687 | } else { |
| 688 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 688 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 689 | 689 | } |
| 690 | 690 | result = result + '</td><td></td></tr>'; |
| 691 | 691 | } |
| 692 | 692 | if (type == 'sp_send') { |
| 693 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 693 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 694 | 694 | result = result + '<table>'; |
| 695 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 696 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 697 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 698 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 699 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 700 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 701 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 702 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 695 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 696 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 697 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 698 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 699 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 700 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 701 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 702 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 703 | 703 | } |
| 704 | 704 | result = result + '</div>'; |
| 705 | 705 | showInfo(result, title); |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 731 | 731 | } |
| 732 | 732 | }); |
| 733 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 733 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 734 | 734 | } else { |
| 735 | 735 | $('#admin_realm').removeClass('error_input'); |
| 736 | 736 | $('#admin_realm').attr('title', ''); |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | $(document).on('keyup change', '#email' , function() { |
| 745 | 745 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 746 | 746 | $('#email').addClass('error_input'); |
| 747 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 747 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 748 | 748 | } else { |
| 749 | 749 | $('#email').removeClass('error_input'); |
| 750 | 750 | $('#email').attr('title', ''); |
@@ -757,7 +757,7 @@ discard block |
||
| 757 | 757 | if ($('#mac').val().length > 0) { |
| 758 | 758 | if ($('#mac').val().length != 17) { |
| 759 | 759 | $('#mac').addClass('error_input'); |
| 760 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 760 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 761 | 761 | } else { |
| 762 | 762 | $('#mac').removeClass('error_input'); |
| 763 | 763 | $('#mac').attr('title', ''); |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 767 | 767 | if (!isEmail($(this).val())) { |
| 768 | 768 | $('#email').addClass('error_input'); |
| 769 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 769 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 770 | 770 | } else { |
| 771 | 771 | $('#email').removeClass('error_input'); |
| 772 | 772 | $('#email').attr('title', ''); |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 776 | 776 | if (!isEmail($(this).val(), true)) { |
| 777 | 777 | $('#outer_id').addClass('error_input'); |
| 778 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 778 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 779 | 779 | } else { |
| 780 | 780 | $('#outer_id').removeClass('error_input'); |
| 781 | 781 | $('#outer_id').attr('title', ''); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 785 | 785 | if (!isOperatorName($(this).val())) { |
| 786 | 786 | $('#opname').addClass('error_input'); |
| 787 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 787 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 788 | 788 | $('#spmanually').show(); |
| 789 | 789 | } else { |
| 790 | 790 | $('#opname').removeClass('error_input'); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | const DOWNLOAD_FOR_MESSAGE = 1055; |
| 53 | 53 | const SB_GO_AWAY = 1060; |
| 54 | 54 | const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061; |
| 55 | -const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062; |
|
| 55 | +const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062; |
|
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | ]; |
| 105 | 105 | $this->templates[WELCOME_ABOARD_TERMS] = ""; |
| 106 | 106 | foreach ($this->templates[NETWORK_TERMS_AND_PRIV] as $consortium => $terms) { |
| 107 | - $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("Please remember that when connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU_LINK'], $terms['PRIV_LINK']); |
|
| 107 | + $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>"._("Please remember that when connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.")."</p>", $consortium, $terms['TOU_LINK'], $terms['PRIV_LINK']); |
|
| 108 | 108 | } |
| 109 | 109 | // $this->templates[WELCOME_ABOARD_TERMS] .= "<p>"._("I agree to be bound by these Terms and Conditions.")."</p>"; |
| 110 | 110 | $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads"); |
| 111 | 111 | $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("We would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 112 | 112 | $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']); |
| 113 | - $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 113 | + $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 114 | 114 | $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 115 | 115 | $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation"); |
| 116 | 116 | $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | - ?> |
|
| 22 | + ?> |
|
| 23 | 23 | <?php |
| 24 | 24 | $Gui = new \web\lib\user\Gui(); |
| 25 | 25 | $Gui->languageInstance->setTextDomain("diagnostics"); |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 31 | 31 | $root = $dom->createElement($rootname); |
| 32 | 32 | $dom->appendChild($root); |
| 33 | - $ns = $dom->createAttributeNS( null, 'xmlns' ); |
|
| 33 | + $ns = $dom->createAttributeNS(null, 'xmlns'); |
|
| 34 | 34 | $ns->value = "http://www.microsoft.com/networking/LAN/profile/v1"; |
| 35 | 35 | $root->appendChild($ns); |
| 36 | 36 | \core\DeviceXMLmain::marshalObject($dom, $root, 'WLANprofile', $this->getLANprofile(), '', true); |
