smrealms / smr

engine/Default/shop_goods_processing.php

Spacing +31 added lines, -31 removed lines

@@ -32,11 +32,11 @@ 
 $portGood = $port->getGood($good_id);
 // check if there are enough left at port
 if ($port->getGoodAmount($good_id) < $amount)
-	create_error('I\'m short of '.$good_name.'. So I\'m not going to sell you '.$amount.' pcs.');
+	create_error('I\'m short of ' . $good_name . '. So I\'m not going to sell you ' . $amount . ' pcs.');
 
 // does we have what we are going to sell?
 if ($transaction == 'Sell' && $amount > $ship->getCargo($good_id))
-	create_error('Scanning your ships indicates you don\'t have '.$amount.' pcs. of '.$good_name.'!');
+	create_error('Scanning your ships indicates you don\'t have ' . $amount . ' pcs. of ' . $good_name . '!');
 
 // check if we have enough room for the thing we are going to buy
 if ($transaction == 'Buy' && $amount > $ship->getEmptyHolds())
@@ -49,10 +49,10 @@ 
 // get relations for us (global + personal)
 $relations = $player->getRelation($port->getRaceID());
 
-if (!isset($var['ideal_price'])) SmrSession::updateVar('ideal_price',$port->getIdealPrice($good_id, $transaction, $amount, $relations));
+if (!isset($var['ideal_price'])) SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
 $ideal_price = $var['ideal_price'];
 
-if (!isset($var['offered_price'])) SmrSession::updateVar('offered_price',$port->getOfferPrice($ideal_price, $relations, $transaction));
+if (!isset($var['offered_price'])) SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
 $offered_price = $var['offered_price'];
 
 // nothing should happen here but just to avoid / by 0
@@ -74,7 +74,7 @@ 
 		$player->setCredits($newCredits);
 		$player->decreaseAlignment(5);
 
-		$fineMessage = '<span class="red">A Federation patrol caught you loading stolen goods onto your ship!<br />The stolen goods have been confiscated and you have been fined '.number_format($fine).' credits.</span><br /><br />';
+		$fineMessage = '<span class="red">A Federation patrol caught you loading stolen goods onto your ship!<br />The stolen goods have been confiscated and you have been fined ' . number_format($fine) . ' credits.</span><br /><br />';
 		$container = create_container('skeleton.php', 'shop_goods.php');
 		$container['trade_msg'] = $fineMessage;
 		forward($container);
@@ -97,60 +97,60 @@ 
 	$base_xp = SmrPort::getBaseExperience($amount, $port->getGoodDistance($good_id));
 
 	// if offered equals ideal we get a problem (division by zero)
-	$gained_exp = round($port->calculateExperiencePercent($ideal_price,$offered_price,$bargain_price,$transaction) * $base_xp);
+	$gained_exp = round($port->calculateExperiencePercent($ideal_price, $offered_price, $bargain_price, $transaction) * $base_xp);
 
 	if ($transaction == 'Buy') {
 		$msg_transaction = 'bought';
-		$ship->increaseCargo($good_id,$amount);
+		$ship->increaseCargo($good_id, $amount);
 		$player->decreaseCredits($bargain_price);
-		$player->increaseHOF($amount,array('Trade','Goods','Bought'), HOF_ALLIANCE);
-		$player->increaseHOF($gained_exp,array('Trade','Experience','Buying'), HOF_PUBLIC);
-		$player->decreaseHOF($bargain_price,array('Trade','Money','Profit'), HOF_PUBLIC);
-		$player->increaseHOF($bargain_price,array('Trade','Money','Buying'), HOF_PUBLIC);
-		$port->buyGoods($portGood,$amount,$ideal_price,$bargain_price,$gained_exp);
+		$player->increaseHOF($amount, array('Trade', 'Goods', 'Bought'), HOF_ALLIANCE);
+		$player->increaseHOF($gained_exp, array('Trade', 'Experience', 'Buying'), HOF_PUBLIC);
+		$player->decreaseHOF($bargain_price, array('Trade', 'Money', 'Profit'), HOF_PUBLIC);
+		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Buying'), HOF_PUBLIC);
+		$port->buyGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 	}
 	elseif ($transaction == 'Sell') {
 		$msg_transaction = 'sold';
-		$ship->decreaseCargo($good_id,$amount);
+		$ship->decreaseCargo($good_id, $amount);
 		$player->increaseCredits($bargain_price);
-		$player->increaseHOF($amount,array('Trade','Goods','Sold'), HOF_ALLIANCE);
-		$player->increaseHOF($gained_exp,array('Trade','Experience','Selling'), HOF_PUBLIC);
-		$player->increaseHOF($bargain_price,array('Trade','Money','Profit'), HOF_PUBLIC);
-		$player->increaseHOF($bargain_price,array('Trade','Money','Selling'), HOF_PUBLIC);
-		$port->sellGoods($portGood,$amount,$ideal_price,$bargain_price,$gained_exp);
+		$player->increaseHOF($amount, array('Trade', 'Goods', 'Sold'), HOF_ALLIANCE);
+		$player->increaseHOF($gained_exp, array('Trade', 'Experience', 'Selling'), HOF_PUBLIC);
+		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Profit'), HOF_PUBLIC);
+		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Selling'), HOF_PUBLIC);
+		$port->sellGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 	}
 	elseif ($transaction == 'Steal') {
 		$msg_transaction = 'stolen';
 		$bargain_price = 0;
 		$gained_exp = round($base_xp);
-		$ship->increaseCargo($good_id,$amount);
-		$player->increaseHOF($amount, array('Trade','Goods','Stolen'), HOF_ALLIANCE);
-		$player->increaseHOF($gained_exp, array('Trade','Experience','Stealing'), HOF_PUBLIC);
+		$ship->increaseCargo($good_id, $amount);
+		$player->increaseHOF($amount, array('Trade', 'Goods', 'Stolen'), HOF_ALLIANCE);
+		$player->increaseHOF($gained_exp, array('Trade', 'Experience', 'Stealing'), HOF_PUBLIC);
 		$port->buyGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 	}
 
