GEANT /
CAT
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | break; |
| 99 | 99 | case 'listIdentityProviders': |
| 100 | 100 | if ($federation === FALSE) { |
| 101 | - $federation = $id ? $validator->Federation($id)->tld : FALSE; |
|
| 101 | + $federation = $id ? $validator->Federation($id)->tld : FALSE; |
|
| 102 | 102 | } |
| 103 | 103 | if ($federation === FALSE) { // federation is a mandatory parameter! |
| 104 | 104 | exit; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | break; |
| 111 | 111 | case 'listProfiles': // needs $idp set - abort if not |
| 112 | 112 | if ($idp === FALSE) { |
| 113 | - $idp = $id ? $validator->IdP($id)->identifier : FALSE; |
|
| 113 | + $idp = $id ? $validator->IdP($id)->identifier : FALSE; |
|
| 114 | 114 | } |
| 115 | 115 | if ($idp === FALSE) { |
| 116 | 116 | exit; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | break; |
| 120 | 120 | case 'listDevices': |
| 121 | 121 | if ($profile === FALSE) { |
| 122 | - $profile = $id ? $validator->Profile($id)->identifier : FALSE; |
|
| 122 | + $profile = $id ? $validator->Profile($id)->identifier : FALSE; |
|
| 123 | 123 | } |
| 124 | 124 | if ($profile === FALSE) { |
| 125 | 125 | exit; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | break; |
| 147 | 147 | case 'profileAttributes': // needs $profile set |
| 148 | 148 | if ($profile === FALSE) { |
| 149 | - $profile = $id ? $validator->Profile($id)->identifier : FALSE; |
|
| 149 | + $profile = $id ? $validator->Profile($id)->identifier : FALSE; |
|
| 150 | 150 | } |
| 151 | 151 | if ($profile === FALSE) { |
| 152 | 152 | exit; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | break; |
| 156 | 156 | case 'sendLogo': // needs $idp and $disco set |
| 157 | 157 | if ($idp === FALSE) { |
| 158 | - $idp = $id ? $validator->IdP($id)->identifier : FALSE; |
|
| 158 | + $idp = $id ? $validator->IdP($id)->identifier : FALSE; |
|
| 159 | 159 | } |
| 160 | 160 | if ($idp === FALSE) { |
| 161 | 161 | exit; |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * |
| 25 | 25 | * @package UserAPI |
| 26 | 26 | */ |
| 27 | -include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php"); |
|
| 27 | +include(dirname(dirname(dirname(__FILE__)))."/config/_config.php"); |
|
| 28 | 28 | $API = new \core\UserNetAPI(); |
| 29 | 29 | $validator = new web\lib\common\InputValidation(); |
| 30 | 30 | $loggerInstance = new \core\common\Logging(); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | - $Tou = [ |
|
| 22 | + $Tou = [ |
|
| 23 | 23 | 'title' => _("Terms of Use"), |
| 24 | 24 | 'subtitle' => _("(for legal reasons, the Terms of Use are in English only)"), |
| 25 | 25 | 'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @package UserGUI |
| 27 | 27 | */ |
| 28 | 28 | error_reporting(E_ALL | E_STRICT); |
| 29 | -require dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 29 | +require dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $langObject = new \core\common\Language(); |
| 32 | 32 | $langObject->setTextDomain("web_user"); |
@@ -39,24 +39,24 @@ discard block |
||
| 39 | 39 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
| 40 | 40 | <div id="heading"> |
| 41 | 41 | <?php |
| 42 | - print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 43 | - print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; |
|
| 44 | - print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1> |
|
| 45 | -<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>'; |
|
| 42 | + print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 43 | + print '<div id="motd">'.(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ').'</div>'; |
|
| 44 | + print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']).'</h1> |
|
| 45 | +<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'].'</h2>'; |
|
| 46 | 46 | echo '<table id="lang_select"><tr><td>'; |
| 47 | 47 | echo _("View this page in"); |
| 48 | 48 | ?> |
| 49 | 49 | <?php |
| 50 | 50 | foreach (CONFIG['LANGUAGES'] as $lang => $value) { |
| 51 | - echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> "; |
|
| 51 | + echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> "; |
|
| 52 | 52 | } |
| 53 | - echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>'; |
|
| 53 | + echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>'; |
|
| 54 | 54 | ?> |
| 55 | 55 | </div> <!-- id="heading" --> |
| 56 | 56 | <div id="main_body" style='padding:20px;'> |
| 57 | - <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1> |
|
| 58 | - <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p> |
|
| 57 | + <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1> |
|
| 58 | + <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p> |
|
| 59 | 59 | <h2>401/403</h2> |
| 60 | - <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang())?></p> |
|
| 60 | + <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang())?></p> |
|
| 61 | 61 | </div> |
| 62 | 62 | <?php echo $deco->footer(); |
@@ -311,8 +311,8 @@ |
||
| 311 | 311 | echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'> |
| 312 | 312 | <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/> |
| 313 | 313 | <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> " |
| 314 | - . sprintf(_("(expires %s)"),$oneinvite['expiry']) |
|
| 315 | - . "</form>"; |
|
| 314 | + . sprintf(_("(expires %s)"),$oneinvite['expiry']) |
|
| 315 | + . "</form>"; |
|
| 316 | 316 | } |
| 317 | 317 | echo " </td> |
| 318 | 318 | </tr>"; |
@@ -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/fgBwBg", $uiElements->nomenclatureFed) . "</h3>"; |
|
| 194 | + $helptext = "<h3>".sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/fgBwBg", $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,27 +245,27 @@ 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 |
| 251 | 251 | echo "<td> |
| 252 | - <input type='hidden' name='inst' value='" . $index . "'>" . $idp_instance->name . " |
|
| 252 | + <input type='hidden' name='inst' value='" . $index."'>".$idp_instance->name." |
|
| 253 | 253 | </td>"; |
| 254 | 254 | // external DB sync, if configured as being necessary |
| 255 | 255 | if (CONFIG['DB']['enforce-external-sync']) { |
| 256 | 256 | echo "<td style='display: ruby;'>"; |
| 257 | 257 | if ($readonly === FALSE) { |
| 258 | - echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=" . $idp_instance->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 259 | - <button type='submit'>" . _("Manage DB Link") . "</button></form> "; |
|
| 258 | + echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=".$idp_instance->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 259 | + <button type='submit'>" . _("Manage DB Link")."</button></form> "; |
|
| 260 | 260 | } |
| 261 | 261 | switch ($idp_instance->getExternalDBSyncState()) { |
| 262 | 262 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOTSUBJECTTOSYNCING: |
| 263 | 263 | break; |
| 264 | 264 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED: |
| 265 | - echo "<div class='acceptable'>" . _("Linked") . "</div>"; |
|
| 265 | + echo "<div class='acceptable'>"._("Linked")."</div>"; |
|
| 266 | 266 | break; |
| 267 | 267 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED: |
| 268 | - echo "<div class='notacceptable'>" . _("NOT linked") . "</div>"; |
|
| 268 | + echo "<div class='notacceptable'>"._("NOT linked")."</div>"; |
|
| 269 | 269 | |
| 270 | 270 | |
| 271 | 271 | break; |
@@ -278,9 +278,9 @@ discard block |
||
| 278 | 278 | echo "<td>"; |
| 279 | 279 | if ($readonly === FALSE) { |
| 280 | 280 | echo "<div style='white-space: nowrap;'> |
| 281 | - <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 281 | + <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 282 | 282 | <button type='submit'>" . |
| 283 | - _("Add/Remove Administrators") . " |
|
| 283 | + _("Add/Remove Administrators")." |
|
| 284 | 284 | </button> |
| 285 | 285 | </form> |
| 286 | 286 | </div>"; |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | echo "<tr> |
| 294 | 294 | <td colspan='2'> |
| 295 | 295 | <strong>" . |
| 296 | - sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed) . " |
|
| 296 | + sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed)." |
|
| 297 | 297 | </strong> |
| 298 | 298 | </td> |
| 299 | 299 | </tr>"; |
@@ -301,17 +301,17 @@ discard block |
||
| 301 | 301 | if (strtoupper($oneinvite['country']) == strtoupper($thefed->tld)) { |
| 302 | 302 | echo "<tr> |
| 303 | 303 | <td>" . |
| 304 | - $oneinvite['name'] . " |
|
| 304 | + $oneinvite['name']." |
|
| 305 | 305 | </td> |
| 306 | 306 | <td>" . |
| 307 | - $oneinvite['mail'] . " |
|
| 307 | + $oneinvite['mail']." |
|
| 308 | 308 | </td> |
| 309 | 309 | <td colspan=2>"; |
| 310 | 310 | if ($readonly === FALSE) { |
| 311 | 311 | echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'> |
| 312 | - <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/> |
|
| 313 | - <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> " |
|
| 314 | - . sprintf(_("(expires %s)"),$oneinvite['expiry']) |
|
| 312 | + <input type='hidden' name='invitation_id' value='" . $oneinvite['token']."'/> |
|
| 313 | + <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> " |
|
| 314 | + . sprintf(_("(expires %s)"), $oneinvite['expiry']) |
|
| 315 | 315 | . "</form>"; |
| 316 | 316 | } |
| 317 | 317 | echo " </td> |
@@ -19,7 +19,7 @@ |
||
| 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(); |
@@ -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 | require_once CONFIG['AUTHENTICATION']['ssp-path-to-autoloader']; |
| 24 | 24 | |
| 25 | 25 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | if ($cutoff !== FALSE) { |
| 39 | 39 | $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff); |
| 40 | 40 | if ($substring !== FALSE) { |
| 41 | - $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring; |
|
| 41 | + $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | header("Location: $url"); |
| 45 | 45 | } else { |
| 46 | 46 | /* Logout failed. Tell the user to close the browser. */ |
| 47 | 47 | echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE); |
| 48 | - echo "<p>" . _("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.") . "</p>"; |
|
| 48 | + echo "<p>"._("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.")."</p>"; |
|
| 49 | 49 | echo $deco->footer(); |
| 50 | 50 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | ?> |
| 29 | 29 | <?php |
| 30 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 30 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 31 | 31 | |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
| 33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | <?php |
| 128 | 128 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 129 | 129 | |
| 130 | - echo "<form enctype='multipart/form-data' action='edit_profile_result.php?inst_id=$my_inst->identifier" . ($my_profile !== NULL ? "&profile_id=" . $my_profile->identifier : "") . "' method='post' accept-charset='UTF-8'> |
|
| 131 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>"; |
|
| 130 | + echo "<form enctype='multipart/form-data' action='edit_profile_result.php?inst_id=$my_inst->identifier".($my_profile !== NULL ? "&profile_id=".$my_profile->identifier : "")."' method='post' accept-charset='UTF-8'> |
|
| 131 | + <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE']."'>"; |
|
| 132 | 132 | $optionDisplay = new \web\lib\admin\OptionDisplay($profile_options, "Profile"); |
| 133 | 133 | ?> |
| 134 | 134 | <fieldset class="option_container"> |
@@ -137,19 +137,19 @@ discard block |
||
| 137 | 137 | </legend> |
| 138 | 138 | <?php |
| 139 | 139 | if ($wizardStyle) { |
| 140 | - echo "<p>" . _("We will now define a profile for your user group(s). You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>"; |
|
| 140 | + echo "<p>"._("We will now define a profile for your user group(s). You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.")."</p>"; |
|
| 141 | 141 | } |
| 142 | 142 | ?> |
| 143 | 143 | <h3><?php echo _("Profile Name and RADIUS realm"); ?></h3> |
| 144 | 144 | <?php |
| 145 | 145 | if ($wizardStyle) { |
| 146 | - echo "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>"; |
|
| 147 | - echo "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>"; |
|
| 148 | - echo "<p>" . _("You can also tell us your RADIUS realm. "); |
|
| 146 | + echo "<p>"._("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.")."</p>"; |
|
| 147 | + echo "<p>"._("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.")."</p>"; |
|
| 148 | + echo "<p>"._("You can also tell us your RADIUS realm. "); |
|
| 149 | 149 | if (CONFIG['FUNCTIONALITY_LOCATIONS']['DIAGNOSTICS'] !== NULL) { |
| 150 | 150 | printf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']); |
| 151 | 151 | } |
| 152 | - echo _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>"; |
|
| 152 | + echo _("It is required to enter the realm name if you want to support anonymous outer identities (see below).")."</p>"; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | echo $optionDisplay->prefilledOptionTable("profile"); |
@@ -203,9 +203,9 @@ discard block |
||
| 203 | 203 | |
| 204 | 204 | <?php |
| 205 | 205 | if ($wizardStyle) { |
| 206 | - echo "<p>" . sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types") . "</p>"; |
|
| 207 | - echo "<p>" . _("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.") . "</p>"; |
|
| 208 | - echo "<p>" . _("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.") . "</p>"; |
|
| 206 | + echo "<p>".sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types")."</p>"; |
|
| 207 | + echo "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>"; |
|
| 208 | + echo "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>"; |
|
| 209 | 209 | } |
| 210 | 210 | ?> |
| 211 | 211 | <p> |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | </td> |
| 223 | 223 | <td> |
| 224 | 224 | <input type='checkbox' <?php |
| 225 | - echo ($verify != FALSE ? "checked" : "" ); |
|
| 225 | + echo ($verify != FALSE ? "checked" : ""); |
|
| 226 | 226 | ?> name='verify_support' onclick=' |
| 227 | 227 | if (this.form.elements["verify_support"].checked !== true || this.form.elements["realm"].value.length == 0) { |
| 228 | 228 | this.form.elements["hint_support"].setAttribute("disabled", "disabled"); |
@@ -230,48 +230,48 @@ discard block |
||
| 230 | 230 | this.form.elements["hint_support"].removeAttribute("disabled"); |
| 231 | 231 | } |
| 232 | 232 | ;'/> |
| 233 | - <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 233 | + <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 234 | 234 | <?php echo _("Prefill user input with realm suffix:"); ?> |
| 235 | 235 | </span> |
| 236 | - <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> /> |
|
| 236 | + <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> /> |
|
| 237 | 237 | </td> |
| 238 | 238 | </tr> |
| 239 | 239 | <tr> |
| 240 | 240 | |
| 241 | 241 | <!-- checkbox and input field for anonymity support, available only when realm is known--> |
| 242 | 242 | <td> |
| 243 | - <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 243 | + <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 244 | 244 | <?php echo _("Enable Anonymous Outer Identity:"); ?> |
| 245 | 245 | </span> |
| 246 | 246 | </td> |
| 247 | 247 | <td> |
| 248 | - <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick=' |
|
| 248 | + <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick=' |
|
| 249 | 249 | if (this.form.elements["anon_support"].checked !== true) { |
| 250 | 250 | this.form.elements["anon_local"].setAttribute("disabled", "disabled"); |
| 251 | 251 | } else { |
| 252 | 252 | this.form.elements["anon_local"].removeAttribute("disabled"); |
| 253 | 253 | } |
| 254 | 254 | ;'/> |
| 255 | - <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/> |
|
| 255 | + <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/> |
|
| 256 | 256 | </td> |
| 257 | 257 | </tr> |
| 258 | 258 | <tr> |
| 259 | 259 | |
| 260 | 260 | <!-- checkbox and input field for check realm outer id, available only when realm is known--> |
| 261 | 261 | <td> |
| 262 | - <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 262 | + <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 263 | 263 | <?php echo _("Use special Outer Identity for realm checks:"); ?> |
| 264 | 264 | </span> |
| 265 | 265 | </td> |
| 266 | 266 | <td> |
| 267 | - <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick=' |
|
| 267 | + <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick=' |
|
| 268 | 268 | if (this.form.elements["checkuser_support"].checked !== true) { |
| 269 | 269 | this.form.elements["checkuser_local"].setAttribute("disabled", "disabled"); |
| 270 | 270 | } else { |
| 271 | 271 | this.form.elements["checkuser_local"].removeAttribute("disabled"); |
| 272 | 272 | } |
| 273 | 273 | ;'/> |
| 274 | - <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/> |
|
| 274 | + <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/> |
|
| 275 | 275 | </td> |
| 276 | 276 | </tr> |
| 277 | 277 | </table> |
@@ -281,20 +281,20 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | <?php |
| 283 | 283 | if ($wizardStyle) { |
| 284 | - echo "<p>" . _("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>"; |
|
| 284 | + echo "<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).")."</p>"; |
|
| 285 | 285 | } |
| 286 | 286 | ?> |
| 287 | 287 | <p> |
| 288 | 288 | |
| 289 | 289 | <?php |
| 290 | - echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span> |
|
| 291 | - <input type='checkbox' name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick=' |
|
| 290 | + echo "<span id='redirect_label' style='".($realm == "" ? "color:#999999" : "")."'><label for='redirect'>"._("Redirect end users to own web page:")."</label></span> |
|
| 291 | + <input type='checkbox' name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ")."onclick=' |
|
| 292 | 292 | if (this.form.elements[\"redirect\"].checked != true) { |
| 293 | 293 | this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\"); |
| 294 | 294 | } else { |
| 295 | 295 | this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\"); |
| 296 | 296 | };'/> |
| 297 | - <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>"; |
|
| 297 | + <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled")."/>"; |
|
| 298 | 298 | ?> |
| 299 | 299 | </p> |
| 300 | 300 | |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | <legend><strong><?php echo _("Supported EAP types"); ?></strong></legend> |
| 304 | 304 | <?php |
| 305 | 305 | if ($wizardStyle) { |
| 306 | - echo "<p>" . _("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>"; |
|
| 306 | + echo "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.")."</p>"; |
|
| 307 | 307 | } |
| 308 | 308 | ?> |
| 309 | 309 | <?php |
@@ -317,9 +317,9 @@ discard block |
||
| 317 | 317 | * @return void |
| 318 | 318 | */ |
| 319 | 319 | function priority(string $eapType, bool $isenabled, int $priority) { |
| 320 | - echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">"; |
|
| 320 | + echo "<td><select id='$eapType-priority' name='$eapType-priority' ".(!$isenabled ? "disabled='disabled'" : "").">"; |
|
| 321 | 321 | for ($a = 1; $a < 7; $a = $a + 1) { |
| 322 | - echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>"; |
|
| 322 | + echo "<option id='$eapType-$a' value='$a' ".($isenabled && $a == $priority ? "selected" : "").">$a</option>"; |
|
| 323 | 323 | } |
| 324 | 324 | echo "</select></td>"; |
| 325 | 325 | } |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | * @return void |
| 336 | 336 | */ |
| 337 | 337 | function inherited_options($idpwideoptions, $eapType, $isVisible) { |
| 338 | - echo "<td><div style='" . (!$isVisible ? "visibility:hidden" : "") . "' class='inheritedoptions' id='$eapType-inherited-global'>"; |
|
| 338 | + echo "<td><div style='".(!$isVisible ? "visibility:hidden" : "")."' class='inheritedoptions' id='$eapType-inherited-global'>"; |
|
| 339 | 339 | |
| 340 | 340 | $eapoptions = []; |
| 341 | 341 | |
@@ -348,12 +348,12 @@ discard block |
||
| 348 | 348 | $eapoptionsNames = array_count_values($eapoptions); |
| 349 | 349 | |
| 350 | 350 | if (count($eapoptionsNames) > 0) { |
| 351 | - echo "<strong>" . _("EAP options inherited from Global level:") . "</strong><br />"; |
|
| 351 | + echo "<strong>"._("EAP options inherited from Global level:")."</strong><br />"; |
|
| 352 | 352 | foreach ($eapoptionsNames as $optionname => $count) { |
| 353 | 353 | /// option count and enumeration |
| 354 | 354 | /// Example: "(3x) Server Name" |
| 355 | 355 | $uiElements = new web\lib\admin\UIElements(); |
| 356 | - printf(_("(%dx) %s") . "<br />", $count, $uiElements->displayName($optionname)); |
|
| 356 | + printf(_("(%dx) %s")."<br />", $count, $uiElements->displayName($optionname)); |
|
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | <?php |
| 389 | 389 | $D = []; |
| 390 | 390 | foreach ($prefill_methods as $prio => $value) { |
| 391 | - print '<li>' . $value->getPrintableRep() . "</li>\n"; |
|
| 391 | + print '<li>'.$value->getPrintableRep()."</li>\n"; |
|
| 392 | 392 | $D[$value->getPrintableRep()] = $prio; |
| 393 | 393 | } |
| 394 | 394 | ?> |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | } |
| 415 | 415 | $display = $a->getPrintableRep(); |
| 416 | 416 | if (!isset($D[$a->getPrintableRep()])) { |
| 417 | - print '<li class="eap1">' . $a->getPrintableRep() . "</li>\n"; |
|
| 417 | + print '<li class="eap1">'.$a->getPrintableRep()."</li>\n"; |
|
| 418 | 418 | } |
| 419 | 419 | } |
| 420 | 420 | ?> |
@@ -427,8 +427,8 @@ discard block |
||
| 427 | 427 | foreach ($methods as $a) { |
| 428 | 428 | $display = $a->getPrintableRep(); |
| 429 | 429 | $v = isset($D[$display]) ? $D[$display] : ''; |
| 430 | - print '<input type="hidden" class="eapm" name="' . $display . '" id="EAP-' . $display . '" value="' . $display . '">'; |
|
| 431 | - print '<input type="hidden" class="eapmv" name="' . $display . '-priority" id="EAP-' . $display . '-priority" value="' . $v . '">'; |
|
| 430 | + print '<input type="hidden" class="eapm" name="'.$display.'" id="EAP-'.$display.'" value="'.$display.'">'; |
|
| 431 | + print '<input type="hidden" class="eapmv" name="'.$display.'-priority" id="EAP-'.$display.'-priority" value="'.$v.'">'; |
|
| 432 | 432 | } |
| 433 | 433 | ?> |
| 434 | 434 | <br style="clear:both;" /> |
@@ -448,11 +448,11 @@ discard block |
||
| 448 | 448 | foreach ($optionsAlreadySet as $optionNames) { |
| 449 | 449 | if (preg_match("/^support:/", $optionNames)) { |
| 450 | 450 | $has_support_options[$optionNames] = "SET"; |
| 451 | - $support_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>"; |
|
| 451 | + $support_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>"; |
|
| 452 | 452 | } |
| 453 | 453 | if (preg_match("/^media:/", $optionNames)) { |
| 454 | 454 | $has_media_options[$$optionNames] = "SET"; |
| 455 | - $media_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>"; |
|
| 455 | + $media_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>"; |
|
| 456 | 456 | } |
| 457 | 457 | } |
| 458 | 458 | $fields = [ |
@@ -461,22 +461,22 @@ discard block |
||
| 461 | 461 | "media" => _("Media Properties for this profile")]; |
| 462 | 462 | |
| 463 | 463 | foreach ($fields as $name => $description) { |
| 464 | - echo "<fieldset class='option_container' id='" . $name . "_override'> |
|
| 464 | + echo "<fieldset class='option_container' id='".$name."_override'> |
|
| 465 | 465 | <legend><strong>$description</strong></legend> |
| 466 | 466 | <p>"; |
| 467 | 467 | |
| 468 | - if (count(${"has_" . $name . "_options"}) > 0) { |
|
| 469 | - printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_" . $name . "_options"})), "<ul>" . ${$name . "_text"} . "</ul>"); |
|
| 468 | + if (count(${"has_".$name."_options"}) > 0) { |
|
| 469 | + printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_".$name."_options"})), "<ul>".${$name."_text"}."</ul>"); |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | echo "</p>"; |
| 473 | 473 | echo $optionDisplay->prefilledOptionTable($name); |
| 474 | - echo "<button type='button' class='newoption' onclick='getXML(\"$name\")'>" . _("Add new option") . "</button>"; |
|
| 474 | + echo "<button type='button' class='newoption' onclick='getXML(\"$name\")'>"._("Add new option")."</button>"; |
|
| 475 | 475 | echo "</fieldset>"; |
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | if ($wizardStyle) { |
| 479 | - echo "<p>" . _("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.") . "</p>"; |
|
| 479 | + echo "<p>"._("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.")."</p>"; |
|
| 480 | 480 | } |
| 481 | -echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_idp.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
| 481 | +echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_idp.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
| 482 | 482 | echo $deco->footer(); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 22 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 23 | 23 | |
| 24 | 24 | CAT_session_start(); |
| 25 | 25 | |
@@ -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!")); |
@@ -186,9 +186,9 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | echo "</td> |
| 188 | 188 | <td> |
| 189 | - <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'> |
|
| 190 | - <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input> |
|
| 191 | - <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button> |
|
| 189 | + <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier."' method='post' ".($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "")." accept-charset='UTF-8'> |
|
| 190 | + <input type='hidden' name='admin_id' value='" . $oneowner['ID']."'></input> |
|
| 191 | + <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete Administrator")."</button> |
|
| 192 | 192 | </form> |
| 193 | 193 | </td> |
| 194 | 194 | </tr>"; |
@@ -202,10 +202,10 @@ discard block |
||
| 202 | 202 | $loggerInstance = new \core\common\Logging(); |
| 203 | 203 | $loggerInstance->debug(4, "Displaying pending invitations for $my_inst->identifier.\n"); |
| 204 | 204 | if (count($pending_invites) > 0) { |
| 205 | - echo "<strong>" . _("Pending invitations for this IdP") . "</strong>"; |
|
| 205 | + echo "<strong>"._("Pending invitations for this IdP")."</strong>"; |
|
| 206 | 206 | echo "<table>"; |
| 207 | 207 | foreach ($pending_invites as $invitee) { |
| 208 | - echo "<tr><td>" . $invitee['mail'] . "</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>"; |
|
| 208 | + echo "<tr><td>".$invitee['mail']."</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>"; |
|
| 209 | 209 | } |
| 210 | 210 | echo "</table>"; |
| 211 | 211 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | |
| 228 | 228 | if (!$is_admin_himself) { |
| 229 | 229 | echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
| 230 | - <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_TAKECONTROL . "'>" . sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst) . "</button> |
|
| 230 | + <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_TAKECONTROL."'>".sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst)."</button> |
|
| 231 | 231 | </form>"; |
| 232 | 232 | } |
| 233 | 233 | } |
