smrealms / smr

htdocs/resend_password_processing.php

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 
 	// get this user from db
 	$account = SmrAccount::getAccountByEmail($_REQUEST['email']);
-	if ($account==null) {
+	if ($account == null) {
 		// unknown user
 		header('Location: /error.php?msg=' . rawurlencode('The specified e-mail address is not registered!'));
 		exit;
@@ -19,13 +19,13 @@ 
 
 	$account->generatePasswordReset();
 
-	$resetURL = URL.'/reset_password.php?login='.$account->getLogin().'&resetcode='.$account->getPasswordReset();
+	$resetURL = URL . '/reset_password.php?login=' . $account->getLogin() . '&resetcode=' . $account->getPasswordReset();
 	$emailMessage =
-		 'A user from ' . getIpAddress() . ' requested to reset your password!'.EOL.EOL.
-		 '   Your game login is: ' . $account->getLogin().EOL.
-		 '   Your password reset code is: ' . $account->getPasswordReset().EOL.EOL.
-		 '   You can use this url: '.$resetURL .EOL.EOL.
-		 'The Space Merchant Realms server is on the web at '.URL.'/';
+		 'A user from ' . getIpAddress() . ' requested to reset your password!' . EOL . EOL .
+		 '   Your game login is: ' . $account->getLogin() . EOL .
+		 '   Your password reset code is: ' . $account->getPasswordReset() . EOL . EOL .
+		 '   You can use this url: ' . $resetURL . EOL . EOL .
+		 'The Space Merchant Realms server is on the web at ' . URL . '/';
 
 	// send email with password to user
 	$mail = setupMailer();
@@ -39,6 +39,6 @@ 
 	exit;
 
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +1 added lines, -2 removed lines

@@ -38,7 +38,6 @@
 	header('Location: /reset_password.php');
 	exit;
 
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/weapon_list.php

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
 	echo ('<link rel="stylesheet" type="text/css" href="css/Default.css">');
 	echo ('<link rel="stylesheet" type="text/css" href="css/Default/Default.css">');
 	echo ('<title>Weapon List</title>');
-	echo ('<meta http-equiv="pragma" content="no-cache">');?>
+	echo ('<meta http-equiv="pragma" content="no-cache">'); ?>
 	<style>
 	#container {
 		margin: 0;
@@ -122,42 +122,42 @@ 
 	else
 		$seq = 'ASC';
 	
-	$columnNames = array('weapon_name','race_name','cost','shield_damage','armour_damage','accuracy','power_level','buyer_restriction');
-	if (isset($_REQUEST['order'])&&in_array($_REQUEST['order'],$columnNames))
+	$columnNames = array('weapon_name', 'race_name', 'cost', 'shield_damage', 'armour_damage', 'accuracy', 'power_level', 'buyer_restriction');
+	if (isset($_REQUEST['order']) && in_array($_REQUEST['order'], $columnNames))
 		$order_by = $_REQUEST['order'];
 	else
 		$order_by = 'weapon_type_id';
 	
 	//$race 		= buildSelector($db, "racePick", "race_name", "race");
 	$race = "";
-	$power 		= buildSelector($db, "powerPick", "power_level", "weapon_type");
-	$restrict 	= buildRestriction();
+	$power = buildSelector($db, "powerPick", "power_level", "weapon_type");
+	$restrict = buildRestriction();
 	
 	echo ('<div id="container" style="padding: 0;">');
 	echo ('<div id="main" style="width:810px; margin-left:auto; margin-right:auto;">');
 	echo (buildRaceBox($db));	
-	$db->query('SELECT * FROM weapon_type JOIN race USING(race_id) ORDER BY '.$order_by.' '.$seq);
+	$db->query('SELECT * FROM weapon_type JOIN race USING(race_id) ORDER BY ' . $order_by . ' ' . $seq);
 	echo ('<table id="table" class="standard">');
 	echo ('<tr>');
-	echo ('<th align="center" style="width: 240px;"><a href="?order=weapon_name&amp;seq='.$seq.'"><span style=color:#80C870;>Weapon Name</span></a></th>');
-	echo ('<th align="center" style="width: 90px;"><a href="?order=race_name&amp;seq='.$seq.'"><span style=color:#80C870;>Race</span></a>'.$race.'</th>');
-	echo ('<th align="center" style="width: 64px;"><a href="?order=cost&amp;seq='.$seq.'"><span style=color:#80C870;>Cost</span></a></th>');
-	echo ('<th align="center" style="width: 74px;"><a href="?order=shield_damage&amp;seq='.$seq.'"><span style=color:#80C870;>Shield<br>Damage</span></a></th>');
-	echo ('<th align="center" style="width: 74px;"><a href="?order=armour_damage&amp;seq='.$seq.'"><span style=color:#80C870;>Armour<br>Damage</span></a></th>');
-	echo ('<th align="center" style="width: 85px;"><a href="?order=accuracy&amp;seq='.$seq.'"><span style=color:#80C870;>Accuracy<br>%</span></a></th>');
-	echo ('<th align="center" style="width: 51px;"><a href="?order=power_level&amp;seq='.$seq.'"><span style=color:#80C870;>Level</span></a>'.$power.'</th>');
-	echo ('<th align="center" style="width: 92px;"><a href="?order=buyer_restriction&amp;seq='.$seq.'"><span style=color:#80C870;>Restriction</span></a>'.$restrict.'</th>');
+	echo ('<th align="center" style="width: 240px;"><a href="?order=weapon_name&amp;seq=' . $seq . '"><span style=color:#80C870;>Weapon Name</span></a></th>');
+	echo ('<th align="center" style="width: 90px;"><a href="?order=race_name&amp;seq=' . $seq . '"><span style=color:#80C870;>Race</span></a>' . $race . '</th>');
+	echo ('<th align="center" style="width: 64px;"><a href="?order=cost&amp;seq=' . $seq . '"><span style=color:#80C870;>Cost</span></a></th>');
+	echo ('<th align="center" style="width: 74px;"><a href="?order=shield_damage&amp;seq=' . $seq . '"><span style=color:#80C870;>Shield<br>Damage</span></a></th>');
+	echo ('<th align="center" style="width: 74px;"><a href="?order=armour_damage&amp;seq=' . $seq . '"><span style=color:#80C870;>Armour<br>Damage</span></a></th>');
+	echo ('<th align="center" style="width: 85px;"><a href="?order=accuracy&amp;seq=' . $seq . '"><span style=color:#80C870;>Accuracy<br>%</span></a></th>');
+	echo ('<th align="center" style="width: 51px;"><a href="?order=power_level&amp;seq=' . $seq . '"><span style=color:#80C870;>Level</span></a>' . $power . '</th>');
+	echo ('<th align="center" style="width: 92px;"><a href="?order=buyer_restriction&amp;seq=' . $seq . '"><span style=color:#80C870;>Restriction</span></a>' . $restrict . '</th>');
 	echo ('</tr>');
 	while ($db->nextRecord()) {
 		echo ('<tr>');
-		echo ('<td align="center">'.$db->getField('weapon_name').'</td>');
-		echo ('<td align="center" class="race'.$db->getInt('race_id').'">'.$db->getField('race_name').'</td>');
-		echo ('<td align="center">'.number_format($db->getInt('cost')).'</td>');
-		echo ('<td align="center">'.$db->getInt('shield_damage').'</td>');
-		echo ('<td align="center">'.$db->getInt('armour_damage').'</td>');
-		echo ('<td align="center">'.$db->getInt('accuracy').'</td>');
-		echo ('<td align="center">'.$db->getInt('power_level').'</td>');
-		switch($db->getInt('buyer_restriction')) {
+		echo ('<td align="center">' . $db->getField('weapon_name') . '</td>');
+		echo ('<td align="center" class="race' . $db->getInt('race_id') . '">' . $db->getField('race_name') . '</td>');
+		echo ('<td align="center">' . number_format($db->getInt('cost')) . '</td>');
+		echo ('<td align="center">' . $db->getInt('shield_damage') . '</td>');
+		echo ('<td align="center">' . $db->getInt('armour_damage') . '</td>');
+		echo ('<td align="center">' . $db->getInt('accuracy') . '</td>');
+		echo ('<td align="center">' . $db->getInt('power_level') . '</td>');
+		switch ($db->getInt('buyer_restriction')) {
 			case BUYER_RESTRICTION_GOOD:
 				echo ('<td align="center" style="color: green;">Good</td>');
 			break;
@@ -183,16 +183,16 @@ 
 
 
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
 function buildSelector($db, $id, $name, $table) {
-	$selector = '<br><select id="'.$id.'" name="'.$name.'" onchange="'.$id.'f()"><option value="All">All</option>';
-	$db->query("SELECT DISTINCT ".$name." FROM ".$table." ORDER BY ".$name);
+	$selector = '<br><select id="' . $id . '" name="' . $name . '" onchange="' . $id . 'f()"><option value="All">All</option>';
+	$db->query("SELECT DISTINCT " . $name . " FROM " . $table . " ORDER BY " . $name);
 	while ($db->nextRecord()) {
-		$selector .= '<option value="'.$db->getField($name).'">'
-		.$db->getField($name).'</option>';
+		$selector .= '<option value="' . $db->getField($name) . '">'
+		.$db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;
@@ -218,8 +218,8 @@ 
 		$raceID = $db->getInt('race_id');
 		$raceName = $db->getField('race_name');
 		$racebox .= '
-			<input type="checkbox" id="race'.$raceID.'" name="races" value="'.$raceName.'" onClick="raceToggle()">
-			<label for="race'.$raceID.'" class="race'.$raceID.'">'.$raceName.'</label>';
+			<input type="checkbox" id="race'.$raceID . '" name="races" value="' . $raceName . '" onClick="raceToggle()">
+			<label for="race'.$raceID . '" class="race' . $raceID . '">' . $raceName . '</label>';
 	}
 	$racebox .= '</form>';
 	return $racebox;

Braces +13 added lines, -12 removed lines

@@ -115,18 +115,20 @@ 
 	
 	echo ('<body onload="resetBoxes()">');
 	$seq = isset($_REQUEST['seq']) ? $_REQUEST['seq'] : '';
-	if (empty($seq))
-		$seq = 'ASC';
-	elseif ($seq == 'ASC')
-		$seq = 'DESC';
-	else
-		$seq = 'ASC';
+	if (empty($seq)) {
+			$seq = 'ASC';
+	} elseif ($seq == 'ASC') {
+			$seq = 'DESC';
+	} else {
+			$seq = 'ASC';
+	}
 	
 	$columnNames = array('weapon_name','race_name','cost','shield_damage','armour_damage','accuracy','power_level','buyer_restriction');
-	if (isset($_REQUEST['order'])&&in_array($_REQUEST['order'],$columnNames))
-		$order_by = $_REQUEST['order'];
-	else
-		$order_by = 'weapon_type_id';
+	if (isset($_REQUEST['order'])&&in_array($_REQUEST['order'],$columnNames)) {
+			$order_by = $_REQUEST['order'];
+	} else {
+			$order_by = 'weapon_type_id';
+	}
 	
 	//$race 		= buildSelector($db, "racePick", "race_name", "race");
 	$race = "";
@@ -182,8 +184,7 @@ 
 	
 
 
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 

htdocs/vote_link_callback.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	// Prevent getting additional turns until a valid free turns link is clicked again
 	$db->query('REPLACE INTO vote_links (account_id, link_id, timeout, turns_claimed) VALUES(' . $db->escapeNumber($accountId) . ',' . $db->escapeNumber($linkId) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeBoolean(true) . ')');
 
-	$player->setLastTurnUpdate($player->getLastTurnUpdate()-VOTE_BONUS_TURNS_TIME); //Give turns via added time, no rounding errors.
+	$player->setLastTurnUpdate($player->getLastTurnUpdate() - VOTE_BONUS_TURNS_TIME); //Give turns via added time, no rounding errors.
 	$player->save();
 	release_lock();
 }

htdocs/level_requirements.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	} ?>
 	</table><?php
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
 		</tr><?php
 	} ?>
 	</table><?php
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 ?>

htdocs/manual.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 	require_once(ENGINE . 'Default/help.inc');
 
 	$topic_id = $_SERVER['QUERY_STRING'];
-	if (empty($topic_id)||!is_numeric($topic_id))
+	if (empty($topic_id) || !is_numeric($topic_id))
 		$topic_id = 1;
 	?>
 <!DOCTYPE html>
@@ -49,7 +49,7 @@ 
 	</body>
 	</html><?php
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 ?>

Braces +4 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 	require_once(ENGINE . 'Default/help.inc');
 
 	$topic_id = $_SERVER['QUERY_STRING'];
-	if (empty($topic_id)||!is_numeric($topic_id))
-		$topic_id = 1;
+	if (empty($topic_id)||!is_numeric($topic_id)) {
+			$topic_id = 1;
+	}
 	?>
 <!DOCTYPE html>
 
@@ -48,8 +49,7 @@ 
 
 	</body>
 	</html><?php
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 ?>

htdocs/login_create_processing.php

Indentation +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 	$account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining.
 	if($socialLogin) {
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		if ($validatedBySocial) {
 			$account->setValidated(true);
 		}
@@ -185,7 +185,7 @@ 
 
 		// remember when we sent validation code
 		$db->query('INSERT INTO notification (notification_type, account_id, time) ' .
-		           'VALUES(\'validation_code\', '.$db->escapeNumber(SmrSession::$account_id).', ' . $db->escapeNumber(TIME) . ')');
+				   'VALUES(\'validation_code\', '.$db->escapeNumber(SmrSession::$account_id).', ' . $db->escapeNumber(TIME) . ')');
 	}
 
 	$container = create_container('login_processing.php');

Spacing +11 added lines, -11 removed lines

@@ -10,9 +10,9 @@ 
 		exit;
 	}
 	$socialLogin = isset($_REQUEST['socialReg']);
-	if($socialLogin) {
+	if ($socialLogin) {
 		session_start();
-		if(!$_SESSION['socialLogin']) {
+		if (!$_SESSION['socialLogin']) {
 			$msg = 'Tried a social registration without having a social session.';
 			header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 			exit;
@@ -50,7 +50,7 @@ 
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 		exit;
 	}
-	if(strpos($login,'NPC')===0) {
+	if (strpos($login, 'NPC') === 0) {
 		$msg = 'Login names cannot begin with "NPC".';
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 		exit;
@@ -109,7 +109,7 @@ 
 
 	// check if the host got a MX or at least an A entry
 	if (!checkdnsrr($host, 'MX') && !checkdnsrr($host, 'A')) {
-		$msg = 'This is not a valid email address! The domain '.$host.' does not exist.';
+		$msg = 'This is not a valid email address! The domain ' . $host . ' does not exist.';
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 		exit;
 	}
@@ -120,7 +120,7 @@ 
 		exit;
 	}
 
-	$db->query('SELECT * FROM account WHERE login = '.$db->escapeString($login));
+	$db->query('SELECT * FROM account WHERE login = ' . $db->escapeString($login));
 	if ($db->getNumRows() > 0) {
 		$msg = 'This user name is already registered.';
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
@@ -149,13 +149,13 @@ 
 	try {
 		$account = SmrAccount::createAccount($login, $password, $email, $timez, $referral);
 	}
-	catch(AccountNotFoundException $e) {
+	catch (AccountNotFoundException $e) {
 		$msg = 'Invalid referral account ID!';
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 		exit;
 	}
 	$account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining.
-	if($socialLogin) {
+	if ($socialLogin) {
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
 		                        $_SESSION['socialLogin']->getUserID());
 		if ($validatedBySocial) {
@@ -173,8 +173,8 @@ 
 	if (!$account->isValidated()) {
 		// send email with validation code to user
 		$emailMessage =
-			'Your validation code is: '.$account->getValidationCode().EOL.
-			'The Space Merchant Realms server is on the web at '.URL;
+			'Your validation code is: ' . $account->getValidationCode() . EOL .
+			'The Space Merchant Realms server is on the web at ' . URL;
 
 		$mail = setupMailer();
 		$mail->Subject = 'New Space Merchant Realms Account';
@@ -185,7 +185,7 @@ 
 
 		// remember when we sent validation code
 		$db->query('INSERT INTO notification (notification_type, account_id, time) ' .
-		           'VALUES(\'validation_code\', '.$db->escapeNumber(SmrSession::$account_id).', ' . $db->escapeNumber(TIME) . ')');
+		           'VALUES(\'validation_code\', ' . $db->escapeNumber(SmrSession::$account_id) . ', ' . $db->escapeNumber(TIME) . ')');
 	}
 
 	$container = create_container('login_processing.php');
@@ -193,6 +193,6 @@ 
 	$container['password'] = $password;
 	forwardURL($container);
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +2 added lines, -4 removed lines

@@ -148,8 +148,7 @@ 
 	// creates a new user account object
 	try {
 		$account = SmrAccount::createAccount($login, $password, $email, $timez, $referral);
-	}
-	catch(AccountNotFoundException $e) {
+	} catch(AccountNotFoundException $e) {
 		$msg = 'Invalid referral account ID!';
 		header('Location: /error.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 		exit;
@@ -192,7 +191,6 @@ 
 	$container['login'] = $login;
 	$container['password'] = $password;
 	forwardURL($container);
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/login_create.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 						<td width='73%'>
 							<select name="timez" id="InputFields"><?php
 								$time = TIME;
-								for ($i = -12; $i<= 11; $i++) {
+								for ($i = -12; $i <= 11; $i++) {
 									?><option value="<?php echo $i; ?>"><?php echo date(DEFAULT_DATE_TIME_SHORT, $time + $i * 3600); ?></option><?php
 								} ?>
 							</select>
@@ -67,7 +67,7 @@ 
 					</tr>
 					<tr>
 						<td width='27%'>Referral ID (Optional):</td>
-						<td width='73%'><input type='text' name='referral_id' size='10' maxlength='20' id='InputFields'<?php if(isset($_REQUEST['ref'])){ echo 'value="'.htmlspecialchars($_REQUEST['ref']).'"'; }?>></td>
+						<td width='73%'><input type='text' name='referral_id' size='10' maxlength='20' id='InputFields'<?php if (isset($_REQUEST['ref'])) { echo 'value="' . htmlspecialchars($_REQUEST['ref']) . '"'; }?>></td>
 					</tr>
 					<tr>
 						<td colspan='2'><div class="g-recaptcha" data-sitekey="<?php echo RECAPTCHA_PUBLIC; ?>"></div></td>

htdocs/login.php

Spacing +4 added lines, -4 removed lines

@@ -22,16 +22,16 @@
 		$href = SmrSession::getNewHREF(create_container('login_check_processing.php'), true);
 		SmrSession::update();
 	
-		header('Location: '.$href);
+		header('Location: ' . $href);
 		exit;
 	}
 	
-	if(isset($_REQUEST['msg']))
-		$template->assign('Message',htmlentities(trim($_REQUEST['msg']),ENT_COMPAT,'utf-8'));
+	if (isset($_REQUEST['msg']))
+		$template->assign('Message', htmlentities(trim($_REQUEST['msg']), ENT_COMPAT, 'utf-8'));
 
 	require_once(ENGINE . 'Default/login.inc');
 
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@
 		exit;
 	}
 	
-	if(isset($_REQUEST['msg']))
-		$template->assign('Message',htmlentities(trim($_REQUEST['msg']),ENT_COMPAT,'utf-8'));
+	if(isset($_REQUEST['msg'])) {
+			$template->assign('Message',htmlentities(trim($_REQUEST['msg']),ENT_COMPAT,'utf-8'));
+	}
 
 	require_once(ENGINE . 'Default/login.inc');
 
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/manual_toc.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	</body>
 </html><?php
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 
 	</body>
 </html><?php
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 ?>