@@ -97,8 +97,7 @@ |
||
97 | 97 | // does the file exist in the current skin's directory? Has precedence |
98 | 98 | if ($submodule !== '' && file_exists(__DIR__ . "/../../skins/" . $this->skin . "/" . $submodule . $path . $filename)) { |
99 | 99 | $extrapath = "/skins/" . $this->skin . "/" . $submodule; |
100 | - } |
|
101 | - elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) { |
|
100 | + } elseif (file_exists(__DIR__ . "/../../skins/" . $this->skin . $path . $filename)) { |
|
102 | 101 | $extrapath = "/skins/" . $this->skin; |
103 | 102 | } elseif (file_exists(__DIR__ . "/../../" . $path . $filename)) { |
104 | 103 | $extrapath = ""; |
@@ -83,7 +83,7 @@ |
||
83 | 83 | */ |
84 | 84 | public function htmlShowtime($wizard = FALSE, $additional = FALSE) { |
85 | 85 | if (!$this->readOnly) { |
86 | - // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE); |
|
86 | + // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE); |
|
87 | 87 | return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE); |
88 | 88 | } |
89 | 89 | } |
@@ -211,7 +211,7 @@ |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | if (!empty($this->attributes['internal:realm'][0])) { |
214 | - $config['user_realm'] = $this->attributes['internal:realm'][0]; |
|
214 | + $config['user_realm'] = $this->attributes['internal:realm'][0]; |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
@@ -201,8 +201,7 @@ |
||
201 | 201 | |
202 | 202 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
203 | 203 | $configRaw['use_other_tls_id'] = "True"; |
204 | - } |
|
205 | - else { |
|
204 | + } else { |
|
206 | 205 | $configRaw['use_other_tls_id'] = "False"; |
207 | 206 | } |
208 | 207 |
@@ -22,15 +22,15 @@ |
||
22 | 22 | namespace devices\redirect_dev; |
23 | 23 | |
24 | 24 | class DeviceRedirectDev extends \core\DeviceConfig { |
25 | - /** |
|
26 | - * Constructs a Device object. |
|
27 | - * |
|
28 | - * @final not to be redefined |
|
29 | - */ |
|
25 | + /** |
|
26 | + * Constructs a Device object. |
|
27 | + * |
|
28 | + * @final not to be redefined |
|
29 | + */ |
|
30 | 30 | final public function __construct() { |
31 | 31 | parent::__construct(); |
32 | - $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
33 | - $this->loggerInstance->debug(4,"RedirectEx called"); |
|
32 | + $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
|
33 | + $this->loggerInstance->debug(4,"RedirectEx called"); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -91,7 +91,7 @@ |
||
91 | 91 | <?php if (empty($_REQUEST['idp'])) { ?> |
92 | 92 | <div id="front_page"> |
93 | 93 | <?php |
94 | - echo $divs->divTopWelcome(); |
|
94 | + echo $divs->divTopWelcome(); |
|
95 | 95 | // echo $divs->div_roller(); |
96 | 96 | // echo $divs->div_main_button(); ?> |
97 | 97 | </div> <!-- id="front_page" --> |
@@ -1115,12 +1115,12 @@ |
||
1115 | 1115 | $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:")); |
1116 | 1116 | $certUsernameLength = strlen($certUsernameLabel); |
1117 | 1117 | $labelLength = max($certPasswordLength,$certUsernameLength); |
1118 | - ?> |
|
1118 | + ?> |
|
1119 | 1119 | ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>" |
1120 | 1120 | !else |
1121 | 1121 | <?php $certPasswordLabel = WindowsCommon::sprintNsis(_("import password:")); |
1122 | 1122 | $certPasswordLength = strlen($certPasswordLabel); |
1123 | - ?> |
|
1123 | + ?> |
|
1124 | 1124 | !insertmacro debug_cat 4 "Unpacking SB_cert.p12" |
1125 | 1125 | File "SB_cert.p12" |
1126 | 1126 | nsArray::Set Delete_files "SB_cert.p12" |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $caEngine->triggerNewOCSPStatement(/** @scrutinizer ignore-type */ $certObject->serial); |
45 | 45 | } |
46 | 46 | |
47 | - /* |
|
47 | + /* |
|
48 | 48 | * and then writes all recently updated statements to a temporary directory. The |
49 | 49 | * calling script ocsp_update.sh should then scp all the files to their |
50 | 50 | * destination. |
@@ -42,8 +42,8 @@ |
||
42 | 42 | $auth->authenticate(); |
43 | 43 | } |
44 | 44 | if (isset($_SESSION['admin_diag_auth'])) { |
45 | - $admin = 1; |
|
46 | - unset($_SESSION['admin_diag_auth']); |
|
45 | + $admin = 1; |
|
46 | + unset($_SESSION['admin_diag_auth']); |
|
47 | 47 | } |
48 | 48 | $Gui = new \web\lib\user\Gui(); |
49 | 49 | $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]); |
@@ -607,8 +607,7 @@ |
||
607 | 607 | $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT); |
608 | 608 | if ($output === FALSE) { |
609 | 609 | $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg()); |
610 | - } |
|
611 | - else { |
|
610 | + } else { |
|
612 | 611 | echo $output; |
613 | 612 | } |
614 | 613 | } |