mdaniels5757 / waca

includes/DataObjects/User.php

Braces +8 added lines, -13 removed lines

@@ -64,12 +64,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -203,12 +201,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 
@@ -533,12 +529,10 @@ 
         if ($this->forceidentified === 0 || $this->forceidentified === "0") {
             // User forced to unidentified in the database.
             return false;
-        }
-        elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
+        } elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
             // User forced to identified in the database.
             return true;
-        }
-        else {
+        } else {
             // User not forced to any particular identified status; consult IdentificationVerifier
             return $iv->isUserIdentified($this->getOnWikiName());
         }
@@ -549,7 +543,8 @@ 
      *
      * @return bool|null
      */
-    public function getForceIdentified() {
+    public function getForceIdentified()
+    {
         return $this->forceidentified;
     }
 

includes/Pages/UserAuth/PagePreferences.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
             SessionAlert::success("Preferences updated!");
 
             $this->redirect('');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('preferences/prefs.tpl');
             $this->assign("enforceOAuth", $enforceOAuth);

includes/Pages/PageViewRequest.php

Braces +2 added lines, -4 removed lines

@@ -99,8 +99,7 @@ 
                 $this->setTemplate('view-request/main-with-checkuser-data.tpl');
                 $this->setupCheckUserData($request);
             }
-        }
-        else {
+        } else {
             $this->setTemplate('view-request/main.tpl');
         }
     }
@@ -114,8 +113,7 @@ 
         if ($request->getStatus() === 'Closed') {
             if ($request->getWasCreated()) {
                 $statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
-            }
-            else {
+            } else {
                 $statusSymbol = self::STATUS_SYMBOL_REJECTED;
             }
         }