smrealms / smr

engine/Default/forces_attack_processing.php

Spacing +4 added lines, -4 removed lines

@@ -72,18 +72,18 @@
 
 // If mines are bumped, the forces shoot first. Otherwise player shoots first.
 if ($bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 }
 
 $results['Attackers'] = array('TotalDamage' => 0);
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootForces($forces);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootForces($forces);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 
 if (!$bump) {
-	$results['Forces'] =& $forces->shootPlayers($attackers, $bump);
+	$results['Forces'] = & $forces->shootPlayers($attackers, $bump);
 	$forces->updateExpire();
 }
 

Braces +27 added lines, -17 removed lines

@@ -3,16 +3,21 @@ 
 $forces = SmrForce::getForce($player->getGameID(), $player->getSectorID(), $var['owner_id']);
 $forceOwner = $forces->getOwner();
 
-if ($player->hasNewbieTurns())
+if ($player->hasNewbieTurns()) {
 	create_error('You are under newbie protection!');
-if ($player->hasFederalProtection())
+}
+if ($player->hasFederalProtection()) {
 	create_error('You are under federal protection.');
-if ($player->isLandedOnPlanet())
+}
+if ($player->isLandedOnPlanet()) {
 	create_error('You cannot attack forces whilst on a planet!');
-if (!$player->canFight())
+}
+if (!$player->canFight()) {
 	create_error('You are not allowed to fight!');
-if ($player->forceNAPAlliance($forceOwner))
+}
+if ($player->forceNAPAlliance($forceOwner)) {
 	create_error('You cannot attack allied forces!');
+}
 
 // The attack is processed slightly differently if the attacker bumped into mines
 // when moving into sector
