smrealms / smr

engine/Default/message_delete_processing.php

Braces +9 added lines, -12 removed lines

@@ -19,29 +19,26 @@
 			while ($db->nextRecord()) {
 				$message_id_list[] = $db->getInt('message_id');
 			}
-		}
-		else {
+		} else {
 			$message_id_list[] = $id;
 		}
 	}
-	if ($var['folder_id'] == MSG_SENT)
-		$db->query('UPDATE message SET sender_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
-	else
-		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
-}
-else {
+	if ($var['folder_id'] == MSG_SENT) {
+			$db->query('UPDATE message SET sender_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
+	} else {
+			$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . ' WHERE message_id IN (' . $db->escapeArray($message_id_list) . ')');
+	}
+	} else {
 	if ($var['folder_id'] == MSG_SCOUT) {
 		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . '
 					WHERE account_id = ' . $db->escapeNumber($player->getAccountID()) . '
 						AND message_type_id = '.$db->escapeNumber($var['folder_id']) . '
 						AND game_id = ' . $db->escapeNumber($player->getGameID()));
-	}
-	else if ($var['folder_id'] == MSG_SENT) {
+	} else if ($var['folder_id'] == MSG_SENT) {
 		$db->query('UPDATE message SET sender_delete = ' . $db->escapeBoolean(true) . '
 					WHERE sender_id = ' . $db->escapeNumber($player->getAccountID()) . '
 						AND game_id = ' . $db->escapeNumber($player->getGameID()));
-	}
-	else {
+	} else {
 		$db->query('UPDATE message SET receiver_delete = ' . $db->escapeBoolean(true) . '
 					WHERE account_id = ' . $db->escapeNumber($player->getAccountID()) . '
 						AND game_id = ' . $db->escapeNumber($player->getGameID()) . '

engine/Default/forces_attack_processing.php

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/irc.php

Braces +91 added lines, -63 removed lines

@@ -6,12 +6,13 @@ 
 function echo_r($message)
 {
 	if (is_array($message)) {
-		foreach ($message as $msg)
-			echo_r($msg);
+		foreach ($message as $msg) {
+					echo_r($msg);
+		}
+	} else {
+			echo date("d.m.Y H:i:s => ") . $message . EOL;
+	}
 	}
-	else
-		echo date("d.m.Y H:i:s => ") . $message . EOL;
-}
 
 // not keeping the filehandle might not be the wisest idea.
 function write_log_message($msg)
@@ -144,8 +145,7 @@ 
 			sleep(60);
 
 		}
-	}
-	catch (TimeoutException $e) {
+	} catch (TimeoutException $e) {
 		// Ignore the timeout exception, we'll loop round and reconnect.
 	}
 } // end of while running
@@ -164,12 +164,14 @@ 
 	$rdata = preg_replace('/\s+/', ' ', $rdata);
 
 	// log for reports (if enabled via command line (-log)
-	if (IRC_LOGGING && strlen($rdata) > 0)
-		write_log_message($rdata);
+	if (IRC_LOGGING && strlen($rdata) > 0) {
+			write_log_message($rdata);
+	}
 
 	// remember the last time we got something from the server
-	if (strlen($rdata) > 0)
-		$last_ping = time();
+	if (strlen($rdata) > 0) {
+			$last_ping = time();
+	}
 
 	// timeout detection!
 	if ($last_ping < time() - 300) {
@@ -186,76 +188,102 @@ 
 	}
 
 	// required!!! otherwise timeout!
-	if (server_ping($fp, $rdata))
-		return;
+	if (server_ping($fp, $rdata)) {
+			return;
+	}
 
 	// server msg
-	if (server_msg_307($fp, $rdata))
-		return;
-	if (server_msg_318($fp, $rdata))
-		return;
-	if (server_msg_352($fp, $rdata))
-		return;
-	if (server_msg_401($fp, $rdata))
-		return;
+	if (server_msg_307($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_318($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_352($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_401($fp, $rdata)) {
+			return;
+	}
 
 	//Are they using a linked nick instead
-	if (notice_nickserv_registered_user($fp, $rdata))
-		return;
-	if (notice_nickserv_unknown_user($fp, $rdata))
-		return;
+	if (notice_nickserv_registered_user($fp, $rdata)) {
+			return;
+	}
+	if (notice_nickserv_unknown_user($fp, $rdata)) {
+			return;
+	}
 
 	// some nice things
-	if (ctcp_version($fp, $rdata))
-		return;
-	if (ctcp_finger($fp, $rdata))
-		return;
-	if (ctcp_time($fp, $rdata))
-		return;
-	if (ctcp_ping($fp, $rdata))
-		return;
+	if (ctcp_version($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_finger($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_time($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_ping($fp, $rdata)) {
+			return;
+	}
 
-	if (invite($fp, $rdata))
-		return;
+	if (invite($fp, $rdata)) {
+			return;
+	}
 
 	// join and part
-	if (channel_join($fp, $rdata))
-		return;
-	if (channel_part($fp, $rdata))
-		return;
+	if (channel_join($fp, $rdata)) {
+			return;
+	}
+	if (channel_part($fp, $rdata)) {
+			return;
+	}
 
 	// nick change and quit
-	if (user_nick($fp, $rdata))
-		return;
-	if (user_quit($fp, $rdata))
-		return;
+	if (user_nick($fp, $rdata)) {
+			return;
+	}
+	if (user_quit($fp, $rdata)) {
+			return;
+	}
 
-	if (channel_action_slap($fp, $rdata))
-		return;
+	if (channel_action_slap($fp, $rdata)) {
+			return;
+	}
 
 	// channel msg (!xyz) without registration
-	if (channel_msg_help($fp, $rdata))
-		return;
-	if (channel_msg_seedlist($fp, $rdata))
-		return;
-	if (channel_msg_op($fp, $rdata))
-		return;
-	if (channel_msg_timer($fp, $rdata))
-		return;
-	if (channel_msg_8ball($fp, $rdata))
-		return;
-	if (channel_msg_seen($fp, $rdata))
-		return;
-	if (channel_msg_sd($fp, $rdata))
-		return;
+	if (channel_msg_help($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_seedlist($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_op($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_timer($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_8ball($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_seen($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_sd($fp, $rdata)) {
+			return;
+	}
 
 	// channel msg (!xyz) with registration
-	if (channel_msg_with_registration($fp, $rdata))
-		return;
+	if (channel_msg_with_registration($fp, $rdata)) {
+			return;
+	}
 
 	// MrSpock can use this to send commands as caretaker
-	if (query_command($fp, $rdata))
-		return;
+	if (query_command($fp, $rdata)) {
+			return;
+	}
 
 
 	// debug

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) {

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')));

admin/Default/album_moderate.php

Braces +10 added lines, -8 removed lines

@@ -19,8 +19,7 @@ 
 		$approved[$accountId] = get_album_nick($accountId);
 	}
 	$template->assign('Approved', $approved);
-}
-else {
+} else {
 	// check if the given account really has an entry
 	$db->query('SELECT * FROM album WHERE account_id = ' . $db->escapeNumber($account_id) . ' AND Approved = \'YES\'');
 	if ($db->nextRecord()) {
@@ -36,12 +35,15 @@ 
 		create_error('This User doesn\'t have an album entry or it needs to be approved first!');
 	}
 
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 
 	$entry = [
 		'disabled' => $disabled,