smrealms / smr

lib/Default/Sorter.class.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 	}
 
 	public static function cmpNum($a, $b) {
-		if($a == $b) return 0;
+		if($a == $b) {
+			return 0;
+		}
 		return (self::$reverseOrder?-1:1)*($a < $b ? -1 : 1);
 	}
 

lib/Default/MySqlDatabase.class.php

Braces +42 added lines, -33 removed lines

@@ -63,8 +63,9 @@ 
 	}
 	
 	public function nextRecord() {
-		if (!$this->dbResult)
-			$this->error('No resource to get record from.');
+		if (!$this->dbResult) {
+					$this->error('No resource to get record from.');
+		}
 		
 		if ($this->dbRecord = $this->dbResult->fetch_assoc()) {
 			return true;
@@ -79,9 +80,10 @@ 
 	}
 	
 	public function getBoolean($name) {
-		if ($this->dbRecord[$name] == 'TRUE')
-			return true;
-//		if($this->dbRecord[$name] == 'FALSE')
+		if ($this->dbRecord[$name] == 'TRUE') {
+					return true;
+		}
+		//		if($this->dbRecord[$name] == 'FALSE')
 		return false;
 //		throw new Exception('Field is not a boolean');
 	}
@@ -114,8 +116,9 @@ 
 	
 	public function getObject($name, $compressed = false) {
 		$object = $this->getField($name);
-		if ($compressed === true)
-			$object = gzuncompress($object);
+		if ($compressed === true) {
+					$object = gzuncompress($object);
+		}
 		return unserialize($object);
 	}
 	
@@ -157,38 +160,43 @@ 
 	
 	public function escape($escape, $autoQuotes = true, $quotes = true) {
 		if (is_bool($escape)) {
-			if ($autoQuotes)
-				return $this->escapeBoolean($escape);
-			else
-				return $this->escapeBoolean($escape, $quotes);
+			if ($autoQuotes) {
+							return $this->escapeBoolean($escape);
+			} else {
+							return $this->escapeBoolean($escape, $quotes);
+			}
 		}
 		if (is_numeric($escape)) {
 			return $this->escapeNumber($escape);
 		}
 		if (is_string($escape)) {
-			if ($autoQuotes)
-				return $this->escapeString($escape);
-			else
-				return $this->escapeString($escape, $quotes);
+			if ($autoQuotes) {
+							return $this->escapeString($escape);
+			} else {
+							return $this->escapeString($escape, $quotes);
+			}
 		}
 		if (is_array($escape)) {
 			return $this->escapeArray($escape, $autoQuotes, $quotes);
 		}
 		if (is_object($escape)) {
-			if ($autoQuotes)
-				return $this->escapeObject($escape);
-			else
-				return $this->escapeObject($escape, $quotes);
+			if ($autoQuotes) {
+							return $this->escapeObject($escape);
+			} else {
+							return $this->escapeObject($escape, $quotes);
+			}
 		}
 	}
 	
 	public function escapeString($string, $quotes = true, $nullable = false) {
-		if ($nullable === true && ($string === null || $string === ''))
-			return 'NULL';
-		if ($string === true)
-			$string = 'TRUE';
-		else if ($string === false)
-			$string = 'FALSE';
+		if ($nullable === true && ($string === null || $string === '')) {
+					return 'NULL';
+		}
+		if ($string === true) {
+					$string = 'TRUE';
+		} else if ($string === false) {
+					$string = 'FALSE';
+		}
 		if (is_array($string)) {
 			$escapedString = '';
 			foreach ($string as $value) {
@@ -210,14 +218,14 @@ 
 		$string = '';
 		if ($escapeIndividually) {
 			foreach ($array as $value) {
-				if (is_array($value))
-					$string .= $this->escapeArray($value, $autoQuotes, $quotes, $implodeString, $escapeIndividually) . $implodeString;
-				else
-					$string .= $this->escape($value, $autoQuotes, $quotes) . $implodeString;
+				if (is_array($value)) {
+									$string .= $this->escapeArray($value, $autoQuotes, $quotes, $implodeString, $escapeIndividually) . $implodeString;
+				} else {
+									$string .= $this->escape($value, $autoQuotes, $quotes) . $implodeString;
+				}
 			}
 			$string = substr($string, 0, -1);
-		}
-		else {
+		} else {
 			$string = $this->escape(implode($implodeString, $array), $autoQuotes, $quotes);
 		}
 		return $string;
@@ -250,8 +258,9 @@ 
 	}
 	
 	public function escapeObject($object, $compress = false, $quotes = true, $nullable = false) {
-		if ($compress === true)
-			return $this->escapeBinary(gzcompress(serialize($object)));
+		if ($compress === true) {
+					return $this->escapeBinary(gzcompress(serialize($object)));
+		}
 		return $this->escapeString(serialize($object), $quotes, $nullable);
 	}
 

lib/Default/ChessGame.class.php

Braces +13 added lines, -26 removed lines

@@ -81,8 +81,7 @@ 
 			$this->blackID = $this->db->getInt('black_id');
 			$this->winner = $this->db->getInt('winner_id');
 			$this->resetHasMoved();
-		}
-		else {
+		} else {
 			throw new Exception('Chess game not found: ' . $chessGameID);
 		}
 	}
@@ -149,8 +148,7 @@ 
 					break;
 				}
 			}
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			if($debugInfo === true) {
 				echo $e->getMessage() . EOL . $e->getTraceAsString() . EOL;
 			}
