mdaniels5757 / waca

includes/Tasks/PagedInternalPageBase.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if ($pageCount < $pageLimit) {
             if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
                 $pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-            }
-            elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+            } elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
                 $pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
             }
         }

includes/Tasks/InternalPageBase.php

Braces +5 added lines, -10 removed lines

@@ -88,8 +88,7 @@ 
         if ($securityResult === SecurityManager::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 === SecurityManager::ERROR_NOT_IDENTIFIED) {
                 // Not identified
                 throw new NotIdentifiedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-            elseif ($denyReason === SecurityManager::ERROR_DENIED) {
+            } elseif ($denyReason === SecurityManager::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

@@ -43,7 +43,8 @@ 
 
     public function switchDomain(User $user, Domain $newDomain): void
     {
-        $mapToId = function(DataObject $object) {
+        $mapToId = function(DataObject $object)
+        {
             return $object->getId();
         };
 
@@ -51,8 +52,7 @@ 
 
         if ($allowed) {
             WebRequest::setActiveDomain($newDomain);
-        }
-        else {
+        } else {
             throw new AccessDeniedException($this->securityManager, $this);
         }
     }

includes/Security/CredentialProviders/CredentialProviderBase.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
             $sql = 'UPDATE credential SET factor = factor - 1 WHERE user = :user AND factor > :factor';
             $statement = $this->database->prepare($sql);
             $statement->execute(array(':user' => $user->getId(), ':factor' => $stage));
-        }
-        else {
+        } else {
             // There are other auth factors at this point. Don't renumber the factors just yet.
         }
 

includes/Security/SecurityManager.php

Braces +2 added lines, -4 removed lines

@@ -197,12 +197,10 @@
             if ($this->roleConfiguration->roleNeedsIdentification($v)) {
                 if ($identified) {
                     $activeRoles[] = $v;
-                }
-                else {
+                } else {
                     $inactiveRoles[] = $v;
                 }
-            }
-            else {
+            } else {
                 $activeRoles[] = $v;
             }
         }

includes/Pages/PageBan.php

Braces +7 added lines, -14 removed lines

@@ -85,8 +85,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
 
             $user = User::getCurrent($this->getDatabase());
@@ -134,8 +133,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
 
             $user = User::getCurrent($database);
@@ -262,8 +260,7 @@ 
             $this->getNotificationHelper()->unbanned($ban, $unbanReason);
 
             $this->redirect('bans');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('ban', $ban);
             $this->setTemplate('bans/unban.tpl');
@@ -283,17 +280,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 {
             return WebRequest::postInt('duration') + time();
         }
     }
@@ -585,8 +579,7 @@ 
             $ipParts = explode('/', $targetIp, 2);
             $targetIp = $ipParts[0];
             $targetMask = (int)$ipParts[1];
-        }
-        else {
+        } else {
             // Default the CIDR range based on the IP type
             $targetMask = filter_var($targetIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 128 : 32;
         }

includes/Pages/PageUserManagement.php

Braces +9 added lines, -18 removed lines

@@ -66,8 +66,7 @@ 
             $this->assign("declinedUsers", $declinedUsers);
 
             UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
+        } else {
             $this->assign("showAll", false);
             $this->assign("suspendedUsers", array());
             $this->assign("declinedUsers", array());
@@ -161,8 +160,7 @@ 
                     if ($newValue === 0) {
                         if ($r['globalOnly']) {
                             $globalDelete[] = $r['object'];
-                        }
-                        else {
+                        } else {
                             $delete[] = $r['object'];
                         }
                     }
@@ -170,8 +168,7 @@ 
                     if ($newValue === 1) {
                         if ($r['globalOnly']) {
                             $globalAdd[] = $name;
-                        }
-                        else {
+                        } else {
                             $add[] = $name;
                         }
                     }
@@ -233,8 +230,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);
@@ -295,8 +291,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -360,8 +355,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -415,8 +409,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("usermanagement/changelevel-reason.tpl");
             $this->assign("user", $user);
@@ -499,8 +492,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/renameuser.tpl');
             $this->assign('user', $user);
@@ -566,8 +558,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
                 $this->getSiteConfiguration());

includes/Helpers/LogHelper.php

Braces +2 added lines, -4 removed lines

@@ -361,8 +361,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>";
@@ -380,8 +379,7 @@ 
                 $task = $job->getTask();
                 if (isset($taskDescriptions[$task])) {
                     $description = $taskDescriptions[$task];
-                }
-                else {
+                } else {
                     $description = 'Unknown task';
                 }
 

includes/Helpers/BanHelper.php

Braces +1 added lines, -2 removed lines

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