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 | $uiElements = new web\lib\admin\UIElements(); |
| 25 | 25 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | // filesystem cleanup |
| 76 | 76 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 77 | 77 | $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs(); |
| 78 | - echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>"; |
|
| 78 | + echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>"; |
|
| 79 | 79 | break; |
| 80 | 80 | default: |
| 81 | 81 | break; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'"); |
| 142 | 142 | // SELECT -> mysqli_result, not boolean |
| 143 | 143 | while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) { |
| 144 | - echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>"; |
|
| 144 | + echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>"; |
|
| 145 | 145 | $gross_admin = $gross_admin + $a->admin; |
| 146 | 146 | $gross_user = $gross_user + $a->user; |
| 147 | 147 | $gross_silverbullet = $gross_silverbullet + $a->silverbullet; |
@@ -134,13 +134,13 @@ |
||
| 134 | 134 | 'db' => 'radacct', |
| 135 | 135 | 'user' => 'someuser', |
| 136 | 136 | 'pass' => 'somepass', |
| 137 | - 'readonly' => TRUE,], |
|
| 137 | + 'readonly' => TRUE, ], |
|
| 138 | 138 | 'RADIUS_2' => [ |
| 139 | 139 | 'host' => 'auth-2.hosted.eduroam.org', |
| 140 | 140 | 'db' => 'radacct', |
| 141 | 141 | 'user' => 'someuser', |
| 142 | 142 | 'pass' => 'somepass', |
| 143 | - 'readonly' => TRUE,], |
|
| 143 | + 'readonly' => TRUE, ], |
|
| 144 | 144 | ], |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -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(); |
@@ -22,30 +22,30 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | ?> |
| 24 | 24 | |
| 25 | -<h1><?php echo _("User Authentication Records");?></h1> |
|
| 26 | -<p><?php echo _("Note that:");?></p> |
|
| 25 | +<h1><?php echo _("User Authentication Records"); ?></h1> |
|
| 26 | +<p><?php echo _("Note that:"); ?></p> |
|
| 27 | 27 | <ul> |
| 28 | - <li><?php echo _("Authentication records are deleted after six months retention time");?></li> |
|
| 29 | - <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots");?></li> |
|
| 30 | - <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems");?></li> |
|
| 28 | + <li><?php echo _("Authentication records are deleted after six months retention time"); ?></li> |
|
| 29 | + <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots"); ?></li> |
|
| 30 | + <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems"); ?></li> |
|
| 31 | 31 | </ul> |
| 32 | 32 | <table class='authrecord'> |
| 33 | 33 | <tr> |
| 34 | - <td><strong><?php echo _("Timestamp");?></strong></td> |
|
| 35 | - <td><strong><?php echo _("Credential");?></strong></td> |
|
| 36 | - <td><strong><?php echo _("MAC Address");?></strong></td> |
|
| 37 | - <td><strong><?php echo _("Result");?></strong></td> |
|
| 38 | - <td><strong><?php echo _("Operator Domain");?></strong></td> |
|
| 34 | + <td><strong><?php echo _("Timestamp"); ?></strong></td> |
|
| 35 | + <td><strong><?php echo _("Credential"); ?></strong></td> |
|
| 36 | + <td><strong><?php echo _("MAC Address"); ?></strong></td> |
|
| 37 | + <td><strong><?php echo _("Result"); ?></strong></td> |
|
| 38 | + <td><strong><?php echo _("Operator Domain"); ?></strong></td> |
|
| 39 | 39 | </tr> |
| 40 | 40 | <?php |
| 41 | 41 | $userAuthData = $profile->getUserAuthRecords($userInt); |
| 42 | 42 | foreach ($userAuthData as $oneRecord) { |
| 43 | - echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail" )."'>" |
|
| 43 | + echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail")."'>" |
|
| 44 | 44 | . "<td>".$oneRecord['TIMESTAMP']."</td>" |
| 45 | - . "<td>".substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'],"@"))."</td>" |
|
| 45 | + . "<td>".substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'], "@"))."</td>" |
|
| 46 | 46 | . "<td>".$oneRecord['MAC']."</td>" |
| 47 | 47 | . "<td>".($oneRecord['RESULT'] == "Access-Accept" ? _("Success") : _("Failure"))."</td>" |
| 48 | - . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)",1)."</td>" |
|
| 48 | + . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)", 1)."</td>" |
|
| 49 | 49 | . "</tr>"; |
| 50 | 50 | } |
| 51 | 51 | ?> |
@@ -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(); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?> |
| 48 | 48 | <tr> |
| 49 | 49 | <td> |
| 50 | - <?php echo "" . _("Unique Identifier") ?> |
|
| 50 | + <?php echo ""._("Unique Identifier") ?> |
|
| 51 | 51 | </td> |
| 52 | 52 | <td> |
| 53 | 53 | </td> |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $mgmt = new \core\UserManagement(); |
| 63 | 63 | |
| 64 | 64 | if (!$user->isFederationAdmin()) { |
| 65 | - echo "<p>" . sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed) . "</p>"; |
|
| 65 | + echo "<p>".sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed)."</p>"; |
|
| 66 | 66 | echo $deco->footer(); |
| 67 | 67 | exit(0); |
| 68 | 68 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | <!-- fed properties --> |
| 80 | 80 | <tr> |
| 81 | 81 | <td> |
| 82 | - <?php echo "" . _("Country") ?> |
|
| 82 | + <?php echo ""._("Country") ?> |
|
| 83 | 83 | </td> |
| 84 | 84 | <td> |
| 85 | 85 | </td> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | default: |
| 161 | 161 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 162 | 162 | } |
| 163 | - echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully.")); |
|
| 163 | + echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully.")); |
|
| 164 | 164 | break; |
| 165 | 165 | case "FAILURE": |
| 166 | 166 | echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!")); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | default: |
| 181 | 181 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 182 | 182 | } |
| 183 | - echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success.")); |
|
| 183 | + echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success.")); |
|
| 184 | 184 | break; |
| 185 | 185 | case "INVALIDSYNTAX": |
| 186 | 186 | echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!")); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | echo "</table></div>"; |
| 192 | 192 | } |
| 193 | 193 | if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == 'eduroam') { |
| 194 | - $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed) . "</h3>"; |
|
| 194 | + $helptext = "<h3>".sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed)."</h3>"; |
|
| 195 | 195 | } else { |
| 196 | 196 | $helptext = ""; |
| 197 | 197 | } |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | $pending_invites = $mgmt->listPendingInvitations(); |
| 206 | 206 | |
| 207 | 207 | if (CONFIG['DB']['enforce-external-sync']) { |
| 208 | - echo "<th>" . sprintf(_("%s Database Sync Status"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</th>"; |
|
| 208 | + echo "<th>".sprintf(_("%s Database Sync Status"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</th>"; |
|
| 209 | 209 | } |
| 210 | 210 | ?> |
| 211 | 211 | <th> |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | foreach ($feds as $onefed) { |
| 221 | 221 | $thefed = new \core\Federation(strtoupper($onefed['value'])); |
| 222 | 222 | /// nomenclature for 'federation', federation name, nomenclature for 'inst' |
| 223 | - echo "<tr><td colspan='8'><strong>" . sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">' . $thefed->name . '</span>') . "</strong></td></tr>"; |
|
| 223 | + echo "<tr><td colspan='8'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>"; |
|
| 224 | 224 | |
| 225 | 225 | // extract only pending invitations for *this* fed |
| 226 | 226 | $display_pendings = FALSE; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | // deployment status; need to dive into profiles for this |
| 246 | 246 | // show happy eyeballs if at least one profile is configured/showtime |
| 247 | 247 | echo "<td>"; |
| 248 | - echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" ); |
|
| 248 | + echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "")." ".($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : ""); |
|
| 249 | 249 | echo "</td>"; |
| 250 | 250 | // name; and realm of silverbullet profiles if any |
| 251 | 251 | // instantiating all profiles is costly, so we only do this if |
@@ -259,23 +259,23 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | echo "<td style='vertical-align:top;'> |
| 262 | - <input type='hidden' name='inst' value='" . $index . "'>" . $idp_instance->name . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) . implode("</li><li>",$listOfSilverbulletRealms) . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) . " |
|
| 262 | + <input type='hidden' name='inst' value='" . $index."'>".$idp_instance->name.(empty($listOfSilverbulletRealms) ? "" : "<ul><li>").implode("</li><li>", $listOfSilverbulletRealms).(empty($listOfSilverbulletRealms) ? "" : "</li><ul>")." |
|
| 263 | 263 | </td>"; |
| 264 | 264 | // external DB sync, if configured as being necessary |
| 265 | 265 | if (CONFIG['DB']['enforce-external-sync']) { |
| 266 | 266 | echo "<td style='display: ruby;'>"; |
| 267 | 267 | if ($readonly === FALSE) { |
| 268 | - echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=" . $idp_instance->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 269 | - <button type='submit'>" . _("Manage DB Link") . "</button></form> "; |
|
| 268 | + echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=".$idp_instance->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 269 | + <button type='submit'>" . _("Manage DB Link")."</button></form> "; |
|
| 270 | 270 | } |
| 271 | 271 | switch ($idp_instance->getExternalDBSyncState()) { |
| 272 | 272 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOTSUBJECTTOSYNCING: |
| 273 | 273 | break; |
| 274 | 274 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED: |
| 275 | - echo "<div class='acceptable'>" . _("Linked") . "</div>"; |
|
| 275 | + echo "<div class='acceptable'>"._("Linked")."</div>"; |
|
| 276 | 276 | break; |
| 277 | 277 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED: |
| 278 | - echo "<div class='notacceptable'>" . _("NOT linked") . "</div>"; |
|
| 278 | + echo "<div class='notacceptable'>"._("NOT linked")."</div>"; |
|
| 279 | 279 | |
| 280 | 280 | |
| 281 | 281 | break; |
@@ -288,9 +288,9 @@ discard block |
||
| 288 | 288 | echo "<td style='vertical-align: top;'>"; |
| 289 | 289 | if ($readonly === FALSE) { |
| 290 | 290 | echo "<div style='white-space: nowrap;'> |
| 291 | - <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 291 | + <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 292 | 292 | <button type='submit'>" . |
| 293 | - _("Add/Remove Administrators") . " |
|
| 293 | + _("Add/Remove Administrators")." |
|
| 294 | 294 | </button> |
| 295 | 295 | </form> |
| 296 | 296 | </div>"; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | echo "<tr> |
| 304 | 304 | <td colspan='2'> |
| 305 | 305 | <strong>" . |
| 306 | - sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed) . " |
|
| 306 | + sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed)." |
|
| 307 | 307 | </strong> |
| 308 | 308 | </td> |
| 309 | 309 | </tr>"; |
@@ -311,17 +311,17 @@ discard block |
||
| 311 | 311 | if (strtoupper($oneinvite['country']) == strtoupper($thefed->tld)) { |
| 312 | 312 | echo "<tr> |
| 313 | 313 | <td>" . |
| 314 | - $oneinvite['name'] . " |
|
| 314 | + $oneinvite['name']." |
|
| 315 | 315 | </td> |
| 316 | 316 | <td>" . |
| 317 | - $oneinvite['mail'] . " |
|
| 317 | + $oneinvite['mail']." |
|
| 318 | 318 | </td> |
| 319 | 319 | <td colspan=2>"; |
| 320 | 320 | if ($readonly === FALSE) { |
| 321 | 321 | echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'> |
| 322 | - <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/> |
|
| 323 | - <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> " |
|
| 324 | - . sprintf(_("(expires %s)"),$oneinvite['expiry']) |
|
| 322 | + <input type='hidden' name='invitation_id' value='" . $oneinvite['token']."'/> |
|
| 323 | + <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> " |
|
| 324 | + . sprintf(_("(expires %s)"), $oneinvite['expiry']) |
|
| 325 | 325 | . "</form>"; |
| 326 | 326 | } |
| 327 | 327 | echo " </td> |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | private function inputValidationError($customtext) { |
| 39 | 39 | \core\common\Entity::intoThePotatoes(); |
| 40 | - $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>"; |
|
| 40 | + $retval = "<p>"._("Input validation error: ").$customtext."</p>"; |
|
| 41 | 41 | \core\common\Entity::outOfThePotatoes(); |
| 42 | 42 | return $retval; |
| 43 | 43 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | */ |
| 150 | 150 | public function string($input, $allowWhitespace = FALSE) { |
| 151 | 151 | // always chop out invalid characters, and surrounding whitespace |
| 152 | - $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
| 152 | + $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
| 153 | 153 | if ($retvalStep0 === FALSE) { |
| 154 | 154 | throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!"); |
| 155 | 155 | } |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | try { |
| 458 | 458 | $image->readImageBlob($binary); |
| 459 | 459 | } catch (\ImagickException $exception) { |
| 460 | - echo "Error" . $exception->getMessage(); |
|
| 460 | + echo "Error".$exception->getMessage(); |
|
| 461 | 461 | return FALSE; |
| 462 | 462 | } |
| 463 | 463 | // image survived the sanity check |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // realm is automatically calculated, then stored in DB |
| 92 | 92 | |
| 93 | - $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']; |
|
| 93 | + $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']; |
|
| 94 | 94 | $localValueIfAny = ""; |
| 95 | 95 | |
| 96 | 96 | // but there's some common internal attributes populated directly |
@@ -107,11 +107,11 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information |
| 109 | 109 | $silverbulletAttributes = [ |
| 110 | - "eap:server_name" => "auth." . strtolower($myFed->tld) . CONFIG_CONFASSISTANT['SILVERBULLET']['server_suffix'], |
|
| 110 | + "eap:server_name" => "auth.".strtolower($myFed->tld).CONFIG_CONFASSISTANT['SILVERBULLET']['server_suffix'], |
|
| 111 | 111 | ]; |
| 112 | 112 | $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes)); |
| 113 | 113 | $x509 = new \core\common\X509(); |
| 114 | - $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r"); |
|
| 114 | + $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r"); |
|
| 115 | 115 | if ($caHandle !== FALSE) { |
| 116 | 116 | $cAFile = fread($caHandle, 16000000); |
| 117 | 117 | foreach ($x509->splitCertificate($cAFile) as $oneCa) { |
@@ -132,26 +132,26 @@ discard block |
||
| 132 | 132 | $this->loggerInstance->debug(3, "--- END Constructing new Profile object ... ---\n"); |
| 133 | 133 | |
| 134 | 134 | $this->termsAndConditions = "<h2>Product Definition</h2> |
| 135 | - <p>" . \core\ProfileSilverbullet::PRODUCTNAME . " outsources the technical setup of " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " functions to the " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " Operations Team. The system includes</p> |
|
| 135 | + <p>" . \core\ProfileSilverbullet::PRODUCTNAME." outsources the technical setup of ".CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." functions to the ".CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']." Operations Team. The system includes</p> |
|
| 136 | 136 | <ul> |
| 137 | 137 | <li>a web-based user management interface where user accounts and access credentials can be created and revoked (there is a limit to the number of active users)</li> |
| 138 | 138 | <li>a technical infrastructure ('CA') which issues and revokes credentials</li> |
| 139 | - <li>a technical infrastructure ('RADIUS') which verifies access credentials and subsequently grants access to " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . "</li> |
|
| 139 | + <li>a technical infrastructure ('RADIUS') which verifies access credentials and subsequently grants access to " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']."</li> |
|
| 140 | 140 | </ul> |
| 141 | 141 | <h2>User Account Liability</h2> |
| 142 | - <p>As an " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " administrator using this system, you are authorized to create user accounts according to your local " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " policy. You are fully responsible for the accounts you issue and are the data controller for all user information you deposit in this system; the system is a data processor.</p>"; |
|
| 142 | + <p>As an " . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." administrator using this system, you are authorized to create user accounts according to your local ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." policy. You are fully responsible for the accounts you issue and are the data controller for all user information you deposit in this system; the system is a data processor.</p>"; |
|
| 143 | 143 | $this->termsAndConditions .= "<p>Your responsibilities include that you</p> |
| 144 | 144 | <ul> |
| 145 | - <li>only issue accounts to members of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", as defined by your local policy.</li> |
|
| 145 | + <li>only issue accounts to members of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", as defined by your local policy.</li> |
|
| 146 | 146 | <li>must make sure that all accounts that you issue can be linked by you to actual human end users</li> |
| 147 | - <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . "</li> |
|
| 147 | + <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']."</li> |
|
| 148 | 148 | <li>will act upon notifications about possible network abuse by your users and will appropriately sanction them</li> |
| 149 | 149 | </ul> |
| 150 | 150 | <p>"; |
| 151 | - $this->termsAndConditions .= "Failure to comply with these requirements may make your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " act on your behalf, which you authorise, and will ultimately lead to the deletion of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " (and all the users you create inside) in this system."; |
|
| 151 | + $this->termsAndConditions .= "Failure to comply with these requirements may make your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." act on your behalf, which you authorise, and will ultimately lead to the deletion of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." (and all the users you create inside) in this system."; |
|
| 152 | 152 | $this->termsAndConditions .= "</p> |
| 153 | 153 | <h2>Privacy</h2> |
| 154 | - <p>With " . \core\ProfileSilverbullet::PRODUCTNAME . ", we are necessarily storing personally identifiable information about the end users you create. While the actual human is only identifiable with your help, we consider all the user data as relevant in terms of privacy jurisdiction. Please note that</p> |
|
| 154 | + <p>With " . \core\ProfileSilverbullet::PRODUCTNAME.", we are necessarily storing personally identifiable information about the end users you create. While the actual human is only identifiable with your help, we consider all the user data as relevant in terms of privacy jurisdiction. Please note that</p> |
|
| 155 | 155 | <ul> |
| 156 | 156 | <li>You are the only one who needs to be able to make a link to the human behind the usernames you create. The usernames you create in the system have to be rich enough to allow you to make that identification step. Also consider situations when you are unavailable or leave the organisation and someone else needs to perform the matching to an individual.</li> |
| 157 | 157 | <li>The identifiers we create in the credentials are not linked to the usernames you add to the system; they are randomly generated pseudonyms.</li> |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | if (empty($certNames)) { |
| 255 | 255 | return []; |
| 256 | 256 | } |
| 257 | - $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'"; |
|
| 257 | + $namesCondensed = "'".implode("' OR username = '", $certNames)."'"; |
|
| 258 | 258 | $serverHandles = DBConnection::handle("RADIUS"); |
| 259 | 259 | $returnarray = []; |
| 260 | 260 | foreach ($serverHandles as $oneDbServer) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function setSupportedEapMethods($eapArray) { |
| 85 | 85 | $this->supportedEapMethods = $eapArray; |
| 86 | - $this->loggerInstance->debug(4, "This device (" . __CLASS__ . ") supports the following EAP methods: "); |
|
| 86 | + $this->loggerInstance->debug(4, "This device (".__CLASS__.") supports the following EAP methods: "); |
|
| 87 | 87 | $this->loggerInstance->debug(4, $this->supportedEapMethods); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | break 2; |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | - $longestSuffix = $candidate . $longestSuffix; |
|
| 136 | + $longestSuffix = $candidate.$longestSuffix; |
|
| 137 | 137 | } |
| 138 | 138 | return $longestSuffix; |
| 139 | 139 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | throw new Exception("No EAP type available."); |
| 170 | 170 | } |
| 171 | 171 | $this->attributes = $this->getProfileAttributes($profile); |
| 172 | - $this->deviceUUID = common\Entity::uuid('', 'CAT' . $profile->institution . "-" . $profile->identifier . "-" . $this->device_id); |
|
| 172 | + $this->deviceUUID = common\Entity::uuid('', 'CAT'.$profile->institution."-".$profile->identifier."-".$this->device_id); |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | 175 | // if we are instantiating a Silverbullet profile AND have been given |
@@ -193,8 +193,8 @@ discard block |
||
| 193 | 193 | // create temporary directory, its full path will be saved in $this->FPATH; |
| 194 | 194 | $tempDir = $this->createTemporaryDirectory($purpose); |
| 195 | 195 | $this->FPATH = $tempDir['dir']; |
| 196 | - mkdir($tempDir['dir'] . '/tmp'); |
|
| 197 | - chdir($tempDir['dir'] . '/tmp'); |
|
| 196 | + mkdir($tempDir['dir'].'/tmp'); |
|
| 197 | + chdir($tempDir['dir'].'/tmp'); |
|
| 198 | 198 | $caList = []; |
| 199 | 199 | $x509 = new \core\common\X509(); |
| 200 | 200 | if (isset($this->attributes['eap:ca_file'])) { |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $this->support_url_substitute = sprintf(_("your local %s support page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']); |
| 231 | 231 | |
| 232 | 232 | if ($this->signer && $this->options['sign']) { |
| 233 | - $this->sign = ROOT . '/signer/' . $this->signer; |
|
| 233 | + $this->sign = ROOT.'/signer/'.$this->signer; |
|
| 234 | 234 | } |
| 235 | 235 | $this->installerBasename = $this->getInstallerBasename(); |
| 236 | 236 | common\Entity::outOfThePotatoes(); |
@@ -286,10 +286,10 @@ discard block |
||
| 286 | 286 | * @return string|boolean the filename as found, with path, or FALSE if it does not exist |
| 287 | 287 | */ |
| 288 | 288 | protected function findSourceFile($file) { |
| 289 | - if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $file)) { |
|
| 290 | - return $this->module_path . '/Files/' . $this->device_id . '/' . $file; |
|
| 291 | - } elseif (is_file($this->module_path . '/Files/' . $file)) { |
|
| 292 | - return $this->module_path . '/Files/' . $file; |
|
| 289 | + if (is_file($this->module_path.'/Files/'.$this->device_id.'/'.$file)) { |
|
| 290 | + return $this->module_path.'/Files/'.$this->device_id.'/'.$file; |
|
| 291 | + } elseif (is_file($this->module_path.'/Files/'.$file)) { |
|
| 292 | + return $this->module_path.'/Files/'.$file; |
|
| 293 | 293 | } else { |
| 294 | 294 | $this->loggerInstance->debug(2, "requested file $file does not exist\n"); |
| 295 | 295 | return FALSE; |
@@ -410,17 +410,17 @@ discard block |
||
| 410 | 410 | */ |
| 411 | 411 | private function getInstallerBasename() { |
| 412 | 412 | |
| 413 | - $baseName = $this->customTranslit(CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "-" . $this->getDeviceId(); |
|
| 413 | + $baseName = $this->customTranslit(CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."-".$this->getDeviceId(); |
|
| 414 | 414 | if (isset($this->attributes['profile:customsuffix'][1])) { |
| 415 | 415 | // this string will end up as a filename on a filesystem, so always |
| 416 | 416 | // take a latin-based language variant if available |
| 417 | 417 | // and then scrub non-ASCII just in case |
| 418 | - return $baseName . $this->customTranslit($this->attributes['profile:customsuffix'][1]); |
|
| 418 | + return $baseName.$this->customTranslit($this->attributes['profile:customsuffix'][1]); |
|
| 419 | 419 | } |
| 420 | 420 | // Okay, no custom suffix. |
| 421 | 421 | // Use the configured inst name and apply shortening heuristics |
| 422 | 422 | $lang_pointer = CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['latin_based'] == TRUE ? 0 : 1; |
| 423 | - $this->loggerInstance->debug(5, "getInstallerBasename1:" . $this->attributes['general:instname'][$lang_pointer] . "\n"); |
|
| 423 | + $this->loggerInstance->debug(5, "getInstallerBasename1:".$this->attributes['general:instname'][$lang_pointer]."\n"); |
|
| 424 | 424 | $inst = $this->customTranslit($this->attributes['general:instname'][$lang_pointer]); |
| 425 | 425 | $this->loggerInstance->debug(4, "getInstallerBasename2:$inst\n"); |
| 426 | 426 | $Inst_a = explode('_', $inst); |
@@ -435,10 +435,10 @@ discard block |
||
| 435 | 435 | if (!empty($this->attributes['profile:name']) && !empty($this->attributes['profile:name'][$lang_pointer])) { |
| 436 | 436 | $profTemp = $this->customTranslit($this->attributes['profile:name'][$lang_pointer]); |
| 437 | 437 | $prof = preg_replace('/_+$/', '', $profTemp); |
| 438 | - return $baseName . $inst . '-' . $prof; |
|
| 438 | + return $baseName.$inst.'-'.$prof; |
|
| 439 | 439 | } |
| 440 | 440 | } |
| 441 | - return $baseName . $inst; |
|
| 441 | + return $baseName.$inst; |
|
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | /** |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | $ext = 'unsupported'; |
| 552 | 552 | } |
| 553 | 553 | $this->loggerInstance->debug(5, "saveLogoFile: $mime : $ext\n"); |
| 554 | - $fileName = 'logo-' . $type . $iterator . '.' . $ext; |
|
| 554 | + $fileName = 'logo-'.$type.$iterator.'.'.$ext; |
|
| 555 | 555 | $fileHandle = fopen($fileName, "w"); |
| 556 | 556 | if (!$fileHandle) { |
| 557 | 557 | $this->loggerInstance->debug(2, "saveLogoFile failed for: $fileName\n"); |
@@ -577,13 +577,13 @@ discard block |
||
| 577 | 577 | $mime = $finfo->buffer($blob); |
| 578 | 578 | $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported'; |
| 579 | 579 | $this->loggerInstance->debug(5, "saveInfoFile: $mime : $ext\n"); |
| 580 | - $fileHandle = fopen('local-info.' . $ext, "w"); |
|
| 580 | + $fileHandle = fopen('local-info.'.$ext, "w"); |
|
| 581 | 581 | if ($fileHandle === FALSE) { |
| 582 | 582 | throw new Exception("problem opening the file"); |
| 583 | 583 | } |
| 584 | 584 | fwrite($fileHandle, $blob); |
| 585 | 585 | fclose($fileHandle); |
| 586 | - return(['name' => 'local-info.' . $ext, 'mime' => $ext]); |
|
| 586 | + return(['name' => 'local-info.'.$ext, 'mime' => $ext]); |
|
| 587 | 587 | } |
| 588 | 588 | |
| 589 | 589 | /** |
@@ -634,9 +634,9 @@ discard block |
||
| 634 | 634 | protected function determineOuterIdString() { |
| 635 | 635 | $outerId = NULL; |
| 636 | 636 | if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) { |
| 637 | - $outerId = "@" . $this->attributes['internal:realm'][0]; |
|
| 637 | + $outerId = "@".$this->attributes['internal:realm'][0]; |
|
| 638 | 638 | if (isset($this->attributes['internal:anon_local_value'])) { |
| 639 | - $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId; |
|
| 639 | + $outerId = $this->attributes['internal:anon_local_value'][0].$outerId; |
|
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | return $outerId; |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | namespace core; |
| 23 | 23 | |
| 24 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 25 | 25 | |
| 26 | 26 | $instMgmt = new \core\UserManagement(); |
| 27 | 27 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?> |
| 52 | 52 | <tr> |
| 53 | 53 | <td> |
| 54 | -<?php echo "" . _("Unique Identifier") ?> |
|
| 54 | +<?php echo ""._("Unique Identifier") ?> |
|
| 55 | 55 | </td> |
| 56 | 56 | <td> |
| 57 | 57 | </td> |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | <div> |
| 65 | 65 | <?php |
| 66 | 66 | if (CONFIG['DB']['USER']['readonly'] === FALSE) { |
| 67 | - echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>"; |
|
| 67 | + echo "<a href='edit_user.php'><button>"._("Edit User Details")."</button></a>"; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | if ($user->isFederationAdmin()) { |
| 71 | - echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed) . "</button></form>"; |
|
| 71 | + echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>".sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed)."</button></form>"; |
|
| 72 | 72 | } |
| 73 | 73 | if ($user->isSuperadmin()) { |
| 74 | - echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>"; |
|
| 74 | + echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>"._('Click here to access the superadmin page')."</button></form>"; |
|
| 75 | 75 | } |
| 76 | 76 | ?> |
| 77 | 77 | </div> |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 84 | 84 | $target = "https://wiki.geant.org/x/6Zg7Bw"; // Managed IdP manual |
| 85 | 85 | } |
| 86 | - $helptext = "<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst) . "</h3>"; |
|
| 86 | + $helptext = "<h3 style='display:inline;'>".sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst)."</h3>"; |
|
| 87 | 87 | } else { |
| 88 | 88 | $helptext = ""; |
| 89 | 89 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | // we need to run the Federation constructor |
| 93 | 93 | $cat = new \core\CAT; |
| 94 | 94 | /// first parameter: number of Identity Providers; second param is the literal configured term for 'Identity Provider' (you may or may not be able to add a plural suffix for your locale) |
| 95 | - echo "<h2>" . sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureInst) . "</h2>"; |
|
| 95 | + echo "<h2>".sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureInst)."</h2>"; |
|
| 96 | 96 | $instlist = []; |
| 97 | 97 | $my_idps = []; |
| 98 | 98 | $myFeds = []; |
@@ -114,10 +114,10 @@ discard block |
||
| 114 | 114 | $country[$key] = $row['country']; |
| 115 | 115 | $name[$key] = $row['name']; |
| 116 | 116 | } |
| 117 | - echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclatureInst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclatureInst) . "</th><th>" . ( CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>"; |
|
| 117 | + echo "<tr><th>".sprintf(_("%s Name"), $uiElements->nomenclatureInst)."</th><th>".sprintf(_("Other admins of this %s"), $uiElements->nomenclatureInst)."</th><th>".(CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "")."</th></tr>"; |
|
| 118 | 118 | foreach ($myFeds as $fed_id => $fed_name) { |
| 119 | 119 | /// nomenclature 'fed', fed name, nomenclature 'inst' |
| 120 | - echo "<tr><td colspan='3'><strong>" . sprintf(_("%s %s: %s list"), $uiElements->nomenclatureFed, $fed_name, $uiElements->nomenclatureInst) . "</strong></td></tr>"; |
|
| 120 | + echo "<tr><td colspan='3'><strong>".sprintf(_("%s %s: %s list"), $uiElements->nomenclatureFed, $fed_name, $uiElements->nomenclatureInst)."</strong></td></tr>"; |
|
| 121 | 121 | |
| 122 | 122 | $fed_idps = $my_idps[$fed_id]; |
| 123 | 123 | asort($fed_idps); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $oneinst = $instlist[$index]; |
| 126 | 126 | $the_inst = $oneinst['object']; |
| 127 | 127 | |
| 128 | - echo "<tr><td><a href='overview_idp.php?inst_id=$the_inst->identifier'>" . $oneinst['name'] . "</a></td><td>"; |
|
| 128 | + echo "<tr><td><a href='overview_idp.php?inst_id=$the_inst->identifier'>".$oneinst['name']."</a></td><td>"; |
|
| 129 | 129 | echo "<input type='hidden' name='inst' value='$the_inst->identifier'>"; |
| 130 | 130 | $admins = $the_inst->listOwners(); |
| 131 | 131 | $blessedUser = FALSE; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $coadmin = new \core\User($username['ID']); |
| 135 | 135 | $coadmin_name = $coadmin->getAttributes('user:realname'); |
| 136 | 136 | if (count($coadmin_name) > 0) { |
| 137 | - echo $coadmin_name[0]['value'] . "<br/>"; |
|
| 137 | + echo $coadmin_name[0]['value']."<br/>"; |
|
| 138 | 138 | unset($admins[$number]); |
| 139 | 139 | } |
| 140 | 140 | } else { // don't list self |
@@ -146,29 +146,29 @@ discard block |
||
| 146 | 146 | } |
| 147 | 147 | $otherAdminCount = count($admins); // only the unnamed remain |
| 148 | 148 | if ($otherAdminCount > 0) { |
| 149 | - echo sprintf(ngettext("%d other user", "%d other users", $otherAdminCount),$otherAdminCount); |
|
| 149 | + echo sprintf(ngettext("%d other user", "%d other users", $otherAdminCount), $otherAdminCount); |
|
| 150 | 150 | } |
| 151 | 151 | echo "</td><td>"; |
| 152 | 152 | if ($blessedUser && CONFIG['DB']['INST']['readonly'] === FALSE) { |
| 153 | - echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>"; |
|
| 153 | + echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=".$the_inst->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>"._("Add/Remove Administrators")."</button></form></div>"; |
|
| 154 | 154 | } |
| 155 | 155 | echo "</td></tr>"; |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | echo "</table>"; |
| 159 | 159 | } else { |
| 160 | - echo "<h2>" . sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst) . "</h2>"; |
|
| 160 | + echo "<h2>".sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst)."</h2>"; |
|
| 161 | 161 | } |
| 162 | 162 | if (CONFIG['DB']['INST']['readonly'] === FALSE) { |
| 163 | 163 | if (CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL) { |
| 164 | - echo "<p>" . sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureInst) . "</p>"; |
|
| 164 | + echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureInst)."</p>"; |
|
| 165 | 165 | echo "<hr/> |
| 166 | 166 | <div style='white-space: nowrap;'> |
| 167 | 167 | <form action='action_enrollment.php' method='get' accept-charset='UTF-8'>" . |
| 168 | - sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureInst) . |
|
| 168 | + sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureInst). |
|
| 169 | 169 | " <input type='text' id='token' name='token'/> |
| 170 | 170 | <button type='submit'>" . |
| 171 | - _("Go!") . " |
|
| 171 | + _("Go!")." |
|
| 172 | 172 | </button> |
| 173 | 173 | </form> |
| 174 | 174 | </div>"; |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | <div style='white-space: nowrap;'> |
| 178 | 178 | <form action='action_enrollment.php' method='get'><button type='submit' accept-charset='UTF-8'> |
| 179 | 179 | <input type='hidden' id='token' name='token' value='SELF-REGISTER'/>" . |
| 180 | - sprintf(_("New %s Registration"), $uiElements->nomenclatureInst) . " |
|
| 180 | + sprintf(_("New %s Registration"), $uiElements->nomenclatureInst)." |
|
| 181 | 181 | </button> |
| 182 | 182 | </form> |
| 183 | 183 | </div>"; |
@@ -40,16 +40,16 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | <?php |
| 42 | 42 | $profile_list_size = 1; |
| 43 | -require_once dirname(__DIR__) . '/Divs.php'; |
|
| 43 | +require_once dirname(__DIR__).'/Divs.php'; |
|
| 44 | 44 | $divs = new Divs($Gui); |
| 45 | 45 | $visibility = 'index'; |
| 46 | 46 | $operatingSystem = $Gui->detectOS(); |
| 47 | 47 | $Gui->loggerInstance->debug(4, $operatingSystem); |
| 48 | 48 | $uiElements = new web\lib\admin\UIElements(); |
| 49 | 49 | if ($operatingSystem) { |
| 50 | - print "recognisedOS = '" . $operatingSystem['device'] . "';\n"; |
|
| 50 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 51 | 51 | } |
| 52 | -require dirname(__DIR__) . '/user/js/cat_js.php'; |
|
| 52 | +require dirname(__DIR__).'/user/js/cat_js.php'; |
|
| 53 | 53 | ?> |
| 54 | 54 | |
| 55 | 55 | </script> |
@@ -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@<b>realm.tld</b>):"); |
| 98 | 98 | ?> |
| 99 | 99 | <input type='text' name='user_realm' id='user_realm' value=''> |
| 100 | 100 | <?php |
| 101 | - echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>'; |
|
| 102 | - echo _("You can select your home institution from the following list") . '<br/>'; |
|
| 101 | + echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>'; |
|
| 102 | + echo _("You can select your home institution from the following list").'<br/>'; |
|
| 103 | 103 | echo '<div id="select_idp_country"><a href="" id="idp_countries_list">'; |
| 104 | - echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>'; |
|
| 104 | + echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>'; |
|
| 105 | 105 | ?> |
| 106 | 106 | <div id="select_idp_area" style="display:none;"> |
| 107 | 107 | </div> |
| 108 | 108 | </div> |
| 109 | 109 | <div id="position_info"> |
| 110 | 110 | <?php |
| 111 | - echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>'; |
|
| 111 | + echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>'; |
|
| 112 | 112 | echo '<div id="select_sp_country"><a href="" id="sp_countries_list">'; |
| 113 | - echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>'; |
|
| 113 | + echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>'; |
|
| 114 | 114 | ?> |
| 115 | 115 | <div id="select_sp_area" style="display:none;"> |
| 116 | 116 | </div> |
@@ -143,9 +143,9 @@ discard block |
||
| 143 | 143 | echo 'none'; |
| 144 | 144 | } |
| 145 | 145 | echo ";'>"; |
| 146 | - echo '<h3>' . _("Which problem are you reporting?") . '</h3>'; |
|
| 146 | + echo '<h3>'._("Which problem are you reporting?").'</h3>'; |
|
| 147 | 147 | echo '<input type="radio" name="problem_type" value="1">'; |
| 148 | - echo _("SP contacting IdP due to technical problems or abuse") . '<br>'; |
|
| 148 | + echo _("SP contacting IdP due to technical problems or abuse").'<br>'; |
|
| 149 | 149 | echo '<input type="radio" name="problem_type" value="2">'; |
| 150 | 150 | echo _("IdP contacting SP due to technical problems"); |
| 151 | 151 | echo "<div id='idp_contact_area'></div>"; |
@@ -154,9 +154,9 @@ discard block |
||
| 154 | 154 | echo "</div>"; |
| 155 | 155 | } else { |
| 156 | 156 | echo "0\">"; |
| 157 | - echo _("This service is for authenticated admins only.") . '<br>'; |
|
| 158 | - echo "<a href=\"diag.php?admin=1\">" . |
|
| 159 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 157 | + echo _("This service is for authenticated admins only.").'<br>'; |
|
| 158 | + echo "<a href=\"diag.php?admin=1\">". |
|
| 159 | + _("eduroam® admin access is needed")."</a>"; |
|
| 160 | 160 | } |
| 161 | 161 | ?> |
| 162 | 162 | </div> |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | if (type === 'idp' || type === 'sp') { |
| 181 | 181 | shtml = '<table><tbody><tr id="row_'+type+'_country"></tr>'; |
| 182 | 182 | shtml = shtml + '<tr id="row_'+type+'_institution" style="visibility: collapse;">'; |
| 183 | - shtml = shtml + '<td>' + <?php echo '"' . _("Select institiution:") . '"'; ?> + '</td><td></td></tr>'; |
|
| 183 | + shtml = shtml + '<td>' + <?php echo '"'._("Select institiution:").'"'; ?> + '</td><td></td></tr>'; |
|
| 184 | 184 | if (type === 'idp') { |
| 185 | 185 | shtml = shtml + '<tr id="row_idp_realm"></tr>'; |
| 186 | 186 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | var options = ''; |
| 207 | 207 | var selecthead = ''; |
| 208 | 208 | if (type1 === 'sp' || type1 === 'idp') { |
| 209 | - selecthead = <?php echo '"<td>' . _("Select country or region:") . ' </td>"'; ?>; |
|
| 209 | + selecthead = <?php echo '"<td>'._("Select country or region:").' </td>"'; ?>; |
|
| 210 | 210 | selecthead = selecthead + '<td>\n'; |
| 211 | 211 | } |
| 212 | 212 | var select = '<select id="' + type1 + '_country" name="' + type1 + '_country" style="margin-left:0px; width:400px;">'; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | options = ($('#'+type2+'_country').html()); |
| 215 | 215 | countryAddSelect(selecthead, select + options + '</select>', type1); |
| 216 | 216 | } else { |
| 217 | - var comment = <?php echo '"<br><br>' . _("Fetching country/region list") . '..."'; ?>; |
|
| 217 | + var comment = <?php echo '"<br><br>'._("Fetching country/region list").'..."'; ?>; |
|
| 218 | 218 | inProgress(1, comment); |
| 219 | 219 | $.ajax({ |
| 220 | 220 | url: "findRealm.php", |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | return false; |
| 252 | 252 | } |
| 253 | 253 | function testSociopath(realm, answer) { |
| 254 | - var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; |
|
| 254 | + var comment = <?php echo '"'._("Testing realm").'..."'; ?>; |
|
| 255 | 255 | inProgress(1, comment); |
| 256 | 256 | if ($('#tested_realm').length == 0) { |
| 257 | 257 | $('<input>').attr({ |
@@ -275,9 +275,9 @@ discard block |
||
| 275 | 275 | query = '<input type="hidden" id="tested_realm" value="' + realm + '">'; |
| 276 | 276 | } |
| 277 | 277 | query = query + '<div id="current_query">'+data['TEXT']+'</div>'; |
| 278 | - query = query + '<div><button id="answer_yes">' + <?php echo '"' . _("Yes") . '"'; ?> + '</button>'; |
|
| 279 | - query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"' . _("No") . '"'; ?> + '</button>'; |
|
| 280 | - query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"' . _("I don't know") . '"'; ?> + '</button></div>'; |
|
| 278 | + query = query + '<div><button id="answer_yes">' + <?php echo '"'._("Yes").'"'; ?> + '</button>'; |
|
| 279 | + query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"'._("No").'"'; ?> + '</button>'; |
|
| 280 | + query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"'._("I don't know").'"'; ?> + '</button></div>'; |
|
| 281 | 281 | $('#sociopath_queries').html(query); |
| 282 | 282 | $('#sociopath_query_area').show(); |
| 283 | 283 | } |
@@ -308,55 +308,55 @@ discard block |
||
| 308 | 308 | }); |
| 309 | 309 | } |
| 310 | 310 | function finalVerdict(realm, verdict) { |
| 311 | - var title = <?php echo '"' . _("Diagnostic tests results for selected realm") . '"'; ?>; |
|
| 311 | + var title = <?php echo '"'._("Diagnostic tests results for selected realm").'"'; ?>; |
|
| 312 | 312 | result = '<div class="padding">'; |
| 313 | 313 | result = result + '<div><h3>'; |
| 314 | - result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm; |
|
| 314 | + result = result + <?php echo '"'._("The result for tested realm:").' "'; ?> + realm; |
|
| 315 | 315 | result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">'; |
| 316 | - result = result + <?php echo '"' . _("The system identified") . '" '; ?> + ' '; |
|
| 316 | + result = result + <?php echo '"'._("The system identified").'" '; ?> + ' '; |
|
| 317 | 317 | result = result + Object.keys(verdict).length + ' '; |
| 318 | - result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>'; |
|
| 319 | - result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>; |
|
| 318 | + result = result + <?php echo '"'._("suspected areas which potentially can cause a problem.").'"'; ?> + '<br>'; |
|
| 319 | + result = result + <?php echo '"'._("Next to the problem description we show a speculated probability of this event.").'"'; ?>; |
|
| 320 | 320 | result = result + '</div><div style="padding: 5px;"><table>'; |
| 321 | 321 | k = 1; |
| 322 | 322 | for (key in verdict) { |
| 323 | 323 | result = result + '<tr><td>' + k + '.</td>'; |
| 324 | 324 | k = k + 1; |
| 325 | 325 | if (key === 'INFRA_DEVICE') { |
| 326 | - result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"'; ?> + '</td>'; |
|
| 326 | + result = result + '<td>' + <?php echo '"'._("Your device configuration is broken").'"'; ?> + '</td>'; |
|
| 327 | 327 | } |
| 328 | 328 | if (key === 'INFRA_SP_80211') { |
| 329 | - result = result + '<td>' + <?php echo '"' . _("The Wi-Fi network in your vicinity has quality issues") . '"'; ?> + '</td>'; |
|
| 329 | + result = result + '<td>' + <?php echo '"'._("The Wi-Fi network in your vicinity has quality issues").'"'; ?> + '</td>'; |
|
| 330 | 330 | } |
| 331 | 331 | if (key === 'INFRA_SP_LAN') { |
| 332 | - result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"'; ?> + '</td>'; |
|
| 332 | + result = result + '<td>' + <?php echo '"'._("The network environment around you is broken").'"'; ?> + '</td>'; |
|
| 333 | 333 | } |
| 334 | 334 | if (key === 'INFRA_SP_RADIUS') { |
| 335 | - result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your service provider is the source of the problem") . '"'; ?> + '</td>'; |
|
| 335 | + result = result + '<td>' + <?php echo '"'._("The RADIUS server of your service provider is the source of the problem").'"'; ?> + '</td>'; |
|
| 336 | 336 | } |
| 337 | 337 | if (key === 'INFRA_IDP_AUTHBACKEND') { |
| 338 | - result = result + '<td>' + <?php echo '"' . _("The RADIUS server in your home institution is currently unable to authenticate you") . '"'; ?> + '</td>'; |
|
| 338 | + result = result + '<td>' + <?php echo '"'._("The RADIUS server in your home institution is currently unable to authenticate you").'"'; ?> + '</td>'; |
|
| 339 | 339 | } |
| 340 | 340 | if (key === 'INFRA_NRO_SP') { |
| 341 | - result = result + '<td>' + <?php echo '"' . _("The national server in the country/region you are visiting is not functioning correctly") . '"'; ?> + '</td>'; |
|
| 341 | + result = result + '<td>' + <?php echo '"'._("The national server in the country/region you are visiting is not functioning correctly").'"'; ?> + '</td>'; |
|
| 342 | 342 | } |
| 343 | 343 | if (key === 'INFRA_LINK_ETLR_NRO_SP') { |
| 344 | - result = result + '<td>' + <?php echo '"' . _("The link between the national server of the country/region you are visiting and the top-level server is broken") . '"'; ?> + '</td>'; |
|
| 344 | + result = result + '<td>' + <?php echo '"'._("The link between the national server of the country/region you are visiting and the top-level server is broken").'"'; ?> + '</td>'; |
|
| 345 | 345 | } |
| 346 | 346 | if (key === 'INFRA_LINK_ETLR_NRO_IdP') { |
| 347 | - result = result + '<td>' + <?php echo '"' . _("The link between the national server of your home country/region and the top-level server is broken") . '"'; ?> + '</td>'; |
|
| 347 | + result = result + '<td>' + <?php echo '"'._("The link between the national server of your home country/region and the top-level server is broken").'"'; ?> + '</td>'; |
|
| 348 | 348 | } |
| 349 | 349 | if (key === 'INFRA_ETLR') { |
| 350 | - result = result + '<td>' + <?php echo '"' . _("The communication to the top-level server is down") . '"'; ?> + '</td>'; |
|
| 350 | + result = result + '<td>' + <?php echo '"'._("The communication to the top-level server is down").'"'; ?> + '</td>'; |
|
| 351 | 351 | } |
| 352 | 352 | if (key === 'INFRA_NRO_IdP') { |
| 353 | - result = result + '<td>' + <?php echo '"' . _("The national server in your home country/region is not functioning properly.") . '"'; ?> + '</td>'; |
|
| 353 | + result = result + '<td>' + <?php echo '"'._("The national server in your home country/region is not functioning properly.").'"'; ?> + '</td>'; |
|
| 354 | 354 | } |
| 355 | 355 | if (key === 'INFRA_IdP_RADIUS') { |
| 356 | - result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your home institution is the source of the problem") . '"'; ?> + '</td>'; |
|
| 356 | + result = result + '<td>' + <?php echo '"'._("The RADIUS server of your home institution is the source of the problem").'"'; ?> + '</td>'; |
|
| 357 | 357 | } |
| 358 | 358 | if (key === 'INFRA_NONEXISTENTREALM') { |
| 359 | - result = result + '<td>' + <?php echo '"' . _("This realm does not exist") . '"'; ?> + '</td>'; |
|
| 359 | + result = result + '<td>' + <?php echo '"'._("This realm does not exist").'"'; ?> + '</td>'; |
|
| 360 | 360 | } |
| 361 | 361 | result = result + '<td style="padding-left: 5px;">' + (verdict[key] * 100).toFixed(2) + "%</td></tr>"; |
| 362 | 362 | } |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | return false; |
| 469 | 469 | }); |
| 470 | 470 | $(document).on('change', '#idp_country' , function() { |
| 471 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 471 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 472 | 472 | var id = $(this).attr('id'); |
| 473 | 473 | var k = id.indexOf('_'); |
| 474 | 474 | var type = id.substr(0,k); |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | var shtml = ''; |
| 487 | 487 | var select = ''; |
| 488 | 488 | if (type !== 'asp') { |
| 489 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 489 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 490 | 490 | } |
| 491 | 491 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 492 | 492 | for (var i in institutions) { |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | } else { |
| 508 | 508 | if (data.status === 0) { |
| 509 | 509 | inProgress(0); |
| 510 | - 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.") . '"'; ?>; |
|
| 510 | + 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.").'"'; ?>; |
|
| 511 | 511 | alert(msg); |
| 512 | 512 | $('#select_idp_country').show(); |
| 513 | 513 | $('#select_idp_area').hide(); |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | }, |
| 517 | 517 | error:function() { |
| 518 | 518 | inProgress(0); |
| 519 | - var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 519 | + var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 520 | 520 | alert(msg); |
| 521 | 521 | $('#select_idp_country').show(); |
| 522 | 522 | $('#select_idp_area').hide(); |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | return false; |
| 532 | 532 | }); |
| 533 | 533 | $(document).on('change', '#sp_country, #asp_country' , function() { |
| 534 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 534 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 535 | 535 | var id = $(this).attr('id'); |
| 536 | 536 | var k = id.indexOf('_'); |
| 537 | 537 | var type = id.substr(0,k); |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | var shtml = ''; |
| 550 | 550 | var select = ''; |
| 551 | 551 | if (type !== 'asp') { |
| 552 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 552 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 553 | 553 | } |
| 554 | 554 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 555 | 555 | for (var i in hotspots) { |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | inProgress(0); |
| 573 | 573 | var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">'; |
| 574 | 574 | var shtml = '<td></td><td>'; |
| 575 | - select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>'; |
|
| 575 | + select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>'; |
|
| 576 | 576 | if (type !== 'asp') { |
| 577 | 577 | $('#row_' + type + '_institution').html(''); |
| 578 | 578 | $('#row_' + type + '_institution').append(shtml + select); |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | $('#start_test_area').hide(); |
| 607 | 607 | return false; |
| 608 | 608 | } |
| 609 | - var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>; |
|
| 609 | + var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>; |
|
| 610 | 610 | inProgress(1, comment); |
| 611 | 611 | $.ajax({ |
| 612 | 612 | url: "findRealm.php", |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | var realms = data.realms; |
| 619 | 619 | var realmselect = ''; |
| 620 | 620 | if (realms.length > 1) { |
| 621 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 621 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 622 | 622 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 623 | 623 | for (var i in realms) { |
| 624 | 624 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | } |
| 631 | 631 | realmselect = realmselect + '</span></td>'; |
| 632 | 632 | } else { |
| 633 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 633 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 634 | 634 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 635 | 635 | realmselect = realmselect + realms[0] + '</span>'; |
| 636 | 636 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | }); |
| 686 | 686 | t = 1; |
| 687 | 687 | } |
| 688 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 688 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 689 | 689 | inProgress(1, comment); |
| 690 | 690 | /*waiting(comment);*/ |
| 691 | 691 | $.ajax({ |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | } |
| 730 | 730 | }); |
| 731 | 731 | $('#sp_questions > tbody').append('<tr class="error_row"><td>' + |
| 732 | - <?php echo '"' . _("Realm is not registered with the eduroam database:") . '"'; ?> + |
|
| 732 | + <?php echo '"'._("Realm is not registered with the eduroam database:").'"'; ?> + |
|
| 733 | 733 | '</td><td>' + realm + '</td></tr>'); |
| 734 | 734 | $('#admin_realm').val(''); |
| 735 | 735 | } |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | testSociopath('', answer); |
| 754 | 754 | }); |
| 755 | 755 | $('#realmtest').click(function(event){ |
| 756 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 756 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 757 | 757 | inProgress(1, comment); |
| 758 | 758 | $('#start_test_area').hide(); |
| 759 | 759 | if ($('#select_sp_area').is(':hidden')) { |
@@ -801,13 +801,13 @@ discard block |
||
| 801 | 801 | reset_footer(); |
| 802 | 802 | testSociopath(realm, 0); |
| 803 | 803 | } else { |
| 804 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 805 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>; |
|
| 804 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 805 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>; |
|
| 806 | 806 | result = result + '</h3>' |
| 807 | 807 | if (r.length == 1) { |
| 808 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 808 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 809 | 809 | } else { |
| 810 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 810 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 811 | 811 | } |
| 812 | 812 | result = result + ': ' |
| 813 | 813 | for (var i=0; i < r.length; i++) { |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | result = result + r[i]; |
| 818 | 818 | } |
| 819 | 819 | result = result + '.<br>'; |
| 820 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 820 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 821 | 821 | result = result + '</div>'; |
| 822 | 822 | $('#after_stage_1').hide(); |
| 823 | 823 | $('#before_stage_1').show(); |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | }); |
| 878 | 878 | }); |
| 879 | 879 | }); |
| 880 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 880 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 881 | 881 | inProgress(1, comment); |
| 882 | 882 | $.ajax({ |
| 883 | 883 | url: "findRealm.php", |
@@ -948,29 +948,29 @@ discard block |
||
| 948 | 948 | success:function(data) { |
| 949 | 949 | if (data.status === 1) { |
| 950 | 950 | var result = ''; |
| 951 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 951 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 952 | 952 | result = '<div class="padding">'; |
| 953 | 953 | if (type == 'idp_send') { |
| 954 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 954 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 955 | 955 | result = result + '<table>'; |
| 956 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 957 | - result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 958 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>'; |
|
| 959 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 960 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 961 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 956 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 957 | + result = result + '<tr><td>' + <?php echo '"'._("SP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 958 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email(s)").'"'; ?> + '</td><td>' + data.idpcontact + '</td></tr>'; |
|
| 959 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 960 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 961 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 962 | 962 | } |
| 963 | 963 | if (type == 'sp_send') { |
| 964 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 964 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 965 | 965 | result = result + '<table>'; |
| 966 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 967 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 968 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 969 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 970 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 971 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 972 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 973 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 966 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 967 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 968 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 969 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 970 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 971 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 972 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 973 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 974 | 974 | } |
| 975 | 975 | result = result + '</div>'; |
| 976 | 976 | showInfo(result, title); |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | if ($('#mac').val().length > 0) { |
| 988 | 988 | if ($('#mac').val().length != 17) { |
| 989 | 989 | $('#mac').addClass('error_input'); |
| 990 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 990 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 991 | 991 | } else { |
| 992 | 992 | $('#mac').removeClass('error_input'); |
| 993 | 993 | $('#mac').attr('title', ''); |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 997 | 997 | if (!isEmail($(this).val())) { |
| 998 | 998 | $('#email').addClass('error_input'); |
| 999 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 999 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 1000 | 1000 | } else { |
| 1001 | 1001 | $('#email').removeClass('error_input'); |
| 1002 | 1002 | $('#email').attr('title', ''); |
@@ -1005,7 +1005,7 @@ discard block |
||
| 1005 | 1005 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 1006 | 1006 | if (!isEmail($(this).val(), true)) { |
| 1007 | 1007 | $('#outer_id').addClass('error_input'); |
| 1008 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 1008 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 1009 | 1009 | } else { |
| 1010 | 1010 | $('#outer_id').removeClass('error_input'); |
| 1011 | 1011 | $('#outer_id').attr('title', ''); |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 1015 | 1015 | if (!isOperatorName($(this).val())) { |
| 1016 | 1016 | $('#opname').addClass('error_input'); |
| 1017 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 1017 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 1018 | 1018 | $('#spmanually').show(); |
| 1019 | 1019 | } else { |
| 1020 | 1020 | $('#opname').removeClass('error_input'); |
