We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -18,7 +18,7 @@ |
||
18 | 18 | } |
19 | 19 | |
20 | 20 | self::$dbConn = new mysqli(self::$host, self::$user, self::$password, |
21 | - $dbName, self::$port, self::$socket); |
|
21 | + $dbName, self::$port, self::$socket); |
|
22 | 22 | self::$selectedDbName = $dbName; |
23 | 23 | |
24 | 24 | // Default server charset should be set correctly. Using the default |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining. |
151 | 151 | if ($socialLogin) { |
152 | 152 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
153 | - $_SESSION['socialLogin']->getUserID()); |
|
153 | + $_SESSION['socialLogin']->getUserID()); |
|
154 | 154 | if ($validatedBySocial) { |
155 | 155 | $account->setValidated(true); |
156 | 156 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | // remember when we sent validation code |
180 | 180 | $db->query('INSERT INTO notification (notification_type, account_id, time) ' . |
181 | - 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
181 | + 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | forwardURL(create_container('login_processing.php')); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | $announcements = []; |
17 | 17 | while ($db->nextRecord()) { |
18 | 18 | $announcements[] = ['Time' => $db->getInt('time'), |
19 | - 'Msg' => htmlentities($db->getField('msg'))]; |
|
19 | + 'Msg' => htmlentities($db->getField('msg'))]; |
|
20 | 20 | } |
21 | 21 | $template->assign('Announcements', $announcements); |
22 | 22 |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | $db = new $var['HistoryDatabase'](); |
13 | 13 | $db->query('SELECT start_date, type, end_date, game_name, speed, game_id ' . |
14 | - 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
14 | + 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
15 | 15 | $db->requireRecord(); |
16 | 16 | $template->assign('GameName', $game_name); |
17 | 17 | $template->assign('Start', date(DATE_DATE_SHORT, $db->getInt('start_date'))); |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | $shareFrom[$fromAccountId] = array( |
20 | 20 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
21 | 21 | 'Player Name' => $otherPlayer == null ? |
22 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
23 | - $otherPlayer->getDisplayName(), |
|
22 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
23 | + $otherPlayer->getDisplayName(), |
|
24 | 24 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
25 | 25 | 'Game ID' => $gameId, |
26 | 26 | ); |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | $shareTo[$toAccountId] = array( |
41 | 41 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
42 | 42 | 'Player Name' => $otherPlayer == null ? |
43 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
44 | - $otherPlayer->getDisplayName(), |
|
43 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
44 | + $otherPlayer->getDisplayName(), |
|
45 | 45 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
46 | 46 | 'Game ID' => $gameId, |
47 | 47 | ); |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | while ($this->db->nextRecord()) { |
315 | 315 | try { |
316 | 316 | $otherPlayer = SmrPlayer::getPlayer($this->db->getInt('from_account_id'), |
317 | - $this->getGameID(), $forceUpdate); |
|
317 | + $this->getGameID(), $forceUpdate); |
|
318 | 318 | } catch (PlayerNotFoundException $e) { |
319 | 319 | // Skip players that have not joined this game |
320 | 320 | continue; |
@@ -878,9 +878,9 @@ discard block |
||
878 | 878 | */ |
879 | 879 | public function canFight() { |
880 | 880 | return !($this->hasNewbieTurns() || |
881 | - $this->isDead() || |
|
882 | - $this->isLandedOnPlanet() || |
|
883 | - $this->hasFederalProtection()); |
|
881 | + $this->isDead() || |
|
882 | + $this->isLandedOnPlanet() || |
|
883 | + $this->hasFederalProtection()); |
|
884 | 884 | } |
885 | 885 | |
886 | 886 | public function setDead($bool) { |