@@ -197,7 +197,7 @@ |
||
| 197 | 197 | // deployment status; need to dive into profiles for this |
| 198 | 198 | // show happy eyeballs if at least one profile is configured/showtime |
| 199 | 199 | echo "<td>"; |
| 200 | - echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" ); |
|
| 200 | + echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "") . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : ""); |
|
| 201 | 201 | echo "</td>"; |
| 202 | 202 | // name |
| 203 | 203 | echo "<td> |
@@ -11,15 +11,15 @@ |
||
| 11 | 11 | namespace devices\redirect_dev; |
| 12 | 12 | |
| 13 | 13 | class Device_RedirectDev extends \core\DeviceConfig { |
| 14 | - /** |
|
| 15 | - * Constructs a Device object. |
|
| 16 | - * |
|
| 17 | - * @final not to be redefined |
|
| 18 | - */ |
|
| 14 | + /** |
|
| 15 | + * Constructs a Device object. |
|
| 16 | + * |
|
| 17 | + * @final not to be redefined |
|
| 18 | + */ |
|
| 19 | 19 | final public function __construct() { |
| 20 | 20 | parent::__construct(); |
| 21 | - $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
| 22 | - $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 21 | + $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
| 22 | + $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 23 | 23 | } |
| 24 | 24 | public function writeDeviceInfo() { |
| 25 | 25 | $out = "<p>"; |
@@ -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>"; |
@@ -206,8 +206,7 @@ |
||
| 206 | 206 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/"); |
| 207 | 207 | } elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) { |
| 208 | 208 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/"); |
| 209 | - } |
|
| 210 | - else { |
|
| 209 | + } else { |
|
| 211 | 210 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/"); |
| 212 | 211 | } |
| 213 | 212 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | <select id='lang' name='lang' onchange='this.form.submit()'>"; |
| 66 | 66 | |
| 67 | 67 | foreach (CONFIG['LANGUAGES'] as $lang => $value) { |
| 68 | - $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> "; |
|
| 68 | + $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> "; |
|
| 69 | 69 | } |
| 70 | 70 | $retval .= "</select>"; |
| 71 | 71 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $advancedControls = TRUE; |
| 124 | 124 | switch ($area) { |
| 125 | 125 | case "ADMIN-IDP": |
| 126 | - $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst); |
|
| 126 | + $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst); |
|
| 127 | 127 | break; |
| 128 | 128 | case "ADMIN-IDP-USERS": |
| 129 | 129 | $cap2 = sprintf(_("Administrator Interface - %s User Management"), \core\ProfileSilverbullet::PRODUCTNAME); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | $cap2 = _("Management of User Details"); |
| 136 | 136 | break; |
| 137 | 137 | case "FEDERATION": |
| 138 | - $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed); |
|
| 138 | + $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed); |
|
| 139 | 139 | break; |
| 140 | 140 | case "USER": |
| 141 | 141 | $cap1 = sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | // content from here on will SCROLL instead of being fixed at the top |
| 158 | 158 | $retval .= "<div class='pagecontent'>"; // closes in footer again |
| 159 | 159 | $retval .= "<div class='trick'>"; // closes in footer again |
| 160 | - $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'> |
|
| 160 | + $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'> |
|
| 161 | 161 | <div id='secondarycaptions' style='display:inline-block; float:left'> |
| 162 | 162 | <h2>$cap2</h2> |
| 163 | 163 | </div><!--secondarycaptions-->"; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/"); |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php"; |
|
| 205 | + $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php"; |
|
| 206 | 206 | |
| 207 | 207 | $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />"; |
| 208 | 208 | $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>"; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/"); |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images"; |
|
| 233 | + $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images"; |
|
| 234 | 234 | |
| 235 | 235 | return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/> |
| 236 | 236 | <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span> |
@@ -246,11 +246,11 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | - * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | - * |
|
| 251 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | - * @return array of OIDs |
|
| 253 | - */ |
|
| 249 | + * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | + * |
|
| 251 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | + * @return array of OIDs |
|
| 253 | + */ |
|
| 254 | 254 | private function propertyCheckPolicy($cert) { |
| 255 | 255 | $oids = []; |
| 256 | 256 | if ($cert['extensions']['certificatePolicies']) { |
@@ -263,11 +263,11 @@ discard block |
||
| 263 | 263 | return $oids; |
| 264 | 264 | } |
| 265 | 265 | /** |
| 266 | - * This function parses a X.509 cert and returns the value of $field |
|
| 267 | - * |
|
| 268 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | - * @return string value of the issuer field or '' |
|
| 270 | - */ |
|
| 266 | + * This function parses a X.509 cert and returns the value of $field |
|
| 267 | + * |
|
| 268 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | + * @return string value of the issuer field or '' |
|
| 270 | + */ |
|
| 271 | 271 | private function getCertificateIssuer($cert) { |
| 272 | 272 | $issuer = ''; |
| 273 | 273 | foreach ($cert['issuer'] as $key => $val) { |
@@ -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 | |