smrealms / smr

engine/Default/trader_attack_processing.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 
 function teamAttack(&$results, $fightingPlayers, $attack, $defend) {
 	foreach ($fightingPlayers[$attack] as $accountID => $teamPlayer) {
-		$playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]);
-		$results[$attack]['Traders'][$teamPlayer->getAccountID()] =& $playerResults;
+		$playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]);
+		$results[$attack]['Traders'][$teamPlayer->getAccountID()] = & $playerResults;
 		$results[$attack]['TotalDamage'] += $playerResults['TotalDamage'];
 
 		// Award assists (if there are multiple attackers)

Braces +26 added lines, -19 removed lines

@@ -1,30 +1,36 @@ 
 <?php declare(strict_types=1);
 
-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 whilst on a planet!');
-if ($player->getTurns() < 3)
+}
+if ($player->getTurns() < 3) {
 	create_error('You have insufficient turns to perform that action.');
-if (!$player->canFight())
+}
+if (!$player->canFight()) {
 	create_error('You are not allowed to fight!');
+}
 
 $targetPlayer = SmrPlayer::getPlayer($var['target'], $player->getGameID());
 
-	if ($player->traderNAPAlliance($targetPlayer))
-		create_error('Your alliance does not allow you to attack this trader.');
-	else if ($targetPlayer->isDead())
-		create_error('Target is already dead.');
-	else if ($targetPlayer->getSectorID() != $player->getSectorID())
-		create_error('Target is no longer in this sector.');
-	else if ($targetPlayer->hasNewbieTurns())
-		create_error('Target is under newbie protection.');
-	else if ($targetPlayer->isLandedOnPlanet())
-		create_error('Target is protected by planetary shields.');
-	else if ($targetPlayer->hasFederalProtection())
-		create_error('Target is under federal protection.');
+	if ($player->traderNAPAlliance($targetPlayer)) {
+			create_error('Your alliance does not allow you to attack this trader.');
+	} else if ($targetPlayer->isDead()) {
+			create_error('Target is already dead.');
+	} else if ($targetPlayer->getSectorID() != $player->getSectorID()) {
+			create_error('Target is no longer in this sector.');
+	} else if ($targetPlayer->hasNewbieTurns()) {
+			create_error('Target is under newbie protection.');
+	} else if ($targetPlayer->isLandedOnPlanet()) {
+			create_error('Target is protected by planetary shields.');
+	} else if ($targetPlayer->hasFederalProtection()) {
+			create_error('Target is under federal protection.');
+	}
 
 $fightingPlayers = $sector->getFightingTraders($player, $targetPlayer);
 
@@ -76,10 +82,11 @@ 
 $container = create_container('skeleton.php', 'trader_attack.php');
 
 // If their target is dead there is no continue attack button
-if (!$targetPlayer->isDead())
+if (!$targetPlayer->isDead()) {
 	$container['target'] = $var['target'];
-else
+} else {
 	$container['target'] = 0;
+}
 
 // If they died on the shot they get to see the results
 if ($player->isDead()) {

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/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;

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

admin/Default/vote_create_processing.php

Braces +19 added lines, -14 removed lines

@@ -15,24 +15,29 @@
 }
 
 if ($_REQUEST['action'] == 'Create Vote') {
-	if (empty($question))
-		create_error('You have to specify a vote message.');
-	if (empty($_REQUEST['days']))
-		create_error('You have to specify the amount of time to run the vote for.');
-	if (!is_numeric($_REQUEST['days']))
-		create_error('The vote runtime must be a number.');
+	if (empty($question)) {
+			create_error('You have to specify a vote message.');
+	}
+	if (empty($_REQUEST['days'])) {
+			create_error('You have to specify the amount of time to run the vote for.');
+	}
+	if (!is_numeric($_REQUEST['days'])) {
+			create_error('The vote runtime must be a number.');
+	}
 	$end = TIME + 86400 * $_REQUEST['days'];
 	
 	// put the msg into the database
 	$db->query('INSERT INTO voting (question, end) VALUES(' . $db->escapeString($question) . ',' . $db->escapeNumber($end) . ')');
-}
-else if ($_REQUEST['action'] == 'Add Option') {
-	if (empty($option))
-		create_error('You have to specify an option message.');
-	if (empty($_REQUEST['vote']))
-		create_error('You have to select a vote to add the option to.');
-	if (!is_numeric($_REQUEST['vote']))
-		create_error('Vote ID must be a number.');
+} else if ($_REQUEST['action'] == 'Add Option') {
+	if (empty($option)) {
+			create_error('You have to specify an option message.');
+	}
+	if (empty($_REQUEST['vote'])) {
+			create_error('You have to select a vote to add the option to.');
+	}
+	if (!is_numeric($_REQUEST['vote'])) {
+			create_error('Vote ID must be a number.');
+	}
 	
 	// put the msg into the database
 	$db->query('INSERT INTO voting_options (vote_id, text) VALUES(' . $db->escapeNumber($_REQUEST['vote']) . ',' . $db->escapeString($option) . ')');

admin/Default/log_console.php

Braces +6 added lines, -4 removed lines

@@ -19,15 +19,17 @@
 								'Notes' => '');
 
 		$db2->query('SELECT notes FROM log_has_notes WHERE account_id = ' . $db2->escapeNumber($accountID));
-		if ($db2->nextRecord())
-			$loggedAccounts[$accountID]['Notes'] = nl2br($db2->getField('notes'));
+		if ($db2->nextRecord()) {
+					$loggedAccounts[$accountID]['Notes'] = nl2br($db2->getField('notes'));
+		}
 	}
 
 	// put hidden fields in for log type to have all fields selected on next page.
 	$logTypes = array();
 	$db->query('SELECT log_type_id FROM log_type');
-	while ($db->nextRecord())
-		$logTypes[] = $db->getInt('log_type_id');
+	while ($db->nextRecord()) {
+			$logTypes[] = $db->getInt('log_type_id');
+	}
 	$template->assign('LogTypes', $logTypes);
 
 	$template->assign('LogConsoleFormHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'log_console_detail.php')));