We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining. |
158 | 158 | if ($socialLogin) { |
159 | 159 | $account->addAuthMethod($_SESSION['socialLogin']->getLoginType(), |
160 | - $_SESSION['socialLogin']->getUserID()); |
|
160 | + $_SESSION['socialLogin']->getUserID()); |
|
161 | 161 | if ($validatedBySocial) { |
162 | 162 | $account->setValidated(true); |
163 | 163 | } |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | // remember when we sent validation code |
187 | 187 | $db->query('INSERT INTO notification (notification_type, account_id, time) ' . |
188 | - 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
188 | + 'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')'); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | $container = create_container('login_processing.php'); |
@@ -41,8 +41,8 @@ |
||
41 | 41 | |
42 | 42 | function teamAttack(&$results, $fightingPlayers, $attack, $defend) { |
43 | 43 | foreach ($fightingPlayers[$attack] as $accountID => $teamPlayer) { |
44 | - $playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]); |
|
45 | - $results[$attack]['Traders'][$teamPlayer->getAccountID()] =& $playerResults; |
|
44 | + $playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]); |
|
45 | + $results[$attack]['Traders'][$teamPlayer->getAccountID()] = & $playerResults; |
|
46 | 46 | $results[$attack]['TotalDamage'] += $playerResults['TotalDamage']; |
47 | 47 | |
48 | 48 | // Award assists (if there are multiple attackers) |
@@ -72,18 +72,18 @@ |
||
72 | 72 | |
73 | 73 | // If mines are bumped, the forces shoot first. Otherwise player shoots first. |
74 | 74 | if ($bump) { |
75 | - $results['Forces'] =& $forces->shootPlayers($attackers, $bump); |
|
75 | + $results['Forces'] = & $forces->shootPlayers($attackers, $bump); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $results['Attackers'] = array('TotalDamage' => 0); |
79 | 79 | foreach ($attackers as $attacker) { |
80 | - $playerResults =& $attacker->shootForces($forces); |
|
81 | - $results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults; |
|
80 | + $playerResults = & $attacker->shootForces($forces); |
|
81 | + $results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults; |
|
82 | 82 | $results['Attackers']['TotalDamage'] += $playerResults['TotalDamage']; |
83 | 83 | } |
84 | 84 | |
85 | 85 | if (!$bump) { |
86 | - $results['Forces'] =& $forces->shootPlayers($attackers, $bump); |
|
86 | + $results['Forces'] = & $forces->shootPlayers($attackers, $bump); |
|
87 | 87 | $forces->updateExpire(); |
88 | 88 | } |
89 | 89 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | // Delete all tickets and re-insert the winning ticket |
24 | 24 | $db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
25 | 25 | $db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
26 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
26 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
27 | 27 | |
28 | 28 | //get around locked table problem |
29 | 29 | $lottoWon = true; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | // Set the body of the e-mail |
37 | 37 | set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'], |
38 | - $_REQUEST['salutation']); |
|
38 | + $_REQUEST['salutation']); |
|
39 | 39 | |
40 | 40 | if ($_REQUEST['to_email'] == '*') { |
41 | 41 | // Send the newsletter to all players. |
@@ -1,5 +1,8 @@ |
||
1 | 1 | <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> |
2 | -<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title> |
|
2 | +<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) { |
|
3 | + echo ": $GameName"; |
|
4 | +} |
|
5 | +?></title> |
|
3 | 6 | <meta http-equiv="pragma" content="no-cache" /><?php |
4 | 7 | if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?> |
5 | 8 | <link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" /> |
@@ -50,9 +50,9 @@ |
||
50 | 50 | //get base for ports that dont happen to trade that good |
51 | 51 | $GOODS = Globals::getGoods(); |
52 | 52 | $fine = $totalFine = $port->getLevel() * |
53 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
54 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
55 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
53 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
54 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
55 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
56 | 56 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC); |
57 | 57 | $player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC); |
58 | 58 | $template->assign('TotalFine', $totalFine); |
@@ -316,8 +316,8 @@ |
||
316 | 316 | foreach (Globals::getAvailableTemplates() as $AvailableTemplate => $ColourSchemes) { |
317 | 317 | foreach ($ColourSchemes as $ColourScheme) { |
318 | 318 | $selected = ($ThisAccount->getTemplate() == $AvailableTemplate && |
319 | - $ThisAccount->getColourScheme() == $ColourScheme && |
|
320 | - $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
319 | + $ThisAccount->getColourScheme() == $ColourScheme && |
|
320 | + $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
321 | 321 | $name = $AvailableTemplate . ' - ' . $ColourScheme; |
322 | 322 | ?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php |
323 | 323 | } |
@@ -102,7 +102,7 @@ |
||
102 | 102 | if (!$UniGen) { |
103 | 103 | $CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector; |
104 | 104 | $ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ? |
105 | - $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
105 | + $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
106 | 106 | if (($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers())) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?> |
107 | 107 | <div class="lmtf"><?php |
108 | 108 | if ($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) { |