@@ -189,11 +187,9 @@ 
 			if(!$mate && $this->hasEnded()) {
 				if($this->getWinner() != 0) {
 					$this->moves[] = ($this->getWinner() == $this->getWhiteID() ? 'Black' : 'White') . ' Resigned.';
-				}
-				else if(count($this->moves) < 2) {
+				} else if(count($this->moves) < 2) {
 					$this->moves[] = 'Game Cancelled.';
-				}
-				else {
+				} else {
 					$this->moves[] = 'Game Drawn.';
 				}
 			}
@@ -212,8 +208,7 @@ 
 			for($x=0; $x < 8; $x++) {
 				if($board[$y][$x] == null) {
 					$blanks++;
-				}
-				else {
+				} else {
 					if($blanks > 0) {
 						$fen .= $blanks;
 						$blanks = 0;
@@ -268,8 +263,7 @@ 
 					$fen .= '3';
 				break;
 			}
-		}
-		else {
+		} else {
 			$fen .= '-';
 		}
 		$fen .= ' 0 ' . floor(count($this->moves)/2);
@@ -386,8 +380,7 @@ 
 		}
 		if($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
 			$this->hasMoved[ChessPiece::PAWN] = array($endX, $endY);
-		}
-		else {
+		} else {
 			$this->hasMoved[ChessPiece::PAWN] = array(-1,-1);
 		}
 		return ($castling == 'Queen' ? '0-0-0' : ($castling == 'King' ? '0-0' : ''))
@@ -493,8 +486,7 @@ 
 				$board[$toY][$castling['ToX']]->setX($castling['ToX']);
 				$board[$y][$castling['X']] = null;
 			}
-		}
-		else if($p->pieceID == ChessPiece::PAWN) {
+		} else if($p->pieceID == ChessPiece::PAWN) {
 			if($toY == 0 || $toY == 7) {
 				$pawnPromotion = $p->promote($pawnPromotionPiece, $board);
 			}
@@ -512,8 +504,7 @@ 
 				}
 				$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null;
 			}
-		}
-		else if($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
+		} else if($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
 			//Rook moved?
 			if($hasMoved[$p->colour][ChessPiece::ROOK][$x==0?'Queen':'King'] === false) {
 				// We set rook moved in here as it's used for move info.
@@ -573,12 +564,10 @@ 
 				$board[$y][$castling['X']]->setX($castling['X']);
 				$board[$toY][$castling['ToX']] = null;
 			}
-		}
-		else if($moveInfo['EnPassant'] === true) {
+		} else if($moveInfo['EnPassant'] === true) {
 			$board[$toY][$toX] = null;
 			$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = $moveInfo['PieceTaken'];
-		}
-		else if($moveInfo['RookMoved'] !== false) {
+		} else if($moveInfo['RookMoved'] !== false) {
 			$hasMoved[$p->colour][ChessPiece::ROOK][$moveInfo['RookMoved']] = false;
 		}
 		if($moveInfo['RookTaken'] !== false) {
@@ -702,8 +691,7 @@ 
 					$this->setWinner($forAccountID);
 					$return = 1;
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'You have just lost [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
-				}
-				else {
+				} else {
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'It is now your turn in [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
 					if($checking == 'CHECK') {
 						$currentPlayer->increaseHOF(1, array($chessType,'Moves','Check Given'), HOF_PUBLIC);
@@ -853,8 +841,7 @@ 
 							SET end_time=' . $this->db->escapeNumber(TIME) . '
 							WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ';');
 			return 1;
-		}
-		else {
+		} else {
 			$loserColour = $this->getColourForAccountID($accountID);
 			$winnerAccountID = $this->getColourID(self::getOtherColour($loserColour));
 			$results = $this->setWinner($winnerAccountID);

lib/Default/DummyPlayer.class.php

Braces +4 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 	}
 	
