smrealms / smr

htdocs/login_processing.php

Indentation +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			exit;
 		}
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		session_destroy();
 	}
 
@@ -113,7 +113,7 @@ 
 		// save session (incase we forward)
 		SmrSession::update();
 		if (($disabled['Reason'] != CLOSE_ACCOUNT_INVALID_EMAIL_REASON) &&
-		    ($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
+			($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
 			forward(create_container('disabled.php'));
 		}
 	}

Braces +31 added lines, -18 removed lines

@@ -31,8 +31,7 @@ 
 				header('Location: /login_social_create.php');
 				exit;
 			}
-		}
-		else {
+		} else {
 			$login = (isset($_REQUEST['login']) ? $_REQUEST['login'] : (isset($var['login']) ? $var['login'] : ''));
 			$password = (isset($_REQUEST['password']) ? $_REQUEST['password'] : (isset($var['password']) ? $var['password'] : ''));
 
@@ -46,8 +45,7 @@ 
 			$account = SmrAccount::getAccountByName($login);
 			if (is_object($account) && $account->checkPassword($password)) {
 				SmrSession::setAccount($account);
-			}
-			else {
+			} else {
 				$msg = 'Password is incorrect!';
 				header('Location: /login.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 				exit;
@@ -142,38 +140,54 @@ 
 			//convert to array
 			$old = explode('-', $db->getField('array'));
 			//get rid of old version cookie since it isn't optimal.
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
-		if (!in_array($account->getAccountID(), $old)) $old[] = $account->getAccountID();
-	}
-	else {
+		if (!in_array($account->getAccountID(), $old)) {
+			$old[] = $account->getAccountID();
+		}
+	} else {
 
 		//we have a cookie so we see if we add to it etc
 		//break cookie into array
 		$cookie = explode('-', $_COOKIE['Session_Info']);
 		//check for current version
-		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) $cookie = array();
+		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) {
+			$cookie = array();
+		}
 		$cookie[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//add this acc to the cookie if it isn't there
-		if (!in_array($account->getAccountID(), $cookie)) $cookie[] = $account->getAccountID();
+		if (!in_array($account->getAccountID(), $cookie)) {
+			$cookie[] = $account->getAccountID();
+		}
 
 		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = ' . $account->getAccountID());
 		if ($db->nextRecord()) {
 			//convert to array
 			$old = explode('-', $db->getField('array'));
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//merge arrays...but keys are all different so we go through each value
-		foreach ($cookie as $value)
-			if (!in_array($value, $old)) $old[] = $value;
+		foreach ($cookie as $value) {
+					if (!in_array($value, $old)) $old[] = $value;
+		}
 	}
 	$use = (count($old) <= 2) ? 'FALSE' : 'TRUE';
 	//check that each value is legit and add it to db string
 	$new = MULTI_CHECKING_COOKIE_VERSION;
 	foreach ($old as $accID) {
-		if (is_numeric($accID)) $new .= '-' . $accID;
+		if (is_numeric($accID)) {
+			$new .= '-' . $accID;
+		}
 	}
 	$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES (' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeString($new) . ', ' . $db->escapeString($use) . ')');
 	//now we update their cookie with the newest info
@@ -193,7 +207,6 @@ 
 
 	header('Location: ' . $href);
 	exit;
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

tools/discord/commands/turns.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 function get_turns_message($player) {
 	// turns only update when the player is active, so calculate current turns
 	$turns = min($player->getTurns() + $player->getTurnsGained(time(), true),
-	             $player->getMaxTurns());
+				 $player->getMaxTurns());
 	$msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns.";
 
 	// Calculate time to max turns if under the max

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/GameLink.inc

Spacing +6 added lines, -6 removed lines

@@ -3,11 +3,11 @@ 
 // Holds information linking the received message and the game data
 class GameLink
 {
-	public $valid = false;  // identifies if the message is linked to game data
-	public $user;           // Discord user associated with the message
-	public $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $user; // Discord user associated with the message
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// Takes the following arguments:
 	//	channel = Discord\Parts\Channel\Channel instance
@@ -60,7 +60,7 @@ 
 
 			$this->player = SmrPlayer::getPlayer($this->account->getAccountID(), $this->alliance->getGameID(), true);
 			if ($this->player->getAllianceID() != $this->alliance->getAllianceID()) {
-				$channel->sendMessage("Player `".$this->player->getPlayerName()."` is not a member of alliance `".$this->alliance->getAllianceName()."`");
+				$channel->sendMessage("Player `" . $this->player->getPlayerName() . "` is not a member of alliance `" . $this->alliance->getAllianceName() . "`");
 				return;
 			}
 		}

tools/chat_helpers/channel_msg_op_turns.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			continue;
 		}
 		$turns = min($attendeePlayer->getTurns() + $attendeePlayer->getTurnsGained(time(), true),
-		             $attendeePlayer->getMaxTurns());
+					 $attendeePlayer->getMaxTurns());
 		$oppers[$attendeePlayer->getPlayerName()] = $turns;
 	}
 

