smrealms / smr

templates/Default/engine/Default/includes/CommonMessageSend.inc

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
-<?php if(isset($Preview)) { ?><table class="standard"><tr><td><?php echo bbifyMessage($Preview); ?></td></tr></table><?php } ?>
+<?php if (isset($Preview)) { ?><table class="standard"><tr><td><?php echo bbifyMessage($Preview); ?></td></tr></table><?php } ?>
 <form name="MessageSendForm" method="POST" action="<?php echo $MessageSendFormHref; ?>">
 	<p>
 		<b>From: </b><?php echo $ThisPlayer->getDisplayName(); ?><br />
-		<b>To: </b><?php if(isset($Receiver) && is_object($Receiver)) {	echo $Receiver->getDisplayName(); } else { echo $Receiver; } ?>
+		<b>To: </b><?php if (isset($Receiver) && is_object($Receiver)) {	echo $Receiver->getDisplayName(); } else { echo $Receiver; } ?>
 	</p>
-	<textarea spellcheck="true" name="message" required><?php if(isset($Preview)) { echo $Preview; } ?></textarea><br />
+	<textarea spellcheck="true" name="message" required><?php if (isset($Preview)) { echo $Preview; } ?></textarea><br />
 	<br />
 	<input type="submit" name="action" value="Send message" />&nbsp;<input type="submit" name="action" value="Preview message" />
 </form>

templates/Default/admin/Default/1.6/GameDetails.inc

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
 		<td>
 			<select name="game_type"><?php
 			foreach (SmrGame::GAME_TYPES as $GameTypeID => $GameType) {
-				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) echo 'selected'; ?>><?php echo $GameType; ?></option><?php
+				?><option value="<?php echo $GameTypeID; ?>" <?php if ($GameType == $Game['gameType']) {
+					echo 'selected';
+				}
+				?>><?php echo $GameType; ?></option><?php
 			} ?>
 			</select>
 		</td>

templates/Default/engine/Default/preferences.php

Indentation +2 added lines, -2 removed lines

@@ -337,8 +337,8 @@
 					foreach (Globals::getAvailableTemplates() as $Template) {
 						foreach (Globals::getAvailableColourSchemes($Template) as $ColourScheme) {
 							$selected = ($ThisAccount->getTemplate() == $Template &&
-							             $ThisAccount->getColourScheme() == $ColourScheme &&
-							             $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
+										 $ThisAccount->getColourScheme() == $ColourScheme &&
+										 $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : '';
 							$name = $Template . ' - ' . $ColourScheme;
 							?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php
 						}

htdocs/login_create_processing.php

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,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);
 			$account->update();

engine/Default/bar_gambling_processing.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	//heres the AIs cards
 	$i = 1;
 	if ($dealerHand->hasBlackjack() ||
-	    ($playerHand->getValue() > 21 && $dealerHand->getValue() <= 21)) {
+		($playerHand->getValue() > 21 && $dealerHand->getValue() <= 21)) {
 		$message .= ('<h1 class="red center">Bank Wins</h1>');
 	}
 	$message .= ('<div class="center">Bank\'s Cards are</div><br /><table class="center"><tr>');

lib/Default/Blackjack/Card.class.php

Indentation +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 	 */
 	public function getValue() : int {
 		if ($this->rank == self::RANK_JACK ||
-		    $this->rank == self::RANK_QUEEN ||
-		    $this->rank == self::RANK_KING) {
+			$this->rank == self::RANK_QUEEN ||
+			$this->rank == self::RANK_KING) {
 			return 10;
 		} elseif ($this->isAce()) {
 			return 11;

lib/Default/Routes/RouteGenerator.class.php

Indentation +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 						}
 					}
@@ -121,7 +121,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 							$fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOODS_NOTHING);
 							$mpr = new MultiplePortRoute($owr, $fakeReturn);

tools/discord/GameLink.inc

Spacing +4 added lines, -4 removed lines

@@ -3,10 +3,10 @@
 // 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 $account;        // SmrAccount instance
