smrealms / smr

lib/Default/Sorter.class.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 	}
 
 	public static function cmpNum($a, $b) {
-		if($a == $b) return 0;
+		if($a == $b) {
+			return 0;
+		}
 		return (self::$reverseOrder?-1:1)*($a < $b ? -1 : 1);
 	}
 

lib/Default/DummyPlayer.class.php

Braces +4 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 	}
 	
@@ -93,8 +94,7 @@ 
 		if($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
-		}
-		else {
+		} else {
 			$return = new DummyPlayer();
 			return $return;
 		}

engine/Default/help.inc

Braces +30 added lines, -22 removed lines

@@ -22,16 +22,18 @@ 
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
 
 		// no result?
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -43,8 +45,9 @@ 
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -52,8 +55,9 @@ 
 		// **************************
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
 
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		}
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
@@ -72,8 +76,7 @@ 
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
-		}
-		else {
+		} else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
@@ -85,18 +88,22 @@ 
 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
-		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		if (isset($previous_topic_id) && $previous_topic_id > 0) {
+					echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($up_topic_id) && $up_topic_id > 0) {
+					echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($next_topic_id) && $next_topic_id > 0) {
+					echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		}
 		echo ('</tr>');
 
 		echo ('</table>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_content($topic_id) {
 	// database object
@@ -114,9 +121,10 @@ 
 		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
 		echo ('<p>'.$text.'<p>');
 		echo ('</div>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_subsection($topic_id) {
 	// database object

admin/Default/game_delete_processing.php

Braces +37 added lines, -17 removed lines

@@ -11,8 +11,7 @@ 
 $action = $_REQUEST['action'];
 if ($_REQUEST['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 {
 

templates/Default/engine/Default/includes/PlanetCombatResults.inc

Braces +12 added lines, -24 removed lines

@@ -5,8 +5,7 @@ 
 	echo $CombatPlanet->getDisplayName();
 	if($TotalDamage > 0) {
 		?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
-	}
-	else {
+	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
@@ -23,24 +22,19 @@ 
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if(!$ShotHit) {
 				?> and misses<?php
-			}
-			else if($ActualDamage['TotalDamage'] == 0) {
+			} else if($ActualDamage['TotalDamage'] == 0) {
 				if($WeaponDamage['Shield'] > 0) {
 					if($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
-					}
-					else {
+					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				}
-				else if($WeaponDamage['Armour'] > 0) {
+				} else if($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
-				}
-				else {
+				} else {
 					?> but it cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
 				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
@@ -79,27 +73,22 @@ 
 	echo $CombatPlanet->getDisplayName();
 	if($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's combat drones<?php
-	}
-	else {
+	} else {
 		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if($ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if(!$ActualDamage['TargetAlreadyDead']) {
 			if($ActualDamage['TotalDamage'] == 0) {
 				if($WeaponDamage['Shield'] > 0) {
 					if($ActualDamage['HasCDs']) {
 						?> which prove ineffective against their combat drones<?php
-					}
-					else {
+					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				}
-				else if($WeaponDamage['Armour'] > 0) {
+				} else if($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
-				}
-				else {
+				} else {
 					?> but they cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				if($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
@@ -124,7 +113,6 @@ 
 echo $CombatPlanet->getDisplayName();
 if($TotalDamage > 0) {
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
-}
-else {
+} else {
 	?> does no damage this round. You call that a planet? It needs a better builder<?php
 } ?>.

admin/Default/1.6/universe_create_save_processing.php

Braces +5 added lines, -3 removed lines

@@ -104,13 +104,15 @@
 		$numberOfPlanets = $_POST['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['port' . $i] ?? 0;

lib/Default/smr.inc

Braces +3 added lines, -2 removed lines

@@ -469,8 +469,9 @@
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			forward(create_container('newbie_warning_processing.php'));
+			$var['url'] != 'newbie_warning_processing.php') {
+					forward(create_container('newbie_warning_processing.php'));
+		}
 	}
 
 	// Initialize the template

engine/Default/shop_hardware_processing.php

Braces +10 added lines, -5 removed lines

@@ -32,11 +32,16 @@
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
-}
-else if ($action == 'Sell') {
+	if ($hardware_id == HARDWARE_COMBAT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_SCOUT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_MINE) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
+	}
+	} else if ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');

lib/Default/ChessPiece.class.php

Braces +5 added lines, -10 removed lines

@@ -91,8 +91,7 @@ 
 						}
 					}
 				}
-			}
-			else if ($this->pieceID == self::KING) {
+			} else if ($this->pieceID == self::KING) {
 				for ($i = -1; $i < 2; $i++) {
 					for ($j = -1; $j < 2; $j++) {
 						if ($i != 0 || $j != 0) {
@@ -114,8 +113,7 @@ 
 						$this->addMove($this->x + 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
-			}
-			else if ($this->pieceID == self::QUEEN) {
+			} else if ($this->pieceID == self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -140,8 +138,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if ($this->pieceID == self::ROOK) {
+			} else if ($this->pieceID == self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -154,8 +151,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
-			}
-			else if ($this->pieceID == self::BISHOP) {
+			} else if ($this->pieceID == self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
@@ -168,8 +164,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if ($this->pieceID == self::KNIGHT) {
+			} else if ($this->pieceID == self::KNIGHT) {
 				$moveX = $this->x - 1;
 				$moveY = $this->y - 2;
 				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-left