smrealms / smr

lib/Default/SmrScoutDrones.class.inc

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);

lib/Default/Rankings.class.inc

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 			$class = '';
 			if ($player->getAllianceID() == $currentAlliance->getAllianceID()) {
 				$class = ' class="bold"';
-			}
-			else if ($currentAlliance->hasDisbanded()) {
+			} else if ($currentAlliance->hasDisbanded()) {
 				$class = ' class="red"';
 			}
 
@@ -61,12 +60,10 @@ 
 		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'Show' && is_numeric($_REQUEST['min_rank']) && is_numeric($_REQUEST['max_rank'])) {
 			$minRank = min($_REQUEST['min_rank'], $_REQUEST['max_rank']);
 			$maxRank = max($_REQUEST['min_rank'], $_REQUEST['max_rank']);
-		}
-		elseif (isset($var['MinRank']) && isset($var['MaxRank'])) {
+		} elseif (isset($var['MinRank']) && isset($var['MaxRank'])) {
 			$minRank = $var['MinRank'];
 			$maxRank = $var['MaxRank'];
-		}
-		else {
+		} else {
 			$minRank = $ourRank - 5;
 			$maxRank = $ourRank + 5;
 		}

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/SmrShip.class.inc

Braces +4 added lines, -4 removed lines

@@ -126,8 +126,7 @@ 
 			$amount = $this->getHardware($hardwareTypeID);
 			if ($amount > 0) {
 				$this->db->query('REPLACE INTO ship_has_hardware (account_id, game_id, hardware_type_id, amount, old_amount) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($hardwareTypeID) . ', ' . $this->db->escapeNumber($amount) . ', ' . $this->db->escapeNumber($this->getOldHardware($hardwareTypeID)) . ')');
-			}
-			else {
+			} else {
 				$this->db->query('DELETE FROM ship_has_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID));
 			}
 		}
@@ -181,8 +180,9 @@ 
 	}
 	
 	public function isCloaked() {
-		if (!$this->hasCloak())
-			return false;
+		if (!$this->hasCloak()) {
+					return false;
+		}
 		if (!isset($this->isCloaked)) {
 			$this->db->query('SELECT 1 FROM ship_is_cloaked WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->isCloaked = $this->db->getNumRows() > 0;

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/discord/commands/seed.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 
 $fn_seed = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$result = shared_channel_msg_seed($link->player);
 	$message->channel->sendMessage(join(EOL, $result));

tools/discord/commands/turns.php

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
 
 $fn_turns = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$msg = get_turns_message($link->player);
 	$message->channel->sendMessage($msg);
@@ -25,7 +27,9 @@ 
 
 $fn_turns_all = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	$results = array_map('get_turns_message', $player->getSharingPlayers(true));

tools/discord/commands/op.php

Braces +9 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 
 $fn_op = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print info about the next op
@@ -16,7 +18,9 @@ 
 
 $fn_op_list = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print list of attendees
@@ -26,7 +30,9 @@ 
 
 $fn_op_turns = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print list of attendees

tools/discord/commands/game.php

Braces +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 $fn_game = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$game = SmrGame::getGame($link->player->getGameID(), true);
 	$msg = "I am linked to game `" . $game->getDisplayName() . "` in this channel.";