smrealms / smr

tools/discord/commands/forces.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 
 $fn_forces = function ($message, $params) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// print the next expiring forces
 	$option = isset($params[0]) ? $params[0] : null;

tools/discord/commands/op.php

Braces +9 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 
 $fn_op = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print info about the next op
@@ -16,7 +18,9 @@ 
 
 $fn_op_list = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print list of attendees
@@ -26,7 +30,9 @@ 
 
 $fn_op_turns = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	// print list of attendees

tools/discord/commands/seedlist.php

Braces +9 added lines, -3 removed lines

@@ -4,7 +4,9 @@ 
 
 $fn_seedlist = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// print the entire seedlist
 	$results = shared_channel_msg_seedlist($link->player);
@@ -13,7 +15,9 @@ 
 
 $fn_seedlist_add = function ($message, $sectors) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// add sectors to the seedlist
 	$results = shared_channel_msg_seedlist_add($link->player, $sectors);
@@ -22,7 +26,9 @@ 
 
 $fn_seedlist_del = function ($message, $sectors) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	// delete sectors from the seedlist
 	$results = shared_channel_msg_seedlist_del($link->player, $sectors);

tools/discord/commands/turns.php

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
 
 $fn_turns = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$msg = get_turns_message($link->player);
 	$message->channel->sendMessage($msg);
@@ -25,7 +27,9 @@ 
 
 $fn_turns_all = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 	$player = $link->player;
 
 	$results = array_map('get_turns_message', $player->getSharingPlayers(true));

tools/discord/commands/money.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 
 $fn_money = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$result = shared_channel_msg_money($link->player);
 	if ($result) {

tools/chat_helpers/channel_msg_forces.php

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
 				)
 			ORDER BY expire_time ASC LIMIT 1'
 		);
-	}
-	else if ($option == "seedlist") {
+	} else if ($option == "seedlist") {
 		// are we restricting to the seedlist?
 		$seedlist = get_seedlist($player);
 		if (count($seedlist) == 0) {
@@ -33,8 +32,7 @@ 
 				)
 			ORDER BY expire_time ASC LIMIT 1'
 		);
-	}
-	else {
+	} else {
 		// did we get a galaxy name?
 		$db->query('SELECT galaxy_id FROM game_galaxy WHERE galaxy_name = ' . $db->escapeString($option));
 		if ($db->nextRecord()) {

tools/npc/npc.php

Braces +63 added lines, -74 removed lines

@@ -101,12 +101,10 @@ 
 
 	try {
 		changeNPCLogin();
-	}
-	catch(ForwardException $e) {}
+	} catch(ForwardException $e) {}
 
 	NPCStuff();
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	logException($e);
 	// Try to shut down cleanly
 	exitNPC();
@@ -137,15 +135,15 @@ 
 					// dirty hack so we can revisit the init block here on next iteration
 					$actions--;
 
-					if($player->hasAlliance())
-						processContainer(leaveAlliance());
+					if($player->hasAlliance()) {
+											processContainer(leaveAlliance());
+					}
 
 					// figure out if the selected alliance already exist
 					$db->query('SELECT alliance_id FROM alliance WHERE alliance_name='.$db->escapeString($NPC_LOGIN['AllianceName']).' AND game_id='.$db->escapeNumber(SmrSession::getGameID()));
 					if ($db->nextRecord()) {
 						processContainer(joinAlliance($db->getField('alliance_id'),'*--NPCS--*'));
-					}
-					else {
+					} else {
 						processContainer(createAlliance($NPC_LOGIN['AllianceName'],'*--NPCS--*'));
 					}
 				}
