mdaniels5757 / waca

includes/DataObjects/Comment.php

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
 		if (User::getCurrent()->isAdmin() || User::getCurrent()->isCheckuser()) {
 			// current user is an admin or checkuser, so retrieve everything.
 			$statement = $database->prepare("SELECT * FROM comment WHERE request = :target;");
-		}
-		else {
+		} else {
 			// current user isn't an admin, so limit to only those which are visible to users, and private comments
 			// the user has posted themselves.
 			$statement = $database->prepare(<<<SQL
@@ -70,12 +69,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			// update
 			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment

includes/DataObjects/Request.php

Braces +5 added lines, -10 removed lines

@@ -83,12 +83,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = (int)$this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `request` SET " .
 				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, " .
@@ -372,12 +370,10 @@ 
 		if ($this->reserved != 0) {
 			if ($this->reserved == User::getCurrent()->getId()) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
-		}
-		else {
+		} else {
 			return false;
 		}
 
@@ -392,8 +388,7 @@ 
 
 		if ($this->getEmailConfirm() == $si) {
 			$this->setEmailConfirm("Confirmed");
-		}
-		else {
+		} else {
 			throw new TransactionException("Confirmation hash does not match the expected value", "Email confirmation failed");
 		}
 	}

includes/DataObjects/EmailTemplate.php

Braces +2 added lines, -4 removed lines

@@ -123,12 +123,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			// update
 			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`

includes/DataObjects/User.php

Indentation +3 added lines, -3 removed lines

@@ -653,9 +653,9 @@
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
-	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
-        }
+		if($this->isCheckuserCache === null) {
+			$this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
+		}
 
 		return $this->isCheckuserCache;
 	}

Braces +8 added lines, -16 removed lines

@@ -46,8 +46,7 @@ 
 		if (self::$currentUser === null) {
 			if (isset($_SESSION['userID'])) {
 				self::$currentUser = self::getById($_SESSION['userID'], $database);
-			}
-			else {
+			} else {
 				$anonymousCoward = new CommunityUser();
 
 				self::$currentUser = $anonymousCoward;
@@ -259,12 +258,10 @@ 
 		if ($filter === null) {
 			$userListQuery = "SELECT username FROM user;";
 			$userListResult = $database->query($userListQuery);
-		}
-		elseif ($filter === true) {
+		} elseif ($filter === true) {
 			$userListQuery = "SELECT username FROM user WHERE status IN ('User', 'Admin');";
 			$userListResult = $database->query($userListQuery);
-		}
-		else {
+		} else {
 			$userListQuery = "SELECT username FROM user WHERE status = :status;";
 			$userListResult = $database->prepare($userListQuery);
 			$userListResult->execute(array(":status" => $filter));
@@ -314,12 +311,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = (int)$this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 
@@ -699,8 +694,7 @@ 
 
 		if ($this->oauthidentitycache == null) {
 			$this->identityCache = null;
-		}
-		else {
+		} else {
 			$this->identityCache = unserialize($this->oauthidentitycache);
 		}
         
@@ -718,14 +712,12 @@ 
 				) {
 				// 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();
 			return $this->identityCache;

Spacing +1 added lines, -1 removed lines

@@ -653,7 +653,7 @@
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
+	    if ($this->isCheckuserCache === null) {
 	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
         }
 

includes/DataObjects/InterfaceMessage.php

Braces +2 added lines, -4 removed lines

@@ -48,12 +48,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE interfacemessage SET type = :type, description = :desc, content = :content, updatecounter = updatecounter + 1 WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);

includes/DataObjects/AntiSpoofCache.php

Braces +1 added lines, -2 removed lines

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

includes/DataObjects/WelcomeTemplate.php

Braces +2 added lines, -4 removed lines

@@ -47,12 +47,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `welcometemplate` SET usercode = :usercode, botcode = :botcode WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);

includes/DataObjects/Ban.php

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
 			$query = "SELECT * FROM ban WHERE target = :target;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":target", $target);
-		}
-		else {
+		} else {
 			$query = "SELECT * FROM ban;";
 			$statement = $database->prepare($query);
 		}
@@ -64,8 +63,7 @@ 
 			$query = "SELECT * FROM ban WHERE target = :target AND (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
 			$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);
 		}
@@ -160,12 +158,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `ban` SET duration = :duration, active = :active, user = :user WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);
@@ -215,8 +211,7 @@ 
 			}
 
 			$this->user = $u->getId();
-		}
-		else {
+		} else {
 			$this->user = $user;
 		}
 	}

includes/DataObjects/Log.php

Braces +3 added lines, -6 removed lines

@@ -35,12 +35,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			throw new Exception("Updating logs is not available");
 		}
 	}
@@ -100,8 +98,7 @@ 
 	{
 		if (is_a($user, "User")) {
 			$this->user = $user->getId();   
-		}
-		else {
+		} else {
 			$this->user = $user;   
 		}
 	}