@@ -172,9 +172,9 @@ |
||
172 | 172 | $totalFailures = 0; |
173 | 173 | foreach ($decoded_response['messages'] as $message) { |
174 | 174 | if ($message['status'] == 0) { |
175 | - $loggerInstance->debug(2, $message['message-id']. ": Success"); |
|
175 | + $loggerInstance->debug(2, $message['message-id'] . ": Success"); |
|
176 | 176 | } else { |
177 | - $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")"); |
|
177 | + $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")"); |
|
178 | 178 | $totalFailures++; |
179 | 179 | } |
180 | 180 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <key>PayloadIdentifier</key> |
72 | 72 | <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
73 | 73 | <key>PayloadOrganization</key> |
74 | - <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> |
|
74 | + <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> |
|
75 | 75 | <key>PayloadType</key> |
76 | 76 | <string>Configuration</string> |
77 | 77 | <key>PayloadUUID</key> |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | <key>PayloadVersion</key> |
480 | 480 | <integer>1</integer> |
481 | 481 | </dict>", |
482 | - "UUID" => $payloadUUID,]; |
|
482 | + "UUID" => $payloadUUID, ]; |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | private function expiryBlock() { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | ?> |
41 | 41 | </h1> |
42 | 42 | <div class='infobox'> |
43 | - <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2> |
|
43 | + <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2> |
|
44 | 44 | <table> |
45 | 45 | <tr> |
46 | 46 | <td><?php echo _("Country:"); ?></td> |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>"; |
58 | 58 | ?> |
59 | 59 | <fieldset class="option_container"> |
60 | - <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend> |
|
60 | + <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend> |
|
61 | 61 | <?php |
62 | 62 | $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED"); |
63 | 63 | echo $optionDisplay->prefilledOptionTable("fed"); |
@@ -37,7 +37,7 @@ |
||
37 | 37 | */ |
38 | 38 | public function insertInHead($inst_country, $inst_name) { |
39 | 39 | $cat = new \core\CAT(); |
40 | - return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script> |
|
40 | + return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script> |
|
41 | 41 | <script type='text/javascript'> |
42 | 42 | // some global variables; |
43 | 43 | var center_lat=49.6114885608729; |
@@ -90,7 +90,7 @@ |
||
90 | 90 | |
91 | 91 | if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) { |
92 | 92 | foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) { |
93 | - $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") ); |
|
93 | + $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)")); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | /* |
12 | 12 | */ |
13 | 13 | |
14 | - $Tou = [ |
|
14 | + $Tou = [ |
|
15 | 15 | 'title' => _("Terms of Use"), |
16 | 16 | 'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam |
17 | 17 | Identity Providers by making available customised and securely configured eduroam installers.</p> |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | they are from the same user group. You are not allowed to share them to an unlimited |
50 | 50 | audience (e.g. on a publicly accessible web server).</li> |
51 | 51 | <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to |
52 | -your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li> |
|
52 | +your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li> |
|
53 | 53 | <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on |
54 | 54 | the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li> |
55 | 55 | </ul> |
@@ -52,7 +52,7 @@ |
||
52 | 52 | they are from the same user group. You are not allowed to share them to an unlimited |
53 | 53 | audience (e.g. on a publicly accessible web server).</li> |
54 | 54 | <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to |
55 | -your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li> |
|
55 | +your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li> |
|
56 | 56 | <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on |
57 | 57 | the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li> |
58 | 58 | </ul> |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $admins = $this_fed->listFederationAdmins(); |
45 | 45 | $mailtext = "Hello, |
46 | 46 | |
47 | -invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired: |
|
47 | +invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired: |
|
48 | 48 | |
49 | 49 | "; |
50 | 50 | foreach ($listofinstnames as $instname) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | if ($numberofexistingidps > 0) { |
55 | 55 | $mailtext .= " |
56 | 56 | |
57 | -Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired. |
|
57 | +Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired. |
|
58 | 58 | "; |
59 | 59 | } |
60 | 60 | $mailtext .= " |
@@ -169,8 +169,7 @@ |
||
169 | 169 | _("and enter the invitation token") . " |
170 | 170 | $newtoken |
171 | 171 | " . ( /* $new_idp_authorized_fedadmin */ FALSE ? |
172 | - wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) : |
|
173 | - wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . " |
|
172 | + wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . " |
|
174 | 173 | |
175 | 174 | " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . " |
176 | 175 |