@@ -173,8 +171,7 @@ 
 			$fedContainer = null;
 			if($var['url']=='shop_ship_processing.php'&&($fedContainer = plotToFed($player,true))!==true) { //We just bought a ship, we should head back to our trade gal/uno - we use HQ for now as it's both in our gal and a UNO, plus it's safe which is always a bonus
 				processContainer($fedContainer);
-			}
-			else if($player->getShip()->isUnderAttack()===true
+			} else if($player->getShip()->isUnderAttack()===true
 				&&($player->hasPlottedCourse()===false||$player->getPlottedCourse()->getEndSector()->offersFederalProtection()===false)
 				&&($fedContainer==null?$fedContainer = plotToFed($player,true):$fedContainer)!==true) { //We're under attack and need to plot course to fed.
 				// Get the lock, remove under attack and update.
@@ -187,20 +184,16 @@ 
 				debug('Under Attack');
 				$underAttack = true;
 				processContainer($fedContainer);
-			}
-			else if($player->hasPlottedCourse()===true&&$player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
+			} else if($player->hasPlottedCourse()===true&&$player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
 				debug('Follow Course: '.$player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player,$player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if(($container = canWeUNO($player,true))!==false) { //We have money and are at a uno, let's uno!
+			} else if(($container = canWeUNO($player,true))!==false) { //We have money and are at a uno, let's uno!
 				debug('We\'re UNOing');
 				processContainer($container);
-			}
-			else if($player->hasPlottedCourse()===true) { //We have a route to follow, figure it's probably a sensible thing to follow.
+			} else if($player->hasPlottedCourse()===true) { //We have a route to follow, figure it's probably a sensible thing to follow.
 				debug('Follow Course: '.$player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player,$player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if($player->getTurns()<NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns()<NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
+			} else if($player->getTurns()<NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns()<NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
 				if($player->getTurns()<NPC_LOW_TURNS) {
 					debug('Low Turns:'.$player->getTurns());
 				}
@@ -217,16 +210,13 @@ 
 				}
 				$ship =& $player->getShip();
 				processContainer(plotToFed($player,!$ship->hasMaxShields()||!$ship->hasMaxArmour()||!$ship->hasMaxCargoHolds()));
-			}
-			else if(($container = checkForShipUpgrade($player))!==false) { //We have money and are at a uno, let's uno!
+			} else if(($container = checkForShipUpgrade($player))!==false) { //We have money and are at a uno, let's uno!
 				debug('We\'re reshipping!');
 				processContainer($container);
-			}
-			else if(($container = canWeUNO($player,false))!==false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
+			} else if(($container = canWeUNO($player,false))!==false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
 				debug('We need to UNO, so off we go!');
 				processContainer($container);
-			}
-			else if($TRADE_ROUTE instanceof Route) {
+			} else if($TRADE_ROUTE instanceof Route) {
 				debug('Trade Route');
 				$forwardRoute =& $TRADE_ROUTE->getForwardRoute();
 				$returnRoute =& $TRADE_ROUTE->getReturnRoute();
@@ -234,8 +224,7 @@ 
 					if($forwardRoute->getBuySectorId()==$player->getSectorID()) {
 						$buyRoute =& $forwardRoute;
 						$sellRoute =& $returnRoute;
-					}
-					else if($returnRoute->getBuySectorId()==$player->getSectorID()) {
+					} else if($returnRoute->getBuySectorId()==$player->getSectorID()) {
 						$buyRoute =& $returnRoute;
 						$sellRoute =& $forwardRoute;
 					}
@@ -252,30 +241,25 @@ 
 								//Sell goods
 								debug('Sell Goods');
 								processContainer(tradeGoods($goodID,$player,$port));
-							}
-							else {
+							} else {
 								//Move to next route or fed.
 								if(($TRADE_ROUTE =& changeRoute($TRADE_ROUTES))===false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
-								}
-								else {
+								} else {
 									debug('Route Changed');
 									continue;
 								}
 							}
-						}
-						else if($ship->hasCargo($buyRoute->getGoodID())===true) { //We've bought goods, plot to sell
+						} else if($ship->hasCargo($buyRoute->getGoodID())===true) { //We've bought goods, plot to sell
 							debug('Plot To Sell: '.$buyRoute->getSellSectorId());
 							processContainer(plotToSector($player,$buyRoute->getSellSectorId()));
-						}
-						else {
+						} else {
 							//Dump goods
 							debug('Dump Goods');
 							processContainer(dumpCargo($player));
 						}
-					}
-					else { //Buy goods
+					} else { //Buy goods
 						$goodID = $buyRoute->getGoodID();
 
 						$port =& $player->getSector()->getPort();
@@ -284,26 +268,22 @@ 
 						if($tradeable===true && $port->getGoodAmount($goodID)>=$ship->getEmptyHolds()) { //Buy goods
 							debug('Buy Goods');
 							processContainer(tradeGoods($goodID,$player,$port));
-						}
-						else {
+						} else {
 							//Move to next route or fed.
 							if(($TRADE_ROUTE =& changeRoute($TRADE_ROUTES))===false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
-							}
-							else {
+							} else {
 								debug('Route Changed');
 								continue;
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					debug('Plot To Buy: '.$forwardRoute->getBuySectorId());
 					processContainer(plotToSector($player,$forwardRoute->getBuySectorId()));
 				}
-			}
-			else { //Something weird is going on.. Let's fed and wait.
+			} else { //Something weird is going on.. Let's fed and wait.
 				debug('No actual action? Wtf?');
 				processContainer(plotToFed($player));
 			}
@@ -315,8 +295,7 @@ 
 				processContainer(moveToSector($player,$moveTo));
 			}
 			*/
-		}
-		catch(ForwardException $e) {
+		} catch(ForwardException $e) {
 			global $lock;
 			if($lock) { //only save if we have the lock.
 				SmrSector::saveSectors();
@@ -324,8 +303,9 @@ 
 				SmrPlayer::savePlayers();
 				SmrForce::saveForces();
 				SmrPort::savePorts();;
-				if(class_exists('WeightedRandom', false))
-					WeightedRandom::saveWeightedRandoms();
+				if(class_exists('WeightedRandom', false)) {
+									WeightedRandom::saveWeightedRandoms();
+				}
 				release_lock();
 			}
 			//Clean up the caches as the data may get changed by other players
@@ -451,8 +431,7 @@ 
 		debug('Creating account for: '.$NPC_LOGIN['Login']);
 		$account = SmrAccount::createAccount($NPC_LOGIN['Login'],'','NPC@smrealms.de','NPC','NPC',0,0);
 		$account->setValidated(true);
-	}
-	else {
+	} else {
 		$account = SmrAccount::getAccountByName($NPC_LOGIN['Login']);
 	}
 