tools/npc/chess.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 	fclose($toEngine);
 	fclose($fromEngine);
 	proc_close($engine);
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	logException($e);
 	exit;
 }

Spacing +13 added lines, -13 removed lines

@@ -10,22 +10,22 @@ 
 
 	debug('Script started');
 	define('SCRIPT_ID', $db->getInsertID());
-	$db->query('UPDATE npc_logs SET script_id='.SCRIPT_ID.' WHERE log_id='.SCRIPT_ID);
+	$db->query('UPDATE npc_logs SET script_id=' . SCRIPT_ID . ' WHERE log_id=' . SCRIPT_ID);
 
 	define('NPC_SCRIPT', true);
 
 	$descriptorSpec = array(
-		0 => array("pipe", "r"),  // stdin is a pipe that the child will read from
+		0 => array("pipe", "r"), // stdin is a pipe that the child will read from
 		1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 	);
 	$engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes);
-	$toEngine =& $pipes[0];
-	$fromEngine =& $pipes[1];
+	$toEngine = & $pipes[0];
+	$fromEngine = & $pipes[1];
 
 	function readFromEngine($block = true) {
 		global $fromEngine;
 		stream_set_blocking($fromEngine, $block == true ? 1 : 0);
-		while(($s = fgets($fromEngine)) !== false) {
+		while (($s = fgets($fromEngine)) !== false) {
 			debug('<-- ' . trim($s));
 			stream_set_blocking($fromEngine, 0);
 		}
@@ -34,7 +34,7 @@ 
 		global $toEngine;
 		debug('--> ' . $s);
 		fputs($toEngine, $s . EOL);
-		if($read === true) {
+		if ($read === true) {
 			readFromEngine($block);
 		}
 	}
@@ -45,7 +45,7 @@ 
 	writeToEngine('isready');
 	writeToEngine('ucinewgame', false);
 
-	while(true) {
+	while (true) {
 		//Redefine MICRO_TIME and TIME, the rest of the game expects them to be the single point in time that the script is executing, with it being redefined for each page load - unfortunately NPCs are one consistent script so we have to do a hack and redefine it (or change every instance of the TIME constant).
 		runkit_constant_redefine('MICRO_TIME', microtime(true));
 		runkit_constant_redefine('TIME', IFloor(MICRO_TIME));
@@ -55,9 +55,9 @@ 
 			writeToEngine('position fen ' . $chessGame->getFENString(), false);
 			writeToEngine('go ' . ($chessGame->getCurrentTurnColour() == ChessGame::PLAYER_WHITE ? 'w' : 'b') . 'time ' . UCI_TIME_PER_MOVE_MS, true, false);
 			stream_set_blocking($fromEngine, 1);
-			while(stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
+			while (stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
 				debug('<-- ' . $move);
-				if(stripos($move, 'Seg') === 0) {
+				if (stripos($move, 'Seg') === 0) {
 					// Segfault
 					debug('UCI engine segfaulted?');
 					exit;
@@ -78,12 +78,12 @@ 
 	fclose($fromEngine);
 	proc_close($engine);
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	logException($e);
 	exit;
 }
 function debug($message, $debugObject = null) {
-	global $account,$var,$db;
-	echo date('Y-m-d H:i:s - ').$message.($debugObject!==null?EOL.var_export($debugObject,true):'').EOL;
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES ('.(defined('SCRIPT_ID')?SCRIPT_ID:0).', '.(is_object($account)?$account->getAccountID():0).',NOW(),'.$db->escapeString($message).','.$db->escapeString(var_export($debugObject,true)).','.$db->escapeString(var_export($var,true)).')');
+	global $account, $var, $db;
+	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ?EOL.var_export($debugObject, true) : '') . EOL;
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ?SCRIPT_ID:0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
 }

tools/reserializeCombatLogs.php

Spacing +2 added lines, -2 removed lines

@@ -21,6 +21,6 @@
 //}
 
 $db->query('SELECT result,log_id FROM combat_logs');
-while($db->nextRecord()) {
-	$db2->query('UPDATE combat_logs SET result='.$db2->escapeBinary(gzcompress(serialize(unserialize(gzuncompress($db->getField('result')))))).' WHERE log_id='.$db->getField('log_id'));
+while ($db->nextRecord()) {
+	$db2->query('UPDATE combat_logs SET result=' . $db2->escapeBinary(gzcompress(serialize(unserialize(gzuncompress($db->getField('result')))))) . ' WHERE log_id=' . $db->getField('log_id'));
 }

tools/irc/irc.php

Indentation +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 
 			safefputs($fp, 'NICKSERV IDENTIFY ' . IRC_BOT_PASS . EOL);
 
-            sleep(5);
+			sleep(5);
 
 			// join our public channel
 			if (!IRC_DEBUGGING) {

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

engine/Default/rankings_alliance_vs_alliance.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	foreach ($alliance_vs_ids as $id) {
 		$row_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) ||
-		           (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
+				   (!$row_alliance->isNone() && $row_alliance->hasDisbanded());
 		$showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID();
 		$style = '';
 		if ($curr_id == $id && !$row_alliance->isNone()) {

Braces +17 added lines, -10 removed lines

@@ -62,8 +62,7 @@ 
 			} elseif ($showBold) {
 				$style = 'class="bold"';
 			}
-		}
-		else {
+		} else {
 			$db2->query('SELECT kills FROM alliance_vs_alliance
 						WHERE alliance_id_2 = ' . $db2->escapeNumber($curr_id) . '
 							AND alliance_id_1 = ' . $db2->escapeNumber($id) . '
@@ -104,11 +103,15 @@ 
 	if ($id > 0) {
 		$killer_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$alliance_name = $killer_alliance->getAllianceDisplayName();
+	} elseif ($id == 0) {
+		$alliance_name = 'No Alliance';
+	} elseif ($id == ALLIANCE_VS_FORCES) {
+		$alliance_name = '<span class="yellow">Forces</span>';
+	} elseif ($id == ALLIANCE_VS_PLANETS) {
+		$alliance_name = '<span class="yellow">Planets</span>';
+	} elseif ($id == ALLIANCE_VS_PORTS) {
+		$alliance_name = '<span class="yellow">Ports</span>';
 	}
-	elseif ($id == 0) $alliance_name = 'No Alliance';
-	elseif ($id == ALLIANCE_VS_FORCES) $alliance_name = '<span class="yellow">Forces</span>';
-	elseif ($id == ALLIANCE_VS_PLANETS) $alliance_name = '<span class="yellow">Planets</span>';
-	elseif ($id == ALLIANCE_VS_PORTS) $alliance_name = '<span class="yellow">Ports</span>';
 
 	$kills[] = [
 		'Name' => $alliance_name,
@@ -126,11 +129,15 @@ 
 	if ($id > 0) {
 		$killer_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$alliance_name = $killer_alliance->getAllianceDisplayName();
+	} elseif ($id == 0) {
+		$alliance_name = 'No Alliance';
+	} elseif ($id == ALLIANCE_VS_FORCES) {
+		$alliance_name = '<span class="yellow">Forces</span>';
+	} elseif ($id == ALLIANCE_VS_PLANETS) {
+		$alliance_name = '<span class="yellow">Planets</span>';
+	} elseif ($id == ALLIANCE_VS_PORTS) {
+		$alliance_name = '<span class="yellow">Ports</span>';
 	}
-	elseif ($id == 0) $alliance_name = 'No Alliance';
-	elseif ($id == ALLIANCE_VS_FORCES) $alliance_name = '<span class="yellow">Forces</span>';
-	elseif ($id == ALLIANCE_VS_PLANETS) $alliance_name = '<span class="yellow">Planets</span>';
-	elseif ($id == ALLIANCE_VS_PORTS) $alliance_name = '<span class="yellow">Ports</span>';
 
 	$deaths[] = [
 		'Name' => $alliance_name,

engine/Default/trader_status.php

Braces +18 added lines, -6 removed lines

@@ -33,12 +33,24 @@
 $template->assign('HardwareHREF', SmrSession::getNewHREF($container));
 
 $hardware = [];
-if ($ship->canHaveScanner()) $hardware[] = 'Scanner';
-if ($ship->canHaveIllusion()) $hardware[] = 'Illusion Generator';
-if ($ship->canHaveCloak()) $hardware[] = 'Cloaking Device';
-if ($ship->canHaveJump()) $hardware[] = 'Jump Drive';
-if ($ship->canHaveDCS()) $hardware[] = 'Drone Scrambler';
-if (empty($hardware)) $hardware[] = 'none';
+if ($ship->canHaveScanner()) {
+	$hardware[] = 'Scanner';
+}
+if ($ship->canHaveIllusion()) {
+	$hardware[] = 'Illusion Generator';
+}
+if ($ship->canHaveCloak()) {
+	$hardware[] = 'Cloaking Device';
+}
+if ($ship->canHaveJump()) {
+	$hardware[] = 'Jump Drive';
+}
+if ($ship->canHaveDCS()) {
+	$hardware[] = 'Drone Scrambler';
+}
+if (empty($hardware)) {
+	$hardware[] = 'none';
+}
 $template->assign('Hardware', $hardware);
 
 $db->query('SELECT level_name,requirement FROM level WHERE requirement>' . $db->escapeNumber($player->getExperience()) . ' ORDER BY requirement ASC LIMIT 1');