@@ -25,16 +30,20 @@ 
 }
 
 if ($bump) {
-	if (!$forces->hasMines())
-		create_error('No mines in sector!');
-} else {
-	if (!$forces->exists())
-		create_error('These forces no longer exist.');
-	if ($player->getTurns() < $forces->getAttackTurnCost($ship))
-		create_error('You do not have enough turns to attack these forces!');
-	if (!$ship->hasWeapons() && !$ship->hasCDs())
-		create_error('You cannot attack without weapons!');
-}
+	if (!$forces->hasMines()) {
+			create_error('No mines in sector!');
+	}
+	} else {
+	if (!$forces->exists()) {
+			create_error('These forces no longer exist.');
+	}
+	if ($player->getTurns() < $forces->getAttackTurnCost($ship)) {
+			create_error('You do not have enough turns to attack these forces!');
+	}
+	if (!$ship->hasWeapons() && !$ship->hasCDs()) {
+			create_error('You cannot attack without weapons!');
+	}
+	}
 
 // take the turns
 if ($bump) {
@@ -103,10 +112,11 @@ 
 $container = create_container('skeleton.php', 'forces_attack.php');
 
 // If their target is dead there is no continue attack button
-if ($forces->exists())
+if ($forces->exists()) {
 	$container['owner_id'] = $forces->getOwnerID();
-else
+} else {
 	$container['owner_id'] = 0;
+}
 
 // If they died on the shot they get to see the results
 if ($player->isDead()) {

tools/discord/commands/seedlist.php

Braces +9 added lines, -3 removed lines

@@ -4,7 +4,9 @@ 
 
 $fn_seedlist = function($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// print the entire seedlist
 	$results = shared_channel_msg_seedlist($link->player);
@@ -13,7 +15,9 @@ 
 
 $fn_seedlist_add = function($message, $sectors) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// add sectors to the seedlist
 	$results = shared_channel_msg_seedlist_add($link->player, $sectors);
@@ -22,7 +26,9 @@ 
 
 $fn_seedlist_del = function($message, $sectors) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// delete sectors from the seedlist
 	$results = shared_channel_msg_seedlist_del($link->player, $sectors);

tools/irc/channel_msg_sd.php

Braces +9 added lines, -5 removed lines

@@ -45,8 +45,9 @@ 
 		// delete any old entries in the list
 		foreach ($sds as $key => $value) {
 
-			if ($value[3] != $channel)
-				continue;
+			if ($value[3] != $channel) {
+							continue;
+			}
 
 			if ($value[0] == $sector) {
 				unset($sds[$key]);
@@ -82,8 +83,9 @@ 
 
 		foreach ($sds as $key => $sd) {
 
-			if ($sd[3] != $channel)
-				continue;
+			if ($sd[3] != $channel) {
+							continue;
+			}
 
 			if ($sd[0] == $sector) {
 				fputs($fp, 'PRIVMSG ' . $channel . ' :The supply/demand for sector ' . $sector . ' has been deleted.' . EOL);
@@ -121,7 +123,9 @@ 
 			if ($sd[3] == $channel) {
 
 				$seconds_since_refresh = time() - $sd[2];
-				if ($seconds_since_refresh < 0) $seconds_since_refresh = 0;
+				if ($seconds_since_refresh < 0) {
+					$seconds_since_refresh = 0;
+				}
 				$amt_to_add = floor($seconds_since_refresh * $refresh_per_sec);
 
 				if ($sd[1] + $amt_to_add > 4000) {

lib/Default/council.inc

Braces +14 added lines, -12 removed lines

@@ -16,17 +16,19 @@ 
 		$race_id_2 = $db->getInt('race_id_2');
 		$action = $db->getField('action');
 
-		if ($action == 'INC')
-			$relation_modifier = RELATIONS_VOTE_CHANGE;
-		else
-			$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		if ($action == 'INC') {
+					$relation_modifier = RELATIONS_VOTE_CHANGE;
+		} else {
+					$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		}
 
 		$db2->query('SELECT * FROM race_has_relation ' .
 					'WHERE race_id_1 = ' . $db2->escapeNumber($race_id_1) . '
 						AND race_id_2 = ' . $db2->escapeNumber($race_id_2) . '
 						AND game_id = ' . $db2->escapeNumber($player->getGameID()));
-		if ($db2->nextRecord())
-			$relation = $db2->getField('relation') + $relation_modifier;
+		if ($db2->nextRecord()) {
+					$relation = $db2->getField('relation') + $relation_modifier;
+		}
 
 		if ($relation < MIN_GLOBAL_RELATIONS) {
 			$relation = MIN_GLOBAL_RELATIONS;
@@ -107,10 +109,11 @@ 
 					$expireTime = TIME + TIME_FOR_WAR_VOTE_FED_SAFETY;
 					$query = 'REPLACE INTO player_can_fed (account_id, game_id, race_id, expiry, allowed) VALUES ';
 					foreach ($currentlyParkedAccountIDs as $raceID => $accountIDs) {
-						if ($raceID == $race_id_1)
-							$message = 'We have declared war upon your race';
-						else
-							$message = 'Your race has declared war upon us';
+						if ($raceID == $race_id_1) {
+													$message = 'We have declared war upon your race';
+						} else {
+													$message = 'Your race has declared war upon us';
+						}
 						$message .= ', you have ' . format_time(TIME_FOR_WAR_VOTE_FED_SAFETY) . ' to vacate our federal space, after that time you will no longer be protected (unless you have strong personal relations).';
 						foreach ($accountIDs as $accountID) {
 							$query .= '(' . $db2->escapeNumber($accountID) . ',' . $db2->escapeNumber($player->getGameID()) . ',' . $db2->escapeNumber($raceID) . ',' . $db2->escapeNumber($expireTime) . ',' . $db2->escapeBoolean(true) . '),';
@@ -135,8 +138,7 @@ 
 				$news = 'The [race=' . $race_id_1 . '] have declared <span class="red">WAR</span> on the [race=' . $race_id_2 . ']';
 				$db2->query('INSERT INTO news (game_id, time, news_message) VALUES ' .
 							'(' . $db2->escapeNumber($player->getGameID()) . ', ' . $db2->escapeNumber(TIME) . ', ' . $db2->escapeString($news) . ')');
-			}
-			elseif ($type == 'PEACE') {
+			} elseif ($type == 'PEACE') {
 				// get 'yes' votes
 				$db2->query('SELECT * FROM player_votes_pact
 							WHERE game_id = '.$db2->escapeNumber($player->getGameID()) . '

lib/Default/message.functions.inc

Braces +18 added lines, -18 removed lines

@@ -26,30 +26,30 @@
 }
 
 function &getMessagePlayer($accountID, $gameID, $messageType = false) {
-	if ($accountID == ACCOUNT_ID_PORT)
-		$return = '<span class="yellow">Port Defenses</span>';
-	else if ($accountID == ACCOUNT_ID_ADMIN)
-		$return = '<span class="admin">Administrator</span>';
-	else if ($accountID == ACCOUNT_ID_PLANET)
-		$return = '<span class="yellow">Planetary Defenses</span>';
-	else if ($accountID == ACCOUNT_ID_ALLIANCE_AMBASSADOR)
-		$return = '<span class="green">Alliance Ambassador</span>';
-	else if ($accountID == ACCOUNT_ID_CASINO)
-		$return = '<span class="yellow">Casino</span>';
-	else if ($accountID == ACCOUNT_ID_FED_CLERK)
-		$return = '<span class="yellow">Federal Clerk</span>';
-	else if ($accountID == ACCOUNT_ID_OP_ANNOUNCE || $accountID == ACCOUNT_ID_ALLIANCE_COMMAND)
-		$return = '<span class="green">Alliance Command</span>';
-	else {
+	if ($accountID == ACCOUNT_ID_PORT) {
+			$return = '<span class="yellow">Port Defenses</span>';
+	} else if ($accountID == ACCOUNT_ID_ADMIN) {
+			$return = '<span class="admin">Administrator</span>';
+	} else if ($accountID == ACCOUNT_ID_PLANET) {
+			$return = '<span class="yellow">Planetary Defenses</span>';
+	} else if ($accountID == ACCOUNT_ID_ALLIANCE_AMBASSADOR) {
+			$return = '<span class="green">Alliance Ambassador</span>';
+	} else if ($accountID == ACCOUNT_ID_CASINO) {
+			$return = '<span class="yellow">Casino</span>';
+	} else if ($accountID == ACCOUNT_ID_FED_CLERK) {
+			$return = '<span class="yellow">Federal Clerk</span>';
+	} else if ($accountID == ACCOUNT_ID_OP_ANNOUNCE || $accountID == ACCOUNT_ID_ALLIANCE_COMMAND) {
+			$return = '<span class="green">Alliance Command</span>';
+	} else {
 		foreach (Globals::getRaces() as $raceID => $raceInfo) {
 			if ($accountID == ACCOUNT_ID_GROUP_RACES + $raceID) {
 				$return = '<span class="yellow">' . $raceInfo['Race Name'] . ' Government</span>';
 				return $return;
 			}
 		}
-		if (!empty($accountID))
-			$return = SmrPlayer::getPlayer($accountID, $gameID);
-		else {
+		if (!empty($accountID)) {
+					$return = SmrPlayer::getPlayer($accountID, $gameID);
+		} else {
 			switch ($messageType) {
 				case MSG_ADMIN:
 					$return = '<span class="admin">Administrator</span>';

lib/Default/bar.functions.inc

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		// Delete all tickets and re-insert the winning ticket
 		$db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID));
 		$db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) '
-		           .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')');
+				   .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')');
 
 		//get around locked table problem
 		$lottoWon = true;

lib/Default/shop_goods.inc

Braces +46 added lines, -35 removed lines

@@ -1,17 +1,21 @@ 
 <?php
 
 function checkPortTradeable($port, $player) {
-	if ($port->getSectorID() != $player->getSectorID())
-		return 'That port is not in this sector!';
+	if ($port->getSectorID() != $player->getSectorID()) {
+			return 'That port is not in this sector!';
+	}
 	
-	if (!$port->exists())
-		return 'There is no port in this sector!';
+	if (!$port->exists()) {
+			return 'There is no port in this sector!';
+	}
 	
-	if ($player->getRelation($port->getRaceID()) <= RELATIONS_WAR)
-		return 'We will not trade with our enemies!';
+	if ($player->getRelation($port->getRaceID()) <= RELATIONS_WAR) {
+			return 'We will not trade with our enemies!';
+	}
 	
-	if ($port->getReinforceTime() > TIME)
-		return 'We are still repairing damage caused during the last raid.';
+	if ($port->getReinforceTime() > TIME) {
+			return 'We are still repairing damage caused during the last raid.';
+	}
 	
 	return true;
 }
@@ -55,39 +59,43 @@ 
 		if (abs($port_off_rel) > abs($trader_off_rel)) {
 			// get a random number between
 			// (port_off) and (100 +/- $trader_off_rel)
-			if (100 + $trader_off_rel < $port_off)
-				$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
-			else
-				$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			if (100 + $trader_off_rel < $port_off) {
+							$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
+			} else {
+							$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			}
 
 			$container['offered_price'] = round($container['ideal_price'] * $offer_modifier / 100);
 		}
+	} else {
+			$container['overall_number_of_bargains'] = mt_rand(2, 5);
+	}
 	}
-	else
-		$container['overall_number_of_bargains'] = mt_rand(2, 5);
-}
 
 function get_amount() {
 	global $var;
 
 	// retrieve amount
-	if (isset($var['amount']))
-		$amount = $var['amount'];
-	else if (isset($_REQUEST['amount']))
-		$amount = $_REQUEST['amount'];
-	else
-		$amount = 0;
+	if (isset($var['amount'])) {
+			$amount = $var['amount'];
+	} else if (isset($_REQUEST['amount'])) {
+			$amount = $_REQUEST['amount'];
+	} else {
+			$amount = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($amount))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($amount)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$amount = floor($amount);
 
 	// no negative amounts are allowed
-	if ($amount <= 0)
-		create_error('You must actually enter an amount > 0!');
+	if ($amount <= 0) {
+			create_error('You must actually enter an amount > 0!');
+	}
 
 	return $amount;
 }
@@ -96,23 +104,26 @@ 
 	global $var;
 
 	// we get it from form
-	if (isset($_REQUEST['bargain_price']))
-		$price = $_REQUEST['bargain_price'];
-	else if (isset($var['bargain_price']))
-		$price = $var['bargain_price'];
-	else
-		$price = 0;
+	if (isset($_REQUEST['bargain_price'])) {
+			$price = $_REQUEST['bargain_price'];
+	} else if (isset($var['bargain_price'])) {
+			$price = $var['bargain_price'];
+	} else {
+			$price = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($price))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($price)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$price = floor($price);
 
 	// no negative amounts are allowed
-	if ($price < 0)
-		create_error('No negative prices are allowed!');
+	if ($price < 0) {
+			create_error('No negative prices are allowed!');
+	}
 
 	return $price;
 }

admin/Default/newsletter_send_processing.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 // Set the body of the e-mail
 set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'],
-              $_REQUEST['salutation']);
+			  $_REQUEST['salutation']);
 
 if ($_REQUEST['to_email'] == '*') {
 	// Send the newsletter to all players.

admin/Default/notify_reply_processing.php

Braces +9 added lines, -5 removed lines

@@ -7,12 +7,14 @@ 
 	transfer('offended');
 	transfer('game_id');
 	transfer('sender_id');
-	if (!empty($offenderReply))
-		$container['PreviewOffender'] = $offenderReply;
+	if (!empty($offenderReply)) {
+			$container['PreviewOffender'] = $offenderReply;
+	}
 	$container['OffenderBanPoints'] = $_REQUEST['offenderBanPoints'];
 
-	if (!empty($offendedReply))
-		$container['PreviewOffended'] = $offendedReply;
+	if (!empty($offendedReply)) {
+			$container['PreviewOffended'] = $offendedReply;
+	}
 	$container['OffendedBanPoints'] = $_REQUEST['offendedBanPoints'];
 	forward($container);
 }
@@ -28,7 +30,9 @@ 
 		$offenderAccount->addPoints($_REQUEST['offenderBanPoints'], $account, 7, $suspicion);
 	}
 }
-if (isset($_REQUEST['offendedReply'])) $offendedReply = $_REQUEST['offendedReply'];
+if (isset($_REQUEST['offendedReply'])) {
+	$offendedReply = $_REQUEST['offendedReply'];
+}
 
 if (isset($offendedReply) && $offendedReply != '') {
 	//next message