@@ -472,11 +451,13 @@ 
 }
 
 function canWeUNO(AbstractSmrPlayer &$player, $oppurtunisticOnly) {
-	if($player->getCredits()<MINUMUM_RESERVE_CREDITS)
-		return false;
+	if($player->getCredits()<MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
 	$ship =& $player->getShip();
-	if($ship->hasMaxShields()&&$ship->hasMaxArmour()&&$ship->hasMaxCargoHolds())
-		return false;
+	if($ship->hasMaxShields()&&$ship->hasMaxArmour()&&$ship->hasMaxCargoHolds()) {
+			return false;
+	}
 	$sector =& $player->getSector();
 
 	// We buy armour in preference to shields as it's cheaper.
@@ -491,8 +472,7 @@ 
 			$hardwareSold =& $location->getHardwareSold();
 			if($player->getNewbieTurns() > MIN_NEWBIE_TURNS_TO_BUY_CARGO && !$ship->hasMaxCargoHolds() && isset($hardwareSold[HARDWARE_CARGO]) && ($amount = floor(($player->getCredits()-MINUMUM_RESERVE_CREDITS)/Globals::getHardwareCost(HARDWARE_CARGO))) > 0) { // Buy cargo holds first if we have plenty of newbie turns left.
 				$hardwareID = HARDWARE_CARGO;
-			}
-			else {
+			} else {
 				foreach($hardwareArray as $hardwareArrayID) {
 					if(!$ship->hasMaxHardware($hardwareArrayID) && isset($hardwareSold[$hardwareArrayID]) && ($amount = floor(($player->getCredits()-MINUMUM_RESERVE_CREDITS)/Globals::getHardwareCost($hardwareArrayID))) > 0) {
 						$hardwareID = $hardwareArrayID;
@@ -506,11 +486,14 @@ 
 		}
 	}
 
-	if($oppurtunisticOnly===true)
-		return false;
+	if($oppurtunisticOnly===true) {
+			return false;
+	}
 
-	if($player->getCredits()-$ship->getCostToUNO()<MINUMUM_RESERVE_CREDITS)
-		return false; //Only do non-oppurtunistic UNO if we have the money to do it properly!
+	if($player->getCredits()-$ship->getCostToUNO()<MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
+	//Only do non-oppurtunistic UNO if we have the money to do it properly!
 
 	foreach($hardwareArray as $hardwareArrayID) {
 		if(!$ship->hasMaxHardware($hardwareArrayID)) {
@@ -596,10 +579,14 @@ 
 
 function checkForShipUpgrade(AbstractSmrPlayer &$player) {
 	foreach(SHIP_UPGRADE_PATH[$player->getRaceID()] as $upgradeShipID) {
-		if($player->getShipTypeID()==$upgradeShipID) //We can't upgrade, only downgrade.
+		if($player->getShipTypeID()==$upgradeShipID) {
+			//We can't upgrade, only downgrade.
 			return false;
-		if($upgradeShipID == SHIP_TYPE_NEWBIE_MERCHANT_VESSEL) //We can't actually buy the NMV, we just don't want to downgrade from it if we have it.
+		}
+		if($upgradeShipID == SHIP_TYPE_NEWBIE_MERCHANT_VESSEL) {
+			//We can't actually buy the NMV, we just don't want to downgrade from it if we have it.
 			continue;
+		}
 		$cost = $player->getShip()->getCostToUpgrade($upgradeShipID);
 		if($cost <= 0 || $player->getCredits()-$cost > MINUMUM_RESERVE_CREDITS) {
 			return doShipUpgrade($player, $upgradeShipID);
@@ -621,8 +608,9 @@ 
 
 function &changeRoute(array &$tradeRoutes) {
 	$false = false;
-	if(count($tradeRoutes)==0)
-		return $false;
+	if(count($tradeRoutes)==0) {
+			return $false;
+	}
 	$routeKey = array_rand($tradeRoutes);
 	$tradeRoute =& $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
@@ -672,10 +660,11 @@ 
 	$tradeGoods = array(GOOD_NOTHING => false);
 	$goods =& Globals::getGoods();
 	foreach($goods as $goodID => &$good) {
-		if($player->meetsAlignmentRestriction($good['AlignRestriction']))
-			$tradeGoods[$goodID] = true;
-		else
-			$tradeGoods[$goodID] = false;
+		if($player->meetsAlignmentRestriction($good['AlignRestriction'])) {
+					$tradeGoods[$goodID] = true;
+		} else {
+					$tradeGoods[$goodID] = false;
+		}
 	} unset($good);
 	$tradeRaces = array();
 	$races =& Globals::getRaces();
@@ -700,8 +689,7 @@ 
 		$routes = unserialize(gzuncompress($db->getField('routes')));
 		debug('Using Cached Routes: #'.count($routes));
 		return $routes;
-	}
-	else {
+	} else {
 		debug('Generating Routes');
 		$allSectors = array();
 		foreach($galaxies as &$galaxy) {
@@ -711,10 +699,11 @@ 
 		$distances =& Plotter::calculatePortToPortDistances($allSectors,$maxDistance,$startSectorID,$endSectorID);
 
 
-		if ($maxNumberOfPorts == 1)
-			$allRoutes = RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
-		else
-			$allRoutes = RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		if ($maxNumberOfPorts == 1) {
+					$allRoutes = RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
+		} else {
+					$allRoutes = RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		}
 
 		unset($distances);
 

tools/npc/chess.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 	fclose($toEngine);
 	fclose($fromEngine);
 	proc_close($engine);
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	logException($e);
 	exit;
 }

tools/irc/irc.php

Braces +91 added lines, -63 removed lines

@@ -6,12 +6,13 @@ 
 function echo_r($message)
 {
 	if (is_array($message)) {
-		foreach ($message as $msg)
-			echo_r($msg);
+		foreach ($message as $msg) {
+					echo_r($msg);
+		}
+	} else {
+			echo date("d.m.Y H:i:s => ") . $message . EOL;
+	}
 	}
-	else
-		echo date("d.m.Y H:i:s => ") . $message . EOL;
-}
 
 // not keeping the filehandle might not be the wisest idea.
 function write_log_message($msg)
@@ -144,8 +145,7 @@ 
 			sleep(60);
 
 		}
-	}
-	catch (TimeoutException $e) {
+	} catch (TimeoutException $e) {
 		// Ignore the timeout exception, we'll loop round and reconnect.
 	}
 } // end of while running
@@ -164,12 +164,14 @@ 
 	$rdata = preg_replace('/\s+/', ' ', $rdata);
 
 	// log for reports (if enabled via command line (-log)
-	if (IRC_LOGGING && strlen($rdata) > 0)
-		write_log_message($rdata);
+	if (IRC_LOGGING && strlen($rdata) > 0) {
+			write_log_message($rdata);
+	}
 
 	// remember the last time we got something from the server
-	if (strlen($rdata) > 0)
-		$last_ping = time();
+	if (strlen($rdata) > 0) {
+			$last_ping = time();
+	}
 
 	// timeout detection!
 	if ($last_ping < time() - 300) {
@@ -186,76 +188,102 @@ 
 	}
 
 	// required!!! otherwise timeout!
-	if (server_ping($fp, $rdata))
-		return;
+	if (server_ping($fp, $rdata)) {
+			return;
+	}
 
 	// server msg
-	if (server_msg_307($fp, $rdata))
-		return;
-	if (server_msg_318($fp, $rdata))
-		return;
-	if (server_msg_352($fp, $rdata))
-		return;
-	if (server_msg_401($fp, $rdata))
-		return;
+	if (server_msg_307($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_318($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_352($fp, $rdata)) {
+			return;
+	}
+	if (server_msg_401($fp, $rdata)) {
+			return;
+	}
 
 	//Are they using a linked nick instead
-	if(notice_nickserv_registered_user($fp, $rdata))
-		return;
-	if(notice_nickserv_unknown_user($fp, $rdata))
-		return;
+	if(notice_nickserv_registered_user($fp, $rdata)) {
+			return;
+	}
+	if(notice_nickserv_unknown_user($fp, $rdata)) {
+			return;
+	}
 
 	// some nice things
-	if (ctcp_version($fp, $rdata))
-		return;
-	if (ctcp_finger($fp, $rdata))
-		return;
-	if (ctcp_time($fp, $rdata))
-		return;
-	if (ctcp_ping($fp, $rdata))
-		return;
+	if (ctcp_version($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_finger($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_time($fp, $rdata)) {
+			return;
+	}
+	if (ctcp_ping($fp, $rdata)) {
+			return;
+	}
 
-	if (invite($fp, $rdata))
-		return;
+	if (invite($fp, $rdata)) {
+			return;
+	}
 
 	// join and part
-	if (channel_join($fp, $rdata))
-		return;
-	if (channel_part($fp, $rdata))
-		return;
+	if (channel_join($fp, $rdata)) {
+			return;
+	}
+	if (channel_part($fp, $rdata)) {
+			return;
+	}
 
 	// nick change and quit
-	if (user_nick($fp, $rdata))
-		return;
-	if (user_quit($fp, $rdata))
-		return;
+	if (user_nick($fp, $rdata)) {
+			return;
+	}
+	if (user_quit($fp, $rdata)) {
+			return;
+	}
 
-	if (channel_action_slap($fp, $rdata))
-		return;
+	if (channel_action_slap($fp, $rdata)) {
+			return;
+	}
 
 	// channel msg (!xyz) without registration
-	if (channel_msg_help($fp, $rdata))
-		return;
-	if (channel_msg_seedlist($fp, $rdata))
-		return;
-	if (channel_msg_op($fp, $rdata))
-		return;
-	if (channel_msg_timer($fp, $rdata))
-		return;
-	if (channel_msg_8ball($fp, $rdata))
-		return;
-	if (channel_msg_seen($fp, $rdata))
-		return;
-	if (channel_msg_sd($fp, $rdata))
-		return;
+	if (channel_msg_help($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_seedlist($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_op($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_timer($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_8ball($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_seen($fp, $rdata)) {
+			return;
+	}
+	if (channel_msg_sd($fp, $rdata)) {
+			return;
+	}
 
 	// channel msg (!xyz) with registration
-	if (channel_msg_with_registration($fp, $rdata))
-		return;
+	if (channel_msg_with_registration($fp, $rdata)) {
+			return;
+	}
 
 	// MrSpock can use this to send commands as caretaker
-	if (query_command($fp, $rdata))
-		return;
+	if (query_command($fp, $rdata)) {
+			return;
+	}
 
 
 	// debug