Passed
Push — master ( 58805a...5272c2 )
by Stefan
06:31
created
web/lib/user/Skinjob.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,8 +97,7 @@
 block discarded – undo
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 = "";
Please login to merge, or discard this patch.
devices/linux/DeviceLinux.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -201,8 +201,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
web/lib/admin/API.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -607,8 +607,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
devices/linux/DeviceLinuxSh.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -203,8 +203,7 @@
 block discarded – undo
203 203
 
204 204
         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') {
205 205
             $configRaw['USE_OTHER_TLS_ID'] = true;
206
-        }
207
-        else {
206
+        } else {
208 207
             $configRaw['USE_OTHER_TLS_ID'] = false;
209 208
         }
210 209
 
Please login to merge, or discard this patch.
core/diag/Logopath.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,10 +173,11 @@  discard block
 block discarded – undo
173 173
         ];
174 174
         
175 175
         // add exalted human-readable information to main mail body
176
-        foreach ($this->mailStack as $oneEntry)
177
-        if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
176
+        foreach ($this->mailStack as $oneEntry) {
177
+                if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
178 178
             $oneEntry .= _("Authentication/Attempt Timestamp of user session:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
179 179
         }
180
+        }
180 181
         if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
181 182
             $oneEntry .= _("MAC address of end user in question:") ." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
182 183
         }
@@ -246,12 +247,13 @@  discard block
 block discarded – undo
246 247
         if (in_array(AbstractTest::INFRA_IDP_ADMIN_DETERMINED_FORCED, $this->possibleFailureReasons)) {
247 248
             $this->mailQueue[] = Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_FORCED;
248 249
         }
249
-        if(in_array($needle, $haystack))
250
-// after collecting all the conditions, find the target entities in all
250
+        if(in_array($needle, $haystack)) {
251
+            // after collecting all the conditions, find the target entities in all
251 252
 // the mails, and check if they resolve to a known mail address. If they
252 253
 // do not, this triggers more mails about missing contact info.
253 254
 
254 255
         $abstractRecipients = [];
256
+        }
255 257
         foreach ($this->mailQueue as $mail) {
256 258
             $abstractRecipients = array_unique(array_merge($this->mailStack[$mail]['to'], $this->mailStack[$mail]['cc'], $this->mailStack[$mail]['bcc'], $this->mailStack[$mail]['reply-to']));
257 259
         }
Please login to merge, or discard this patch.