mdaniels5757 / waca

includes/DataObjects/Notification.php

Braces +2 added lines, -4 removed lines

@@ -41,12 +41,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             throw new Exception("You shouldn't be doing this...");
         }
     }

includes/DataObjects/Request.php

Braces +2 added lines, -4 removed lines

@@ -67,12 +67,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 `request` SET

includes/DataObjects/EmailTemplate.php

Braces +2 added lines, -4 removed lines

@@ -183,12 +183,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 `emailtemplate`

includes/DataObjects/User.php

Braces +9 added lines, -18 removed lines

@@ -77,12 +77,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -284,12 +282,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 
@@ -724,12 +720,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());
         }
@@ -799,8 +793,7 @@ 
 
         if ($this->oauthidentitycache == null) {
             $this->identityCache = null;
-        }
-        else {
+        } else {
             $this->identityCache = unserialize($this->oauthidentitycache);
         }
 
@@ -818,15 +811,13 @@ 
             ) {
                 // Use cached value - it's either valid or we don't care.
                 return $this->identityCache;
-            }
-            else {
+            } else {
                 // Cache expired and not forcing use of cached value
                 $this->getIdentityCache();
 
                 return $this->identityCache;
             }
-        }
-        else {
+        } else {
             // Cache isn't ours or doesn't exist
             $this->getIdentityCache();
 

includes/DataObjects/AntiSpoofCache.php

Braces +1 added lines, -2 removed lines

@@ -109,8 +109,7 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
         }

includes/DataObjects/WelcomeTemplate.php

Braces +2 added lines, -4 removed lines

@@ -65,12 +65,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 `welcometemplate`

includes/DataObjects/Ban.php

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
 SQL;
             $statement = $database->prepare($query);
             $statement->bindValue(":target", $target);
-        }
-        else {
+        } else {
             $query = "SELECT * FROM ban WHERE (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
             $statement = $database->prepare($query);
         }
@@ -145,12 +144,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 `ban`

includes/DataObjects/Log.php

Braces +2 added lines, -4 removed lines

@@ -49,12 +49,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             throw new Exception("Updating logs is not available");
         }
     }

includes/Pages/PageEditComment.php

Braces +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
             SessionAlert::success("Comment has been saved successfully");
 
             $this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('comment', $comment);
             $this->assign('request', $request);