-	$player->increaseHOF($gained_exp,array('Trade','Experience','Total'), HOF_PUBLIC);
-	$player->increaseHOF(1,array('Trade','Results','Success'), HOF_PUBLIC);
+	$player->increaseHOF($gained_exp, array('Trade', 'Experience', 'Total'), HOF_PUBLIC);
+	$player->increaseHOF(1, array('Trade', 'Results', 'Success'), HOF_PUBLIC);
 
 	// log action
-	$account->log(LOG_TYPE_TRADING, $transaction . 's '.$amount.' '.$good_name.' for '.$bargain_price.' credits and '.$gained_exp.' experience', $player->getSectorID());
+	$account->log(LOG_TYPE_TRADING, $transaction . 's ' . $amount . ' ' . $good_name . ' for ' . $bargain_price . ' credits and ' . $gained_exp . ' experience', $player->getSectorID());
 
 	$player->increaseExperience($gained_exp);
 
 	// change relation for non neutral ports (Alskants get to treat neutrals as an alskant port);
 	if ($port->getRaceID() != RACE_NEUTRAL || $player->getRaceID() == RACE_ALSKANT) {
-		$player->increaseRelationsByTrade($amount,$port->getRaceID());
+		$player->increaseRelationsByTrade($amount, $port->getRaceID());
 	}
 
 	//will use these variables in current sector and port after successful trade
-	$tradeMessage = 'You have just '.$msg_transaction.' <span class="yellow">'.$amount.'</span> '.pluralise('unit', $amount).' of <span class="yellow">'.$good_name.'</span>';
+	$tradeMessage = 'You have just ' . $msg_transaction . ' <span class="yellow">' . $amount . '</span> ' . pluralise('unit', $amount) . ' of <span class="yellow">' . $good_name . '</span>';
 	if ($bargain_price > 0) {
-		$tradeMessage .= ' for <span class="creds">'.$bargain_price.'</span> '.pluralise('credit', $bargain_price);
+		$tradeMessage .= ' for <span class="creds">' . $bargain_price . '</span> ' . pluralise('credit', $bargain_price);
 	}
 	$tradeMessage .= '.<br />';
 	if ($gained_exp > 0) {
 		$skill = $transaction == 'Steal' ? 'thievery' : 'trading';
-		$tradeMessage .= 'Your excellent '.$skill.' skills have earned you <span class="exp">'.$gained_exp.' </span> experience '.pluralise('point', $gained_exp).'!<br />';
+		$tradeMessage .= 'Your excellent ' . $skill . ' skills have earned you <span class="exp">' . $gained_exp . ' </span> experience ' . pluralise('point', $gained_exp) . '!<br />';
 	}
 	$tradeMessage .= '<br />';
 
@@ -167,7 +167,7 @@ 
 	$container = create_container('skeleton.php', 'shop_goods_trade.php');
 	transfer('ideal_price');
 	transfer('offered_price');
-	check_bargain_number($amount,$ideal_price,$offered_price,$bargain_price,$container);
+	check_bargain_number($amount, $ideal_price, $offered_price, $bargain_price, $container);
 
 	// transfer values to next page
 	transfer('good_id');
