smrealms / smr

tools/testCoursePlotters.php

Spacing +18 added lines, -18 removed lines

@@ -9,57 +9,57 @@
 function testCourseDistances($gameID)
 {
 	//Initialise cache for fairness
-	$galaxies =& SmrGalaxy::getGameGalaxies($gameID);
+	$galaxies = & SmrGalaxy::getGameGalaxies($gameID);
 	$galaxySectors = array();
-	foreach($galaxies as &$galaxy)
+	foreach ($galaxies as &$galaxy)
 	{
-		$galaxiesSectors[] =& $galaxy->getSectors();
+		$galaxiesSectors[] = & $galaxy->getSectors();
 	} unset($galaxy);
 	//Test plotters
 	$newTime = 0;
 	$oldTime = 0;
-	foreach($galaxiesSectors as &$galaxySectors)
+	foreach ($galaxiesSectors as &$galaxySectors)
 	{
-		foreach($galaxySectors as &$galaxySector)
+		foreach ($galaxySectors as &$galaxySector)
 		{
-			foreach($galaxiesSectors as &$targetGalaxySectors)
+			foreach ($galaxiesSectors as &$targetGalaxySectors)
 			{
-				foreach($targetGalaxySectors as &$targetGalaxySector)
+				foreach ($targetGalaxySectors as &$targetGalaxySector)
 				{
-					if(!$galaxySector->equals($targetGalaxySector))
+					if (!$galaxySector->equals($targetGalaxySector))
 					{
 						$time = microtime(true);
-						$newDI = getPlotDistanceNew($galaxySector,$targetGalaxySector);
+						$newDI = getPlotDistanceNew($galaxySector, $targetGalaxySector);
 						$newTime += microtime(true) - $time;
 						
 						$time = microtime(true);
-						$oldDI = getPlotDistanceOld($galaxySector,$targetGalaxySector);
+						$oldDI = getPlotDistanceOld($galaxySector, $targetGalaxySector);
 						$oldTime += microtime(true) - $time;
 						
-						if($newDI!=$oldDI)
+						if ($newDI != $oldDI)
 						{
-							echo 'Difference, new: '.$newDI.', old:'.$oldDI.', sector1:'.$galaxySector->getSectorID().', sector2:'.$targetGalaxySector->getSectorID().EOL;
+							echo 'Difference, new: ' . $newDI . ', old:' . $oldDI . ', sector1:' . $galaxySector->getSectorID() . ', sector2:' . $targetGalaxySector->getSectorID() . EOL;
 						}
 					}
 				} unset($targetGalaxySector);
-				echo 'New time: '.$newTime.', old time:'.$oldTime.EOL;
+				echo 'New time: ' . $newTime . ', old time:' . $oldTime . EOL;
 			} unset($targetGalaxySectors);
 		} unset($galaxySector);
 	} unset($galaxySectors);
-	echo 'New time: '.$newTime.', old time:'.$oldTime.EOL;
+	echo 'New time: ' . $newTime . ', old time:' . $oldTime . EOL;
 }
 
 
-function getPlotDistanceNew(SmrSector &$sector,SmrSector &$target)
+function getPlotDistanceNew(SmrSector &$sector, SmrSector &$target)
 {
-	$path =& Plotter::findDistanceToX($target, $sector, true);
+	$path = & Plotter::findDistanceToX($target, $sector, true);
 	return $path->getRelativeDistance();
 }
 
-function getPlotDistanceOld(SmrSector &$sector,SmrSector &$target)
+function getPlotDistanceOld(SmrSector &$sector, SmrSector &$target)
 {
 	$plotter = new Course_Plotter();
-	$plotter->set_course($sector->getSectorID(),$target->getSectorID(),$sector->getGameID());
+	$plotter->set_course($sector->getSectorID(), $target->getSectorID(), $sector->getGameID());
 	$plotter->plot();
 	$return = $plotter->plotted_course[0];
 	$plotter->Course_Plotter_Destructor();

tools/irc/channel_action.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 			'gets up off the ground and roundhouse kicks ' . $nick . ' in the face',
 			'does an evasive backflip and throws ninja stars at ' . $nick,
 			'slaps ' . $nick . ' around a bit with a large trout',
-			'deflects the slap and deals ' . rand(1,999999) . ' damage to ' . $nick,
+			'deflects the slap and deals ' . rand(1, 999999) . ' damage to ' . $nick,
 			'steals the trout and throws it back in the river'
 		);
 		fputs($fp, 'PRIVMSG ' . $channel . ' :' . chr(1) . 'ACTION ' . $slap_responses[rand(0, count($slap_responses) - 1)] . chr(1) . EOL);

tools/irc/irc.php

Spacing +3 added lines, -3 removed lines

@@ -152,7 +152,7 @@ 
 
 function safefputs($fp, $text) {
 	stream_set_blocking($fp, false);
-	while(readFromStream($fp)!==false);
+	while (readFromStream($fp) !== false);
 	fputs($fp, $text);
 	stream_set_blocking($fp, true);
 }
@@ -200,9 +200,9 @@ 
 		return;
 
 	//Are they using a linked nick instead
-	if(notice_nickserv_registered_user($fp, $rdata))
+	if (notice_nickserv_registered_user($fp, $rdata))
 		return;
-	if(notice_nickserv_unknown_user($fp, $rdata))
+	if (notice_nickserv_unknown_user($fp, $rdata))
 		return;
 
 	// some nice things

tools/irc/channel_msg_sd.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 		echo_r('[SD_SET] by ' . $nick . ' in ' . $channel);
 
 		// delete any old entries in the list