@@ -93,8 +94,7 @@ 
 		if($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
-		}
-		else {
+		} else {
 			$return = new DummyPlayer();
 			return $return;
 		}

htdocs/login_processing.php

Braces +31 added lines, -18 removed lines

@@ -31,8 +31,7 @@ 
 				header('Location: /login_social_create.php');
 				exit;
 			}
-		}
-		else {
+		} else {
 			$login = (isset($_REQUEST['login']) ? $_REQUEST['login'] : (isset($var['login']) ? $var['login'] : ''));
 			$password = (isset($_REQUEST['password']) ? $_REQUEST['password'] : (isset($var['password']) ? $var['password'] : ''));
 
@@ -46,8 +45,7 @@ 
 			$account = SmrAccount::getAccountByName($login);
 			if (is_object($account) && $account->checkPassword($password)) {
 				SmrSession::setAccount($account);
-			}
-			else {
+			} else {
 				$msg = 'Password is incorrect!';
 				header('Location: /login.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 				exit;
@@ -142,38 +140,54 @@ 
 			//convert to array
 			$old = explode('-', $db->getField('array'));
 			//get rid of old version cookie since it isn't optimal.
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
-		if (!in_array($account->getAccountID(), $old)) $old[] = $account->getAccountID();
-	}
-	else {
+		if (!in_array($account->getAccountID(), $old)) {
+			$old[] = $account->getAccountID();
+		}
+	} else {
 
 		//we have a cookie so we see if we add to it etc
 		//break cookie into array
 		$cookie = explode('-', $_COOKIE['Session_Info']);
 		//check for current version
-		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) $cookie = array();
+		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) {
+			$cookie = array();
+		}
 		$cookie[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//add this acc to the cookie if it isn't there
-		if (!in_array($account->getAccountID(), $cookie)) $cookie[] = $account->getAccountID();
+		if (!in_array($account->getAccountID(), $cookie)) {
+			$cookie[] = $account->getAccountID();
+		}
 
 		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = ' . $account->getAccountID());
 		if ($db->nextRecord()) {
 			//convert to array
 			$old = explode('-', $db->getField('array'));
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//merge arrays...but keys are all different so we go through each value
-		foreach ($cookie as $value)
-			if (!in_array($value, $old)) $old[] = $value;
+		foreach ($cookie as $value) {
+					if (!in_array($value, $old)) $old[] = $value;
+		}
 	}
 	$use = (count($old) <= 2) ? 'FALSE' : 'TRUE';
 	//check that each value is legit and add it to db string
 	$new = MULTI_CHECKING_COOKIE_VERSION;
 	foreach ($old as $accID) {
-		if (is_numeric($accID)) $new .= '-' . $accID;
+		if (is_numeric($accID)) {
+			$new .= '-' . $accID;
+		}
 	}
 	$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES (' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeString($new) . ', ' . $db->escapeString($use) . ')');
 	//now we update their cookie with the newest info
@@ -193,7 +207,6 @@ 
 
 	header('Location: ' . $href);
 	exit;
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

htdocs/login.php

Braces +1 added lines, -2 removed lines

@@ -50,7 +50,6 @@
 	$template->assign('Body', 'login/login.php');
 	$template->display('login/skeleton.php');
 
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

engine/Default/hall_of_fame_new.php

Braces +12 added lines, -11 removed lines

@@ -1,18 +1,21 @@ 
 <?php declare(strict_types=1);
 require_once(get_file_loc('hof.functions.inc'));
 $game_id = null;
-if (isset($var['game_id'])) $game_id = $var['game_id'];
+if (isset($var['game_id'])) {
+	$game_id = $var['game_id'];
+}
 
 if (empty($game_id)) {
 	$topic = 'All Time Hall of Fame';
-}
-else {
+} else {
 	$topic = 'Hall of Fame: ' . SmrGame::getGame($game_id)->getDisplayName();
 }
 $template->assign('PageTopic', $topic);
 
 $container = create_container('skeleton.php', 'hall_of_fame_player_detail.php');
-if (isset($game_id)) $container['game_id'] = $game_id;
+if (isset($game_id)) {
+	$container['game_id'] = $game_id;
+}
 $template->assign('PersonalHofHREF', SmrSession::getNewHREF($container));
 
 $db->query('SELECT type FROM hof_visibility WHERE visibility != ' . $db->escapeString(HOF_PRIVATE) . ' ORDER BY type');
@@ -35,8 +38,7 @@ 
 if (!isset($var['view'])) {
 	$categories = getHofCategories($hofTypes, $game_id, $account->getAccountID());
 	$template->assign('Categories', $categories);
-}
-else {
+} else {
 	$gameIDSql = ' AND game_id ' . (isset($game_id) ? '= ' . $db->escapeNumber($game_id) : 'IN (SELECT game_id FROM game WHERE end_time < ' . TIME . ' AND ignore_stats = ' . $db->escapeBoolean(false) . ')');
 
 	$vis = HOF_PUBLIC;
@@ -44,15 +46,14 @@ 
 	$foundMe = false;
 	$viewType = $var['type'];
 	$viewType[] = $var['view'];
-	if ($var['view'] == DONATION_NAME)
-		$db->query('SELECT account_id, SUM(amount) as amount FROM account_donated
+	if ($var['view'] == DONATION_NAME) {
+			$db->query('SELECT account_id, SUM(amount) as amount FROM account_donated
 					GROUP BY account_id ORDER BY amount DESC, account_id ASC LIMIT 25');
-	else if ($var['view'] == USER_SCORE_NAME) {
+	} else if ($var['view'] == USER_SCORE_NAME) {
 		$statements = SmrAccount::getUserScoreCaseStatement($db);
 		$query = 'SELECT account_id, ' . $statements['CASE'] . ' amount FROM (SELECT account_id, type, SUM(amount) amount FROM player_hof WHERE type IN (' . $statements['IN'] . ')' . $gameIDSql . ' GROUP BY account_id,type) x GROUP BY account_id ORDER BY amount DESC, account_id ASC LIMIT 25';
 		$db->query($query);
-	}
-	else {
+	} else {
 		$db->query('SELECT visibility FROM hof_visibility WHERE type = ' . $db->escapeArray($viewType, false, true, ':', false) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			$vis = $db->getField('visibility');

engine/Default/course_plot_processing.php

Braces +26 added lines, -14 removed lines

@@ -1,36 +1,48 @@
 <?php declare(strict_types=1);
 
-if (isset($var['from'])) $start = $var['from'];
-else $start = trim($_POST['from']);
-if (isset($var['to'])) $target = $var['to'];
-else $target = trim($_POST['to']);
+if (isset($var['from'])) {
+	$start = $var['from'];
+} else {
+	$start = trim($_POST['from']);
+}
+if (isset($var['to'])) {
+	$target = $var['to'];
+} else {
+	$target = trim($_POST['to']);
+}
 
 // perform some basic checks on both numbers
-if (empty($start) || empty($target))
+if (empty($start) || empty($target)) {
 	create_error('Where do you want to go today?');
+}
 
 
-if (!is_numeric($start) || !is_numeric($target))
+if (!is_numeric($start) || !is_numeric($target)) {
 	create_error('Please enter only numbers!');
+}
 
 $start = abs(str_replace('.', '', $start));
 $target = abs(str_replace('.', '', $target));
 
-if ($start == $target)
+if ($start == $target) {
 	create_error('Hmmmm...if ' . $start . '=' . $target . ' then that means...YOU\'RE ALREADY THERE! *cough*you\'re real smart*cough*');
+}
 
 $startExists = false;
 $targetExists = false;
 $galaxies = SmrGalaxy::getGameGalaxies($player->getGameID());
 foreach ($galaxies as $galaxy) {
-	if ($galaxy->contains($start))
-		$startExists = true;
-	if ($galaxy->contains($target))
-		$targetExists = true;
-}
-
-if ($startExists === false || $targetExists === false)
+	if ($galaxy->contains($start)) {
+			$startExists = true;
+	}
+	if ($galaxy->contains($target)) {
+			$targetExists = true;
+	}
+	}
+
+if ($startExists === false || $targetExists === false) {
 	create_error('The sectors have to exist!');
+}
 
 $account->log(LOG_TYPE_MOVEMENT, 'Player plots to ' . $target . '.', $player->getSectorID());
 

engine/Default/planet_defense_processing.php

Braces +50 added lines, -38 removed lines

@@ -1,17 +1,21 @@ 
 <?php declare(strict_types=1);
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $amount = trim($_REQUEST['amount']);
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 	
 // only whole numbers allowed
 $amount = round($amount);
 
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount > 0!');
-if ($player->getNewbieTurns() > 0)
+}
+if ($player->getNewbieTurns() > 0) {
 	create_error('You can\'t drop defenses under newbie protection!');
+}
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
 
@@ -21,40 +25,44 @@ 
 if ($action == 'Ship') {
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getShields())
-			create_error('You can\'t take more shields from planet than are on it!');
+		if ($amount > $planet->getShields()) {
+					create_error('You can\'t take more shields from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxShields() - $ship->getShields())
-			create_error('You can\'t take more shields than you can carry!');
+		if ($amount > $ship->getMaxShields() - $ship->getShields()) {
+					create_error('You can\'t take more shields than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseShields($amount);
 		$ship->increaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' shields from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getCDs())
-			create_error('You can\'t take more drones from planet than are on it!');
+		if ($amount > $planet->getCDs()) {
+					create_error('You can\'t take more drones from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxCDs() - $ship->getCDs())
-			create_error('You can\'t take more drones than you can carry!');
+		if ($amount > $ship->getMaxCDs() - $ship->getCDs()) {
+					create_error('You can\'t take more drones than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseCDs($amount);
 		$ship->increaseCDs($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' drones from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_ARMOUR) {
+	} else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getArmour())
-			create_error('You can\'t take more armour from planet than are on it!');
+		if ($amount > $planet->getArmour()) {
+					create_error('You can\'t take more armour from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxArmour() - $ship->getArmour())
-			create_error('You can\'t take more armour than you can carry!');
+		if ($amount > $ship->getMaxArmour() - $ship->getArmour()) {
+					create_error('You can\'t take more armour than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseArmour($amount);
@@ -62,32 +70,34 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' armour from planet.', $player->getSectorID());
 	}
 	
-}
-elseif ($action == 'Planet') {
+} elseif ($action == 'Planet') {
 	// does the user wants to transfer shields?
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getShields())
-			create_error('You can\'t transfer more shields than you carry!');
+		if ($amount > $ship->getShields()) {
+					create_error('You can\'t transfer more shields than you carry!');
+		}
 
 		// do we want to transfer more than the planet can hold?
-		if ($amount + $planet->getShields() > $planet->getMaxShields())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		if ($amount + $planet->getShields() > $planet->getMaxShields()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		}
 
 		// now transfer
 		$planet->increaseShields($amount);
 		$ship->decreaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' shields on planet.', $player->getSectorID());
 	// does the user wants to transfer drones?
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getCDs())
-			create_error('You can\'t transfer more combat drones than you carry!');
+		if ($amount > $ship->getCDs()) {
+					create_error('You can\'t transfer more combat drones than you carry!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getCDs() > $planet->getMaxCDs())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		if ($amount + $planet->getCDs() > $planet->getMaxCDs()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		}
 
 		// now transfer
 		$planet->increaseCDs($amount);
@@ -97,12 +107,14 @@ 
 	// does the user wish to transfare armour?
 	else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount >= $ship->getArmour())
-			create_error('You can\'t transfer more armour than what you carry minus one!');
+		if ($amount >= $ship->getArmour()) {
+					create_error('You can\'t transfer more armour than what you carry minus one!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getArmour() > $planet->getMaxArmour())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		if ($amount + $planet->getArmour() > $planet->getMaxArmour()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		}
 
 		// now transfer
 		$planet->increaseArmour($amount);
@@ -110,9 +122,9 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' armour on planet.', $player->getSectorID());
 	}
 	
-}
-else
+} else {
 	create_error('You must choose if you want to transfer to planet or to the ship!');
+}
 
 $ship->removeUnderAttack();