mdaniels5757 / waca

includes/Pages/PagePreferences.php

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
             SessionAlert::success("Preferences updated!");
 
             $this->redirect('');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('preferences/prefs.tpl');
             $this->assign("enforceOAuth", $enforceOAuth);
@@ -82,8 +81,7 @@ 
             SessionAlert::success('Password changed successfully!');
 
             $this->redirect('preferences');
-        }
-        else {
+        } else {
             // not allowed to GET this.
             $this->redirect('preferences');
         }

includes/Pages/PageBan.php

Braces +7 added lines, -11 removed lines

@@ -33,7 +33,8 @@ 
         $bans = Ban::getActiveBans(null, $this->getDatabase());
 
         $userIds = array_map(
-            function(Ban $entry) {
+            function(Ban $entry)
+            {
                 return $entry->getUser();
             },
             $bans);
@@ -64,8 +65,7 @@ 
                 SessionAlert::error($ex->getMessage());
                 $this->redirect("bans", "set");
             }
-        }
-        else {
+        } else {
             $this->handleGetMethodForSetBan();
         }
     }
@@ -103,8 +103,7 @@ 
             $this->getNotificationHelper()->unbanned($ban, $unbanReason);
 
             $this->redirect('bans');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('ban', $ban);
             $this->setTemplate('bans/unban.tpl');
@@ -122,19 +121,16 @@ 
 
             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") {
             $duration = -1;
 
             return $duration;
-        }
-        else {
+        } else {
             $duration = WebRequest::postInt('duration') + time();
 
             return $duration;

includes/Pages/PageLog.php

Braces +3 added lines, -3 removed lines

@@ -36,7 +36,8 @@ 
             $filterObjectType = null;
         }
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database)
+        {
             return UserSearchHelper::get($database)->fetchColumn('username');
         });
 
@@ -116,8 +117,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/Pages/PageEmailManagement.php

Braces +2 added lines, -4 removed lines

@@ -115,8 +115,7 @@ 
             SessionAlert::success("Email template has been saved successfully.");
 
             $this->redirect('emailManagement');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('id', $template->getId());
             $this->assign('emailTemplate', $template);
@@ -183,8 +182,7 @@ 
             SessionAlert::success("Email template has been saved successfully.");
 
             $this->redirect('emailManagement');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('requeststates', $requestStates);
             $this->setTemplate('email-management/create.tpl');

includes/Pages/PageTeam.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
         foreach ($teamData as $name => $item) {
             if (count($item['Role']) == 0) {
                 $inactive[$name] = $item;
-            }
-            else {
+            } else {
                 $active[$name] = $item;
             }
         }

includes/Pages/PageOAuth.php

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
         $redirectDestination = WebRequest::clearPostLoginRedirect();
         if ($redirectDestination !== null && !$user->isNewUser()) {
             $this->redirectUrl($redirectDestination);
-        }
-        else {
+        } else {
             $this->redirect('preferences', null, null, 'internal.php');
         }
     }

includes/Pages/PageMain.php

Braces +3 added lines, -3 removed lines

@@ -33,8 +33,7 @@ 
         if ($config->getEmailConfirmationEnabled()) {
             $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed' LIMIT :lim;";
             $totalQuery = "SELECT COUNT(id) FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-        }
-        else {
+        } else {
             $query = "SELECT * FROM request WHERE status = :type LIMIT :lim;";
             $totalQuery = "SELECT COUNT(id) FROM request WHERE status = :type;";
         }
@@ -63,7 +62,8 @@ 
             $totalRequestsStatement->closeCursor();
 
             $userIds = array_map(
-                function(Request $entry) {
+                function(Request $entry)
+                {
                     return $entry->getReserved();
                 },
                 $requests);

includes/Pages/PageUserManagement.php

Braces +9 added lines, -15 removed lines

@@ -44,8 +44,7 @@ 
             $this->assign("declinedUsers", UserSearchHelper::get($database)->byStatus(User::STATUS_DECLINED)->fetch());
 
             UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
+        } else {
             $this->assign("showAll", false);
             $this->assign("suspendedUsers", array());
             $this->assign("declinedUsers", array());
@@ -65,7 +64,8 @@ 
 
         $this->assign('roles', $roleMap);
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database)
+        {
             return UserSearchHelper::get($database)->fetchColumn('username');
         });
 
@@ -166,8 +166,7 @@ 
 
             $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/roleedit.tpl');
             $this->assign('user', $user);
@@ -228,8 +227,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -289,8 +287,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -344,8 +341,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("usermanagement/changelevel-reason.tpl");
             $this->assign("user", $user);
@@ -425,8 +421,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/renameuser.tpl');
             $this->assign('user', $user);
@@ -482,8 +477,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/edituser.tpl');
             $this->assign('user', $user);

includes/Pages/RequestAction/PageCustomClose.php

Braces +4 added lines, -8 removed lines

@@ -42,8 +42,7 @@ 
             $this->doCustomClose($currentUser, $request, $database);
 
             $this->redirect();
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->showCustomCloseForm($database, $request);
         }
@@ -185,16 +184,14 @@ 
 
             // Send the mail after the save, since save can be rolled back
             $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-        }
-        else {
+        } else {
             if (array_key_exists($action, $availableRequestStates)) {
                 // Defer to other state
                 $this->deferRequest($request, $database, $action, $availableRequestStates, $messageBody);
 
                 // Send the mail after the save, since save can be rolled back
                 $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-            }
-            else {
+            } else {
                 $request->setReserved(null);
                 $request->setUpdateVersion(WebRequest::postInt('updateversion'));
                 $request->save();
@@ -236,8 +233,7 @@ 
         if ($action == EmailTemplate::CREATED) {
             $logCloseType = 'custom-y';
             $notificationCloseType = "Custom, Created";
-        }
-        else {
+        } else {
             $logCloseType = 'custom-n';
             $notificationCloseType = "Custom, Not Created";
         }