@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | $lookFor .= "$name"; |
| 186 | 186 | } |
| 187 | - $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches); |
|
| 187 | + $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches); |
|
| 188 | 188 | if ($finding === 0 || $finding === FALSE) { |
| 189 | 189 | return FALSE; |
| 190 | 190 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | case $providerStrings[3]: |
| 207 | 207 | case $providerStrings[4]: |
| 208 | 208 | case $providerStrings[5]: |
| 209 | - if (!in_array(User::PROVIDER_STRINGS[$matches[1]],$listOfProviders)) { |
|
| 209 | + if (!in_array(User::PROVIDER_STRINGS[$matches[1]], $listOfProviders)) { |
|
| 210 | 210 | $listOfProviders[] = User::PROVIDER_STRINGS[$matches[1]]; |
| 211 | 211 | } |
| 212 | 212 | break; |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | */ |
| 135 | 135 | public function string($input, $allowWhitespace = FALSE) { |
| 136 | 136 | // always chop out invalid characters, and surrounding whitespace |
| 137 | - $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
| 137 | + $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input); |
|
| 138 | 138 | if ($retvalStep0 === FALSE) { |
| 139 | 139 | throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!"); |
| 140 | 140 | } |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | final public function __construct() { |
| 20 | 20 | parent::__construct(); |
| 21 | 21 | $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
| 22 | - $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 22 | + $this->loggerInstance->debug(4, "RedirectEx called"); |
|
| 23 | 23 | } |
| 24 | 24 | public function writeDeviceInfo() { |
| 25 | 25 | $out = "<p>"; |
@@ -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 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | public function listIdPs() { |
| 143 | 143 | $instList = $this->orderIdentityProviders($this->country->identifier); |
| 144 | 144 | $out = ''; |
| 145 | - $out .= sprintf(_("Select your %s"), $this->nomenclature_inst ); |
|
| 145 | + $out .= sprintf(_("Select your %s"), $this->nomenclature_inst); |
|
| 146 | 146 | $out .= '<select name="idp" onchange="submit_form(this)">'; |
| 147 | 147 | if (!empty($instList)) { |
| 148 | 148 | if (!isset($this->idp)) { |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | $out .= '>' . $disp . '</option>'; |
| 239 | - $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';'; |
|
| 239 | + $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';'; |
|
| 240 | 240 | $iterator++; |
| 241 | 241 | } |
| 242 | 242 | $out .= '</select>'; |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | </script> |
| 431 | 431 | </head> |
| 432 | 432 | <body style=""> |
| 433 | - <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; ?> |
|
| 433 | + <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; ?> |
|
| 434 | 434 | <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'> |
| 435 | 435 | <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" /> |
| 436 | 436 | <?php |
@@ -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> |