smrealms / smr

admin/Default/log_console.php

Braces +6 added lines, -4 removed lines

@@ -19,15 +19,17 @@
 								'Notes' => '');
 
 		$db2->query('SELECT notes FROM log_has_notes WHERE account_id = ' . $db2->escapeNumber($accountID));
-		if ($db2->nextRecord())
-			$loggedAccounts[$accountID]['Notes'] = nl2br($db2->getField('notes'));
+		if ($db2->nextRecord()) {
+					$loggedAccounts[$accountID]['Notes'] = nl2br($db2->getField('notes'));
+		}
 	}
 
 	// put hidden fields in for log type to have all fields selected on next page.
 	$logTypes = array();
 	$db->query('SELECT log_type_id FROM log_type');
-	while ($db->nextRecord())
-		$logTypes[] = $db->getInt('log_type_id');
+	while ($db->nextRecord()) {
+			$logTypes[] = $db->getInt('log_type_id');
+	}
 	$template->assign('LogTypes', $logTypes);
 
 	$template->assign('LogConsoleFormHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'log_console_detail.php')));

admin/Default/box_delete_processing.php

Braces +10 added lines, -8 removed lines

@@ -1,15 +1,17 @@
 <?php
 $action = $_REQUEST['action'];
 if ($action == 'Marked Messages') {
-	if (!isset($_REQUEST['message_id']))
-		create_error('You must choose the messages you want to delete.');
+	if (!isset($_REQUEST['message_id'])) {
+			create_error('You must choose the messages you want to delete.');
+	}
 
-	foreach ($_REQUEST['message_id'] as $id)
-		$db->query('DELETE FROM message_boxes WHERE message_id = ' . $db->escapeNumber($id));
-}
-else if ($action == 'All Messages') {
-	if (!isset($var['box_type_id']))
-		create_error('No box selected.');
+	foreach ($_REQUEST['message_id'] as $id) {
+			$db->query('DELETE FROM message_boxes WHERE message_id = ' . $db->escapeNumber($id));
+	}
+	} else if ($action == 'All Messages') {
+	if (!isset($var['box_type_id'])) {
+			create_error('No box selected.');
+	}
 	$db->query('DELETE FROM message_boxes WHERE box_type_id = ' . $db->escapeNumber($var['box_type_id']));
 }
 forward(create_container('skeleton.php', 'box_view.php'));

admin/Default/album_approve.php

Braces +12 added lines, -8 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 
 function get_album_nick($album_id) {
-	if ($album_id == 0)
-		return 'System';
+	if ($album_id == 0) {
+			return 'System';
+	}
 
 	return SmrAccount::getAccount($album_id)->getHofName();
 }
@@ -59,12 +60,15 @@ 
 	$nick = get_album_nick($album_id);
 	$template->assign('Nick', $nick);
 
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 	$template->assign('Birthdate', $birthdate);
 
 	// get the time that passed since the entry was last changed

admin/Default/album_moderate_processing.php

Braces +12 added lines, -12 removed lines

@@ -10,10 +10,11 @@ 
 
 	$db->lockTable('album_has_comments');
 	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = ' . $db->escapeNumber($account_id));
-	if ($db->nextRecord())
-		$comment_id = $db->getField('MAX(comment_id)') + 1;
-	else
-		$comment_id = 1;
+	if ($db->nextRecord()) {
+			$comment_id = $db->getField('MAX(comment_id)') + 1;
+	} else {
+			$comment_id = 1;
+	}
 
 	$db->query('INSERT INTO album_has_comments
 				(album_id, comment_id, time, post_id, msg)
@@ -31,17 +32,17 @@ 
 		$mail->send();
 	}
 
-} else if ($var['task'] == 'reset_location')
+} else if ($var['task'] == 'reset_location') {
 	$db->query('UPDATE album SET location = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_email')
+} else if ($var['task'] == 'reset_email') {
 	$db->query('UPDATE album SET email = \'\' WHERE account_id =' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_website')
+} else if ($var['task'] == 'reset_website') {
 	$db->query('UPDATE album SET website = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_birthdate')
+} else if ($var['task'] == 'reset_birthdate') {
 	$db->query('UPDATE album SET day = 0, month = 0, year = 0 WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_other')
+} else if ($var['task'] == 'reset_other') {
 	$db->query('UPDATE album SET other = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'delete_comment') {
+} else if ($var['task'] == 'delete_comment') {
 	$comment_ids = $_REQUEST['comment_ids'];
 	// we just ignore if nothing was set
 	if (count($comment_ids) > 0) {
@@ -50,8 +51,7 @@ 
 					WHERE album_id = '.$db->escapeNumber($account_id) . ' AND
 						  comment_id IN ('.$db->escapeArray($comment_ids) . ')');
 	}
-}
-else {
+} else {
 	create_error('No action chosen!');
 }
 

admin/Default/album_moderate.php

Braces +10 added lines, -8 removed lines

@@ -19,8 +19,7 @@ 
 		$approved[$accountId] = get_album_nick($accountId);
 	}
 	$template->assign('Approved', $approved);
-}
-else {
+} else {
 	// check if the given account really has an entry
 	$db->query('SELECT * FROM album WHERE account_id = ' . $db->escapeNumber($account_id) . ' AND Approved = \'YES\'');
 	if ($db->nextRecord()) {
@@ -36,12 +35,15 @@ 
 		create_error('This User doesn\'t have an album entry or it needs to be approved first!');
 	}
 
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 
 	$entry = [
 		'disabled' => $disabled,

templates/Default/engine/Default/includes/Head.inc

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title>
+<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) {
+	echo ": $GameName";
+}
+?></title>
 <meta http-equiv="pragma" content="no-cache" /><?php
 if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" />

engine/Default/shop_goods.php

Indentation +3 added lines, -3 removed lines

@@ -50,9 +50,9 @@
 			//get base for ports that dont happen to trade that good
 			$GOODS = Globals::getGoods();
 			$fine = $totalFine = $port->getLevel() *
-			    (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
-			     ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
-			     ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
+				(($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) +
+				 ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) +
+				 ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice']));
 			$player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC);
 			$player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC);
 			$template->assign('TotalFine', $totalFine);