-		foreach($sds as $key => $value) {
+		foreach ($sds as $key => $value) {
 
 			if ($value[3] != $channel)
 				continue;
@@ -80,7 +80,7 @@ 
 
 		echo_r('[SD_DEL] by ' . $nick . ' in ' . $channel);
 
-		foreach($sds as $key => $sd) {
+		foreach ($sds as $key => $sd) {
 
 			if ($sd[3] != $channel)
 				continue;

tools/irc/channel_msg_op.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 
 function channel_op_notification($fp, $rdata, $nick, $channel) {
 	echo_r('[OP_ATTENDANCE_CHECK] ' . $nick);
-	if(check_for_registration($account, $player, $fp, $nick, $channel, 'channel_op_notification($fp, \'' . $rdata . '\', \'' . $nick . '\', \'' . $channel . '\');', false)) {
+	if (check_for_registration($account, $player, $fp, $nick, $channel, 'channel_op_notification($fp, \'' . $rdata . '\', \'' . $nick . '\', \'' . $channel . '\');', false)) {
 		return true;
 	}
 

tools/irc/server.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 
 
 		global $actions;
-		foreach($actions as $key => $action) {
+		foreach ($actions as $key => $action) {
 
 			// is that a callback for our nick?
 			if ($action[0] == 'MSG_318' && $nick == $action[2]) {
@@ -96,7 +96,7 @@ 
 					$action[4] = time();
 					array_push($actions, $action);
 					fputs($fp, 'NICKSERV INFO ' . $nick . EOL);
-				} else if($action[5] === true) {
+				} else if ($action[5] === true) {
 					fputs($fp, 'PRIVMSG ' . $action[1] . ' :' . $nick . ', you are not using a registered nick. Please identify with NICKSERV and try the last command again.' . EOL);
 				}
 

tools/irc/notice.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 		}
 		
 		global $actions;
-		foreach($actions as $key => $action) {
+		foreach ($actions as $key => $action) {
 
 			// is that a callback for our nick?
 			if ($action[0] == 'NICKSERV_INFO' && $nick == $action[2]) {
@@ -59,7 +59,7 @@ 
 		echo_r('[NOTICE_NICKSERV_UNKNOWN_NICK] ' . $nick);
 		
 		global $actions;
-		foreach($actions as $key => $action) {
+		foreach ($actions as $key => $action) {
 
 			// is that a callback for our nick?
 			if ($action[0] == 'NICKSERV_INFO' && $nick == $action[2]) {
@@ -68,7 +68,7 @@ 
 				
 				unset($actions[$key]);
 
-				if($action[5] === true) {
+				if ($action[5] === true) {
 					fputs($fp, 'PRIVMSG ' . $action[1] . ' :' . $nick . ', you are not using a registered nick. Please identify with NICKSERV and try the last command again.' . EOL);
 				}
 

tools/irc/channel_msg.php

Spacing +8 added lines, -8 removed lines

@@ -22,9 +22,9 @@ 
 	$registeredNick = $db->getField('registered_nick');
 
 	// get alliance_id and game_id for this channel
-	$alliance =& SmrAlliance::getAllianceByIrcChannel($channel, true);
+	$alliance = & SmrAlliance::getAllianceByIrcChannel($channel, true);
 	if ($alliance == null) {
-		if($validationMessages === true) {
+		if ($validationMessages === true) {
 			fputs($fp, 'PRIVMSG ' . $channel . ' :' . $nick . ', the channel ' . $channel . ' has not been registered with me.' . EOL);
 		}
 		return true;
@@ -33,11 +33,11 @@ 
 	// get smr account
 	$account = SmrAccount::getAccountByIrcNick($nick, true);
 	if ($account == null) {
-		if($registeredNick != '') {
+		if ($registeredNick != '') {
 			$account = SmrAccount::getAccountByIrcNick($registeredNick, true);
 		}
 		if ($account == null) {
-			if($validationMessages === true) {
+			if ($validationMessages === true) {
 				fputs($fp, 'PRIVMSG ' . $channel . ' :' . $nick . ', please set your \'irc nick\' in SMR preferences to your registered nick so i can recognize you.' . EOL);
 			}
 			return true;
@@ -48,8 +48,8 @@ 
 	try {
 		$player = SmrPlayer::getPlayer($account->getAccountID(), $alliance->getGameId(), true);
 	}
-	catch(PlayerNotFoundException $e) {
-		if($validationMessages === true) {
+	catch (PlayerNotFoundException $e) {
+		if ($validationMessages === true) {
 			fputs($fp, 'PRIVMSG ' . $channel . ' :' . $nick . ', you have not joined the game that this channel belongs to.' . EOL);
 		}
 		return true;
@@ -57,7 +57,7 @@ 
 
 	// is the user part of this alliance? (no need to check for 0, cannot happen at this point in code)
 	if ($player->getAllianceID() != $alliance->getAllianceID()) {
-		if($validationMessages === true) {
+		if ($validationMessages === true) {
 			fputs($fp, 'KICK ' . $channel . ' ' . $nick . ' :You are not a member of this alliance!' . EOL);
 		}
 		return true;
@@ -81,7 +81,7 @@ 
 			return true;
 		}
 		
-		if(check_for_registration($account, $player, $fp, $nick, $channel, 'channel_msg_with_registration($fp, \'' . $rdata . '\');')) {
+		if (check_for_registration($account, $player, $fp, $nick, $channel, 'channel_msg_with_registration($fp, \'' . $rdata . '\');')) {
 			return true;
 		}
 

tools/remove_semi_exp.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 <?php
 
 //config file
-require( realpath(dirname(__FILE__)) . '/../htdocs/config.inc');
+require(realpath(dirname(__FILE__)) . '/../htdocs/config.inc');
 
 $db = new SmrMySqlDatabase();
 $db2 = new SmrMySqlDatabase();