mdaniels5757 / waca

includes/Pages/PageViewRequest.php

Braces +3 added lines, -6 removed lines

@@ -136,8 +136,7 @@ 
                 $this->setTemplate('view-request/main-with-checkuser-data.tpl');
                 $this->setupCheckUserData($request);
             }
-        }
-        else {
+        } else {
             $this->setTemplate('view-request/main.tpl');
         }
     }
@@ -151,8 +150,7 @@ 
         if ($request->getStatus() === RequestStatus::CLOSED) {
             if ($request->getWasCreated()) {
                 $statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
-            }
-            else {
+            } else {
                 $statusSymbol = self::STATUS_SYMBOL_REJECTED;
             }
         }
@@ -304,8 +302,7 @@ 
                         'jobId'    => $job->getId(),
                         'jobDesc'  => JobQueue::getTaskDescriptions()[$job->getTask()],
                     );
-                }
-                else {
+                } else {
                     $requestLogs[] = array(
                         'type'     => 'log',
                         'security' => 'user',

includes/Pages/PageFlagComment.php

Braces +2 added lines, -4 removed lines

@@ -70,15 +70,13 @@
 
         if ($flagState === 1) {
             Logger::flaggedComment($database, $comment, $request->getDomain());
-        }
-        else {
+        } else {
             Logger::unflaggedComment($database, $comment, $request->getDomain());
         }
 
         if (WebRequest::postString('return') == 'list') {
             $this->redirect('flaggedComments');
-        }
-        else {
+        } else {
             $this->redirect('viewRequest', null, ['id' => $comment->getRequest()]);
         }
     }

includes/Pages/PageLog.php

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
             $userObj = User::getByUsername($filterUser, $database);
             if ($userObj !== false) {
                 $logSearch->byUser($userObj->getId());
-            }
-            else {
+            } else {
                 $logSearch->byUser(-1);
             }
         }

includes/Pages/PageListFlaggedComments.php

Braces +5 added lines, -10 removed lines

@@ -61,28 +61,23 @@
 
                 if ($request->getReserved() === $currentUser->getId()) {
                     $data['hiddenText'] = false;
-                }
-                else {
+                } else {
                     $data['hiddenText'] = true;
                 }
             }
 
             if ($object->getVisibility() == 'requester' || $object->getVisibility() == 'user') {
                 $data['hidden'] = false;
-            }
-            elseif ($object->getVisibility() == 'admin') {
+            } elseif ($object->getVisibility() == 'admin') {
                 if ($seeRestrictedComments) {
                     $data['hidden'] = false;
-                }
-                else {
+                } else {
                     $data['hidden'] = true;
                 }
-            }
-            elseif ($object->getVisibility() == 'checkuser') {
+            } elseif ($object->getVisibility() == 'checkuser') {
                 if ($seeCheckuserComments) {
                     $data['hidden'] = false;
-                }
-                else {
+                } else {
                     $data['hidden'] = true;
                 }
             }

includes/Pages/PageRequestFormManagement.php

Braces +6 added lines, -9 removed lines

@@ -56,7 +56,8 @@ 
         $this->setTemplate('form-management/main.tpl');
     }
 