Braces +17 added lines, -15 removed lines

@@ -6,8 +6,9 @@ 
 $port = $player->getSectorPort();
 
 $tradeable = checkPortTradeable($port, $player);
-if ($tradeable !== true)
+if ($tradeable !== true) {
 	create_error($tradeable);
+}
 
 // topic
 $template->assign('PageTopic', 'Port In Sector #' . $player->getSectorID());
@@ -23,17 +24,19 @@ 
 //The player is sent here after trading and sees this if his offer is accepted.
 if (!empty($var['trade_msg'])) {
 	$template->assign('TradeMsg', $var['trade_msg']);
-}
-elseif ($player->getLastPort() != $player->getSectorID()) {
+} elseif ($player->getLastPort() != $player->getSectorID()) {
 	// test if we are searched, but only if we hadn't a previous trade here
 
 	$base_chance = 15;
-	if ($port->hasGood(GOODS_SLAVES))
-		$base_chance -= 4;
-	if ($port->hasGood(GOODS_WEAPONS))
-		$base_chance -= 4;
-	if ($port->hasGood(GOODS_NARCOTICS))
-		$base_chance -= 4;
+	if ($port->hasGood(GOODS_SLAVES)) {
+			$base_chance -= 4;
+	}
+	if ($port->hasGood(GOODS_WEAPONS)) {
+			$base_chance -= 4;
+	}
+	if ($port->hasGood(GOODS_NARCOTICS)) {
+			$base_chance -= 4;
+	}
 
 	if ($ship->isUnderground()) {
 		$base_chance -= 4;
@@ -64,11 +67,11 @@ 
 					// because credits is 0 it will take money from bank
 					$player->decreaseBank(min($fine, $player->getBank()));
 					// leave insurance
-					if ($player->getBank() < 5000)
-						$player->setBank(5000);
+					if ($player->getBank() < 5000) {
+											$player->setBank(5000);
+					}
 				}
-			}
-			else {
+			} else {
 				$player->decreaseCredits($fine);
 			}
 
@@ -80,8 +83,7 @@ 
 			$ship->setCargo(GOODS_NARCOTICS, 0);
 			$account->log(LOG_TYPE_TRADING, 'Player gets caught with illegals', $player->getSectorID());
 
-		}
-		else {
+		} else {
 			$template->assign('IllegalsFound', false);
 			$player->increaseHOF(1, array('Trade', 'Search', 'Times Found Innocent'), HOF_PUBLIC);
 			$player->increaseAlignment(1);

engine/Default/sector_jump_processing.php

Braces +20 added lines, -13 removed lines

@@ -4,8 +4,11 @@ 
 	create_error('You cannot move until the game has started!');
 }
 
-if (isset($_REQUEST['target'])) $target = trim($_REQUEST['target']);
-else $target = $var['target'];
+if (isset($_REQUEST['target'])) {
+	$target = trim($_REQUEST['target']);
+} else {
+	$target = $var['target'];
+}
 
 //allow hidden players (admins that don't play) to move without pinging, hitting mines, losing turns
 if (in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
@@ -20,18 +23,22 @@ 
 }
 
 // you can't move while on planet
-if ($player->isLandedOnPlanet())
+if ($player->isLandedOnPlanet()) {
 	create_error('You are on a planet! You must launch first!');
+}
 
 // if no 'target' is given we forward to plot
-if (empty($target))
+if (empty($target)) {
 	create_error('Where do you want to go today?');
+}
 
