GEANT /
CAT
@@ -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, |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | $invitationObject = new SilverbulletInvitation($token); |
| 326 | 326 | $profile = new ProfileSilverbullet($invitationObject->profile); |
| 327 | 327 | $inst = new IdP($profile->institution); |
| 328 | - $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n"); |
|
| 328 | + $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n"); |
|
| 329 | 329 | if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) { |
| 330 | 330 | throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have gotten that far!"); |
| 331 | 331 | } |
@@ -338,12 +338,12 @@ discard block |
||
| 338 | 338 | throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!"); |
| 339 | 339 | } |
| 340 | 340 | $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow); |
| 341 | - $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n"); |
|
| 341 | + $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n"); |
|
| 342 | 342 | $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry); |
| 343 | 343 | if ($expiryDateObject === FALSE) { |
| 344 | 344 | throw new Exception("The expiry date we got from the DB is bogus!"); |
| 345 | 345 | } |
| 346 | - $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n"); |
|
| 346 | + $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n"); |
|
| 347 | 347 | // date_create with no parameters can't fail, i.e. is never FALSE |
| 348 | 348 | $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject); |
| 349 | 349 | $expiryDays = $validity->days + 1; |
@@ -377,14 +377,14 @@ discard block |
||
| 377 | 377 | $exportedCertClear = ""; |
| 378 | 378 | openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]); |
| 379 | 379 | $pkey_3des = ""; |
| 380 | - openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]); |
|
| 380 | + openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]); |
|
| 381 | 381 | // store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key! |
| 382 | 382 | // we need the *real* expiry date, not just the day-approximation |
| 383 | 383 | $x509 = new \core\common\X509(); |
| 384 | 384 | $certString = ""; |
| 385 | 385 | openssl_x509_export($cert, $certString); |
| 386 | 386 | $parsedCert = $x509->processCertificate($certString); |
| 387 | - $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true)); |
|
| 387 | + $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true)); |
|
| 388 | 388 | $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s"); |
| 389 | 389 | |
| 390 | 390 | // store new cert info in DB |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | // let the RADIUS users know the actual username for CUI generation |
| 397 | 397 | $radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns |
| 398 | 398 | foreach ($radiusDbs as $oneRadiusDb) { |
| 399 | - $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]); |
|
| 399 | + $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]); |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | // return PKCS#12 data stream |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | $username = ""; |
| 454 | 454 | while ($usernameIsUnique === FALSE) { |
| 455 | 455 | $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz"); |
| 456 | - $username = $usernameLocalPart . "@" . $realm; |
|
| 456 | + $username = $usernameLocalPart."@".$realm; |
|
| 457 | 457 | $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype); |
| 458 | 458 | // SELECT -> resource, not boolean |
| 459 | 459 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) { |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
| 32 | 32 | $validator = new \web\lib\common\InputValidation(); |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
| 41 | 41 | ) |
| 42 | 42 | ) {*/ |
| 43 | - if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 43 | + if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 44 | 44 | { |
| 45 | 45 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 46 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 46 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 47 | 47 | exit(0); |
| 48 | 48 | } else { |
| 49 | 49 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -100,19 +100,19 @@ discard block |
||
| 100 | 100 | if (isset($_POST['agreement']) && $_POST['agreement'] == "true") { |
| 101 | 101 | $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1); |
| 102 | 102 | } |
| 103 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 103 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 104 | 104 | exit(0); |
| 105 | 105 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 106 | 106 | $response = $deployment->setRADIUSconfig(); |
| 107 | 107 | if (in_array('OK', $response)) { |
| 108 | 108 | $deployment->deactivate(); |
| 109 | 109 | } |
| 110 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 110 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 111 | 111 | exit(0); |
| 112 | 112 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 113 | 113 | error_log("MGW Remove deployment ".serialize($deployment)); |
| 114 | 114 | $deployment->remove(); |
| 115 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 115 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 116 | 116 | exit(0); |
| 117 | 117 | case web\lib\common\FormElements::BUTTON_ACTIVATE: |
| 118 | 118 | if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) { |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | if (in_array('OK', $response)) { |
| 121 | 121 | $deployment->activate(); |
| 122 | 122 | } |
| 123 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 123 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 124 | 124 | exit(0); |
| 125 | 125 | } else { |
| 126 | 126 | throw new Exception("Activate button pushed without acknowledged ToUs!"); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } else { |
| 150 | 150 | $response = ['NOOP', 'NOOP']; |
| 151 | 151 | } |
| 152 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 152 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 153 | 153 | exit(0); |
| 154 | 154 | default: |
| 155 | 155 | throw new Exception("Unknown button action requested!"); |
@@ -158,10 +158,10 @@ discard block |
||
| 158 | 158 | if (isset($_POST['command'])) { |
| 159 | 159 | switch ($_POST['command']) { |
| 160 | 160 | case web\lib\common\FormElements::BUTTON_CLOSE: |
| 161 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 161 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 162 | 162 | exit(0); |
| 163 | 163 | default: |
| 164 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 164 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 165 | 165 | exit(0); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 189 | 189 | $deploymentOptions = $deployment->getAttributes(); |
| 190 | 190 | echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'> |
| 191 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 191 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 192 | 192 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 193 | 193 | ?> |
| 194 | 194 | <fieldset class='option_container' id='managedsp_override'> |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | <!-- input for VLAN identifier for home users--> |
| 223 | 223 | <td> |
| 224 | 224 | <span id='vlan_label'> |
| 225 | - <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 225 | + <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 226 | 226 | </span> |
| 227 | 227 | </td> |
| 228 | 228 | <td> |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | </fieldset> |
| 243 | 243 | |
| 244 | 244 | <?php |
| 245 | - echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
| 245 | + echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
| 246 | 246 | echo $deco->footer(); |
| 247 | 247 | |
| 248 | 248 | |
| 249 | 249 | \ No newline at end of file |
@@ -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 | |
| 54 | 54 | ?> |
| 55 | 55 | </script> |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | <div id='wrap' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "beta.png"); ?>");'> |
| 62 | 62 | <form id="cat_form" name="cat_form" accept-charset="UTF-8" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="POST"> |
| 63 | 63 | <?php |
| 64 | -require dirname(__DIR__) . '/diag/js/diag_js.php'; |
|
| 64 | +require dirname(__DIR__).'/diag/js/diag_js.php'; |
|
| 65 | 65 | echo $divs->divHeading($visibility); |
| 66 | 66 | $Gui->languageInstance->setTextDomain("diagnostics"); |
| 67 | 67 | ?> |
@@ -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 | $.ajax({ |
| 392 | 392 | url: "findRealm.php", |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | var realms = data.realms; |
| 399 | 399 | var realmselect = ''; |
| 400 | 400 | if (realms.length > 1) { |
| 401 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 401 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 402 | 402 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 403 | 403 | for (var i in realms) { |
| 404 | 404 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | } |
| 411 | 411 | realmselect = realmselect + '</span></td>'; |
| 412 | 412 | } else { |
| 413 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 413 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 414 | 414 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 415 | 415 | realmselect = realmselect + realms[0] + '</span>'; |
| 416 | 416 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | clear_sp_question(); |
| 463 | 463 | t = 1; |
| 464 | 464 | } |
| 465 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 465 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 466 | 466 | inProgress(1, comment); |
| 467 | 467 | /*waiting(comment);*/ |
| 468 | 468 | $.ajax({ |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | testSociopath('', answer); |
| 524 | 524 | }); |
| 525 | 525 | $('#realmtest').click(function(event){ |
| 526 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 526 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 527 | 527 | inProgress(1, comment); |
| 528 | 528 | $('#start_test_area').hide(); |
| 529 | 529 | if ($('#select_sp_area').is(':hidden')) { |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | reset_footer(); |
| 572 | 572 | testSociopath(realm, 0); |
| 573 | 573 | } else { |
| 574 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 575 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>; |
|
| 574 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 575 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>; |
|
| 576 | 576 | result = result + '</h3>' |
| 577 | 577 | if (r.length == 1) { |
| 578 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 578 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 579 | 579 | } else { |
| 580 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 580 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 581 | 581 | } |
| 582 | 582 | result = result + ': ' |
| 583 | 583 | for (var i=0; i < r.length; i++) { |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | result = result + r[i]; |
| 588 | 588 | } |
| 589 | 589 | result = result + '.<br>'; |
| 590 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 590 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 591 | 591 | result = result + '</div>'; |
| 592 | 592 | $('#after_stage_1').hide(); |
| 593 | 593 | $('#before_stage_1').show(); |
@@ -655,43 +655,43 @@ discard block |
||
| 655 | 655 | success:function(data) { |
| 656 | 656 | if (data.status === 1) { |
| 657 | 657 | var result = ''; |
| 658 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 658 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 659 | 659 | result = '<div class="padding">'; |
| 660 | 660 | if (type == 'idp_send') { |
| 661 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 661 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 662 | 662 | result = result + '<table>'; |
| 663 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 663 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 669 | 669 | if (data.tests_result == 1) { |
| 670 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 670 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 671 | 671 | } else { |
| 672 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 672 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 673 | 673 | } |
| 674 | 674 | result = result + '</td></tr>'; |
| 675 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 675 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 677 | 677 | if (data.emailsent == 1) { |
| 678 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 678 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 679 | 679 | } else { |
| 680 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 680 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 681 | 681 | } |
| 682 | 682 | result = result + '</td><td></td></tr>'; |
| 683 | 683 | } |
| 684 | 684 | if (type == 'sp_send') { |
| 685 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 685 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 686 | 686 | result = result + '<table>'; |
| 687 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 687 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 695 | 695 | } |
| 696 | 696 | result = result + '</div>'; |
| 697 | 697 | showInfo(result, title); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 718 | 718 | } |
| 719 | 719 | }); |
| 720 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 720 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 721 | 721 | } else { |
| 722 | 722 | $('#admin_realm').removeClass('error_input'); |
| 723 | 723 | $('#admin_realm').attr('title', ''); |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | $(document).on('keyup change', '#email' , function() { |
| 728 | 728 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 729 | 729 | $('#email').addClass('error_input'); |
| 730 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 730 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 731 | 731 | } else { |
| 732 | 732 | $('#email').removeClass('error_input'); |
| 733 | 733 | $('#email').attr('title', ''); |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | if ($('#mac').val().length > 0) { |
| 741 | 741 | if ($('#mac').val().length != 17) { |
| 742 | 742 | $('#mac').addClass('error_input'); |
| 743 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 743 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 744 | 744 | } else { |
| 745 | 745 | $('#mac').removeClass('error_input'); |
| 746 | 746 | $('#mac').attr('title', ''); |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 750 | 750 | if (!isEmail($(this).val())) { |
| 751 | 751 | $('#email').addClass('error_input'); |
| 752 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 752 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 753 | 753 | } else { |
| 754 | 754 | $('#email').removeClass('error_input'); |
| 755 | 755 | $('#email').attr('title', ''); |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 759 | 759 | if (!isEmail($(this).val(), true)) { |
| 760 | 760 | $('#outer_id').addClass('error_input'); |
| 761 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 761 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 762 | 762 | } else { |
| 763 | 763 | $('#outer_id').removeClass('error_input'); |
| 764 | 764 | $('#outer_id').attr('title', ''); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 768 | 768 | if (!isOperatorName($(this).val())) { |
| 769 | 769 | $('#opname').addClass('error_input'); |
| 770 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 770 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 771 | 771 | $('#spmanually').show(); |
| 772 | 772 | } else { |
| 773 | 773 | $('#opname').removeClass('error_input'); |