-    protected function preview() {
+    protected function preview()
+    {
         $previewContent = WebRequest::getSessionContext('preview');
 
         $renderer = new MarkdownRenderingHelper();
@@ -129,8 +130,7 @@ 
                 $form->save();
                 Logger::requestFormCreated($database, $form);
                 $this->redirect('requestFormManagement');
-            }
-            else {
+            } else {
                 $this->populateFromObject($form);
                 WebRequest::setSessionContext('preview', [
                     'main' => $form->getFormContent(),
@@ -142,8 +142,7 @@ 
                 $this->assign('createMode', true);
                 $this->setTemplate('form-management/edit.tpl');
             }
-        }
-        else {
+        } else {
             $this->populateFromObject(new RequestForm());
             WebRequest::setSessionContext('preview', null);
             $this->assign('hidePreview', true);
@@ -237,8 +236,7 @@ 
                 Logger::requestFormEdited($database, $form);
                 $form->save();
                 $this->redirect('requestFormManagement');
-            }
-            else {
+            } else {
                 $this->populateFromObject($form);
                 WebRequest::setSessionContext('preview', [
                     'main' => $form->getFormContent(),
@@ -250,8 +248,7 @@ 
                 $this->assign('createMode', false);
                 $this->setTemplate('form-management/edit.tpl');
             }
-        }
-        else {
+        } else {
             $this->populateFromObject($form);
             WebRequest::setSessionContext('preview', [
                 'main' => $form->getFormContent(),

includes/Pages/UserAuth/PagePreferences.php

Braces +3 added lines, -6 removed lines

@@ -54,12 +54,10 @@ 
 
             if ($this->barrierTest(RoleConfiguration::MAIN, $user, PageMain::class)) {
                 $this->redirect('');
-            }
-            else {
+            } else {
                 $this->redirect('preferences');
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('preferences/prefs.tpl');
 
@@ -118,8 +116,7 @@ 
         $globalDefinition = WebRequest::postBoolean($fieldName . 'Global');
         if ($globalDefinition) {
             $preferencesManager->setGlobalPreference($preferenceName, $value);
-        }
-        else {
+        } else {
             $preferencesManager->setLocalPreference($preferenceName, $value);
         }
     }

includes/Pages/UserAuth/MultiFactor/PageMultiFactor.php

Braces +10 added lines, -20 removed lines

@@ -91,13 +91,11 @@ 
                 }
 
                 $this->redirect('multiFactor');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error enabling YubiKey OTP - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             if ($otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is already enrolled in the selected MFA mechanism');
@@ -161,8 +159,7 @@ 
                     $this->setTemplate('mfa/enableTotpEnroll.tpl');
 
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - invalid credentials.');
                     $this->redirect('multiFactor');
 
@@ -187,8 +184,7 @@ 
                             $this->setTemplate('mfa/regenScratchTokens.tpl');
                             return;
                         }
-                    }
-                    else {
+                    } else {
                         $otpCredentialProvider->deleteCredential($currentUser);
                         SessionAlert::error('Error enabling TOTP: invalid token provided');
                     }
@@ -196,8 +192,7 @@ 
 
                     $this->redirect('multiFactor');
                     return;
-                }
-                else {
+                } else {
                     SessionAlert::error('Error enabling TOTP - no enrollment found or enrollment expired.');
                     $this->redirect('multiFactor');
 
@@ -207,8 +202,7 @@ 
 
             // urgh, dunno what happened, but it's not something expected.
             throw new ApplicationLogicException();
-        }
-        else {
+        } else {
             if ($otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is already enrolled in the selected MFA mechanism');
@@ -258,13 +252,11 @@ 
                 $tokens = $otpCredentialProvider->getTokens();
                 $this->assign('tokens', $tokens);
                 $this->setTemplate('mfa/regenScratchTokens.tpl');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error refreshing scratch tokens - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
 
             $this->assign('alertmessage', 'To regenerate your emergency scratch tokens, please prove you are who you say you are by providing your tool password below. Note that continuing will invalidate all remaining scratch tokens, and provide a set of new ones.');
@@ -302,13 +294,11 @@ 
                 $otpCredentialProvider->deleteCredential($currentUser);
                 SessionAlert::success('Disabled ' . $factorType . '.');
                 $this->redirect('multiFactor');
-            }
-            else {
+            } else {
                 SessionAlert::error('Error disabling ' . $factorType . ' - invalid credentials.');
                 $this->redirect('multiFactor');
             }
-        }
-        else {
+        } else {
             if (!$otpCredentialProvider->userIsEnrolled($currentUser->getId())) {
                 // user is not enrolled, we shouldn't have got here.
                 throw new ApplicationLogicException('User is not enrolled in the selected MFA mechanism');

includes/Pages/PageBan.php

Braces +8 added lines, -13 removed lines

@@ -80,8 +80,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
         }
     }
@@ -130,8 +129,7 @@ 
             $this->getNotificationHelper()->unbanned($ban, $unbanReason);
 
             $this->redirect('bans');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('ban', $ban);
             $this->setTemplate('bans/unban.tpl');
@@ -149,17 +147,14 @@ 
 
             if (!$duration) {
                 throw new ApplicationLogicException('Invalid ban time');
-            }
-            elseif (time() > $duration) {
+            } elseif (time() > $duration) {
                 throw new ApplicationLogicException('Ban time has already expired!');
             }
 
             return $duration;
-        }
-        elseif ($duration === "-1") {
+        } elseif ($duration === "-1") {
             return null;
-        }
-        else {
+        } else {
             $duration = WebRequest::postInt('duration') + time();
 
             return $duration;
@@ -409,7 +404,8 @@ 
     protected function setupBanList(array $bans): void
     {
         $userIds = array_map(
-            function(Ban $entry) {
+            function(Ban $entry)
+            {
                 return $entry->getUser();
             },
             $bans);
@@ -439,8 +435,7 @@ 
             $ipParts = explode('/', $targetIp, 2);
             $targetIp = $ipParts[0];
             $targetMask = (int)$ipParts[1];
-        }
-        else {
+        } else {
             $targetMask = filter_var($targetIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 128 : 32;
         }
 

includes/Pages/RequestAction/PageBreakReservation.php

Braces +3 added lines, -6 removed lines

@@ -33,13 +33,11 @@ 
 
         if ($currentUser->getId() === $request->getReserved()) {
             $this->doUnreserve($request, $database);
-        }
-        else {
+        } else {
             // not the same user!
             if ($this->barrierTest('force', $currentUser)) {
                 $this->doBreakReserve($request, $database);
-            }
-            else {
+            } else {
                 throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
             }
         }
@@ -83,8 +81,7 @@ 
             $this->skipAlerts();
 
             $this->setTemplate("confirmations/breakreserve.tpl");
-        }
-        else {
+        } else {
             $request->setReserved(null);
             $request->setUpdateVersion(WebRequest::postInt('updateversion'));
             $request->save();