smrealms / smr

tools/irc/channel.php

Braces +9 added lines, -6 removed lines

@@ -14,12 +14,15 @@
 
 //		if ($nick == 'MrSpock' && $user == 'mrspock')
 //			fputs($fp, 'PRIVMSG ' . $channel . ' :The creator! The God! He\'s among us! Praise him!' . EOL);
-		if ($nick == 'Holti' && $user == 'Holti')
-			fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '4@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
-		if ($nick == 'kiNky' && $user == 'cicika')
-			fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '4@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
-		if ($nick == 'River' && $user == 'Serenity')
-			fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '8@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
+		if ($nick == 'Holti' && $user == 'Holti') {
+					fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '4@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
+		}
+		if ($nick == 'kiNky' && $user == 'cicika') {
+					fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '4@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
+		}
+		if ($nick == 'River' && $user == 'Serenity') {
+					fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION hands ' . $nick . ' a ' . chr(3) . '8@' . chr(3) . '3' . chr(2) . '}' . chr(2) . '-,`--' . chr(1) . EOL);
+		}
 
 		$db = new SmrMySqlDatabase();
 

tools/irc/channel_msg.php

Braces +49 added lines, -34 removed lines

@@ -47,8 +47,7 @@ 
 	// get smr player
 	try {
 		$player = SmrPlayer::getPlayer($account->getAccountID(), $alliance->getGameId(), true);
-	}
-	catch(PlayerNotFoundException $e) {
+	} catch(PlayerNotFoundException $e) {
 		if($validationMessages === true) {
 			fputs($fp, 'PRIVMSG ' . $channel . ' :' . $nick . ', you have not joined the game that this channel belongs to.' . EOL);
 		}
@@ -85,36 +84,50 @@ 
 			return true;
 		}
 
-		if (channel_msg_money($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_forces($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_money($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_forces($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
-		if (channel_msg_seed($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_seedlist_add($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_seedlist_del($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_seed($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_seedlist_add($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_seedlist_del($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
-		if (channel_msg_op_info($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_cancel($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_set($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_turns($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_response($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_op_list($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_set($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_del($fp, $rdata, $account, $player))
-			return true;
-		if (channel_msg_sd_list($fp, $rdata, $account, $player))
-			return true;
+		if (channel_msg_op_info($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_cancel($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_set($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_turns($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_response($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_op_list($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_set($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_del($fp, $rdata, $account, $player)) {
+					return true;
+		}
+		if (channel_msg_sd_list($fp, $rdata, $account, $player)) {
+					return true;
+		}
 
 	}
 
@@ -253,8 +266,9 @@ 
 		$countdown = intval($msg[5]);
 		$message = 'ALERT! ALERT! ALERT!';
 
-		if (isset($msg[6]))
-			$message .= ' ' . $msg[6];
+		if (isset($msg[6])) {
+					$message .= ' ' . $msg[6];
+		}
 
 		echo_r('[TIMER] ' . $nick . ' started a timer with ' . $countdown . ' minute(s) (' . $message . ') in ' . $channel);
 
@@ -364,8 +378,9 @@ 
 		if ($topic == 'seen') {
 			fputs($fp, 'NOTICE ' . $nick . ' :Syntax !seen <nickname>' . EOL);
 			fputs($fp, 'NOTICE ' . $nick . ' :   Displays the last time <nickname> was seen' . EOL);
-		} else
-			fputs($fp, 'NOTICE ' . $nick . ' :There is no help available for this command! Try !help' . EOL);
+		} else {
+					fputs($fp, 'NOTICE ' . $nick . ' :There is no help available for this command! Try !help' . EOL);
+		}
 
 		//		if ($topic == 'login')
 		//			fputs($fp, 'NOTICE '.$nick.' :No help available yet! Ask MrSpock!'.EOL);

tools/testRouteGen.php

Braces +3 added lines, -2 removed lines

@@ -31,10 +31,11 @@
 $routesForPort=-1;
 $numberOfRoutes=5;
 
-if ($maxNumberOfPorts == 1)
+if ($maxNumberOfPorts == 1) {
 	$allRoutes = RouteGenerator::generateOneWayRoutes($allSectors, $distances, $goods, $races, $routesForPort);
-else
+} else {
 	$allRoutes = RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $goods, $races, $distances, $routesForPort, $numberOfRoutes);
+}
 
 //var_dump($allRoutes);
 

tools/testDistancePlotters.php

Braces +20 added lines, -13 removed lines

@@ -18,8 +18,9 @@ 
 	{
 		foreach($galaxySectors as &$galaxySector)
 		{
-			if($galaxySector->hasPort())
-				$galaxySector->getPort();
+			if($galaxySector->hasPort()) {
+							$galaxySector->getPort();
+			}
 		} unset($galaxySector);
 	} unset($galaxySectors);
 	//Test plotters
@@ -78,8 +79,9 @@ 
 			$x['TransactionType'] = 'Buy';
 	}
 	$di = Plotter::findDistanceToX($x, $sector, true);
-	if(is_object($di))
-		$di = $di->getRelativeDistance();
+	if(is_object($di)) {
+			$di = $di->getRelativeDistance();
+	}
 	$container['good_distance'] = $di;
 	return $di;
 }
@@ -87,10 +89,11 @@ 
 function getGoodDistanceOld(SmrSector &$sector, $goodID, $transaction)
 {
 	// if we buy a good we're looking for the nearest sector that sells that good
-	if ($transaction == 'Buy')
-		$neg_transaction = 'Sell';
-	elseif ($transaction == 'Sell')
-		$neg_transaction = 'Buy';
+	if ($transaction == 'Buy') {
+			$neg_transaction = 'Sell';
+	} elseif ($transaction == 'Sell') {
+			$neg_transaction = 'Buy';
+	}
 
 	// initialize the queue. all sectors we have to visit are in here
 	$sector_queue = array();
@@ -118,16 +121,20 @@ 
 
 		// does the current sector buy/sell the good we're looking for?
         if ($good_distance != 0) {
-			if ($curr_sector->hasPort() && $curr_sector->getPort()->hasGood($goodID, $neg_transaction) && $distance < $good_distance)
-				$good_distance = $distance;
+			if ($curr_sector->hasPort() && $curr_sector->getPort()->hasGood($goodID, $neg_transaction) && $distance < $good_distance) {
+							$good_distance = $distance;
+			}
         } else {
-			if ($curr_sector->hasPort() && $curr_sector->getPort()->hasGood($goodID, $neg_transaction))
-				$good_distance = $distance;
+			if ($curr_sector->hasPort() && $curr_sector->getPort()->hasGood($goodID, $neg_transaction)) {
+							$good_distance = $distance;
+			}
         }
 
 		// if we already found a port that buy or sell our product we don't need
 		// to go further than this one.
-		if ($good_distance != 0 && $good_distance <= $distance) continue;
+		if ($good_distance != 0 && $good_distance <= $distance) {
+			continue;
+		}
 
 		// enqueue all neighbours
 		if ($curr_sector->getLinkUp() > 0 && (!isset($sector_distance[$curr_sector->getLinkUp()]) || $sector_distance[$curr_sector->getLinkUp()] > $distance + 1)) {

lib/Default/DummyPlayer.class.inc

Braces +16 added lines, -14 removed lines

@@ -70,8 +70,9 @@ 
 		$newCredits = round($this->getShip()->getCost() / 4);
 		$old_speed = $this->getShip()->getSpeed();
 			
-		if ($newCredits < 100000)
-			$newCredits = 100000;
+		if ($newCredits < 100000) {
+					$newCredits = 100000;
+		}
 		$this->setCredits($newCredits);
 
 		// speed for pod
@@ -90,8 +91,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 	}
 	
@@ -152,15 +154,17 @@ 
 		$relation = $relations[$killer->getRaceID()];
 
 		$alignChangePerRelation = 0.1;
-		if($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
-			$alignChangePerRelation = 0.04;
+		if($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR) {
+					$alignChangePerRelation = 0.04;
+		}
 
 		$alignChange = $relation * $alignChangePerRelation;
 		$return['KillerAlign'] = $alignChange;
-		if($alignChange>0)
-			$killer->increaseAlignment($alignChange);
-		else
-			$killer->decreaseAlignment(-$alignChange);
+		if($alignChange>0) {
+					$killer->increaseAlignment($alignChange);
+		} else {
+					$killer->decreaseAlignment(-$alignChange);
+		}
 		// War setting gives them military pay
 		if($relation <= RELATIONS_WAR) {
 			$killer->increaseMilitaryPayment(-floor($relation * 100 * (pow($gainedExp/2,0.25))));
@@ -196,8 +200,7 @@ 
 			// If the podded players alignment makes them deputy or member then set bounty
 			if($this->getAlignment() >= 100) {
 				$bounty_type = 'HQ';
-			}
-			else if ($this->getAlignment() <= 100) {
+			} else if ($this->getAlignment() <= 100) {
 				$bounty_type = 'UG';
 			}
 
@@ -262,8 +265,7 @@ 
 		if($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
-		}
-		else {
+		} else {
 			$return = new DummyPlayer();
 			return $return;
 		}

lib/Default/SmrSession.class.inc

Braces +28 added lines, -31 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if(!defined('USING_AJAX'))
+if(!defined('USING_AJAX')) {
 	define('USING_AJAX',false);
+}
 class SmrSession {
 	const ALWAYS_AVAILABLE = 999999;
 	const TIME_BEFORE_EXPIRY = 3600;
@@ -149,8 +150,7 @@ 
 		// now try the cookie
 		if (isset($_COOKIE['session_id'])) {
 			self::$session_id = $_COOKIE['session_id'];
-		}
-		else {
+		} else {
 			// create a new session id
 			do {
 				self::$session_id = md5 (uniqid (mt_rand()) );
@@ -199,18 +199,15 @@ 
 				self::$account_id	= 0;
 				self::$game_id		= 0;
 				self::$var			= array();
-			}
-			else {
+			} else {
 				foreach(self::$var as $key => &$value) {
 					if ($value['Expires'] > 0 && $value['Expires'] <= TIME) { // Use 0 for infinity
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else if ($value['RemainingPageLoads'] < 0) {
+					} else if ($value['RemainingPageLoads'] < 0) {
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else {
+					} else {
 						--$value['RemainingPageLoads'];
 						if(isset($value['CommonID'])) {
 							self::$commonIDs[$value['CommonID']] = $key;
@@ -218,8 +215,7 @@ 
 					}
 				} unset($value);
 			}
-		}
-		else {
+		} else {
 			self::$generate = true;
 			self::$account_id	= 0;
 			self::$game_id		= 0;
@@ -240,8 +236,7 @@ 
 			self::$db->query('UPDATE active_session SET account_id=' . self::$db->escapeNumber(self::$account_id) . ',game_id=' . self::$db->escapeNumber(self::$game_id) . (!USING_AJAX ? ',last_accessed=' . self::$db->escapeNumber(TIME) : '') . ',session_var=' . self::$db->escapeBinary($compressed) .
 					',last_sn='.self::$db->escapeString(self::$SN).
 					' WHERE session_id=' . self::$db->escapeString(self::$session_id) . (USING_AJAX ? ' AND last_sn='.self::$db->escapeString(self::$lastSN) : '') . ' LIMIT 1');
-		}
-		else {
+		} else {
 			self::$db->query('DELETE FROM active_session WHERE account_id = ' . self::$db->escapeNumber(self::$account_id) . ' AND game_id = ' . self::$db->escapeNumber(self::$game_id));
 			self::$db->query('INSERT INTO active_session (session_id, account_id, game_id, last_accessed, session_var) VALUES(' . self::$db->escapeString(self::$session_id) . ',' . self::$db->escapeNumber(self::$account_id) . ',' . self::$db->escapeNumber(self::$game_id) . ',' . self::$db->escapeNumber(TIME) . ',' . self::$db->escapeBinary($compressed) . ')');
 			self::$generate = false;
@@ -276,9 +271,10 @@ 
 	}
 
 	public static function updateSN() {
-		if(!USING_AJAX)
-			self::$db->query('UPDATE active_session SET last_sn='.self::$db->escapeString(self::$SN).
+		if(!USING_AJAX) {
+					self::$db->query('UPDATE active_session SET last_sn='.self::$db->escapeString(self::$SN).
 				' WHERE session_id=' . self::$db->escapeString(self::$session_id) . ' LIMIT 1');
+		}
 	}
 
 	public static function destroy() {
@@ -289,8 +285,9 @@ 
 	}
 
 	public static function retrieveVar($sn) {
-		if(!isset(self::$var[$sn]) || empty(self::$var[$sn]))
-			return false;
+		if(!isset(self::$var[$sn]) || empty(self::$var[$sn])) {
+					return false;
+		}
 		self::$SN = $sn;
 		SmrSession::updateSN();
 		if(isset(self::$var[$sn]['body']) && isset(self::$var[$sn]['CommonID'])) {
@@ -342,8 +339,9 @@ 
 		}
 
 		self::$var[$sn] = $container;
-		if(!$lock && !USING_AJAX)
-			self::update();
+		if(!$lock && !USING_AJAX) {
+					self::update();
+		}
 		return $sn;
 	}
 
@@ -352,8 +350,7 @@ 
 		if($value===null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
-		}
-		else {
+		} else {
 			$var[$key] = $value;
 			self::$var[self::$SN][$key] = $value;
 		}
@@ -375,8 +372,7 @@ 
 
 		if($sn === false) {
 			$sn = self::generateSN($container);
-		}
-		else {
+		} else {
 			// If we've been provided an SN to use then copy over the existing 'PreviousRequestTime'
 			$container['PreviousRequestTime'] = self::$var[$sn]['PreviousRequestTime'];
 		}
@@ -389,8 +385,7 @@ 
 		if(isset(self::$commonIDs[$container['CommonID']])) {
 			$sn = self::$commonIDs[$container['CommonID']];
 			$container['PreviousRequestTime'] = isset(self::$var[$sn]) ? self::$var[$sn]['PreviousRequestTime'] : MICRO_TIME;
-		}
-		else {
+		} else {
 			do {
 				$sn = substr(md5(mt_rand()),0,8);
 			} while(isset(self::$var[$sn]));
@@ -410,10 +405,11 @@ 
 
 	public static function getNewHREF($container, $forceFullURL=false) {
 		$sn = self::addLink($container) . (isset($container['AJAX']) && $container['AJAX'] == true ? '&ajax=1':'');
-		if($forceFullURL===true||stripos($_SERVER['REQUEST_URI'],'loader.php')===false)
-			return '/loader.php?sn=' . $sn;
-		else
-			return '?sn=' . $sn;
+		if($forceFullURL===true||stripos($_SERVER['REQUEST_URI'],'loader.php')===false) {
+					return '/loader.php?sn=' . $sn;
+		} else {
+					return '?sn=' . $sn;
+		}
 	}
 
 	public static function addAjaxReturns($element,$contents) {
@@ -422,8 +418,9 @@ 
 	}
 
 	public static function saveAjaxReturns() {
-		if(empty(self::$ajaxReturns))
-			return;
+		if(empty(self::$ajaxReturns)) {
+					return;
+		}
 		$compressed = gzcompress(serialize(self::$ajaxReturns));
 		self::$db->query('UPDATE active_session SET ajax_returns=' . self::$db->escapeBinary($compressed) .
 				' WHERE session_id=' . self::$db->escapeString(self::$session_id) . ' LIMIT 1');

lib/Default/Council.class.inc

Braces +3 added lines, -2 removed lines

@@ -9,8 +9,9 @@
 	}
 
 	protected static function initialiseDatabase() {
-		if(self::$db==null)
-			self::$db = new SmrMySqlDatabase();
+		if(self::$db==null) {
+					self::$db = new SmrMySqlDatabase();
+		}
 	}
 
 	/**

lib/Default/SmrGame.class.inc

Braces +3 added lines, -6 removed lines

@@ -90,13 +90,11 @@ 
 			$this->allianceMaxPlayers	= $this->db->getInt('alliance_max_players');
 			$this->allianceMaxVets		= $this->db->getInt('alliance_max_vets');
 			$this->startingCredits		= $this->db->getInt('starting_credits');
-		}
-		else if($create===true) {
+		} else if($create===true) {
 			$this->gameID		= (int)$gameID;
 			$this->isNew		= true;
 			return;
-		}
-		else {
+		} else {
 			throw new GameNotFoundException('No such game: ' . $gameID);
 		}
 	}
@@ -121,8 +119,7 @@ 
 										', alliance_max_vets = ' . $this->db->escapeNumber($this->getAllianceMaxVets()) .
 										', starting_credits = ' . $this->db->escapeNumber($this->getStartingCredits()) .
 									' WHERE game_id = ' . $this->db->escapeNumber($this->getGameID()) . ' LIMIT 1');
-			}
-			else {
+			} else {
 				$this->db->query('INSERT INTO game (game_id,game_name,game_description,start_date,start_turns_date,end_date,max_players,max_turns,start_turns,game_type,credits_needed,game_speed,enabled,ignore_stats,alliance_max_players,alliance_max_vets,starting_credits)
 									VALUES
 									(' . $this->db->escapeNumber($this->getGameID()) .

lib/Default/Template.class.inc

Braces +16 added lines, -32 removed lines

@@ -78,52 +78,39 @@ 
 		$templateDir = TEMPLATES_DIR;
 		if (isset($this->data['ThisAccount']) && is_object($this->data['ThisAccount']) && $this->data['ThisAccount'] instanceof SmrAccount) {
 			$templateDir .= $this->data['ThisAccount']->getTemplate() . '/';
-		}
-		else {
+		} else {
 			$templateDir .= 'Default/';
 		}
 
 		if (SmrSession::hasGame()) {
 			$gameDir = Globals::getGameType(SmrSession::getGameID()) . '/';
-		}
-		else {
+		} else {
 			$gameDir = 'Default/';
 		}
 
 		if (file_exists($templateDir . 'engine/' . $gameDir . $templateName)) {
 			return $templateDir . 'engine/' . $gameDir . $templateName;
-		}
-		elseif (file_exists($templateDir . 'engine/Default/' . $templateName)) {
+		} elseif (file_exists($templateDir . 'engine/Default/' . $templateName)) {
 			return $templateDir . 'engine/Default/' . $templateName;
-		}
-		elseif (file_exists(TEMPLATES_DIR . 'Default/engine/' . $gameDir . $templateName)) {
+		} elseif (file_exists(TEMPLATES_DIR . 'Default/engine/' . $gameDir . $templateName)) {
 			return TEMPLATES_DIR . 'Default/engine/' . $gameDir . $templateName;
-		}
-		elseif (file_exists(TEMPLATES_DIR . 'Default/engine/Default/' . $templateName)) {
+		} elseif (file_exists(TEMPLATES_DIR . 'Default/engine/Default/' . $templateName)) {
 			return TEMPLATES_DIR . 'Default/engine/Default/' . $templateName;
-		}
-		elseif (file_exists($templateDir . 'admin/' . $gameDir . $templateName)) {
+		} elseif (file_exists($templateDir . 'admin/' . $gameDir . $templateName)) {
 			return $templateDir . 'admin/' . $gameDir . $templateName;
-		}
-		elseif (file_exists($templateDir . 'admin/Default/' . $templateName)) {
+		} elseif (file_exists($templateDir . 'admin/Default/' . $templateName)) {
 			return $templateDir . 'admin/Default/' . $templateName;
-		}
-		elseif (file_exists(TEMPLATES_DIR . 'Default/admin/' . $gameDir . $templateName)) {
+		} elseif (file_exists(TEMPLATES_DIR . 'Default/admin/' . $gameDir . $templateName)) {
 			return TEMPLATES_DIR . 'Default/admin/' . $gameDir . $templateName;
-		}
-		elseif (file_exists(TEMPLATES_DIR . 'Default/admin/Default/' . $templateName)) {
+		} elseif (file_exists(TEMPLATES_DIR . 'Default/admin/Default/' . $templateName)) {
 			return TEMPLATES_DIR . 'Default/admin/Default/' . $templateName;
-		}
-		elseif (file_exists($templateDir . $templateName)) {
+		} elseif (file_exists($templateDir . $templateName)) {
 			return $templateDir . $templateName;
-		}
-		elseif (file_exists(TEMPLATES_DIR . 'Default/' . $templateName)) {
+		} elseif (file_exists(TEMPLATES_DIR . 'Default/' . $templateName)) {
 			return TEMPLATES_DIR . 'Default/' . $templateName;
-		}
-		elseif (file_exists($templateDir . 'default.inc')) {
+		} elseif (file_exists($templateDir . 'default.inc')) {
 			return $templateDir.'default.inc';
-		}
-		else {
+		} else {
 			return TEMPLATES_DIR.'Default/default.inc';//return $file_name;
 		}
 	}
@@ -239,8 +226,7 @@ 
 		for ($_i=0, $_count=count($replace); $_i<$_count; $_i++) {
 			if (($_pos=strpos($subject, $search_str, $_pos))!==false) {
 				$subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -249,8 +235,7 @@ 
 	protected function doDamageTypeReductionDisplay(&$damageTypes) {
 		if($damageTypes == 3) {
 			echo ', ';
-		}
-		else if($damageTypes == 2) {
+		} else if($damageTypes == 2) {
 			echo ' and ';
 		}
 		$damageTypes--;
@@ -260,8 +245,7 @@ 
 		$char = strtoupper($wordAfter[0]);
 		if($char == 'A' || $char == 'E' || $char == 'I' || $char == 'O' || $char == 'U') {
 			echo 'an';
-		}
-		else {
+		} else {
 			echo 'a';
 		}
 	}