@@ -156,8 +156,8 @@ |
||
| 156 | 156 | // replace namespace separators with directory separators |
| 157 | 157 | // in the relative class name, append with .php |
| 158 | 158 | $file = $base_dir |
| 159 | - . str_replace('\\', '/', $relative_class) |
|
| 160 | - . '.php'; |
|
| 159 | + . str_replace('\\', '/', $relative_class) |
|
| 160 | + . '.php'; |
|
| 161 | 161 | |
| 162 | 162 | // if the mapped file exists, require it |
| 163 | 163 | if ($this->requireFile($file)) { |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
| 29 | 29 | <div id="heading"> |
| 30 | 30 | <?php |
| 31 | - print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 32 | - print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; |
|
| 31 | + print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 32 | + print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; |
|
| 33 | 33 | print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1> |
| 34 | 34 | <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>'; |
| 35 | 35 | echo '<table id="lang_select"><tr><td>'; |
@@ -43,10 +43,10 @@ discard block |
||
| 43 | 43 | ?> |
| 44 | 44 | </div> <!-- id="heading" --> |
| 45 | 45 | <div id="main_body" style='padding:20px;'> |
| 46 | - <h1><?php echo _("This is not the CAT you are looking for.");?></h1> |
|
| 47 | - <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p> |
|
| 46 | + <h1><?php echo _("This is not the CAT you are looking for."); ?></h1> |
|
| 47 | + <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p> |
|
| 48 | 48 | <h2>404</h2> |
| 49 | - <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p> |
|
| 49 | + <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang()); ?></p> |
|
| 50 | 50 | </div> <!-- id="main_body" --> |
| 51 | 51 | |
| 52 | 52 | <?php echo $deco->footer(); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | ?> |
| 11 | 11 | <h1>Example Skin (main user frontpage)</h1> |
| 12 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/> |
|
| 12 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/> |
|
| 13 | 13 | <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p> |
| 14 | 14 | <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename): |
| 15 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/> |
|
| 15 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/> |
|
@@ -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 | } |
@@ -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-->"; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | if ($host === FALSE) { |
| 207 | 207 | throw new \Exception("We don't know our own hostname!"); |
| 208 | 208 | } |
| 209 | - $cssUrl = "//$host" . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php"; |
|
| 209 | + $cssUrl = "//$host" . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php"; |
|
| 210 | 210 | |
| 211 | 211 | $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />"; |
| 212 | 212 | $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>"; |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | if ($host === FALSE) { |
| 238 | 238 | throw new Exception("We don't know our own hostname!"); |
| 239 | 239 | } |
| 240 | - $logoBase = "//$host" . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images"; |
|
| 240 | + $logoBase = "//$host" . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images"; |
|
| 241 | 241 | |
| 242 | 242 | return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/> |
| 243 | 243 | <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 | } |