GEANT /
CAT
@@ -19,7 +19,7 @@ discard block |
||
| 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 | |
| 24 | 24 | $deco = new \web\lib\admin\PageDecoration(); |
| 25 | 25 | $validator = new \web\lib\common\InputValidation(); |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $preflist = $my_profile->getEapMethodsinOrderOfPreference(); |
| 46 | 46 | ?> |
| 47 | - <h1><?php $tablecaption = sprintf(_("Device compatiblity matrix for %s of %s "), $profile_name, $inst_name); echo $tablecaption;?></h1> |
|
| 47 | + <h1><?php $tablecaption = sprintf(_("Device compatiblity matrix for %s of %s "), $profile_name, $inst_name); echo $tablecaption; ?></h1> |
|
| 48 | 48 | <table class="compatmatrix"> |
| 49 | - <caption><?php echo $tablecaption;?></caption> |
|
| 49 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 50 | 50 | <tr> |
| 51 | 51 | <th scope='col'></th> |
| 52 | 52 | <th scope='col'><?php echo _("Device"); ?></th> |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | <?php |
| 55 | 55 | foreach ($preflist as $method) { |
| 56 | 56 | $escapedMethod = $method->getIntegerRep(); |
| 57 | - echo "<th scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/> |
|
| 57 | + echo "<th scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/> |
|
| 58 | 58 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 59 | 59 | <input type='hidden' name='eaptype' value='$escapedMethod'> |
| 60 | - <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button> |
|
| 60 | + <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button> |
|
| 61 | 61 | </form></th>"; |
| 62 | 62 | } |
| 63 | 63 | ?> |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | foreach (\devices\Devices::listDevices() as $index => $description) { |
| 74 | 74 | |
| 75 | 75 | echo "<tr>"; |
| 76 | - echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/> |
|
| 76 | + echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/> |
|
| 77 | 77 | <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 78 | 78 | <input type='hidden' name='device' value='$index'> |
| 79 | - <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button> |
|
| 79 | + <button class='redirect' type='submit'>"._("Device-specific options...")."</button> |
|
| 80 | 80 | </form> |
| 81 | 81 | </td>"; |
| 82 | 82 | $factory = new \core\DeviceFactory($index); |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | $footnotesForDevEapCombo = []; |
| 86 | 86 | $display_footnote = FALSE; |
| 87 | 87 | $langObject = new \core\common\Language(); |
| 88 | - $downloadform = "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'> |
|
| 88 | + $downloadform = "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'> |
|
| 89 | 89 | <input type='hidden' name='device' value='$index'/> |
| 90 | 90 | <input type='hidden' name='generatedfor' value='admin'/> |
| 91 | - <button class='download'>" . _("Download") . "</button> |
|
| 91 | + <button class='download'>"._("Download")."</button> |
|
| 92 | 92 | "; |
| 93 | 93 | // first of all: if redirected, indicate by color |
| 94 | 94 | |
@@ -151,8 +151,8 @@ discard block |
||
| 151 | 151 | </table> |
| 152 | 152 | <p><strong><?php $tablecaption2 = _("Legend:"); echo $tablecaption2; ?></strong></p> |
| 153 | 153 | <table class="compatmatrix"> |
| 154 | - <caption><?php echo $tablecaption2;?></caption> |
|
| 155 | - <tr><th scope="col"><?php echo _("Colour");?></th><th scope='col'><?php echo _("Meaning");?></th></tr> |
|
| 154 | + <caption><?php echo $tablecaption2; ?></caption> |
|
| 155 | + <tr><th scope="col"><?php echo _("Colour"); ?></th><th scope='col'><?php echo _("Meaning"); ?></th></tr> |
|
| 156 | 156 | <tr><td class="compat_redirected"> </td> <td><?php echo _("redirection is set"); ?></td></tr> |
| 157 | 157 | <tr><td class="compat_default"> </td> <td><?php echo _("will be offered on download site"); ?></td></tr> |
| 158 | 158 | <tr><td class="compat_secondary"> </td> <td><?php echo _("configured, but not preferred EAP type"); ?></td></tr> |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | </table> |
| 162 | 162 | <?php |
| 163 | 163 | if (count($distinctFootnotes)) { |
| 164 | - echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>"; |
|
| 164 | + echo "<p><strong>"._("Footnotes:")."</strong></p><table>"; |
|
| 165 | 165 | foreach ($distinctFootnotes as $number => $text) { |
| 166 | 166 | echo "<tr><td>($number) - </td><td>$text</td></tr>"; |
| 167 | 167 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /* |
| 21 | 21 | * Class autoloader invocation, should be included prior to any other code at the entry points to the application |
| 22 | 22 | */ |
| 23 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 23 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 24 | 24 | |
| 25 | 25 | $auth = new \web\lib\admin\Authentication(); |
| 26 | 26 | $auth->authenticate(); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $fed = new \core\Federation($inst->federation); |
| 54 | 54 | $allowSb = $fed->getAttributes("fed:silverbullet"); |
| 55 | 55 | if (count($allowSb) == 0) { |
| 56 | - throw new Exception("We were told to create a new SB profile, but this " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " does not allow SB at all!"); |
|
| 56 | + throw new Exception("We were told to create a new SB profile, but this ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." does not allow SB at all!"); |
|
| 57 | 57 | } |
| 58 | 58 | // okay, new SB profiles are allowed. |
| 59 | 59 | // but is there a support:email attribute on inst level? |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | // Create one. |
| 65 | 65 | $newProfile = $inst->newProfile(core\AbstractProfile::PROFILETYPE_SILVERBULLET); |
| 66 | 66 | // and modify the REQUEST_URI to add the new profile ID |
| 67 | - $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier; |
|
| 67 | + $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier; |
|
| 68 | 68 | $_GET['profile_id'] = $newProfile->identifier; |
| 69 | 69 | $profile = $newProfile; |
| 70 | 70 | } else { |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | if (isset($_POST['command'])) { |
| 90 | 90 | switch ($_POST['command']) { |
| 91 | 91 | case \web\lib\common\FormElements::BUTTON_CLOSE: |
| 92 | - header("Location: overview_idp.php?inst_id=" . $inst->identifier); |
|
| 92 | + header("Location: overview_idp.php?inst_id=".$inst->identifier); |
|
| 93 | 93 | break; |
| 94 | 94 | case \web\lib\common\FormElements::BUTTON_TERMSOFUSE: |
| 95 | 95 | if (isset($_POST['agreement']) && $_POST['agreement'] == 'true') { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | break; |
| 133 | 133 | } |
| 134 | 134 | $properName = $validator->syntaxConformUser($elements[0]); |
| 135 | - $properDate = new DateTime($elements[1] . " 00:00:00"); |
|
| 135 | + $properDate = new DateTime($elements[1]." 00:00:00"); |
|
| 136 | 136 | $numberOfActivations = $elements[2] ?? 5; |
| 137 | 137 | $number = $validator->integer($numberOfActivations); |
| 138 | 138 | if ($number === FALSE) { // invalid input received, default to sane |
@@ -235,18 +235,18 @@ discard block |
||
| 235 | 235 | // warn and ask for confirmation unless already confirmed |
| 236 | 236 | if (!isset($_POST['insecureconfirm']) || $_POST['insecureconfirm'] != "CONFIRM") { |
| 237 | 237 | echo $deco->pageheader(_("Insecure mail domain!"), "ADMIN-IDP-USERS"); |
| 238 | - echo "<p>" . sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail) . "</p>"; |
|
| 239 | - echo "<p>" . _("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.") . "</p>"; |
|
| 240 | - echo "<p>" . _("Do you want the system to send this mail anyway?") . "</p>"; |
|
| 238 | + echo "<p>".sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail)."</p>"; |
|
| 239 | + echo "<p>"._("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.")."</p>"; |
|
| 240 | + echo "<p>"._("Do you want the system to send this mail anyway?")."</p>"; |
|
| 241 | 241 | echo $formtext; |
| 242 | - echo "<button type='submit' class='delete'>" . _("DO NOT SEND") . "</button>"; |
|
| 242 | + echo "<button type='submit' class='delete'>"._("DO NOT SEND")."</button>"; |
|
| 243 | 243 | echo "</form>"; |
| 244 | 244 | echo $formtext; |
| 245 | - echo "<input type='hidden' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'</>"; |
|
| 245 | + echo "<input type='hidden' name='command' value='".\web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'</>"; |
|
| 246 | 246 | echo "<input type='hidden' name='address' value='$properEmail'</>"; |
| 247 | - echo "<input type='hidden' name='token' value='" . $invitationObject->invitationTokenString . "'</>"; |
|
| 247 | + echo "<input type='hidden' name='token' value='".$invitationObject->invitationTokenString."'</>"; |
|
| 248 | 248 | echo "<input type='hidden' name='insecureconfirm' value='CONFIRM'/>"; |
| 249 | - echo "<button type='submit'>" . _("Send anyway.") . "</button>"; |
|
| 249 | + echo "<button type='submit'>"._("Send anyway.")."</button>"; |
|
| 250 | 250 | echo "</form>"; |
| 251 | 251 | echo $deco->footer(); |
| 252 | 252 | exit; |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $activeUsers = $profile->listActiveUsers(); |
| 298 | 298 | |
| 299 | 299 | |
| 300 | -echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME )); |
|
| 300 | +echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME)); |
|
| 301 | 301 | |
| 302 | 302 | ?> |
| 303 | 303 | <script src='js/option_expand.js' type='text/javascript'></script> |
@@ -337,12 +337,12 @@ discard block |
||
| 337 | 337 | <img src='../resources/images/icons/loading51.gif' id='spin' alt='loading...' style='position:absolute;left: 50%; top: 50%; transform: translate(-100px, -50px); display:none; z-index: 100;'> |
| 338 | 338 | <?php echo $uiElements->instLevelInfoBoxes($inst); ?> |
| 339 | 339 | <div class='infobox'> |
| 340 | - <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption;?></h2> |
|
| 340 | + <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption; ?></h2> |
|
| 341 | 341 | <table> |
| 342 | - <caption><?php echo $tablecaption;?></caption> |
|
| 342 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 343 | 343 | <tr> |
| 344 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 345 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 344 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 345 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 346 | 346 | </tr> |
| 347 | 347 | |
| 348 | 348 | <tr> |
@@ -366,19 +366,19 @@ discard block |
||
| 366 | 366 | case "NOSTIPULATION": |
| 367 | 367 | break; |
| 368 | 368 | case "EMAIL-SENT": |
| 369 | - echo $boundaryPre . $uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE) . $boundaryPost; |
|
| 369 | + echo $boundaryPre.$uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE).$boundaryPost; |
|
| 370 | 370 | break; |
| 371 | 371 | case "EMAIL-NOTSENT": |
| 372 | - echo $boundaryPre . $uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE) . $boundaryPost; |
|
| 372 | + echo $boundaryPre.$uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE).$boundaryPost; |
|
| 373 | 373 | break; |
| 374 | 374 | case "SMS-SENT": |
| 375 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE) . $boundaryPost; |
|
| 375 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE).$boundaryPost; |
|
| 376 | 376 | break; |
| 377 | 377 | case "SMS-NOTSENT": |
| 378 | - echo $boundaryPre . $uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE) . $boundaryPost; |
|
| 378 | + echo $boundaryPre.$uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE).$boundaryPost; |
|
| 379 | 379 | break; |
| 380 | 380 | case "SMS-FRAGMENT": |
| 381 | - echo $boundaryPre . $uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE) . $boundaryPost; |
|
| 381 | + echo $boundaryPre.$uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE).$boundaryPost; |
|
| 382 | 382 | break; |
| 383 | 383 | } |
| 384 | 384 | ?> |
@@ -391,17 +391,17 @@ discard block |
||
| 391 | 391 | <?php |
| 392 | 392 | $bufferCurrentUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 393 | 393 | <tr class='sb-title-row'> |
| 394 | - <td>" . _("User") . "</td> |
|
| 395 | - <td>" . _("Token/Certificate details") . "</td> |
|
| 396 | - <td>" . _("User/Token Expiry") . "</td> |
|
| 397 | - <td>" . _("Actions") . "</td> |
|
| 394 | + <td>" . _("User")."</td> |
|
| 395 | + <td>" . _("Token/Certificate details")."</td> |
|
| 396 | + <td>" . _("User/Token Expiry")."</td> |
|
| 397 | + <td>" . _("Actions")."</td> |
|
| 398 | 398 | </tr>"; |
| 399 | 399 | $bufferPreviousUsers = "<table class='sb-user-table' style='max-width:1920px;'> |
| 400 | 400 | <tr class='sb-title-row'> |
| 401 | - <td>" . _("User") . "</td> |
|
| 402 | - <td>" . _("Certificate details") . "</td> |
|
| 403 | - <td>" . _("User Expiry") . "</td> |
|
| 404 | - <td>" . _("Actions") . "</td> |
|
| 401 | + <td>" . _("User")."</td> |
|
| 402 | + <td>" . _("Certificate details")."</td> |
|
| 403 | + <td>" . _("User Expiry")."</td> |
|
| 404 | + <td>" . _("Actions")."</td> |
|
| 405 | 405 | </tr>"; |
| 406 | 406 | |
| 407 | 407 | natsort($allUsers); |
@@ -458,23 +458,23 @@ discard block |
||
| 458 | 458 | $display = empty(devices\Devices::listDevices()[$oneCert->device]['display']) ? $oneCert->device : devices\Devices::listDevices()[$oneCert->device]['display']; |
| 459 | 459 | |
| 460 | 460 | $bufferText = "<div class='sb-certificate-summary ca-summary' $style> |
| 461 | - <div class='sb-certificate-details'>" . _("Device:") . " " . $display . |
|
| 462 | - "<br>" . _("Serial Number:") . " " . dechex($oneCert->serial) . |
|
| 463 | - "<br>" . _("CN:") . " " . explode('@', $oneCert->username)[0] . "@…" . |
|
| 464 | - "<br>" . _("Expiry:") . " " . $oneCert->expiry . |
|
| 465 | - "<br>" . _("Issued:") . " " . $oneCert->issued . |
|
| 466 | - "</div>" . |
|
| 461 | + <div class='sb-certificate-details'>"._("Device:")." ".$display. |
|
| 462 | + "<br>"._("Serial Number:")." ".dechex($oneCert->serial). |
|
| 463 | + "<br>"._("CN:")." ".explode('@', $oneCert->username)[0]."@…". |
|
| 464 | + "<br>"._("Expiry:")." ".$oneCert->expiry. |
|
| 465 | + "<br>"._("Issued:")." ".$oneCert->issued. |
|
| 466 | + "</div>". |
|
| 467 | 467 | "<div style='text-align:right;padding-top: 5px; $buttonStyle'>"; |
| 468 | 468 | |
| 469 | 469 | if ($buttonText == "") { |
| 470 | 470 | $bufferText .= $formtext |
| 471 | - . "<input type='hidden' name='certSerial' value='" . $oneCert->serial . "'/>" |
|
| 472 | - . "<input type='hidden' name='certAlgo' value='" . $oneCert->ca_type . "'/>" |
|
| 471 | + . "<input type='hidden' name='certSerial' value='".$oneCert->serial."'/>" |
|
| 472 | + . "<input type='hidden' name='certAlgo' value='".$oneCert->ca_type."'/>" |
|
| 473 | 473 | . "<button type='submit' " |
| 474 | 474 | . "name='command' " |
| 475 | - . "value='" . \web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL . "' " |
|
| 475 | + . "value='".\web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL."' " |
|
| 476 | 476 | . "class='delete' " |
| 477 | - . "onclick='return confirm(\"" . sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']) . "\")'>" |
|
| 477 | + . "onclick='return confirm(\"".sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name'])."\")'>" |
|
| 478 | 478 | . _("Revoke") |
| 479 | 479 | . "</button>" |
| 480 | 480 | . "</form>"; |
@@ -499,13 +499,13 @@ discard block |
||
| 499 | 499 | } |
| 500 | 500 | // wrap the revoked and expired certs in a div that is hidden by default |
| 501 | 501 | if ($textRevokedCerts !== "") { |
| 502 | - $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked) . "</span><div id='$oneUserId-revoked-certs' style='display:none;'>" . $textRevokedCerts . "</div>"; |
|
| 502 | + $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked)."</span><div id='$oneUserId-revoked-certs' style='display:none;'>".$textRevokedCerts."</div>"; |
|
| 503 | 503 | } |
| 504 | 504 | if ($textExpiredCerts !== "") { |
| 505 | - $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired) . "</span><div id='$oneUserId-expired-certs' style='display:none;'>" . $textExpiredCerts . "</div>"; |
|
| 505 | + $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired)."</span><div id='$oneUserId-expired-certs' style='display:none;'>".$textExpiredCerts."</div>"; |
|
| 506 | 506 | } |
| 507 | 507 | // and push out the HTML |
| 508 | - ${$outputBuffer} .= $textActiveCerts . "<br/>" . $textExpiredCerts . " " . $textRevokedCerts . "</td>"; |
|
| 508 | + ${$outputBuffer} .= $textActiveCerts."<br/>".$textExpiredCerts." ".$textRevokedCerts."</td>"; |
|
| 509 | 509 | $tokenHtmlBuffer = ""; |
| 510 | 510 | $hasOnePendingInvite = FALSE; |
| 511 | 511 | foreach ($tokensWithoutCerts as $invitationObject) { |
@@ -516,38 +516,38 @@ discard block |
||
| 516 | 516 | $tokenHtmlBuffer .= "<tr class='sb-certificate-row'><td></td>"; |
| 517 | 517 | $jsEncodedBody = str_replace('\n', '%0D%0A', str_replace('"', '', json_encode($invitationObject->invitationMailBody()))); |
| 518 | 518 | $tokenHtmlBuffer .= "<td>"; |
| 519 | - $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='" . $invitationObject->link() . "' name='token' class='identifiedtokenarea-" . $invitationObject->identifier . "'>(…)<br/>"); |
|
| 519 | + $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='".$invitationObject->link()."' name='token' class='identifiedtokenarea-".$invitationObject->identifier."'>(…)<br/>"); |
|
| 520 | 520 | $tokenHtmlBuffer .= "<table> |
| 521 | - <tr><td style='vertical-align:bottom;'>" . _("E-Mail:") . "</td><td> |
|
| 521 | + <tr><td style='vertical-align:bottom;'>" . _("E-Mail:")."</td><td> |
|
| 522 | 522 | $formtext |
| 523 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 523 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 524 | 524 | <input type='text' name='address' id='address-$invitationObject->identifier'/> |
| 525 | - <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=" . $invitationObject->invitationMailSubject() . "&body=$jsEncodedBody\"; return false;'>" . _("Local mail client") . "</button> |
|
| 526 | - <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'>" . _("Send with CAT") . "</button> |
|
| 525 | + <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=".$invitationObject->invitationMailSubject()."&body=$jsEncodedBody\"; return false;'>"._("Local mail client")."</button> |
|
| 526 | + <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'>"._("Send with CAT")."</button> |
|
| 527 | 527 | </form> |
| 528 | 528 | </td></tr> |
| 529 | - <tr><td style='vertical-align:bottom;'>" . _("SMS:") . "</td><td> |
|
| 529 | + <tr><td style='vertical-align:bottom;'>" . _("SMS:")."</td><td> |
|
| 530 | 530 | $formtext |
| 531 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 531 | + <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/> |
|
| 532 | 532 | <input type='text' name='smsnumber' /> |
| 533 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS . "'>" . _("Send in SMS...") . "</button> |
|
| 533 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS."'>"._("Send in SMS...")."</button> |
|
| 534 | 534 | </form> |
| 535 | 535 | </td></tr> |
| 536 | - <tr><td style='vertical-align:bottom;'>" . _("Manual:") . "</td><td> |
|
| 537 | - <button type='button' class='clipboardButton' onclick='clipboardCopy(" . $invitationObject->identifier . ");'>" . _("Copy to Clipboard") . "</button> |
|
| 536 | + <tr><td style='vertical-align:bottom;'>" . _("Manual:")."</td><td> |
|
| 537 | + <button type='button' class='clipboardButton' onclick='clipboardCopy(" . $invitationObject->identifier.");'>"._("Copy to Clipboard")."</button> |
|
| 538 | 538 | <form style='display:inline-block;' method='post' action='inc/displayQRcode.inc.php' onsubmit='popupQRWindow(this); return false;' accept-charset='UTF-8'> |
| 539 | - <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/> |
|
| 540 | - <button type='submit'>" . _("Display QR code") . "</button> |
|
| 539 | + <input type='hidden' value='" . $invitationObject->invitationTokenString."' name='token'><br/> |
|
| 540 | + <button type='submit'>" . _("Display QR code")."</button> |
|
| 541 | 541 | </form> |
| 542 | 542 | </td></tr> |
| 543 | 543 | |
| 544 | 544 | </table> |
| 545 | 545 | </td>"; |
| 546 | - $tokenHtmlBuffer .= "<td>" . _("Expiry Date:") . " " . $invitationObject->expiry . " UTC<br>" . _("Activations remaining:") . " " . sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal) . "</td>"; |
|
| 546 | + $tokenHtmlBuffer .= "<td>"._("Expiry Date:")." ".$invitationObject->expiry." UTC<br>"._("Activations remaining:")." ".sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal)."</td>"; |
|
| 547 | 547 | $tokenHtmlBuffer .= "<td>" |
| 548 | 548 | . $formtext |
| 549 | - . "<input type='hidden' name='invitationtoken' value='" . $invitationObject->invitationTokenString . "'/>" |
|
| 550 | - . "<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_REVOKEINVITATION . "' class='delete'>" . _("Revoke") . "</button></form>" |
|
| 549 | + . "<input type='hidden' name='invitationtoken' value='".$invitationObject->invitationTokenString."'/>" |
|
| 550 | + . "<button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_REVOKEINVITATION."' class='delete'>"._("Revoke")."</button></form>" |
|
| 551 | 551 | . "</td></tr>"; |
| 552 | 552 | break; |
| 553 | 553 | case core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED: |
@@ -563,10 +563,10 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | ${$outputBuffer} .= "<td>$formtext |
| 565 | 565 | <div class='sb-date-container' style='min-width: 200px;'> |
| 566 | - <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='" . $profile->getUserExpiryDate($oneUserId) . "'> (UTC)</span> |
|
| 566 | + <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='".$profile->getUserExpiryDate($oneUserId)."'> (UTC)</span> |
|
| 567 | 567 | </div> |
| 568 | 568 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 569 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY . "'>" . _("Update") . "</button> |
|
| 569 | + <button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY."'>"._("Update")."</button> |
|
| 570 | 570 | </form> |
| 571 | 571 | </td> |
| 572 | 572 | <td> |
@@ -574,33 +574,33 @@ discard block |
||
| 574 | 574 | |
| 575 | 575 | if ($hasOnePendingInvite || count($validCerts) > 0) { |
| 576 | 576 | $deletionText = sprintf(_("All of the currently active devices will stop functioning with %s. This cannot be undone. While the user can be re-activated later, they will then need to be re-provisioned with new invitation tokens. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 577 | - ${$outputBuffer} .= $formtext . " |
|
| 577 | + ${$outputBuffer} .= $formtext." |
|
| 578 | 578 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 579 | 579 | <button type='submit' " |
| 580 | 580 | . "name='command' " |
| 581 | - . "value='" . \web\lib\common\FormElements::BUTTON_DEACTIVATEUSER . "' " |
|
| 581 | + . "value='".\web\lib\common\FormElements::BUTTON_DEACTIVATEUSER."' " |
|
| 582 | 582 | . "class='delete' " |
| 583 | - . ( count($validCerts) > 0 ? "onclick='return confirm(\"" . $deletionText . "\")' " : "" ) |
|
| 583 | + . (count($validCerts) > 0 ? "onclick='return confirm(\"".$deletionText."\")' " : "") |
|
| 584 | 584 | . ">" |
| 585 | 585 | . _("Deactivate User") |
| 586 | 586 | . "</button> |
| 587 | 587 | </form>"; |
| 588 | 588 | } |
| 589 | - ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=" . $profile->institution . "&profile_id=" . $profile->identifier . "&user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'> |
|
| 590 | - <button type='submit'>" . _("Show Authentication Records") . "</button> |
|
| 589 | + ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=".$profile->institution."&profile_id=".$profile->identifier."&user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'> |
|
| 590 | + <button type='submit'>"._("Show Authentication Records")."</button> |
|
| 591 | 591 | </form>"; |
| 592 | 592 | if (new DateTime() < new DateTime($expiryDate)) { // current user, allow sending new token |
| 593 | - ${$outputBuffer} .= $formtext . " |
|
| 593 | + ${$outputBuffer} .= $formtext." |
|
| 594 | 594 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 595 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_NEWINVITATION . "'>" . _("New Invitation") . "</button> |
|
| 596 | - <label>" . _("Activations:") . " |
|
| 595 | + <button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_NEWINVITATION."'>"._("New Invitation")."</button> |
|
| 596 | + <label>" . _("Activations:")." |
|
| 597 | 597 | <input type='text' name='invitationsquantity' value='5' maxlength='3' style='width: 30px;'/> |
| 598 | 598 | </label> |
| 599 | 599 | </form>"; |
| 600 | 600 | } elseif (count($profile->getUserAuthRecords($oneUserId)) == 0) { // previous user; if there are NO authentication records, allow full deletion - otherwise, need to keep user trace for abuse handling |
| 601 | - ${$outputBuffer} .= $formtext . " |
|
| 601 | + ${$outputBuffer} .= $formtext." |
|
| 602 | 602 | <input type='hidden' name='userid' value='$oneUserId'/> |
| 603 | - <button type='submit' class='delete' name='command' value='" . \web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete User") . "</button> |
|
| 603 | + <button type='submit' class='delete' name='command' value='".\web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete User")."</button> |
|
| 604 | 604 | </form>"; |
| 605 | 605 | } |
| 606 | 606 | ${$outputBuffer} .= "</div> |
@@ -632,13 +632,13 @@ discard block |
||
| 632 | 632 | . ' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".' |
| 633 | 633 | . ' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.'), \config\ConfAssistant::SILVERBULLET['gracetime'] ?? core\ProfileSilverbullet::SB_ACKNOWLEDGEMENT_REQUIRED_DAYS); |
| 634 | 634 | |
| 635 | - echo $formtext . "<div style='padding-bottom: 20px;'>" |
|
| 635 | + echo $formtext."<div style='padding-bottom: 20px;'>" |
|
| 636 | 636 | . " |
| 637 | 637 | <p>$acknowledgeText</p> |
| 638 | 638 | <input type='checkbox' name='acknowledge' value='true'> |
| 639 | - <label>" . sprintf(_("I have verified that all configured users are still eligible for %s."),\config\ConfAssistant::CONSORTIUM['display_name']) . "</label> |
|
| 639 | + <label>".sprintf(_("I have verified that all configured users are still eligible for %s."), \config\ConfAssistant::CONSORTIUM['display_name'])."</label> |
|
| 640 | 640 | </div> |
| 641 | - <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY . "'>" . _("Save") . "</button></form>"; |
|
| 641 | + <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY."'>"._("Save")."</button></form>"; |
|
| 642 | 642 | } |
| 643 | 643 | ?> |
| 644 | 644 | </div> |
@@ -19,7 +19,7 @@ discard block |
||
| 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 | |
| 24 | 24 | $deco = new \web\lib\admin\PageDecoration(); |
| 25 | 25 | $uiElements = new web\lib\admin\UIElements(); |
@@ -37,14 +37,14 @@ discard block |
||
| 37 | 37 | </h1> |
| 38 | 38 | <div class='infobox'> |
| 39 | 39 | <h2> |
| 40 | - <?php $tablecaption = _("Current User Attributes"); echo $tablecaption;?> |
|
| 40 | + <?php $tablecaption = _("Current User Attributes"); echo $tablecaption; ?> |
|
| 41 | 41 | </h2> |
| 42 | 42 | <table> |
| 43 | - <caption><?php echo $tablecaption;?></caption> |
|
| 43 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 44 | 44 | <tr> |
| 45 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 46 | - <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th> |
|
| 47 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 45 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 46 | + <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th> |
|
| 47 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 48 | 48 | </tr> |
| 49 | 49 | <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?> |
| 50 | 50 | </table> |
@@ -19,7 +19,7 @@ discard block |
||
| 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 | |
| 24 | 24 | $loggerInstance = new \core\common\Logging(); |
| 25 | 25 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $user = new \core\User($_SESSION['user']); |
| 31 | 31 | if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do? |
| 32 | - echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>"; |
|
| 32 | + echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>"; |
|
| 33 | 33 | echo $deco->footer(); |
| 34 | 34 | exit(0); |
| 35 | 35 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | if (isset($_POST['option'])) { |
| 47 | 47 | foreach ($_POST['option'] as $opt_id => $optname) { |
| 48 | 48 | if ($optname == "user:fedadmin") { |
| 49 | - echo "Security violation: user tried to make himself " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " administrator!"; |
|
| 49 | + echo "Security violation: user tried to make himself ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." administrator!"; |
|
| 50 | 50 | exit(1); |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -71,11 +71,11 @@ discard block |
||
| 71 | 71 | ?> |
| 72 | 72 | <h1><?php $tablecaption = _("Submitted attributes for this user"); echo $tablecaption; ?></h1> |
| 73 | 73 | <table> |
| 74 | - <caption><?php echo $tablecaption;?></caption> |
|
| 74 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 75 | 75 | <tr> |
| 76 | 76 | <tr> |
| 77 | - <th class="wai-invisible" scope="col"><?php echo _("Overall Result");?></th> |
|
| 78 | - <th class="wai-invisible" scope="col"><?php echo _("Details");?></th> |
|
| 77 | + <th class="wai-invisible" scope="col"><?php echo _("Overall Result"); ?></th> |
|
| 78 | + <th class="wai-invisible" scope="col"><?php echo _("Details"); ?></th> |
|
| 79 | 79 | </tr> |
| 80 | 80 | <?php |
| 81 | 81 | echo $optionParser->processSubmittedFields($user, $_POST, $_FILES); |
@@ -20,7 +20,7 @@ discard block |
||
| 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(); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $ownermgmt = new \core\UserManagement(); |
| 83 | 83 | $ownermgmt->addAdminToIdp($my_inst, $_SESSION['user']); |
| 84 | 84 | } else { |
| 85 | - echo "Fatal Error: you wanted to take control over an " . \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . ", but are not a " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " operator!"; |
|
| 85 | + echo "Fatal Error: you wanted to take control over an ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution'].", but are not a ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." operator!"; |
|
| 86 | 86 | exit(1); |
| 87 | 87 | } |
| 88 | 88 | break; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | default: |
| 119 | 119 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 120 | 120 | } |
| 121 | - echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully.")); |
|
| 121 | + echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully.")); |
|
| 122 | 122 | break; |
| 123 | 123 | case "FAILURE": |
| 124 | 124 | echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!")); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | default: |
| 139 | 139 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 140 | 140 | } |
| 141 | - echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success.")); |
|
| 141 | + echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success.")); |
|
| 142 | 142 | break; |
| 143 | 143 | case "INVALIDSYNTAX": |
| 144 | 144 | echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!")); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | <?php echo $invite; ?> |
| 191 | 191 | </td> |
| 192 | 192 | <td> |
| 193 | - <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier ?>' method='post' <?php echo ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ); ?> accept-charset='UTF-8'> |
|
| 193 | + <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier ?>' method='post' <?php echo ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : ""); ?> accept-charset='UTF-8'> |
|
| 194 | 194 | <input type='hidden' name='admin_id' value='<?php echo $oneowner['ID']; ?>'></input> |
| 195 | 195 | <button type='submit' name='submitbutton' class='delete' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>'><?php echo _("Delete Administrator") ?></button> |
| 196 | 196 | </form> |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | $loggerInstance = new \core\common\Logging(); |
| 208 | 208 | $loggerInstance->debug(4, "Displaying pending invitations for $my_inst->identifier.\n"); |
| 209 | 209 | if (count($pending_invites) > 0) { |
| 210 | - echo "<strong>" . _("Pending invitations for this IdP") . "</strong>"; |
|
| 210 | + echo "<strong>"._("Pending invitations for this IdP")."</strong>"; |
|
| 211 | 211 | echo "<table>"; |
| 212 | 212 | foreach ($pending_invites as $invitee) { |
| 213 | - echo "<tr><td>" . $invitee['mail'] . "</td><td>" . sprintf(_("(expires %s)"), $invitee['expiry']) . "</td></tr>"; |
|
| 213 | + echo "<tr><td>".$invitee['mail']."</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>"; |
|
| 214 | 214 | } |
| 215 | 215 | echo "</table>"; |
| 216 | 216 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | |
| 233 | 233 | if (!$is_admin_himself) { |
| 234 | 234 | echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 235 | - <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_TAKECONTROL . "'>" . sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst) . "</button> |
|
| 235 | + <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_TAKECONTROL."'>".sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst)."</button> |
|
| 236 | 236 | </form>"; |
| 237 | 237 | } |
| 238 | 238 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * ****************************************************************************** |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 12 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 13 | 13 | |
| 14 | 14 | $auth = new \web\lib\admin\Authentication(); |
| 15 | 15 | $auth->authenticate(); |
@@ -29,30 +29,30 @@ discard block |
||
| 29 | 29 | ?> |
| 30 | 30 | |
| 31 | 31 | <h1><?php $tablecaption = _("User Authentication Records"); echo $tablecaption; ?></h1> |
| 32 | -<p><?php echo _("Note that:");?></p> |
|
| 32 | +<p><?php echo _("Note that:"); ?></p> |
|
| 33 | 33 | <ul> |
| 34 | - <li><?php echo _("Authentication records are deleted after six months retention time");?></li> |
|
| 35 | - <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots");?></li> |
|
| 36 | - <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems");?></li> |
|
| 34 | + <li><?php echo _("Authentication records are deleted after six months retention time"); ?></li> |
|
| 35 | + <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots"); ?></li> |
|
| 36 | + <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems"); ?></li> |
|
| 37 | 37 | </ul> |
| 38 | 38 | <table class='authrecord'> |
| 39 | - <caption><?php echo $tablecaption;?></caption> |
|
| 39 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 40 | 40 | <tr> |
| 41 | - <th scope="col"><strong><?php echo _("Timestamp");?></strong></th> |
|
| 42 | - <th scope="col"><strong><?php echo _("Credential");?></strong></th> |
|
| 43 | - <th scope="col"><strong><?php echo _("MAC Address");?></strong></th> |
|
| 44 | - <th scope="col"><strong><?php echo _("Result");?></strong></th> |
|
| 45 | - <th scope="col"><strong><?php echo _("Operator Domain");?></strong></th> |
|
| 41 | + <th scope="col"><strong><?php echo _("Timestamp"); ?></strong></th> |
|
| 42 | + <th scope="col"><strong><?php echo _("Credential"); ?></strong></th> |
|
| 43 | + <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th> |
|
| 44 | + <th scope="col"><strong><?php echo _("Result"); ?></strong></th> |
|
| 45 | + <th scope="col"><strong><?php echo _("Operator Domain"); ?></strong></th> |
|
| 46 | 46 | </tr> |
| 47 | 47 | <?php |
| 48 | 48 | $userAuthData = $profile->getUserAuthRecords($userInt); |
| 49 | 49 | foreach ($userAuthData as $oneRecord) { |
| 50 | - echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail" )."'>" |
|
| 50 | + echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail")."'>" |
|
| 51 | 51 | . "<td>".$oneRecord['TIMESTAMP']."</td>" |
| 52 | - . "<td>".substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'],"@"))."</td>" |
|
| 52 | + . "<td>".substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'], "@"))."</td>" |
|
| 53 | 53 | . "<td>".$oneRecord['MAC']."</td>" |
| 54 | 54 | . "<td>".($oneRecord['RESULT'] == "Access-Accept" ? _("Success") : _("Failure"))."</td>" |
| 55 | - . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)",1)."</td>" |
|
| 55 | + . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)", 1)."</td>" |
|
| 56 | 56 | . "</tr>"; |
| 57 | 57 | } |
| 58 | 58 | ?> |
@@ -20,7 +20,7 @@ discard block |
||
| 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(); |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | $invitationObject = new core\SilverbulletInvitation($validator->token(filter_input(INPUT_POST, 'token'))); |
| 39 | 39 | header("Content-Type:text/html;charset=utf-8"); |
| 40 | 40 | ?> |
| 41 | -<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1> |
|
| 42 | -<img alt='<?php echo _("Invitation Token QR Code");?>' style='float:none' src='data:image/png;base64,<?php |
|
| 41 | +<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1> |
|
| 42 | +<img alt='<?php echo _("Invitation Token QR Code"); ?>' style='float:none' src='data:image/png;base64,<?php |
|
| 43 | 43 | $size = 10; |
| 44 | 44 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 45 | 45 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
@@ -51,5 +51,5 @@ discard block |
||
| 51 | 51 | if (empty($rawQr)) { |
| 52 | 52 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 53 | 53 | } |
| 54 | -echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size));?>'/> |
|
| 55 | -<p>(<a href='<?php echo $invitationObject->link();?>'><?php echo $invitationObject->link();?>)</a></p> |
|
| 54 | +echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size)); ?>'/> |
|
| 55 | +<p>(<a href='<?php echo $invitationObject->link(); ?>'><?php echo $invitationObject->link(); ?>)</a></p> |
|
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | $cat = new \web\lib\user\Gui(); |
| 23 | -$idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT)?? 0; |
|
| 23 | +$idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT) ?? 0; |
|
| 24 | 24 | $profileId = filter_input(INPUT_GET, 'profile', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'profile', FILTER_VALIDATE_INT) ?? 0; |
| 25 | 25 | $skinObject = $Gui->skinObject; |
| 26 | 26 | ?> |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | otherdata = j.otherdata; |
| 84 | 84 | if(! result) { |
| 85 | 85 | alert("<?php $cat->javaScriptEscapedEcho(_("no matching data found"))?>"); |
| 86 | - document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>'; |
|
| 86 | + document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>'; |
|
| 87 | 87 | } |
| 88 | 88 | j = j.data; |
| 89 | 89 | n = j.length; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | result = j1.status; |
| 221 | 221 | if(! result) { |
| 222 | 222 | alert("<?php $cat->javaScriptEscapedEcho(_("no matching data found")) ?>"); |
| 223 | - document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>'; |
|
| 223 | + document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>'; |
|
| 224 | 224 | } |
| 225 | 225 | j = j1.data; |
| 226 | 226 | if(j.description !== undefined && j.description) { |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | $("#profile_desc").hide(); |
| 232 | 232 | $("#profile_desc").text(''); |
| 233 | 233 | } |
| 234 | - updateTxt = '<span class="user_info"><?php $cat->javaScriptEscapedEcho(_("This entry was last updated at:"));?>'+' '+j.last_changed+'</span><br/>'; |
|
| 234 | + updateTxt = '<span class="user_info"><?php $cat->javaScriptEscapedEcho(_("This entry was last updated at:")); ?>'+' '+j.last_changed+'</span><br/>'; |
|
| 235 | 235 | if(j.local_url !== undefined && j.local_url) |
| 236 | 236 | txt = txt+'<span class="user_info"><?php $cat->javaScriptEscapedEcho(_("WWW:")); ?> <a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></span><br/>'; |
| 237 | 237 | if(j.local_email !== undefined && j.local_email) |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | $Gui->loggerInstance->debug(4, $operatingSystem); |
| 47 | 47 | $uiElements = new web\lib\admin\UIElements(); |
| 48 | 48 | if ($operatingSystem) { |
| 49 | - print "recognisedOS = '" . $operatingSystem['device'] . "';\n"; |
|
| 49 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 50 | 50 | } |
| 51 | -require dirname(__DIR__) . '/user/js/cat_js.php'; |
|
| 51 | +require dirname(__DIR__).'/user/js/cat_js.php'; |
|
| 52 | 52 | |
| 53 | 53 | ?> |
| 54 | 54 | </script> |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | <div id='wrap' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "beta.png"); ?>");'> |
| 61 | 61 | <form id="cat_form" name="cat_form" accept-charset="UTF-8" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="POST"> |
| 62 | 62 | <?php |
| 63 | -require dirname(__DIR__) . '/diag/js/diag_js.php'; |
|
| 63 | +require dirname(__DIR__).'/diag/js/diag_js.php'; |
|
| 64 | 64 | echo $divs->divHeading($visibility); |
| 65 | 65 | $Gui->languageInstance->setTextDomain("diagnostics"); |
| 66 | 66 | ?> |
@@ -78,12 +78,12 @@ discard block |
||
| 78 | 78 | </div> |
| 79 | 79 | <div id="main_body"> |
| 80 | 80 | <div id="user_page"> |
| 81 | - <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?> |
|
| 81 | + <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?> |
|
| 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 |
||
| 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@<strong>realm.tld</strong>):"); |
| 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,11 +143,11 @@ discard block |
||
| 143 | 143 | echo 'none'; |
| 144 | 144 | } |
| 145 | 145 | echo ";'>"; |
| 146 | - echo '<h3>' . _("What is the nature of the problem?") . '</h3>'; |
|
| 147 | - echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>'; |
|
| 148 | - echo _("I suspect a technical problem at a particular IdP") . '<br>'; |
|
| 146 | + echo '<h3>'._("What is the nature of the problem?").'</h3>'; |
|
| 147 | + echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>'; |
|
| 148 | + echo _("I suspect a technical problem at a particular IdP").'<br>'; |
|
| 149 | 149 | echo '<input type="radio" name="problem_type" value="1">'; |
| 150 | - echo _("I want to report abuse of network resources by a roaming user") . '<br>'; |
|
| 150 | + echo _("I want to report abuse of network resources by a roaming user").'<br>'; |
|
| 151 | 151 | echo '<input type="radio" name="problem_type" value="2">'; |
| 152 | 152 | echo _("I suspect a technical problem for one of my users at a particular SP"); |
| 153 | 153 | echo "<div id='idp_contact_area'></div>"; |
@@ -156,9 +156,9 @@ discard block |
||
| 156 | 156 | echo "</div>"; |
| 157 | 157 | } else { |
| 158 | 158 | echo "0\">"; |
| 159 | - echo _("This service is for authenticated admins only.") . '<br>'; |
|
| 160 | - echo "<a href=\"diag.php?admin=1\">" . |
|
| 161 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 159 | + echo _("This service is for authenticated admins only.").'<br>'; |
|
| 160 | + echo "<a href=\"diag.php?admin=1\">". |
|
| 161 | + _("eduroam® admin access is needed")."</a>"; |
|
| 162 | 162 | } |
| 163 | 163 | ?> |
| 164 | 164 | </div> |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | return false; |
| 235 | 235 | }); |
| 236 | 236 | $(document).on('change', '#idp_country' , function() { |
| 237 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 237 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 238 | 238 | var id = $(this).attr('id'); |
| 239 | 239 | var k = id.indexOf('_'); |
| 240 | 240 | var type = id.substr(0,k); |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | var shtml = ''; |
| 253 | 253 | var select = ''; |
| 254 | 254 | if (type !== 'asp') { |
| 255 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 255 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 256 | 256 | } |
| 257 | 257 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 258 | 258 | for (var i in institutions) { |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | } else { |
| 274 | 274 | if (data.status === 0) { |
| 275 | 275 | inProgress(0); |
| 276 | - 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.") . '"'; ?>; |
|
| 276 | + 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.").'"'; ?>; |
|
| 277 | 277 | alert(msg); |
| 278 | 278 | $('#select_idp_country').show(); |
| 279 | 279 | $('#select_idp_area').hide(); |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | }, |
| 283 | 283 | error:function() { |
| 284 | 284 | inProgress(0); |
| 285 | - var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 285 | + var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 286 | 286 | alert(msg); |
| 287 | 287 | $('#select_idp_country').show(); |
| 288 | 288 | $('#select_idp_area').hide(); |
@@ -298,9 +298,9 @@ discard block |
||
| 298 | 298 | }); |
| 299 | 299 | $(document).on('change', '#select_sp_problem' , function() { |
| 300 | 300 | if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') { |
| 301 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>); |
|
| 301 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>); |
|
| 302 | 302 | } else { |
| 303 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>); |
|
| 303 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>); |
|
| 304 | 304 | } |
| 305 | 305 | $('#realm_in_db_admin').hide(); |
| 306 | 306 | $('#admin_realm').val(''); |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | clear_sp_question(); |
| 309 | 309 | }); |
| 310 | 310 | $(document).on('change', '#sp_country, #asp_country' , function() { |
| 311 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 311 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 312 | 312 | var id = $(this).attr('id'); |
| 313 | 313 | var k = id.indexOf('_'); |
| 314 | 314 | var type = id.substr(0,k); |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | var shtml = ''; |
| 327 | 327 | var select = ''; |
| 328 | 328 | if (type !== 'asp') { |
| 329 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 329 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 330 | 330 | } |
| 331 | 331 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 332 | 332 | for (var i in hotspots) { |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | inProgress(0); |
| 350 | 350 | var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">'; |
| 351 | 351 | var shtml = '<td></td><td>'; |
| 352 | - select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>'; |
|
| 352 | + select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>'; |
|
| 353 | 353 | if (type !== 'asp') { |
| 354 | 354 | $('#row_' + type + '_institution').html(''); |
| 355 | 355 | $('#row_' + type + '_institution').append(shtml + select); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | $('#start_test_area').hide(); |
| 384 | 384 | return false; |
| 385 | 385 | } |
| 386 | - var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>; |
|
| 386 | + var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>; |
|
| 387 | 387 | inProgress(1, comment); |
| 388 | 388 | $.ajax({ |
| 389 | 389 | url: "findRealm.php", |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | var realms = data.realms; |
| 396 | 396 | var realmselect = ''; |
| 397 | 397 | if (realms.length > 1) { |
| 398 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 398 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 399 | 399 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 400 | 400 | for (var i in realms) { |
| 401 | 401 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | } |
| 408 | 408 | realmselect = realmselect + '</span></td>'; |
| 409 | 409 | } else { |
| 410 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 410 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 411 | 411 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 412 | 412 | realmselect = realmselect + realms[0] + '</span>'; |
| 413 | 413 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | clear_sp_question(); |
| 460 | 460 | t = 1; |
| 461 | 461 | } |
| 462 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 462 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 463 | 463 | inProgress(1, comment); |
| 464 | 464 | /*waiting(comment);*/ |
| 465 | 465 | $.ajax({ |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | testSociopath('', answer); |
| 519 | 519 | }); |
| 520 | 520 | $('#realmtest').click(function(event){ |
| 521 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 521 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 522 | 522 | inProgress(1, comment); |
| 523 | 523 | $('#start_test_area').hide(); |
| 524 | 524 | if ($('#select_sp_area').is(':hidden')) { |
@@ -566,13 +566,13 @@ discard block |
||
| 566 | 566 | reset_footer(); |
| 567 | 567 | testSociopath(realm, 0); |
| 568 | 568 | } else { |
| 569 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 570 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>; |
|
| 569 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 570 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>; |
|
| 571 | 571 | result = result + '</h3>' |
| 572 | 572 | if (r.length == 1) { |
| 573 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 573 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 574 | 574 | } else { |
| 575 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 575 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 576 | 576 | } |
| 577 | 577 | result = result + ': ' |
| 578 | 578 | for (var i=0; i < r.length; i++) { |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | result = result + r[i]; |
| 583 | 583 | } |
| 584 | 584 | result = result + '.<br>'; |
| 585 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 585 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 586 | 586 | result = result + '</div>'; |
| 587 | 587 | $('#after_stage_1').hide(); |
| 588 | 588 | $('#before_stage_1').show(); |
@@ -650,43 +650,43 @@ discard block |
||
| 650 | 650 | success:function(data) { |
| 651 | 651 | if (data.status === 1) { |
| 652 | 652 | var result = ''; |
| 653 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 653 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 654 | 654 | result = '<div class="padding">'; |
| 655 | 655 | if (type == 'idp_send') { |
| 656 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 656 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 657 | 657 | result = result + '<table>'; |
| 658 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 659 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 660 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 661 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 662 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 663 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 658 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 659 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 660 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 661 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 662 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 663 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 664 | 664 | if (data.tests_result == 1) { |
| 665 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 665 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 666 | 666 | } else { |
| 667 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 667 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 668 | 668 | } |
| 669 | 669 | result = result + '</td></tr>'; |
| 670 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 671 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 670 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 671 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 672 | 672 | if (data.emailsent == 1) { |
| 673 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 673 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 674 | 674 | } else { |
| 675 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 675 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 676 | 676 | } |
| 677 | 677 | result = result + '</td><td></td></tr>'; |
| 678 | 678 | } |
| 679 | 679 | if (type == 'sp_send') { |
| 680 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 680 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 681 | 681 | result = result + '<table>'; |
| 682 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 683 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 684 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 685 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 686 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 687 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 688 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 689 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 682 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 683 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 684 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 685 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 686 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 687 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 688 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 689 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 690 | 690 | } |
| 691 | 691 | result = result + '</div>'; |
| 692 | 692 | showInfo(result, title); |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 712 | 712 | } |
| 713 | 713 | }); |
| 714 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 714 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 715 | 715 | } else { |
| 716 | 716 | $('#admin_realm').removeClass('error_input'); |
| 717 | 717 | $('#admin_realm').attr('title', ''); |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | $(document).on('keyup change', '#email' , function() { |
| 722 | 722 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 723 | 723 | $('#email').addClass('error_input'); |
| 724 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 724 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 725 | 725 | } else { |
| 726 | 726 | $('#email').removeClass('error_input'); |
| 727 | 727 | $('#email').attr('title', ''); |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | if ($('#mac').val().length > 0) { |
| 735 | 735 | if ($('#mac').val().length != 17) { |
| 736 | 736 | $('#mac').addClass('error_input'); |
| 737 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 737 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 738 | 738 | } else { |
| 739 | 739 | $('#mac').removeClass('error_input'); |
| 740 | 740 | $('#mac').attr('title', ''); |
@@ -743,7 +743,7 @@ discard block |
||
| 743 | 743 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 744 | 744 | if (!isEmail($(this).val())) { |
| 745 | 745 | $('#email').addClass('error_input'); |
| 746 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 746 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 747 | 747 | } else { |
| 748 | 748 | $('#email').removeClass('error_input'); |
| 749 | 749 | $('#email').attr('title', ''); |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 753 | 753 | if (!isEmail($(this).val(), true)) { |
| 754 | 754 | $('#outer_id').addClass('error_input'); |
| 755 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 755 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 756 | 756 | } else { |
| 757 | 757 | $('#outer_id').removeClass('error_input'); |
| 758 | 758 | $('#outer_id').attr('title', ''); |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 762 | 762 | if (!isOperatorName($(this).val())) { |
| 763 | 763 | $('#opname').addClass('error_input'); |
| 764 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 764 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 765 | 765 | $('#spmanually').show(); |
| 766 | 766 | } else { |
| 767 | 767 | $('#opname').removeClass('error_input'); |
