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(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(); |
@@ -50,16 +50,16 @@ discard block |
||
| 50 | 50 | <div class="infobox"> |
| 51 | 51 | <h2><?php $tablecaption = _("Your Personal Information"); echo $tablecaption; ?></h2> |
| 52 | 52 | <table> |
| 53 | - <caption><?php echo $tablecaption;?></caption> |
|
| 53 | + <caption><?php echo $tablecaption; ?></caption> |
|
| 54 | 54 | <tr> |
| 55 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 56 | - <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th> |
|
| 57 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 55 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 56 | + <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th> |
|
| 57 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 58 | 58 | </tr> |
| 59 | 59 | <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?> |
| 60 | 60 | <tr> |
| 61 | 61 | <td> |
| 62 | - <?php echo "" . _("Unique Identifier") ?> |
|
| 62 | + <?php echo ""._("Unique Identifier") ?> |
|
| 63 | 63 | </td> |
| 64 | 64 | <td> |
| 65 | 65 | </td> |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $mgmt = new \core\UserManagement(); |
| 75 | 75 | |
| 76 | 76 | if (!$user->isFederationAdmin()) { |
| 77 | - echo "<p>" . sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed) . "</p>"; |
|
| 77 | + echo "<p>".sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed)."</p>"; |
|
| 78 | 78 | echo $deco->footer(); |
| 79 | 79 | exit(0); |
| 80 | 80 | } |
@@ -88,16 +88,16 @@ discard block |
||
| 88 | 88 | <?php $tablecaption2 = sprintf(_("%s Properties: %s"), $uiElements->nomenclatureFed, $thefed->name); echo $tablecaption2; ?> |
| 89 | 89 | </h2> |
| 90 | 90 | <table> |
| 91 | - <caption><?php echo $tablecaption2;?></caption> |
|
| 91 | + <caption><?php echo $tablecaption2; ?></caption> |
|
| 92 | 92 | <tr> |
| 93 | - <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th> |
|
| 94 | - <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th> |
|
| 95 | - <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th> |
|
| 93 | + <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th> |
|
| 94 | + <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th> |
|
| 95 | + <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th> |
|
| 96 | 96 | </tr> |
| 97 | 97 | <!-- fed properties --> |
| 98 | 98 | <tr> |
| 99 | 99 | <td> |
| 100 | - <?php echo "" . _("Country") ?> |
|
| 100 | + <?php echo ""._("Country") ?> |
|
| 101 | 101 | </td> |
| 102 | 102 | <td> |
| 103 | 103 | </td> |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | default: |
| 179 | 179 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 180 | 180 | } |
| 181 | - echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully.")); |
|
| 181 | + echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully.")); |
|
| 182 | 182 | break; |
| 183 | 183 | case "FAILURE": |
| 184 | 184 | echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!")); |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | default: |
| 199 | 199 | throw new Exception("Error: unknown encryption status of invitation!?!"); |
| 200 | 200 | } |
| 201 | - echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success.")); |
|
| 201 | + echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success.")); |
|
| 202 | 202 | break; |
| 203 | 203 | case "INVALIDSYNTAX": |
| 204 | 204 | echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!")); |
@@ -214,27 +214,27 @@ discard block |
||
| 214 | 214 | } else { |
| 215 | 215 | $link = 'http://'; |
| 216 | 216 | } |
| 217 | - $link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME']; |
|
| 217 | + $link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']; |
|
| 218 | 218 | $link = htmlspecialchars($link); |
| 219 | 219 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL' && \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') { |
| 220 | 220 | echo "<table><tr> |
| 221 | - <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureIdP) . "</td> |
|
| 221 | + <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureIdP)."</td> |
|
| 222 | 222 | <td><form method='post' action='../diag/action_realmcheck.php' accept-charset='UTF-8'> |
| 223 | 223 | <input type='hidden' name='comefrom' id='comefrom' value='$link'/> |
| 224 | - <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button> |
|
| 224 | + <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button> |
|
| 225 | 225 | </form> |
| 226 | 226 | </td> |
| 227 | 227 | </tr> |
| 228 | 228 | </table>"; |
| 229 | 229 | } |
| 230 | 230 | if (\config\ConfAssistant::CONSORTIUM['name'] == 'eduroam') { |
| 231 | - $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed) . "</h3>"; |
|
| 231 | + $helptext = "<h3>".sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed)."</h3>"; |
|
| 232 | 232 | } else { |
| 233 | 233 | $helptext = ""; |
| 234 | 234 | } |
| 235 | 235 | ?> |
| 236 | 236 | <table class='user_overview' style='border:0px;'> |
| 237 | - <caption><?php echo _("Participant Details");?></caption> |
|
| 237 | + <caption><?php echo _("Participant Details"); ?></caption> |
|
| 238 | 238 | <tr> |
| 239 | 239 | <th scope='col'><?php echo _("Configured / Visible / OpenRoaming"); ?></th> |
| 240 | 240 | <th scope='col'><?php echo sprintf(_("%s Name"), $uiElements->nomenclatureParticipant); ?></th> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | $pending_invites = $mgmt->listPendingInvitations(); |
| 244 | 244 | |
| 245 | 245 | if (\config\Master::DB['enforce-external-sync']) { |
| 246 | - echo "<th scope='col'>" . sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</th>"; |
|
| 246 | + echo "<th scope='col'>".sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name'])."</th>"; |
|
| 247 | 247 | } |
| 248 | 248 | ?> |
| 249 | 249 | <th scope='col'> |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | foreach ($feds as $onefed) { |
| 259 | 259 | $thefed = new \core\Federation(strtoupper($onefed['value'])); |
| 260 | 260 | /// nomenclature for 'federation', federation name, nomenclature for 'inst' |
| 261 | - echo "<tr><td colspan='8'><strong>" . sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">' . $thefed->name . '</span>') . "</strong></td></tr>"; |
|
| 261 | + echo "<tr><td colspan='8'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>"; |
|
| 262 | 262 | |
| 263 | 263 | // extract only pending invitations for *this* fed |
| 264 | 264 | $display_pendings = FALSE; |
@@ -283,9 +283,9 @@ discard block |
||
| 283 | 283 | // deployment status; need to dive into profiles for this |
| 284 | 284 | // show happy eyeballs if at least one profile is configured/showtime |
| 285 | 285 | echo "<td>"; |
| 286 | - echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "-" ) |
|
| 286 | + echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "-") |
|
| 287 | 287 | . " " |
| 288 | - . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "-" ) |
|
| 288 | + . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "-") |
|
| 289 | 289 | . " " |
| 290 | 290 | . "<span style='color:"; |
| 291 | 291 | switch ($idp_instance->maxOpenRoamingStatus()) { |
@@ -320,23 +320,23 @@ discard block |
||
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | echo "<td style='vertical-align:top;'> |
| 323 | - <input type='hidden' name='inst' value='" . $index . "'>" . $idp_instance->name . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) . implode("</li><li>", $listOfSilverbulletRealms) . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) . " |
|
| 323 | + <input type='hidden' name='inst' value='" . $index."'>".$idp_instance->name.(empty($listOfSilverbulletRealms) ? "" : "<ul><li>").implode("</li><li>", $listOfSilverbulletRealms).(empty($listOfSilverbulletRealms) ? "" : "</li><ul>")." |
|
| 324 | 324 | </td>"; |
| 325 | 325 | // external DB sync, if configured as being necessary |
| 326 | 326 | if (\config\Master::DB['enforce-external-sync']) { |
| 327 | 327 | echo "<td style='display: ruby;'>"; |
| 328 | 328 | if ($readonly === FALSE) { |
| 329 | - echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=" . $idp_instance->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 330 | - <button type='submit'>" . _("Manage DB Link") . "</button></form> "; |
|
| 329 | + echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=".$idp_instance->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 330 | + <button type='submit'>" . _("Manage DB Link")."</button></form> "; |
|
| 331 | 331 | } |
| 332 | 332 | switch ($idp_instance->getExternalDBSyncState()) { |
| 333 | 333 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOTSUBJECTTOSYNCING: |
| 334 | 334 | break; |
| 335 | 335 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED: |
| 336 | - echo "<div class='acceptable'>" . _("Linked") . "</div>"; |
|
| 336 | + echo "<div class='acceptable'>"._("Linked")."</div>"; |
|
| 337 | 337 | break; |
| 338 | 338 | case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED: |
| 339 | - echo "<div class='notacceptable'>" . _("NOT linked") . "</div>"; |
|
| 339 | + echo "<div class='notacceptable'>"._("NOT linked")."</div>"; |
|
| 340 | 340 | |
| 341 | 341 | |
| 342 | 342 | break; |
@@ -349,9 +349,9 @@ discard block |
||
| 349 | 349 | echo "<td style='vertical-align: top;'>"; |
| 350 | 350 | if ($readonly === FALSE) { |
| 351 | 351 | echo "<div style='white-space: nowrap;'> |
| 352 | - <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 352 | + <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'> |
|
| 353 | 353 | <button type='submit'>" . |
| 354 | - _("Add/Remove Administrators") . " |
|
| 354 | + _("Add/Remove Administrators")." |
|
| 355 | 355 | </button> |
| 356 | 356 | </form> |
| 357 | 357 | </div>"; |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | echo "<tr> |
| 365 | 365 | <td colspan='2'> |
| 366 | 366 | <strong>" . |
| 367 | - sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed) . " |
|
| 367 | + sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed)." |
|
| 368 | 368 | </strong> |
| 369 | 369 | </td> |
| 370 | 370 | </tr>"; |
@@ -372,16 +372,16 @@ discard block |
||
| 372 | 372 | if (strtoupper($oneinvite['country']) == strtoupper($thefed->tld)) { |
| 373 | 373 | echo "<tr> |
| 374 | 374 | <td>" . |
| 375 | - $oneinvite['name'] . " |
|
| 375 | + $oneinvite['name']." |
|
| 376 | 376 | </td> |
| 377 | 377 | <td>" . |
| 378 | - $oneinvite['mail'] . " |
|
| 378 | + $oneinvite['mail']." |
|
| 379 | 379 | </td> |
| 380 | 380 | <td colspan=2>"; |
| 381 | 381 | if ($readonly === FALSE) { |
| 382 | 382 | echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'> |
| 383 | - <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/> |
|
| 384 | - <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> " |
|
| 383 | + <input type='hidden' name='invitation_id' value='" . $oneinvite['token']."'/> |
|
| 384 | + <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> " |
|
| 385 | 385 | . sprintf(_("(expires %s)"), $oneinvite['expiry']) |
| 386 | 386 | . "</form>"; |
| 387 | 387 | } |
@@ -522,7 +522,7 @@ discard block |
||
| 522 | 522 | if ( |
| 523 | 523 | get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigIos12plus" || |
| 524 | 524 | get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigOsX" |
| 525 | - ) { |
|
| 525 | + ) { |
|
| 526 | 526 | return "WPA2"; |
| 527 | 527 | } else { |
| 528 | 528 | return "WPA"; |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | \core\common\Entity::$nomenclature_idp, |
| 810 | 810 | count($this->CAsAccountedFor)+1, |
| 811 | 811 | ($ca['root'] ? _("Root") : _("Intermediate"))) . |
| 812 | - "</string> |
|
| 812 | + "</string> |
|
| 813 | 813 | <key>PayloadIdentifier</key> |
| 814 | 814 | <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
| 815 | 815 | <key>PayloadOrganization</key> |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | \core\common\Entity::intoThePotatoes(); |
| 146 | 146 | // that's what all variants support. Sub-classes can change it. |
| 147 | 147 | $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_PEAP_MSCHAP2, \core\common\EAP::EAPTYPE_TTLS_PAP, \core\common\EAP::EAPTYPE_TTLS_MSCHAP2, \core\common\EAP::EAPTYPE_SILVERBULLET]); |
| 148 | - foreach(\core\common\EAP::listKnownEAPTypes() as $eapType) { |
|
| 148 | + foreach (\core\common\EAP::listKnownEAPTypes() as $eapType) { |
|
| 149 | 149 | if ($eapType->isPasswordRequired() || $eapType->isPasswordOptional()) { |
| 150 | 150 | $this->specialities['internal:verify_userinput_suffix'][serialize($eapType->getArrayRep())] = _("It is not possible to actively verify the user input for suffix match; but if there is no 'Terms of Use' configured, the installer will display a corresponding hint to the user instead."); |
| 151 | 151 | $this->specialities['media:openroaming'][serialize($eapType->getArrayRep())] = _("OpenRoaming is not provisioned due to severe UI limitations during install time."); |
@@ -185,15 +185,15 @@ discard block |
||
| 185 | 185 | <key>PayloadDescription</key> |
| 186 | 186 | <string>$tagline</string> |
| 187 | 187 | <key>PayloadDisplayName</key> |
| 188 | - <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . "</string> |
|
| 188 | + <string>".\config\ConfAssistant::CONSORTIUM['display_name']."</string> |
|
| 189 | 189 | <key>PayloadIdentifier</key> |
| 190 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
|
| 190 | + <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
|
| 191 | 191 | <key>PayloadOrganization</key> |
| 192 | - <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string> |
|
| 192 | + <string>".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8').($this->attributes['internal:profile_count'][0] > 1 ? " (".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8').")" : "")."</string> |
|
| 193 | 193 | <key>PayloadType</key> |
| 194 | 194 | <string>Configuration</string> |
| 195 | 195 | <key>PayloadUUID</key> |
| 196 | - <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string> |
|
| 196 | + <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string> |
|
| 197 | 197 | <key>PayloadVersion</key> |
| 198 | 198 | <integer>1</integer>"; |
| 199 | 199 | \core\common\Entity::outOfThePotatoes(); |
@@ -225,21 +225,21 @@ discard block |
||
| 225 | 225 | { |
| 226 | 226 | \core\common\Entity::intoThePotatoes(); |
| 227 | 227 | if (isset($this->attributes['support:info_file'])) { |
| 228 | - return MobileconfigSuperclass::BUFFER_CONSENT_PRE . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 228 | + return MobileconfigSuperclass::BUFFER_CONSENT_PRE.htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8').MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 229 | 229 | } |
| 230 | 230 | if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) { |
| 231 | 231 | if ($this->attributes['internal:hint_userinput_suffix'][0] != 0) { |
| 232 | - $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 232 | + $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 233 | 233 | \core\common\Entity::outOfThePotatoes(); |
| 234 | 234 | return $retval; |
| 235 | 235 | } else { |
| 236 | 236 | if (strlen($this->attributes['internal:realm'][0]) > 0) { |
| 237 | 237 | /// note space between variable and exclamation mark - makes sure users don't mistakenly think the exclamation mark is part of the required username! |
| 238 | - $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 238 | + $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 239 | 239 | \core\common\Entity::outOfThePotatoes(); |
| 240 | 240 | return $retval; |
| 241 | 241 | } |
| 242 | - $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . _("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.") . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 242 | + $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE._("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.").MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 243 | 243 | \core\common\Entity::outOfThePotatoes(); |
| 244 | 244 | return $retval; |
| 245 | 245 | } |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | // also escape htmlspecialchars |
| 264 | 264 | // not all names and profiles have a name, so be prepared |
| 265 | 265 | |
| 266 | - $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE)); |
|
| 266 | + $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE)); |
|
| 267 | 267 | |
| 268 | 268 | $this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation"); |
| 269 | 269 | $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile"); |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | |
| 306 | 306 | file_put_contents('installer_profile', $outputXml); |
| 307 | 307 | |
| 308 | - $fileName = $this->installerBasename . '.mobileconfig'; |
|
| 308 | + $fileName = $this->installerBasename.'.mobileconfig'; |
|
| 309 | 309 | |
| 310 | 310 | if (!$this->sign) { |
| 311 | 311 | rename("installer_profile", $fileName); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | return $fileName; |
| 314 | 314 | } |
| 315 | 315 | // still here? Then we are signing. |
| 316 | - $signing = system($this->sign . " installer_profile '$fileName' > /dev/null"); |
|
| 316 | + $signing = system($this->sign." installer_profile '$fileName' > /dev/null"); |
|
| 317 | 317 | if ($signing === FALSE) { |
| 318 | 318 | $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n"); |
| 319 | 319 | } |
@@ -332,19 +332,19 @@ discard block |
||
| 332 | 332 | \core\common\Entity::intoThePotatoes(); |
| 333 | 333 | $ssidCount = count($this->attributes['internal:SSID']); |
| 334 | 334 | $certCount = count($this->attributes['internal:CAs'][0]); |
| 335 | - $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>"; |
|
| 335 | + $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>"; |
|
| 336 | 336 | $out .= "<p>"; |
| 337 | 337 | $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:"); |
| 338 | 338 | $out .= "<ul>"; |
| 339 | - $out .= "<li>" . _("to install the profile") . "</li>"; |
|
| 340 | - $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 339 | + $out .= "<li>"._("to install the profile")."</li>"; |
|
| 340 | + $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 341 | 341 | if ($certCount > 1) { |
| 342 | - $out .= " " . sprintf(_("(%d times)"), $certCount); |
|
| 342 | + $out .= " ".sprintf(_("(%d times)"), $certCount); |
|
| 343 | 343 | } |
| 344 | 344 | $out .= "</li>"; |
| 345 | - $out .= "<li>" . _("to enter the username and password you have been given by your organisation"); |
|
| 345 | + $out .= "<li>"._("to enter the username and password you have been given by your organisation"); |
|
| 346 | 346 | if ($ssidCount > 1) { |
| 347 | - $out .= " " . sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, \config\ConfAssistant::CONSORTIUM['display_name'], $ssidCount); |
|
| 347 | + $out .= " ".sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, \config\ConfAssistant::CONSORTIUM['display_name'], $ssidCount); |
|
| 348 | 348 | } |
| 349 | 349 | $out .= "</li>"; |
| 350 | 350 | $out .= "</ul>"; |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | <key>ServiceProviderRoamingEnabled</key> |
| 385 | 385 | <true/> |
| 386 | 386 | <key>DisplayedOperatorName</key> |
| 387 | - <string>" . $oiName . "</string>"; |
|
| 387 | + <string>" . $oiName."</string>"; |
|
| 388 | 388 | // if we don't know the realm, omit the entire DomainName key |
| 389 | 389 | if (isset($this->attributes['internal:realm'])) { |
| 390 | 390 | $retval .= "<key>DomainName</key> |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | <array>"; |
| 398 | 398 | |
| 399 | 399 | foreach ($consortiumOi as $oneCons) { |
| 400 | - $retval .= "<string>" . strtoupper($oneCons) . "</string>"; |
|
| 400 | + $retval .= "<string>".strtoupper($oneCons)."</string>"; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | $retval .= "</array>"; |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | <dict> |
| 436 | 436 | <key>AcceptEAPTypes</key> |
| 437 | 437 | <array> |
| 438 | - <integer>" . $eapType['OUTER'] . "</integer> |
|
| 438 | + <integer>" . $eapType['OUTER']."</integer> |
|
| 439 | 439 | </array> |
| 440 | 440 | <key>EAPFASTProvisionPAC</key> |
| 441 | 441 | <true /> |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | "; |
| 449 | 449 | if ($realm !== NULL) { |
| 450 | 450 | $retval .= "<key>OuterIdentity</key> |
| 451 | - <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string> |
|
| 451 | + <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string> |
|
| 452 | 452 | "; |
| 453 | 453 | } |
| 454 | 454 | $retval .= "<key>PayloadCertificateAnchorUUID</key> |
@@ -472,11 +472,11 @@ discard block |
||
| 472 | 472 | $retval .= " |
| 473 | 473 | </array>"; |
| 474 | 474 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
| 475 | - $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>"; |
|
| 475 | + $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>"; |
|
| 476 | 476 | } |
| 477 | 477 | $retval .= " |
| 478 | 478 | <key>TTLSInnerAuthentication</key> |
| 479 | - <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string> |
|
| 479 | + <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string> |
|
| 480 | 480 | </dict>"; |
| 481 | 481 | return $retval; |
| 482 | 482 | } |
@@ -496,9 +496,9 @@ discard block |
||
| 496 | 496 | // characters are still reversed, invert on use! |
| 497 | 497 | $buffer .= "<string>Manual</string> |
| 498 | 498 | <key>ProxyServer</key> |
| 499 | - <string>" . strrev($serverAndPort[1]) . "</string> |
|
| 499 | + <string>" . strrev($serverAndPort[1])."</string> |
|
| 500 | 500 | <key>ProxyServerPort</key> |
| 501 | - <integer>" . strrev($serverAndPort[0]) . "</integer> |
|
| 501 | + <integer>" . strrev($serverAndPort[0])."</integer> |
|
| 502 | 502 | <key>ProxyPACFallbackAllowed</key> |
| 503 | 503 | <false/>"; |
| 504 | 504 | } else { |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | throw new Exception("SSID must be a string!"); |
| 549 | 549 | } |
| 550 | 550 | $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8'); |
| 551 | - $payloadIdentifier = "wifi." . $this->serial; |
|
| 551 | + $payloadIdentifier = "wifi.".$this->serial; |
|
| 552 | 552 | $payloadShortName = sprintf(_("%s - SSID %s"), $prettyName, $escapedSSID); |
| 553 | 553 | $payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID); |
| 554 | 554 | $encryptionTypeString = $this->encryptionString(); |
@@ -578,9 +578,9 @@ discard block |
||
| 578 | 578 | if (count($toBeConfigured) == 0) { |
| 579 | 579 | return ""; |
| 580 | 580 | } |
| 581 | - $payloadIdentifier = "hs20.".implode('-',$toBeConfigured); |
|
| 581 | + $payloadIdentifier = "hs20.".implode('-', $toBeConfigured); |
|
| 582 | 582 | $payloadShortName = sprintf(_("%s - RCOI"), $prettyName); |
| 583 | - $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName); |
|
| 583 | + $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName); |
|
| 584 | 584 | $encryptionTypeString = $this->encryptionString(); |
| 585 | 585 | $setupModesString = ""; |
| 586 | 586 | $wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName); |
@@ -599,11 +599,11 @@ discard block |
||
| 599 | 599 | <key>PayloadDisplayName</key> |
| 600 | 600 | <string>$payloadShortName</string> |
| 601 | 601 | <key>PayloadIdentifier</key> |
| 602 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 602 | + <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 603 | 603 | <key>PayloadOrganization</key> |
| 604 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 604 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 605 | 605 | <key>PayloadType</key> |
| 606 | - <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>"; |
|
| 606 | + <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>"; |
|
| 607 | 607 | $retval .= $this->proxySettings(); |
| 608 | 608 | $retval .= $setupModesString; |
| 609 | 609 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | } |
| 616 | 616 | $retval .= " |
| 617 | 617 | <key>PayloadUUID</key> |
| 618 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 618 | + <string>" . \core\common\Entity::uuid()."</string> |
|
| 619 | 619 | <key>PayloadVersion</key> |
| 620 | 620 | <integer>1</integer> |
| 621 | 621 | $wifiNetworkIdentification</dict>"; |
@@ -645,15 +645,15 @@ discard block |
||
| 645 | 645 | <key>IsHotspot</key> |
| 646 | 646 | <false/> |
| 647 | 647 | <key>PayloadDescription</key> |
| 648 | - <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string> |
|
| 648 | + <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string> |
|
| 649 | 649 | <key>PayloadDisplayName</key> |
| 650 | - <string>" . _("Disabled WiFi network") . "</string> |
|
| 650 | + <string>" . _("Disabled WiFi network")."</string> |
|
| 651 | 651 | <key>PayloadIdentifier</key> |
| 652 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 652 | + <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 653 | 653 | <key>PayloadType</key> |
| 654 | 654 | <string>com.apple.wifi.managed</string> |
| 655 | 655 | <key>PayloadUUID</key> |
| 656 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 656 | + <string>".\core\common\Entity::uuid()."</string> |
|
| 657 | 657 | <key>PayloadVersion</key> |
| 658 | 658 | <real>1</real>"; |
| 659 | 659 | $retval .= $this->proxySettings(); |
@@ -733,12 +733,12 @@ discard block |
||
| 733 | 733 | $mimeBlob = base64_encode($binaryBlob); |
| 734 | 734 | $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n"); |
| 735 | 735 | $payloadUUID = \core\common\Entity::uuid('', $mimeBlob); |
| 736 | - $retArray = ["block" => "<dict>" . |
|
| 736 | + $retArray = ["block" => "<dict>". |
|
| 737 | 737 | // we don't include the import password. It's displayed on screen, and should be input by the user. |
| 738 | 738 | // <key>Password</key> |
| 739 | 739 | // <string>" . $this->clientCert['password'] . "</string> |
| 740 | 740 | "<key>PayloadCertificateFileName</key> |
| 741 | - <string>" . $this->massagedConsortium . ".pfx</string> |
|
| 741 | + <string>" . $this->massagedConsortium.".pfx</string> |
|
| 742 | 742 | <key>PayloadContent</key> |
| 743 | 743 | <data> |
| 744 | 744 | $mimeFormatted |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | <key>PayloadDescription</key> |
| 747 | 747 | <string>MIME Base-64 encoded PKCS#12 Client Certificate</string> |
| 748 | 748 | <key>PayloadDisplayName</key> |
| 749 | - <string>" . _("User certificate") . "</string> |
|
| 749 | + <string>"._("User certificate")."</string> |
|
| 750 | 750 | <key>PayloadIdentifier</key> |
| 751 | 751 | <string>com.apple.security.pkcs12.$payloadUUID</string> |
| 752 | 752 | <key>PayloadType</key> |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | <key>PayloadVersion</key> |
| 757 | 757 | <integer>1</integer> |
| 758 | 758 | </dict>", |
| 759 | - "UUID" => $payloadUUID,]; |
|
| 759 | + "UUID" => $payloadUUID, ]; |
|
| 760 | 760 | \core\common\Entity::outOfThePotatoes(); |
| 761 | 761 | return $retArray; |
| 762 | 762 | } |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | } |
| 775 | 775 | $expiryTime = new \DateTime($this->clientCert['certObject']->expiry); |
| 776 | 776 | return "<key>RemovalDate</key> |
| 777 | - <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>"; |
|
| 777 | + <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>"; |
|
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | /** |
@@ -796,27 +796,27 @@ discard block |
||
| 796 | 796 | $stream = " |
| 797 | 797 | <dict> |
| 798 | 798 | <key>PayloadCertificateFileName</key> |
| 799 | - <string>" . $ca['uuid'] . ".der</string> |
|
| 799 | + <string>" . $ca['uuid'].".der</string> |
|
| 800 | 800 | <key>PayloadContent</key> |
| 801 | 801 | <data> |
| 802 | -" . $trimmedPem . "</data> |
|
| 802 | +" . $trimmedPem."</data> |
|
| 803 | 803 | <key>PayloadDescription</key> |
| 804 | - <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp) . "</string> |
|
| 804 | + <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp)."</string> |
|
| 805 | 805 | <key>PayloadDisplayName</key> |
| 806 | 806 | <string>" . |
| 807 | 807 | /// example: "Identity Provider CA #1 (Root)" |
| 808 | - sprintf(_("%s CA #%d (%s)" ), |
|
| 808 | + sprintf(_("%s CA #%d (%s)"), |
|
| 809 | 809 | \core\common\Entity::$nomenclature_idp, |
| 810 | - count($this->CAsAccountedFor)+1, |
|
| 811 | - ($ca['root'] ? _("Root") : _("Intermediate"))) . |
|
| 810 | + count($this->CAsAccountedFor) + 1, |
|
| 811 | + ($ca['root'] ? _("Root") : _("Intermediate"))). |
|
| 812 | 812 | "</string> |
| 813 | 813 | <key>PayloadIdentifier</key> |
| 814 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 814 | + <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 815 | 815 | <key>PayloadOrganization</key> |
| 816 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 816 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 817 | 817 | <key>PayloadType</key> |
| 818 | 818 | <string>com.apple.security.root</string> |
| 819 | - <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string> |
|
| 819 | + <key>PayloadUUID</key><string>" . $ca['uuid']."</string> |
|
| 820 | 820 | <key>PayloadVersion</key> |
| 821 | 821 | <integer>1</integer> |
| 822 | 822 | </dict>"; |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | // please run this as a cron job every hour |
| 23 | 23 | |
| 24 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 25 | 25 | |
| 26 | 26 | // iterate through all federations and see if there are recently expired |
| 27 | 27 | // invitations for any of them |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $admins = $this_fed->listFederationAdmins(); |
| 56 | 56 | $mailtext = "Hello, |
| 57 | 57 | |
| 58 | -invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] ." have recently expired: |
|
| 58 | +invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have recently expired: |
|
| 59 | 59 | |
| 60 | 60 | "; |
| 61 | 61 | foreach ($listofinstnames as $instname) { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | if ($numberofexistingidps > 0) { |
| 66 | 66 | $mailtext .= " |
| 67 | 67 | |
| 68 | -Additionally, $numberofexistingidps invitations for an existing ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have expired. |
|
| 68 | +Additionally, $numberofexistingidps invitations for an existing ".\config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have expired. |
|
| 69 | 69 | "; |
| 70 | 70 | } |
| 71 | 71 | $mailtext .= " |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | Greetings, |
| 75 | 75 | |
| 76 | -A humble " . \config\Master::APPEARANCE['productname'] . " cron job |
|
| 76 | +A humble " . \config\Master::APPEARANCE['productname']." cron job |
|
| 77 | 77 | "; |
| 78 | 78 | |
| 79 | 79 | foreach ($admins as $admin) { |
@@ -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 | $auth = new \web\lib\admin\Authentication(); |
| 25 | 25 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -102,12 +102,12 @@ discard block |
||
| 102 | 102 | </table> |
| 103 | 103 | </div> |
| 104 | 104 | <?php |
| 105 | - echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier" . ($wizardStyle ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'> |
|
| 106 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 105 | + echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier".($wizardStyle ? "&wizard=true" : "")."' method='post' accept-charset='UTF-8'> |
|
| 106 | + <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 107 | 107 | |
| 108 | 108 | if ($wizardStyle) { |
| 109 | - echo "<p>" . |
|
| 110 | - sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant) . "</p>"; |
|
| 109 | + echo "<p>". |
|
| 110 | + sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant)."</p>"; |
|
| 111 | 111 | } |
| 112 | 112 | $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, \core\Options::LEVEL_IDP); |
| 113 | 113 | ?> |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | <legend><strong><?php echo _("General Information"); ?></strong></legend> |
| 116 | 116 | <?php |
| 117 | 117 | if ($wizardStyle) { |
| 118 | - echo "<p>" . |
|
| 119 | - _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p> |
|
| 118 | + echo "<p>". |
|
| 119 | + _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p> |
|
| 120 | 120 | <ul> |
| 121 | - <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li> |
|
| 122 | - <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant) . "</li>"; |
|
| 121 | + <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li> |
|
| 122 | + <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant)."</li>"; |
|
| 123 | 123 | echo "</ul>"; |
| 124 | 124 | } |
| 125 | 125 | echo $optionDisplay->prefilledOptionTable("general", $my_inst->federation); |
@@ -134,44 +134,44 @@ discard block |
||
| 134 | 134 | <legend><strong><?php echo _("Media Properties"); ?></strong></legend> |
| 135 | 135 | <?php |
| 136 | 136 | if ($wizardStyle) { |
| 137 | - echo "<p>" . |
|
| 138 | - sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p> |
|
| 137 | + echo "<p>". |
|
| 138 | + sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p> |
|
| 139 | 139 | <ul>"; |
| 140 | 140 | echo "<li>"; |
| 141 | - echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>"; |
|
| 141 | + echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>"; |
|
| 142 | 142 | if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) { |
| 143 | 143 | $ssidlist = ""; |
| 144 | 144 | foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) { |
| 145 | - $ssidlist .= ", '<strong>" . $ssid . "</strong>'"; |
|
| 145 | + $ssidlist .= ", '<strong>".$ssid."</strong>'"; |
|
| 146 | 146 | } |
| 147 | 147 | $ssidlist = substr($ssidlist, 2); |
| 148 | 148 | echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist); |
| 149 | - echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID")); |
|
| 149 | + echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID")); |
|
| 150 | 150 | } else { |
| 151 | 151 | echo _("Please configure which SSIDs should be configured in the installers."); |
| 152 | 152 | } |
| 153 | - echo " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
| 153 | + echo " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
| 154 | 154 | echo "</li>"; |
| 155 | 155 | |
| 156 | 156 | echo "<li>"; |
| 157 | - echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>"; |
|
| 157 | + echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>"; |
|
| 158 | 158 | if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) { |
| 159 | 159 | $consortiumlist = ""; |
| 160 | 160 | foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) { |
| 161 | - $consortiumlist .= ", '<strong>" . $oi . "</strong>'"; |
|
| 161 | + $consortiumlist .= ", '<strong>".$oi."</strong>'"; |
|
| 162 | 162 | } |
| 163 | 163 | $consortiumlist = substr($consortiumlist, 2); |
| 164 | 164 | echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist); |
| 165 | 165 | |
| 166 | - echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI")); |
|
| 166 | + echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI")); |
|
| 167 | 167 | } else { |
| 168 | 168 | echo _("Please configure which Consortium OIs should be configured in the installers."); |
| 169 | 169 | } |
| 170 | 170 | echo "</li>"; |
| 171 | - echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>" |
|
| 172 | - . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") . |
|
| 171 | + echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>" |
|
| 172 | + . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail)."). |
|
| 173 | 173 | "</li>"; |
| 174 | - echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>" |
|
| 174 | + echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>" |
|
| 175 | 175 | . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.") |
| 176 | 176 | . "</li>"; |
| 177 | 177 | echo "</ul>"; |
@@ -187,18 +187,18 @@ discard block |
||
| 187 | 187 | <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend> |
| 188 | 188 | <?php |
| 189 | 189 | if ($wizardStyle) { |
| 190 | - echo "<p>" . _("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.") . "</p>"; |
|
| 190 | + echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>"; |
|
| 191 | 191 | |
| 192 | 192 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") { |
| 193 | - echo "<p>" . |
|
| 194 | - sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant) . "</p>" . |
|
| 195 | - "<p>" . |
|
| 196 | - _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>"; |
|
| 193 | + echo "<p>". |
|
| 194 | + sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant)."</p>". |
|
| 195 | + "<p>". |
|
| 196 | + _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>"; |
|
| 197 | 197 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 198 | - echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>"; |
|
| 198 | + echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</p>"; |
|
| 199 | 199 | } |
| 200 | 200 | } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") { |
| 201 | - echo "<p>" . _("Providing at least a local support e-mail contact is required.") . " " . _("This is the contact point for your end users' level 1 support.") . "</p>"; |
|
| 201 | + echo "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>"; |
|
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | echo $optionDisplay->prefilledOptionTable("support", $fed->tld); |
@@ -207,9 +207,9 @@ discard block |
||
| 207 | 207 | <button type='button' class='newoption' onclick='getXML("support", "<?php echo $my_inst->federation ?>")'><?php echo _("Add new option"); ?></button></fieldset> |
| 208 | 208 | <?php |
| 209 | 209 | if ($wizardStyle) { |
| 210 | - echo "<p>" . sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CONTINUE . "'>", "</button>") . "</p></form>"; |
|
| 210 | + echo "<p>".sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CONTINUE."'>", "</button>")."</p></form>"; |
|
| 211 | 211 | } else { |
| 212 | - echo "<div><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_user.php\"'>" . _("Discard changes") . "</button></div></form>"; |
|
| 212 | + echo "<div><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_user.php\"'>"._("Discard changes")."</button></div></form>"; |
|
| 213 | 213 | } |
| 214 | 214 | echo $deco->footer(); |
| 215 | 215 | |
| 216 | 216 | \ No newline at end of file |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) { |
| 32 | 32 | ?> |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | <ul style='margin:1px'> |
| 44 | 44 | <?php |
| 45 | 45 | foreach ($completeness as $missing_attrib) { |
| 46 | - echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 46 | + echo "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 47 | 47 | } |
| 48 | 48 | ?> |
| 49 | 49 | </ul> |
| 50 | 50 | </div> |
| 51 | 51 | <?php |
| 52 | 52 | } else { |
| 53 | - echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 53 | + echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm); |
|
| 54 | 54 | } |
| 55 | 55 | ?> |
| 56 | 56 | <br/> |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if ($readonly === FALSE) { |
| 60 | 60 | ?> |
| 61 | 61 | <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&profile_id=<?php echo $theProfile->identifier; ?>' method='POST'> |
| 62 | - <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 62 | + <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button> |
|
| 63 | 63 | </form> |
| 64 | 64 | <?php |
| 65 | 65 | } |
@@ -92,21 +92,21 @@ discard block |
||
| 92 | 92 | $has_overrides = TRUE; |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
| 95 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>"; |
|
| 96 | 96 | $typelist = $theProfile->getEapMethodsinOrderOfPreference(); |
| 97 | 97 | $allcomplete = TRUE; |
| 98 | 98 | foreach ($typelist as $eaptype) { |
| 99 | 99 | $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
| 100 | 100 | $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype); |
| 101 | 101 | if ($completeness === true) { |
| 102 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
| 102 | + $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>"; |
|
| 103 | 103 | } else { |
| 104 | 104 | $buffer_eaptypediv .= " <div class='notacceptable'>"; |
| 105 | 105 | $buffer_eaptypediv .= _("Information needed!"); |
| 106 | 106 | if (is_array($completeness)) { |
| 107 | 107 | $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
| 108 | 108 | foreach ($completeness as $missing_attrib) { |
| 109 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
| 109 | + $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>"; |
|
| 110 | 110 | } |
| 111 | 111 | $buffer_eaptypediv .= "</ul>"; |
| 112 | 112 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | foreach ($attribs as $attrib) { |
| 119 | 119 | if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
| 120 | 120 | $justOnce = TRUE; |
| 121 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
| 121 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>"; |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | $buffer_eaptypediv .= "<br/>"; |
@@ -164,11 +164,11 @@ discard block |
||
| 164 | 164 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") { |
| 165 | 165 | $diagUrl = "../diag/"; |
| 166 | 166 | } else { |
| 167 | - $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/"; |
|
| 167 | + $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/"; |
|
| 168 | 168 | } |
| 169 | 169 | ?> |
| 170 | - <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 171 | - <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 170 | + <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'> |
|
| 171 | + <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/> |
|
| 172 | 172 | <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'> |
| 173 | 173 | <?php echo _("Check realm reachability"); ?> |
| 174 | 174 | </button> |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | ?> |
| 202 | 202 | <div style='display: flex;'> |
| 203 | 203 | <?php |
| 204 | - $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution; |
|
| 205 | - $displayurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 206 | - $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier; |
|
| 204 | + $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution; |
|
| 205 | + $displayurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 206 | + $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier; |
|
| 207 | 207 | $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([ |
| 208 | 208 | 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG, |
| 209 | 209 | 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H, |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | if (empty($rawQr)) { |
| 216 | 216 | throw new Exception("Something went seriously wrong during QR code generation!"); |
| 217 | 217 | } |
| 218 | - $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 218 | + $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL)); |
|
| 219 | 219 | $size = getimagesize($uri); |
| 220 | - echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>"; |
|
| 220 | + echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>"; |
|
| 221 | 221 | |
| 222 | 222 | //echo "<nobr>$displayurl</nobr></a>"; |
| 223 | 223 | echo "<p>$displayurl</p></a>"; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | <h2><?php |
| 262 | 262 | switch ($deploymentObject->consortium) { |
| 263 | 263 | case "eduroam": |
| 264 | - $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME; |
|
| 264 | + $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME; |
|
| 265 | 265 | break; |
| 266 | 266 | case "OpenRoaming": |
| 267 | 267 | $displayname = "OpenRoaming ANP"; |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | default: |
| 270 | 270 | throw new Exception("We are supposed to operate on a roaming consortium we don't know."); |
| 271 | 271 | } |
| 272 | - echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; |
|
| 272 | + echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; |
|
| 273 | 273 | ?></h2> |
| 274 | 274 | <table> |
| 275 | 275 | <caption><?php echo _("Deployment Details"); ?></caption> |
@@ -283,13 +283,13 @@ discard block |
||
| 283 | 283 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
| 284 | 284 | <?php |
| 285 | 285 | if ($deploymentObject->host1_v4 !== NULL) { |
| 286 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
| 286 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
| 287 | 287 | } |
| 288 | 288 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
| 289 | 289 | echo "<br/>"; |
| 290 | 290 | } |
| 291 | 291 | if ($deploymentObject->host1_v6 !== NULL) { |
| 292 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
| 292 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
| 293 | 293 | } |
| 294 | 294 | ?> |
| 295 | 295 | </td> |
@@ -297,9 +297,9 @@ discard block |
||
| 297 | 297 | <td><?php echo $deploymentObject->port1; ?></td> |
| 298 | 298 | <td> |
| 299 | 299 | <?php |
| 300 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
| 301 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
| 302 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
| 300 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
| 301 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
| 302 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
| 303 | 303 | ?> |
| 304 | 304 | </td> |
| 305 | 305 | </tr> |
@@ -307,22 +307,22 @@ discard block |
||
| 307 | 307 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
| 308 | 308 | <?php |
| 309 | 309 | if ($deploymentObject->host2_v4 !== NULL) { |
| 310 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
| 310 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
| 311 | 311 | } |
| 312 | 312 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
| 313 | 313 | echo "<br/>"; |
| 314 | 314 | } |
| 315 | 315 | if ($deploymentObject->host2_v6 !== NULL) { |
| 316 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
| 316 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
| 317 | 317 | } |
| 318 | 318 | ?></td> |
| 319 | 319 | <td><?php echo _("RADIUS port number: ") ?></td> |
| 320 | 320 | <td><?php echo $deploymentObject->port2; ?></td> |
| 321 | 321 | <td> |
| 322 | 322 | <?php |
| 323 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
| 324 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
| 325 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
| 323 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
| 324 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
| 325 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
| 326 | 326 | ?> |
| 327 | 327 | </td> |
| 328 | 328 | </tr> |
@@ -374,12 +374,12 @@ discard block |
||
| 374 | 374 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
| 375 | 375 | echo '<br>'; |
| 376 | 376 | if ($res['FAILURE'] == 2) { |
| 377 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
| 377 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
| 378 | 378 | } else { |
| 379 | 379 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 380 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
| 380 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
| 381 | 381 | } else { |
| 382 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
| 382 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
| 383 | 383 | } |
| 384 | 384 | } |
| 385 | 385 | } |
@@ -399,12 +399,12 @@ discard block |
||
| 399 | 399 | if ($res['FAILURE'] > 0) { |
| 400 | 400 | echo '<br>'; |
| 401 | 401 | if ($res['FAILURE'] == 2) { |
| 402 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
| 402 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
| 403 | 403 | } else { |
| 404 | 404 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
| 405 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
| 405 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
| 406 | 406 | } else { |
| 407 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
| 407 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | <div> |
| 604 | 604 | <input type="hidden" name="consortium" value="eduroam"/> |
| 605 | 605 | <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'> |
| 606 | - <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 606 | + <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?> |
|
| 607 | 607 | </button> |
| 608 | 608 | |
| 609 | 609 | </div> |