@@ -177,8 +177,8 @@ 
 }
 
 // only take turns if they bargained
-if (!isset($container['number_of_bargains'])||$container['number_of_bargains'] != 1)
-	$player->takeTurns(TURNS_PER_TRADE,TURNS_PER_TRADE);
+if (!isset($container['number_of_bargains']) || $container['number_of_bargains'] != 1)
+	$player->takeTurns(TURNS_PER_TRADE, TURNS_PER_TRADE);
 
 // go to next page
 forward($container);

engine/Default/shop_goods_trade.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$template->assign('PageTopic','Negotiate Price');
+$template->assign('PageTopic', 'Negotiate Price');
 require_once(LIB . 'Default/shop_goods.inc');
 // creates needed objects
 $port = $player->getSectorPort();

engine/Default/buy_ship_name.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-$template->assign('PageTopic','Naming Your Ship');
+$template->assign('PageTopic', 'Naming Your Ship');
 
-if(isset($var['Preview'])) {
-	$template->assign('Preview',$var['Preview']);
-	$template->assign('ContinueHref',SmrSession::getNewHREF(create_container('skeleton.php','buy_ship_name_processing.php',array('ShipName'=>$var['Preview']))));
+if (isset($var['Preview'])) {
+	$template->assign('Preview', $var['Preview']);
+	$template->assign('ContinueHref', SmrSession::getNewHREF(create_container('skeleton.php', 'buy_ship_name_processing.php', array('ShipName'=>$var['Preview']))));
 }
 else {
-	$template->assign('ShipNameFormHref',SmrSession::getNewHREF(create_container('skeleton.php','buy_ship_name_processing.php')));
+	$template->assign('ShipNameFormHref', SmrSession::getNewHREF(create_container('skeleton.php', 'buy_ship_name_processing.php')));
 }

engine/Default/alliance_roles_processing.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 if (!is_numeric($withPerDay) || ($withPerDay < 0 && $withPerDay != ALLIANCE_BANK_UNLIMITED)) {
 	create_error('You must enter a number for max withdrawals per 24 hours.');
 }
-if($withPerDay == ALLIANCE_BANK_UNLIMITED && $positiveBalance) {
+if ($withPerDay == ALLIANCE_BANK_UNLIMITED && $positiveBalance) {
 	create_error('You cannot have both unlimited withdrawals and a positive balance limit.');
 }
 
@@ -50,10 +50,10 @@ 
 else {
 	// if no role is given we delete that entry
 	if (empty($_REQUEST['role'])) {
-		if($var['role_id']==1) {
+		if ($var['role_id'] == 1) {
 			create_error('You cannot delete the leader role.');
 		}
-		else if($var['role_id']==2) {
+		else if ($var['role_id'] == 2) {
 			create_error('You cannot delete the new member role.');
 		}
 		$db->query('DELETE FROM alliance_has_roles

engine/Default/bar_ticker_buy.php

Spacing +7 added lines, -7 removed lines

@@ -4,14 +4,14 @@ 
 	if ($account->getTotalSmrCredits() < CREDITS_PER_TICKER) {
 		create_error('You don\'t have enough SMR Credits.  Donate money to SMR to gain SMR Credits!');
 	}
-	if(isset($_REQUEST['type'])) {
-		SmrSession::updateVar('type',$_REQUEST['type']);
+	if (isset($_REQUEST['type'])) {
+		SmrSession::updateVar('type', $_REQUEST['type']);
 	}
 	$type = $var['type'];
-	if(empty($type)) {
+	if (empty($type)) {
 		create_error('You have to choose the type of ticker to buy.');
 	}
-	switch($type) {
+	switch ($type) {
 		case 'NEWS':
 		case 'SCOUT':
 		case 'BLOCK':
@@ -21,15 +21,15 @@ 
 	}
 	$expires = TIME;
 	$ticker = $player->getTicker($type);
-	if($ticker !== false) {
+	if ($ticker !== false) {
 		$expires = $ticker['Expires'];
 	}
-	$expires += 5*86400;
+	$expires += 5 * 86400;
 	$db->query('REPLACE INTO player_has_ticker (game_id, account_id, type, expires) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeString($type) . ', ' . $db->escapeNumber($expires) . ')');
 	//take credits
 	$account->decreaseTotalSmrCredits(CREDITS_PER_TICKER);
 	//offer another drink and such
-	$container=create_container('skeleton.php','bar_main.php');
+	$container = create_container('skeleton.php', 'bar_main.php');
 	transfer('LocationID');
 	$container['message'] = '<div align="center">Your system has been added.  Enjoy!</div><br />';
 	forward($container);

engine/Default/message_blacklist_del.php

Spacing +3 added lines, -3 removed lines

@@ -4,13 +4,13 @@
 $container['url'] = 'skeleton.php';
 $container['body'] = 'message_blacklist.php';
 
-if(!isset($_REQUEST['entry_ids']) || !is_array($_REQUEST['entry_ids'])) {
+if (!isset($_REQUEST['entry_ids']) || !is_array($_REQUEST['entry_ids'])) {
 	$container['error'] = 4;	
 	forward($container);
 }
 
-foreach($_REQUEST['entry_ids'] as $entry_id) {
-	if(!is_numeric($entry_id)) {
+foreach ($_REQUEST['entry_ids'] as $entry_id) {
+	if (!is_numeric($entry_id)) {
 		$container['error'] = 5;	
 		forward($container);
 	}

engine/Default/chat_sharing.php

Spacing +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +39,7 @@ 
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

engine/Default/edit_dummys.php

Spacing +15 added lines, -15 removed lines

@@ -1,25 +1,25 @@ 
 <?php
-$template->assign('PageTopic','Edit Dummys');
+$template->assign('PageTopic', 'Edit Dummys');
 
 //TODO add game type id
-$template->assign('CombatSimLink',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php')));
-$template->assign('BaseShips',AbstractSmrShip::getAllBaseShips(0));
-$template->assign('Weapons',SmrWeapon::getAllWeapons(0));
+$template->assign('CombatSimLink', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php')));
+$template->assign('BaseShips', AbstractSmrShip::getAllBaseShips(0));
+$template->assign('Weapons', SmrWeapon::getAllWeapons(0));
 
-$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php')));
+$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php')));
 
-$dummyPlayer =& DummyPlayer::getCachedDummyPlayer($_REQUEST['dummy_name']);
-$dummyShip =& $dummyPlayer->getShip();
+$dummyPlayer = & DummyPlayer::getCachedDummyPlayer($_REQUEST['dummy_name']);
+$dummyShip = & $dummyPlayer->getShip();
 
-if(isset($_REQUEST['save_dummy'])) {
+if (isset($_REQUEST['save_dummy'])) {
 	$dummyPlayer->setPlayerName($_REQUEST['dummy_name']);
 	$dummyPlayer->setExperience($_REQUEST['level']);
 	$dummyPlayer->setShipTypeID($_REQUEST['ship_id']);
 	$dummyShip->regenerate($dummyPlayer);
-	if(isset($_REQUEST['weapons']) && is_array($_REQUEST['weapons'])) {
+	if (isset($_REQUEST['weapons']) && is_array($_REQUEST['weapons'])) {
 		$dummyShip->removeAllWeapons();
-		foreach($_REQUEST['weapons'] as $weaponTypeID) {
-			if($weaponTypeID!=0) {
+		foreach ($_REQUEST['weapons'] as $weaponTypeID) {
+			if ($weaponTypeID != 0) {
 				$dummyShip->addWeapon($weaponTypeID);
 			}
 		}
@@ -28,10 +28,10 @@ 
 }
 
 
-$template->assign('DummyPlayer',$dummyPlayer);
-$template->assign('DummyShip',$dummyShip);
-$template->assign('ShipWeapons',$dummyShip->getWeapons());
-$template->assign('Levels',Globals::getLevelRequirements());
+$template->assign('DummyPlayer', $dummyPlayer);
+$template->assign('DummyShip', $dummyShip);
+$template->assign('ShipWeapons', $dummyShip->getWeapons());
+$template->assign('Levels', Globals::getLevelRequirements());
 
 
 

engine/Default/buy_message_notifications_processing.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
-if($account->getTotalSmrCredits() < 1) {
+if ($account->getTotalSmrCredits() < 1) {
 	create_error('You do not have enough SMR credits.');
 }
 
 $account->decreaseTotalSmrCredits(1);
 $account->increaseMessageNotifications($var['MessageTypeID'], MESSAGES_PER_CREDIT[$var['MessageTypeID']]);
 
-forward(create_container('skeleton.php', 'buy_message_notifications.php', array('Message' => '<span class="green">SUCCESS</span>: You have purchased '.MESSAGES_PER_CREDIT[$var['MessageTypeID']].' message notifications.')));
+forward(create_container('skeleton.php', 'buy_message_notifications.php', array('Message' => '<span class="green">SUCCESS</span>: You have purchased ' . MESSAGES_PER_CREDIT[$var['MessageTypeID']] . ' message notifications.')));