-	public $alliance;       // SmrAlliance instance
-	public $player;         // SmrPlayer instance
+	public $valid = false; // identifies if the message is linked to game data
+	public $account; // SmrAccount instance
+	public $alliance; // SmrAlliance instance
+	public $player; // SmrPlayer instance
 
 	// $author can be either Discord\Parts\User\{User,Member}
 	function __construct(Discord\Parts\Channel\Channel $channel, $author) {

test/lib/Default/AbstractSmrAccountTest.php

Indentation +81 added lines, -81 removed lines

@@ -6,30 +6,30 @@ 
 
 class Record
 {
-    public int $account_id = 1;
-    public string $login = "login";
-    public string $password = "password";
-    public string $email = "email";
-    public string $last_login = "last login";
-    public string $validation_code = "validation code";
-    public string $offset = "offset";
-    public string $images = "Yes";
-    public string $fontsize = "font size";
-    public string $password_reset = "password reset";
-    public int $mail_banned = 0;
-    public string $friendly_colour = "colour";
-    public string $neutral_colour = "colour";
-    public string $enemy_colour = "colour";
-    public string $css_link = "css link";
-    public string $referral_id = 'referral_id';
-    public string $max_rank_achieved = 'max_rank_achieved';
-    public string $hof_name = 'hof_name';
-    public string $discord_id = 'discord_id';
-    public string $irc_nick = 'irc_nick';
-    public string $date_short = 'date_short';
-    public string $time_short = 'time_short';
-    public string $template = 'template';
-    public string $colour_scheme = 'colour_scheme';
+	public int $account_id = 1;
+	public string $login = "login";
+	public string $password = "password";
+	public string $email = "email";
+	public string $last_login = "last login";
+	public string $validation_code = "validation code";
+	public string $offset = "offset";
+	public string $images = "Yes";
+	public string $fontsize = "font size";
+	public string $password_reset = "password reset";
+	public int $mail_banned = 0;
+	public string $friendly_colour = "colour";
+	public string $neutral_colour = "colour";
+	public string $enemy_colour = "colour";
+	public string $css_link = "css link";
+	public string $referral_id = 'referral_id';
+	public string $max_rank_achieved = 'max_rank_achieved';
+	public string $hof_name = 'hof_name';
+	public string $discord_id = 'discord_id';
+	public string $irc_nick = 'irc_nick';
+	public string $date_short = 'date_short';
+	public string $time_short = 'time_short';
+	public string $template = 'template';
+	public string $colour_scheme = 'colour_scheme';
 }
 
 /**
@@ -39,63 +39,63 @@ 
  */
 class AbstractSmrAccountTest extends TestCase
 {
-    private AbstractSmrAccount $abstractSmrAccount;
+	private AbstractSmrAccount $abstractSmrAccount;
 
-    public function testGetAccountByAccountId()
-    {
-        //# Given the database has been set up with a user
-        $record = new Record();
-        self::setupMockMysqlDatabase($record);
-        //# And there is no force update
-        $forceUpdate = false;
-        //# When the account is retrieved by its ID
-        $this->abstractSmrAccount = AbstractSmrAccount::getAccount($record->account_id, $forceUpdate);
-        //# Then the integrity of the user is correct
-        $this->assertEquals($record->account_id, $this->abstractSmrAccount->getAccountID());
-        $this->assertEquals($record->login, $this->abstractSmrAccount->getLogin());
-        $this->assertEquals($record->email, $this->abstractSmrAccount->getEmail());
-        $this->assertEquals($record->last_login, $this->abstractSmrAccount->getLastLogin());
-        $this->assertEquals($record->validation_code, $this->abstractSmrAccount->getValidationCode());
-        $this->assertEquals($record->offset, $this->abstractSmrAccount->getOffset());
-        $this->assertEquals(true, $this->abstractSmrAccount->isDisplayShipImages());
-        $this->assertEquals($record->fontsize, $this->abstractSmrAccount->getFontSize());
-        $this->assertEquals($record->password_reset, $this->abstractSmrAccount->getPasswordReset());
-        $this->assertEquals($record->mail_banned, $this->abstractSmrAccount->getMailBanned());
-        $this->assertEquals($record->friendly_colour, $this->abstractSmrAccount->getFriendlyColour());
-        $this->assertEquals($record->neutral_colour, $this->abstractSmrAccount->getNeutralColour());
-        $this->assertEquals($record->enemy_colour, $this->abstractSmrAccount->getEnemyColour());
-        $this->assertEquals($record->css_link, $this->abstractSmrAccount->getCssLink());
-        $this->assertEquals($record->referral_id, $this->abstractSmrAccount->getReferrerID());
-        $this->assertEquals($record->hof_name, $this->abstractSmrAccount->getHofName());
-        $this->assertEquals($record->discord_id, $this->abstractSmrAccount->getDiscordId());
-        $this->assertEquals($record->irc_nick, $this->abstractSmrAccount->getIrcNick());
-        $this->assertEquals($record->date_short, $this->abstractSmrAccount->getShortDateFormat());
-        $this->assertEquals($record->time_short, $this->abstractSmrAccount->getShortTimeFormat());
-        $this->assertEquals($record->template, $this->abstractSmrAccount->getTemplate());
-    }
+	public function testGetAccountByAccountId()
+	{
+		//# Given the database has been set up with a user
+		$record = new Record();
+		self::setupMockMysqlDatabase($record);
+		//# And there is no force update
+		$forceUpdate = false;
+		//# When the account is retrieved by its ID
+		$this->abstractSmrAccount = AbstractSmrAccount::getAccount($record->account_id, $forceUpdate);
+		//# Then the integrity of the user is correct
+		$this->assertEquals($record->account_id, $this->abstractSmrAccount->getAccountID());
+		$this->assertEquals($record->login, $this->abstractSmrAccount->getLogin());
+		$this->assertEquals($record->email, $this->abstractSmrAccount->getEmail());
+		$this->assertEquals($record->last_login, $this->abstractSmrAccount->getLastLogin());
+		$this->assertEquals($record->validation_code, $this->abstractSmrAccount->getValidationCode());
+		$this->assertEquals($record->offset, $this->abstractSmrAccount->getOffset());
+		$this->assertEquals(true, $this->abstractSmrAccount->isDisplayShipImages());
+		$this->assertEquals($record->fontsize, $this->abstractSmrAccount->getFontSize());
+		$this->assertEquals($record->password_reset, $this->abstractSmrAccount->getPasswordReset());
+		$this->assertEquals($record->mail_banned, $this->abstractSmrAccount->getMailBanned());
+		$this->assertEquals($record->friendly_colour, $this->abstractSmrAccount->getFriendlyColour());
+		$this->assertEquals($record->neutral_colour, $this->abstractSmrAccount->getNeutralColour());
+		$this->assertEquals($record->enemy_colour, $this->abstractSmrAccount->getEnemyColour());
+		$this->assertEquals($record->css_link, $this->abstractSmrAccount->getCssLink());
+		$this->assertEquals($record->referral_id, $this->abstractSmrAccount->getReferrerID());
+		$this->assertEquals($record->hof_name, $this->abstractSmrAccount->getHofName());
+		$this->assertEquals($record->discord_id, $this->abstractSmrAccount->getDiscordId());
+		$this->assertEquals($record->irc_nick, $this->abstractSmrAccount->getIrcNick());
+		$this->assertEquals($record->date_short, $this->abstractSmrAccount->getShortDateFormat());
+		$this->assertEquals($record->time_short, $this->abstractSmrAccount->getShortTimeFormat());
+		$this->assertEquals($record->template, $this->abstractSmrAccount->getTemplate());
+	}
 
-    private static function setupMockMysqlDatabase(Record $record): MockInterface
-    {
-        //# Force the mock to be used in the autoloader
-        $mysqlDatabase = m::mock("overload:SmrMySqlDatabase");
-        $mysqlDatabase
-            ->shouldReceive("escapeNumber")
-            ->with($record->account_id)
-            ->andReturn($record->account_id);
-        $mysqlDatabase
-            ->shouldReceive("query");
-        $mysqlDatabase
-            ->shouldReceive("nextRecord")
-            ->andReturn("a record");
-        $mysqlDatabase
-            ->shouldReceive("getRow")
-            ->andReturn((array)$record);
-        $mysqlDatabase
-            ->shouldReceive("getBoolean")
-            ->andReturn(false);
-        $mysqlDatabase
-            ->shouldReceive("getObject")
-            ->andReturn(array());
-        return $mysqlDatabase;
-    }
+	private static function setupMockMysqlDatabase(Record $record): MockInterface
+	{
+		//# Force the mock to be used in the autoloader
+		$mysqlDatabase = m::mock("overload:SmrMySqlDatabase");
+		$mysqlDatabase
+			->shouldReceive("escapeNumber")
+			->with($record->account_id)
+			->andReturn($record->account_id);
+		$mysqlDatabase
+			->shouldReceive("query");
+		$mysqlDatabase
+			->shouldReceive("nextRecord")
+			->andReturn("a record");
+		$mysqlDatabase
+			->shouldReceive("getRow")
+			->andReturn((array)$record);
+		$mysqlDatabase
+			->shouldReceive("getBoolean")
+			->andReturn(false);
+		$mysqlDatabase
+			->shouldReceive("getObject")
+			->andReturn(array());
+		return $mysqlDatabase;
+	}
 }