We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
| @@ -11,8 +11,7 @@ discard block | ||
| 11 | 11 |  $action = Request::get('action'); | 
| 12 | 12 |  if (Request::get('save') == 'Yes') { | 
| 13 | 13 | $save = true; | 
| 14 | -} | |
| 15 | -else { | |
| 14 | +} else { | |
| 16 | 15 | $save = false; | 
| 17 | 16 | } | 
| 18 | 17 | |
| @@ -42,8 +41,7 @@ discard block | ||
| 42 | 41 |  				$mines = $db2->getInt('sum_m'); | 
| 43 | 42 |  				$cds = $db2->getInt('cds'); | 
| 44 | 43 |  				$sds = $db2->getInt('sds'); | 
| 45 | - } | |
| 46 | -			else { | |
| 44 | +			} else { | |
| 47 | 45 | $mines = 0; | 
| 48 | 46 | $cds = 0; | 
| 49 | 47 | $sds = 0; | 
| @@ -143,16 +141,25 @@ discard block | ||
| 143 | 141 |  			$owner = $db->getInt('owner_id'); | 
| 144 | 142 | |
| 145 | 143 |  			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1'); | 
| 146 | -			if ($db2->nextRecord()) $gens = $db2->getInt('amount'); | |
| 147 | - else $gens = 0; | |
| 144 | +			if ($db2->nextRecord()) { | |
| 145 | +				$gens = $db2->getInt('amount'); | |
| 146 | +			} else { | |
| 147 | + $gens = 0; | |
| 148 | + } | |
| 148 | 149 | |
| 149 | 150 |  			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2'); | 
| 150 | -			if ($db2->nextRecord()) $hangs = $db2->getInt('amount'); | |
| 151 | - else $hangs = 0; | |
| 151 | +			if ($db2->nextRecord()) { | |
| 152 | +				$hangs = $db2->getInt('amount'); | |
| 153 | +			} else { | |
| 154 | + $hangs = 0; | |
| 155 | + } | |
| 152 | 156 | |
| 153 | 157 |  			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3'); | 
| 154 | -			if ($db2->nextRecord()) $turs = $db2->getInt('amount'); | |
| 155 | - else $turs = 0; | |
| 158 | +			if ($db2->nextRecord()) { | |
| 159 | +				$turs = $db2->getInt('amount'); | |
| 160 | +			} else { | |
| 161 | + $turs = 0; | |
| 162 | + } | |
| 156 | 163 | |
| 157 | 164 | // insert into history db | 
| 158 | 165 | $history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' . | 
| @@ -189,14 +196,21 @@ discard block | ||
| 189 | 196 | $smrCredits = 0; | 
| 190 | 197 |  			$db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = '.$game_id.' AND account_id = '.$acc_id.' AND claimer_id = 0'); | 
| 191 | 198 |  			if ($db2->nextRecord()) { | 
| 192 | -				if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am'); | |
| 193 | -				if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred'); | |
| 199 | +				if (is_int($db2->getField('bounty_am'))) { | |
| 200 | +					$amount = $db2->getInt('bounty_am'); | |
| 201 | + } | |
| 202 | +				if (is_int($db2->getField('bounty_cred'))) { | |
| 203 | +					$smrCredits = $db2->getInt('bounty_cred'); | |
| 204 | + } | |
| 194 | 205 | |
| 195 | 206 | } | 
| 196 | 207 | |
| 197 | 208 |  			$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id); | 
| 198 | -			if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name'); | |
| 199 | - else $ship_name = 'None'; | |
| 209 | +			if ($db2->nextRecord()) { | |
| 210 | +				$ship_name = $db2->getField('ship_name'); | |
| 211 | +			} else { | |
| 212 | + $ship_name = 'None'; | |
| 213 | + } | |
| 200 | 214 | |
| 201 | 215 | // insert into history db | 
| 202 | 216 | $history_db_sql[] = 'INSERT INTO player (account_id, game_id, player_name, player_id, experience, ship, race, alignment, alliance_id, kills, deaths, bounty, bounty_cred, ship_name) ' . | 
| @@ -244,9 +258,15 @@ discard block | ||
| 244 | 258 |  				$mines = $db2->getInt('sum_mines'); | 
| 245 | 259 |  				$cds = $db2->getInt('cds'); | 
| 246 | 260 |  				$sds = $db2->getInt('sds'); | 
| 247 | - if (!is_numeric($mines)) $mines = 0; | |
| 248 | - if (!is_numeric($cds)) $cds = 0; | |
| 249 | - if (!is_numeric($sds)) $sds = 0; | |
| 261 | +				if (!is_numeric($mines)) { | |
| 262 | + $mines = 0; | |
| 263 | + } | |
| 264 | +				if (!is_numeric($cds)) { | |
| 265 | + $cds = 0; | |
| 266 | + } | |
| 267 | +				if (!is_numeric($sds)) { | |
| 268 | + $sds = 0; | |
| 269 | + } | |
| 250 | 270 | |
| 251 | 271 |  			} else { | 
| 252 | 272 | |
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 |  // Get the dates ("|" sets hr/min/sec to 0) | 
| 4 | 4 |  $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); | 
| 5 | 5 |  $start = empty(Request::get('game_start')) ? $join : | 
| 6 | -         DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); | |
| 6 | +		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); | |
| 7 | 7 |  $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); | 
| 8 | 8 | |
| 9 | 9 | $game = SmrGame::getGame($var['game_id']); | 
| @@ -16,7 +16,7 @@ | ||
| 16 | 16 |  // Get the dates ("|" sets hr/min/sec to 0) | 
| 17 | 17 |  $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); | 
| 18 | 18 |  $start = empty(Request::get('game_start')) ? $join : | 
| 19 | -         DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); | |
| 19 | +		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); | |
| 20 | 20 |  $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); | 
| 21 | 21 | |
| 22 | 22 | $game = SmrGame::createGame($newID); | 
| @@ -105,13 +105,15 @@ | ||
| 105 | 105 |  		$numberOfPlanets = Request::getInt('type' . $planetTypeID); | 
| 106 | 106 |  		for ($i = 1; $i <= $numberOfPlanets; $i++) { | 
| 107 | 107 | $galSector = $galSectors[array_rand($galSectors)]; | 
| 108 | - while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector | |
| 108 | +			while ($galSector->hasPlanet()) { | |
| 109 | + $galSector = $galSectors[array_rand($galSectors)]; | |
| 110 | + } | |
| 111 | + //1 per sector | |
| 109 | 112 | $galSector->createPlanet($planetTypeID); | 
| 110 | 113 | } | 
| 111 | 114 | } | 
| 112 | 115 | $var['message'] = '<span class="green">Success</span> : Succesfully added planets.'; | 
| 113 | -} | |
| 114 | -elseif ($submit == 'Create Ports') { | |
| 116 | +} elseif ($submit == 'Create Ports') { | |
| 115 | 117 | $numLevelPorts = []; | 
| 116 | 118 |  	for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) { | 
| 117 | 119 |  		$numLevelPorts[$i] = Request::getInt('port' . $i); | 
| @@ -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::get('salutation')); | |
| 38 | +			  Request::get('salutation')); | |
| 39 | 39 | |
| 40 | 40 |  if (Request::get('to_email') == '*') { | 
| 41 | 41 | // Send the newsletter to all players. | 
| @@ -35,7 +35,7 @@ | ||
| 35 | 35 | } | 
| 36 | 36 | $helper = self::getTwitterObj($_SESSION['TwitterToken']); | 
| 37 | 37 |  		$accessToken = $helper->oauth('oauth/access_token', | 
| 38 | -		                              ['oauth_verifier' => \Request::get('oauth_verifier')]); | |
| 38 | +									  ['oauth_verifier' => \Request::get('oauth_verifier')]); | |
| 39 | 39 | $auth = self::getTwitterObj($accessToken); | 
| 40 | 40 |  		$userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']); | 
| 41 | 41 |  		if ($auth->getLastHttpCode() == 200) { |