mdaniels5757 / waca

includes/WebStart.php

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
 
                 if ($siteConfiguration->getTitleBlacklistEnabled()) {
                     $page->setBlacklistHelper(new BlacklistHelper($httpHelper, $database, $siteConfiguration));
-                }
-                else {
+                } else {
                     $page->setBlacklistHelper(new FakeBlacklistHelper());
                 }
             }

includes/Helpers/BanHelper.php

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 
         if ($ban->getDomain() === null) {
             $allowed &= $this->securityManager->allows('BanType', 'global', $user) === ISecurityManager::ALLOWED;
-        }
-        else {
+        } else {
             $currentDomain = Domain::getCurrent($this->database);
             $allowed &= $currentDomain->getId() === $ban->getDomain();
         }

includes/Helpers/LogHelper.php

Braces +4 added lines, -8 removed lines

@@ -362,8 +362,7 @@ 
                 // some old templates have been completely deleted and lost to the depths of time.
                 if ($welcomeTemplate === false) {
                     return "Welcome template #{$objectId}";
-                }
-                else {
+                } else {
                     $userCode = htmlentities($welcomeTemplate->getUserCode(), ENT_COMPAT, 'UTF-8');
 
                     return "<a href=\"{$baseurl}/internal.php/welcomeTemplates/view?template={$objectId}\">{$userCode}</a>";
@@ -381,8 +380,7 @@ 
                 $task = $job->getTask();
                 if (isset($taskDescriptions[$task])) {
                     $description = $taskDescriptions[$task];
-                }
-                else {
+                } else {
                     $description = 'Unknown task';
                 }
 
@@ -549,11 +547,9 @@ 
             if (in_array($logEntry->getAction(), $protectedLogActions) && $logEntry->getObjectType() === 'User') {
                 if ($allowAccountLog) {
                     // do nothing, allowed to see all account logs
-                }
-                else if ($allowAccountLogSelf && $currentUser->getId() === $logEntry->getObjectId()) {
+                } else if ($allowAccountLogSelf && $currentUser->getId() === $logEntry->getObjectId()) {
                     // do nothing, allowed to see own account log
-                }
-                else {
+                } else {
                     $comment = null;
                 }
             }

includes/Tasks/InternalPageBase.php

Braces +5 added lines, -10 removed lines

@@ -88,8 +88,7 @@ 
         if ($securityResult === ISecurityManager::ALLOWED) {
             // We're allowed to run the page, so let's run it.
             $this->runPage();
-        }
-        else {
+        } else {
             $this->handleAccessDenied($securityResult);
 
             // Send the headers
@@ -116,8 +115,7 @@ 
 
             if (WebRequest::testSiteNoticeCookieValue($siteNoticeHash)) {
                 $this->assign('siteNoticeState', 'd-none');
-            }
-            else {
+            } else {
                 $this->assign('siteNoticeState', 'd-block');
             }
 
@@ -163,19 +161,16 @@ 
             $this->redirect("login");
 
             return;
-        }
-        else {
+        } else {
             // Decide whether this was a rights failure, or an identification failure.
 
             if ($denyReason === ISecurityManager::ERROR_NOT_IDENTIFIED) {
                 // Not identified
                 throw new NotIdentifiedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-            elseif ($denyReason === ISecurityManager::ERROR_DENIED) {
+            } elseif ($denyReason === ISecurityManager::ERROR_DENIED) {
                 // Nope, plain old access denied
                 throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-            else {
+            } else {
                 throw new Exception('Unknown response from security manager.');
             }
         }

includes/Security/DomainAccessManager.php

Braces +3 added lines, -3 removed lines

@@ -46,7 +46,8 @@ 
 
     public function switchDomain(User $user, Domain $newDomain): void
     {
-        $mapToId = function(DataObject $object) {
+        $mapToId = function(DataObject $object)
+        {
             return $object->getId();
         };
 
@@ -54,8 +55,7 @@ 
 
         if ($allowed) {
             WebRequest::setActiveDomain($newDomain);
-        }
-        else {
+        } else {
             throw new DomainSwitchNotAllowedException();
         }
     }

includes/DataObjects/User.php

Braces +4 added lines, -8 removed lines

@@ -58,12 +58,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -190,12 +188,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 

includes/Pages/PageJobQueue.php

Braces +3 added lines, -3 removed lines

@@ -134,7 +134,8 @@ 
             $job->setDatabase($database);
         }
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database)
+        {
             return UserSearchHelper::get($database)->fetchColumn('username');
         });
 
@@ -178,8 +179,7 @@ 
             ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
         if ($logCount === 0) {
             $this->assign('log', array());
-        }
-        else {
+        } else {
             list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
 
             $this->assign("log", $logData);

includes/Pages/PageUserManagement.php

Braces +8 added lines, -16 removed lines

@@ -64,8 +64,7 @@ 
             $this->assign('deactivatedUsers', $deactivatedUsers);
 
             UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
+        } else {
             $this->assign("showAll", false);
             $this->assign('deactivatedUsers', array());
 
@@ -159,8 +158,7 @@ 
                     if ($newValue === 0) {
                         if ($r['globalOnly']) {
                             $globalDelete[] = $r['object'];
-                        }
-                        else {
+                        } else {
                             $delete[] = $r['object'];
                         }
                     }
@@ -168,8 +166,7 @@ 
                     if ($newValue === 1) {
                         if ($r['globalOnly']) {
                             $globalAdd[] = $name;
-                        }
-                        else {
+                        } else {
                             $add[] = $name;
                         }
                     }
@@ -231,8 +228,7 @@ 
             SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/roleedit.tpl');
             $this->assign('user', $user);
@@ -293,8 +289,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -352,8 +347,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("usermanagement/changelevel-reason.tpl");
             $this->assign("user", $user);
@@ -436,8 +430,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/renameuser.tpl');
             $this->assign('user', $user);
@@ -505,8 +498,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
                 $this->getSiteConfiguration());

includes/Pages/PageDomainSwitch.php

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         try {
             $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
         }
-        catch(DomainSwitchNotAllowedException $ex){
+        catch(DomainSwitchNotAllowedException $ex) {
             throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
         }