-if (!is_numeric($target))
+if (!is_numeric($target)) {
 	create_error('Please enter only numbers!');
+}
 	
-if ($player->getSectorID() == $target)
+if ($player->getSectorID() == $target) {
 	create_error('Hmmmm...if ' . $player->getSectorID() . '=' . $target . ' then that means...YOU\'RE ALREADY THERE! *cough*you\'re real smart*cough*');
+}
 
 if (!SmrSector::sectorExists($player->getGameID(), $target)) {
 	create_error('The target sector doesn\'t exist!');
@@ -60,8 +67,9 @@ 
 $maxMisjump = $jumpInfo['max_misjump'];
 
 // check for turns
-if ($player->getTurns() < $turnsToJump)
+if ($player->getTurns() < $turnsToJump) {
 	create_error('You don\'t have enough turns for that jump!');
+}
 
 // send scout msg
 $sector->leavingSector($player, MOVEMENT_JUMP);
@@ -76,12 +84,12 @@ 
 	}
 		
 	$misjumpSector = array_rand($distances[$misjump]);
-	if ($misjumpSector == null)
-		throw new Exception('Misjump sector is null, distances: ' . var_export($distances, true));
+	if ($misjumpSector == null) {
+			throw new Exception('Misjump sector is null, distances: ' . var_export($distances, true));
+	}
 	$player->setSectorID($misjumpSector);
 	unset($distances);
-}
-else { // we hit it. exactly
+} else { // we hit it. exactly
 	$player->setSectorID($targetSector->getSectorID());
 }
 $player->takeTurns($turnsToJump, $turnsToJump);
@@ -118,8 +126,7 @@ 
 		$container = create_container('skeleton.php', 'current_sector.php');
 		$container['msg'] = 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.';
 		forward($container);
-	}
-	else {
+	} else {
 		$container = create_container('forces_attack_processing.php');
 		$container['action'] = 'bump';
 		$container['owner_id'] = $mineOwnerID;

admin/Default/location_edit.php

Braces +19 added lines, -14 removed lines

@@ -5,21 +5,27 @@ 
 if (isset($var['location_type_id'])) {
 	$location = SmrLocation::getLocation($var['location_type_id']);
 	if (isset($_REQUEST['save'])) {
-		if ($_REQUEST['add_ship_id'] != 0)
-			$location->addShipSold($_REQUEST['add_ship_id']);
-		if ($_REQUEST['add_weapon_id'] != 0)
-			$location->addWeaponSold($_REQUEST['add_weapon_id']);
-		if ($_REQUEST['add_hardware_id'] != 0)
-			$location->addHardwareSold($_REQUEST['add_hardware_id']);
-		if (isset($_REQUEST['remove_ships']) && is_array($_REQUEST['remove_ships']))
-			foreach ($_REQUEST['remove_ships'] as $shipTypeID)
+		if ($_REQUEST['add_ship_id'] != 0) {
+					$location->addShipSold($_REQUEST['add_ship_id']);
+		}
+		if ($_REQUEST['add_weapon_id'] != 0) {
+					$location->addWeaponSold($_REQUEST['add_weapon_id']);
+		}
+		if ($_REQUEST['add_hardware_id'] != 0) {
+					$location->addHardwareSold($_REQUEST['add_hardware_id']);
+		}
+		if (isset($_REQUEST['remove_ships']) && is_array($_REQUEST['remove_ships'])) {
+					foreach ($_REQUEST['remove_ships'] as $shipTypeID)
 				$location->removeShipSold($shipTypeID);
-		if (isset($_REQUEST['remove_weapons']) && is_array($_REQUEST['remove_weapons']))
-			foreach ($_REQUEST['remove_weapons'] as $weaponTypeID)
+		}
+		if (isset($_REQUEST['remove_weapons']) && is_array($_REQUEST['remove_weapons'])) {
+					foreach ($_REQUEST['remove_weapons'] as $weaponTypeID)
 				$location->removeWeaponSold($weaponTypeID);
-		if (isset($_REQUEST['remove_hardware']) && is_array($_REQUEST['remove_hardware']))
-			foreach ($_REQUEST['remove_hardware'] as $hardwareTypeID)
+		}
+		if (isset($_REQUEST['remove_hardware']) && is_array($_REQUEST['remove_hardware'])) {
+					foreach ($_REQUEST['remove_hardware'] as $hardwareTypeID)
 				$location->removeHardwareSold($hardwareTypeID);
+		}
 
 		$location->setFed(isset($_REQUEST['fed']));
 		$location->setBar(isset($_REQUEST['bar']));
@@ -41,7 +47,6 @@ 
 														'Name' => $db->getField('hardware_name'));
 	}
 	$template->assign('AllHardware', $hardware);
-}
-else {
+} else {
 	$template->assign('Locations', SmrLocation::getAllLocations());
 }