smrealms / smr

lib/Default/SocialLogins/Twitter.class.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		}
 		$helper = self::getTwitterObj($_SESSION['TwitterToken']);
 		$accessToken = $helper->oauth('oauth/access_token',
-		                              ['oauth_verifier' => Request::get('oauth_verifier')]);
+									  ['oauth_verifier' => Request::get('oauth_verifier')]);
 		$auth = self::getTwitterObj($accessToken);
 		$userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']);
 		if ($auth->getLastHttpCode() == 200) {

engine/Default/sector_jump_processing.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 }
 
 // If the Calculate Turn Cost button was pressed
-if (Request::get('action', '')  == 'Calculate Turn Cost') {
+if (Request::get('action', '') == 'Calculate Turn Cost') {
 	$container = create_container('skeleton.php', 'sector_jump_calculate.php');
 	$container['target'] = $target;
 	forward($container);

admin/Default/game_delete_processing.php

Braces +37 added lines, -17 removed lines

@@ -11,8 +11,7 @@ 
 $action = Request::get('action');
 if (Request::get('save') == 'Yes') {
 	$save = true;
-}
-else {
+} else {
 	$save = false;
 }
 
@@ -42,8 +41,7 @@ 
 				$mines = $db2->getInt('sum_m');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-			}
-			else {
+			} else {
 				$mines = 0;
 				$cds = 0;
 				$sds = 0;
@@ -143,16 +141,25 @@ 
 			$owner = $db->getInt('owner_id');
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1');
-			if ($db2->nextRecord()) $gens = $db2->getInt('amount');
-			else $gens = 0;
+			if ($db2->nextRecord()) {
+				$gens = $db2->getInt('amount');
+			} else {
+				$gens = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2');
-			if ($db2->nextRecord()) $hangs = $db2->getInt('amount');
-			else $hangs = 0;
+			if ($db2->nextRecord()) {
+				$hangs = $db2->getInt('amount');
+			} else {
+				$hangs = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3');
-			if ($db2->nextRecord()) $turs = $db2->getInt('amount');
-			else $turs = 0;
+			if ($db2->nextRecord()) {
+				$turs = $db2->getInt('amount');
+			} else {
+				$turs = 0;
+			}
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' .
@@ -189,14 +196,21 @@ 
 			$smrCredits = 0;
 			$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');
 			if ($db2->nextRecord()) {
-				if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am');
-				if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred');
+				if (is_int($db2->getField('bounty_am'))) {
+					$amount = $db2->getInt('bounty_am');
+				}
+				if (is_int($db2->getField('bounty_cred'))) {
+					$smrCredits = $db2->getInt('bounty_cred');
+				}
 
 			}
 
 			$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id);
-			if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name');
-			else $ship_name = 'None';
+			if ($db2->nextRecord()) {
+				$ship_name = $db2->getField('ship_name');
+			} else {
+				$ship_name = 'None';
+			}
 
 			// insert into history db
 			$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 @@ 
 				$mines = $db2->getInt('sum_mines');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-				if (!is_numeric($mines)) $mines = 0;
-				if (!is_numeric($cds)) $cds = 0;
-				if (!is_numeric($sds)) $sds = 0;
+				if (!is_numeric($mines)) {
+					$mines = 0;
+				}
+				if (!is_numeric($cds)) {
+					$cds = 0;
+				}
+				if (!is_numeric($sds)) {
+					$sds = 0;
+				}
 
 			} else {
 

admin/Default/1.6/game_edit_processing.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
 $start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::getGame($var['game_id']);

Spacing +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::getGame($var['game_id']);

admin/Default/1.6/game_create_processing.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
 $start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+		 DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::createGame($newID);

Spacing +3 added lines, -4 removed lines

@@ -1,22 +1,21 @@
 <?php declare(strict_types=1);
 
 //first create the game
-$db->query('SELECT game_id FROM game WHERE game_name='.$db->escapeString(Request::get('game_name')).' LIMIT 1');
+$db->query('SELECT game_id FROM game WHERE game_name=' . $db->escapeString(Request::get('game_name')) . ' LIMIT 1');
 if ($db->nextRecord()) {
 	create_error('That game name is already taken.');
 }
 
 $db->query('SELECT game_id FROM game ORDER BY game_id DESC LIMIT 1');
 if ($db->nextRecord()) {
-	$newID = $db->getInt('game_id')+1;
+	$newID = $db->getInt('game_id') + 1;
 } else {
 	$newID = 1;
 }
 
 // Get the dates ("|" sets hr/min/sec to 0)
 $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join'));
-$start = empty(Request::get('game_start')) ? $join :
-         DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
+$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start'));
 $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end'));
 
 $game = SmrGame::createGame($newID);

admin/Default/1.6/universe_create_save_processing.php

Braces +5 added lines, -3 removed lines

@@ -105,13 +105,15 @@
 		$numberOfPlanets = Request::getInt('type' . $planetTypeID);
 		for ($i = 1; $i <= $numberOfPlanets; $i++) {
 			$galSector = $galSectors[array_rand($galSectors)];
-			while ($galSector->hasPlanet()) $galSector = $galSectors[array_rand($galSectors)]; //1 per sector
+			while ($galSector->hasPlanet()) {
+				$galSector = $galSectors[array_rand($galSectors)];
+			}
+			//1 per sector
 			$galSector->createPlanet($planetTypeID);
 		}
 	}
 	$var['message'] = '<span class="green">Success</span> : Succesfully added planets.';
-}
-elseif ($submit == 'Create Ports') {
+} elseif ($submit == 'Create Ports') {
 	$numLevelPorts = [];
 	for ($i = 1; $i <= SmrPort::MAX_LEVEL; $i++) {
 		$numLevelPorts[$i] = Request::getInt('port' . $i);

admin/Default/newsletter_send_processing.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 // Set the body of the e-mail
 set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'],
-              Request::get('salutation'));
+			  Request::get('salutation'));
 
 if (Request::get('to_email') == '*') {
 	// Send the newsletter to all players.