smrealms / smr

lib/Default/SmrGalaxy.class.inc

Spacing +35 added lines, -35 removed lines

@@ -19,12 +19,12 @@ 
 	protected $hasChanged = false;
 	protected $isNew = false;
 
-	public static function &getGameGalaxies($gameID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_GAME_GALAXIES[$gameID])) {
+	public static function &getGameGalaxies($gameID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_GAME_GALAXIES[$gameID])) {
 			$db = new SmrMySqlDatabase();
-			$db->query('SELECT * FROM game_galaxy WHERE game_id = ' . $db->escapeNumber($gameID) .' ORDER BY galaxy_id ASC');
+			$db->query('SELECT * FROM game_galaxy WHERE game_id = ' . $db->escapeNumber($gameID) . ' ORDER BY galaxy_id ASC');
 			$galaxies = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$galaxyID = $db->getField('galaxy_id');
 				$galaxies[$galaxyID] = self::getGalaxy($gameID, $galaxyID, $forceUpdate, $db);
 			}
@@ -33,8 +33,8 @@ 
 		return self::$CACHE_GAME_GALAXIES[$gameID];
 	}
 
-	public static function &getGalaxy($gameID, $galaxyID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_GALAXIES[$gameID][$galaxyID])) {
+	public static function &getGalaxy($gameID, $galaxyID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_GALAXIES[$gameID][$galaxyID])) {
 			$g = new SmrGalaxy($gameID, $galaxyID, false, $db);
 			self::$CACHE_GALAXIES[$gameID][$galaxyID] = $g;
 		}
@@ -42,22 +42,22 @@ 
 	}
 	
 	public static function saveGalaxies() {
-		foreach(self::$CACHE_GALAXIES as $gameGalaxies) {
-			foreach($gameGalaxies as $galaxy) {
+		foreach (self::$CACHE_GALAXIES as $gameGalaxies) {
+			foreach ($gameGalaxies as $galaxy) {
 				$galaxy->save();
 			}
 		}
 	}
 	
-	public static function &createGalaxy($gameID,$galaxyID) {
-		if(!isset(self::$CACHE_GALAXIES[$gameID][$galaxyID])) {
-			$g = new SmrGalaxy($gameID,$galaxyID,true);
+	public static function &createGalaxy($gameID, $galaxyID) {
+		if (!isset(self::$CACHE_GALAXIES[$gameID][$galaxyID])) {
+			$g = new SmrGalaxy($gameID, $galaxyID, true);
 			self::$CACHE_GALAXIES[$gameID][$galaxyID] = $g;
 		}
 		return self::$CACHE_GALAXIES[$gameID][$galaxyID];
 	}
 	
-	protected function __construct($gameID, $galaxyID, $create=false, $db=null) {
+	protected function __construct($gameID, $galaxyID, $create = false, $db = null) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'game_id = ' . $this->db->escapeNumber($gameID) . '
 		              AND galaxy_id = ' . $this->db->escapeNumber($galaxyID);
@@ -70,8 +70,8 @@ 
 			$this->isNew = !$db->nextRecord();
 		}
 
-		$this->gameID = (int) $gameID;
-		$this->galaxyID = (int) $galaxyID;
+		$this->gameID = (int)$gameID;
+		$this->galaxyID = (int)$galaxyID;
 		if (!$this->isNew) {
 			$this->name = $db->getField('galaxy_name');
 			$this->width = $db->getInt('width');
@@ -79,13 +79,13 @@ 
 			$this->galaxyType = $db->getField('galaxy_type');
 			$this->maxForceTime = $db->getInt('max_force_time');
 		} elseif ($create === false) {
-			throw new Exception('No such galaxy: '.$gameID.'-'.$galaxyID);
+			throw new Exception('No such galaxy: ' . $gameID . '-' . $galaxyID);
 		}
 	}
 
 	public function save() {
-		if($this->hasChanged) {
-			if($this->isNew==false) {
+		if ($this->hasChanged) {
+			if ($this->isNew == false) {
 				$this->db->query('UPDATE game_galaxy SET galaxy_name = ' . $this->db->escapeString($this->getName()) .
 										', width = ' . $this->db->escapeNumber($this->getWidth()) .
 										', height = ' . $this->db->escapeNumber($this->getHeight()) .
@@ -125,8 +125,8 @@ 
 	}
 	
 	public function setName($name) {
-		$name = htmlentities($name,ENT_COMPAT,'utf-8');
-		if($this->name == $name) {
+		$name = htmlentities($name, ENT_COMPAT, 'utf-8');
+		if ($this->name == $name) {
 			return;
 		}
 		$this->name = $name;
@@ -138,7 +138,7 @@ 
 	}
 	
 	public function setWidth($width) {
-		if($this->width == $width) {
+		if ($this->width == $width) {
 			return;
 		}
 		$this->width = $width;
@@ -150,7 +150,7 @@ 
 	}
 	
 	public function setHeight($height) {
-		if($this->height == $height) {
+		if ($this->height == $height) {
 			return;
 		}
 		$this->height = $height;
@@ -158,11 +158,11 @@ 
 	}
 	
 	public function getStartSector() {
-		if($this->startSector === false) {
+		if ($this->startSector === false) {
 			$this->startSector = 1;
 			if ($this->getGalaxyID() != 1) {
 				$galaxies = SmrGalaxy::getGameGalaxies($this->getGameID());
-				for ($i=1;$i < $this->getGalaxyID();$i++) {
+				for ($i = 1; $i < $this->getGalaxyID(); $i++) {
 					$this->startSector += $galaxies[$i]->getSize();
 				}
 			}
@@ -187,28 +187,28 @@ 
 	 * If $centerSectorID is specified, it will be in the center of the array.
 	 * If $dist is also specified, only include sectors $dist away from center.
 	 */
-	public function getMapSectors($centerSectorID=false, $dist=false) {
+	public function getMapSectors($centerSectorID = false, $dist = false) {
 		if ($centerSectorID === false) {
 			$topLeft = SmrSector::getSector($this->getGameID(), $this->getStartSector());
 		} else {
 			$topLeft = SmrSector::getSector($this->getGameID(), $centerSectorID);
 			// go left then up
-			for ($i=0; (!$dist || $i<$dist) && $i<floor($this->getWidth()/2); $i++) {
+			for ($i = 0; (!$dist || $i < $dist) && $i < floor($this->getWidth() / 2); $i++) {
 				$topLeft = $topLeft->getNeighbourSector('Left');
 			}
-			for ($i=0; (!$dist || $i<$dist) && $i<floor($this->getHeight()/2); $i++) {
+			for ($i = 0; (!$dist || $i < $dist) && $i < floor($this->getHeight() / 2); $i++) {
 				$topLeft = $topLeft->getNeighbourSector('Up');
 			}
 		}
 
 		$mapSectors = array();
-		for ($i=0; (!$dist || $i<2*$dist+1) && $i<$this->getHeight(); $i++) {
+		for ($i = 0; (!$dist || $i < 2 * $dist + 1) && $i < $this->getHeight(); $i++) {
 			$mapSectors[$i] = array();
 			// get left most sector for this row
 			$rowLeft = $i == 0 ? $topLeft : $rowLeft->getNeighbourSector('Down');
 
 			// iterate through the columns
-			for ($j=0; (!$dist || $j<2*$dist+1) && $j<$this->getWidth(); $j++) {
+			for ($j = 0; (!$dist || $j < 2 * $dist + 1) && $j < $this->getWidth(); $j++) {
 				$nextSec = $j == 0 ? $rowLeft : $nextSec->getNeighbourSector('Right');
 				$mapSectors[$i][$j] = $nextSec;
 			}
@@ -221,7 +221,7 @@ 
 	}
 	
 	public function setGalaxyType($galaxyType) {
-		if($this->galaxyType == $galaxyType) {
+		if ($this->galaxyType == $galaxyType) {
 			return;
 		}
 		$this->galaxyType = $galaxyType;
@@ -233,7 +233,7 @@ 
 	}
 	
 	public function setMaxForceTime($maxForceTime) {
-		if($this->maxForceTime == $maxForceTime) {
+		if ($this->maxForceTime == $maxForceTime) {
 			return;
 		}
 		$this->maxForceTime = $maxForceTime;
@@ -257,7 +257,7 @@ 
 	 */
 	public function setConnectivity($connectivity) {
 		// Only set down/right, otherwise we double-hit every link
-		$linkDirs = array('Down','Right');
+		$linkDirs = array('Down', 'Right');
 
 		$problem = true;
 		$problemTimes = 0;
@@ -265,8 +265,8 @@ 
 			$problem = false;
 		
 			foreach ($this->getSectors() as $galSector) {
-				foreach($linkDirs as $linkDir) {
-					if (mt_rand(1,100) <= $connectivity) {
+				foreach ($linkDirs as $linkDir) {
+					if (mt_rand(1, 100) <= $connectivity) {
 						$galSector->enableLink($linkDir);
 					} else {
 						$galSector->disableLink($linkDir);
@@ -305,8 +305,8 @@ 
 	}
 
 	public function contains($sectorID) {
-		if($sectorID instanceof SmrSector) {
-			return $sectorID->getGalaxyID()==$this->getGalaxyID();
+		if ($sectorID instanceof SmrSector) {
+			return $sectorID->getGalaxyID() == $this->getGalaxyID();
 		}
 		return $sectorID >= $this->getStartSector() && $sectorID <= $this->getEndSector();
 	}

lib/Default/ChessGame.class.inc

Spacing +162 added lines, -163 removed lines

@@ -32,10 +32,10 @@ 
 					JOIN chess_game ON account_id = black_id OR account_id = white_id
 					WHERE end_time > ' . TIME . ' OR end_time IS NULL;');
 		$games = array();
-		while($db->nextRecord()) {
-			$game =& self::getChessGame($db->getInt('chess_game_id'), $forceUpdate);
-			if($game->getCurrentTurnAccount()->isNPC()) {
-				$games[] =& $game;
+		while ($db->nextRecord()) {
+			$game = & self::getChessGame($db->getInt('chess_game_id'), $forceUpdate);
+			if ($game->getCurrentTurnAccount()->isNPC()) {
+				$games[] = & $game;
 			}
 		}
 		return $games;
@@ -45,8 +45,8 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT chess_game_id FROM chess_game WHERE (black_id = ' . $db->escapeNumber($accountID) . ' OR white_id = ' . $db->escapeNumber($accountID) . ') AND (end_time > ' . TIME . ' OR end_time IS NULL);');
 		$games = array();
-		while($db->nextRecord()) {
-			$games[] =& self::getChessGame($db->getInt('chess_game_id'));
+		while ($db->nextRecord()) {
+			$games[] = & self::getChessGame($db->getInt('chess_game_id'));
 		}
 		return $games;
 	}
@@ -55,14 +55,14 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT chess_game_id FROM chess_game WHERE black_id = ' . $db->escapeNumber($accountID) . ' OR white_id = ' . $db->escapeNumber($accountID) . ';');
 		$games = array();
-		while($db->nextRecord()) {
-			$games[] =& self::getChessGame($db->getInt('chess_game_id'));
+		while ($db->nextRecord()) {
+			$games[] = & self::getChessGame($db->getInt('chess_game_id'));
 		}
 		return $games;
 	}
 
-	public static function &getChessGame($chessGameID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_CHESS_GAMES[$chessGameID])) {
+	public static function &getChessGame($chessGameID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_CHESS_GAMES[$chessGameID])) {
 			self::$CACHE_CHESS_GAMES[$chessGameID] = new ChessGame($chessGameID);
 		}
 		return self::$CACHE_CHESS_GAMES[$chessGameID];
@@ -73,7 +73,7 @@ 
 		$this->db->query('SELECT *
 						FROM chess_game
 						WHERE chess_game_id=' . $this->db->escapeNumber($chessGameID) . ' LIMIT 1;');
-		if($this->db->nextRecord()) {
+		if ($this->db->nextRecord()) {
 			$this->chessGameID = $chessGameID;
 			$this->startDate = $this->db->getInt('start_time');
 			$this->endDate = $this->db->getInt('end_time');
@@ -92,9 +92,9 @@ 
 	}
 
 	public static function isPlayerChecked(array &$board, array &$hasMoved, $colour) {
-		foreach($board as &$row) {
-			foreach($row as &$p) {
-				if($p != null && $p->colour != $colour && $p->isAttacking($board, $hasMoved, true)) {
+		foreach ($board as &$row) {
+			foreach ($row as &$p) {
+				if ($p != null && $p->colour != $colour && $p->isAttacking($board, $hasMoved, true)) {
 					return true;
 				}
 			}
@@ -118,7 +118,7 @@ 
 					'King' => false
 				)
 			),
-			ChessPiece::PAWN => array(-1,-1)
+			ChessPiece::PAWN => array(-1, -1)
 		);
 	}
 
@@ -141,17 +141,17 @@ 
 		$this->resetHasMoved();
 
 		try {
-			while($db->nextRecord()) {
-				if($debugInfo === true) {
+			while ($db->nextRecord()) {
+				if ($debugInfo === true) {
 					echo 'x=', $db->getInt('start_x'), ', y=', $db->getInt('start_y'), ', endX=', $db->getInt('end_x'), ', endY=', $db->getInt('end_y'), ', forAccountID=', $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID(), EOL;
 				}
-				if(0 != $this->tryMove($db->getInt('start_x'), $db->getInt('start_y'), $db->getInt('end_x'), $db->getInt('end_y'), $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID())) {
+				if (0 != $this->tryMove($db->getInt('start_x'), $db->getInt('start_y'), $db->getInt('end_x'), $db->getInt('end_y'), $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID())) {
 					break;
 				}
 			}
 		}
-		catch(Exception $e) {
-			if($debugInfo === true) {
+		catch (Exception $e) {
+			if ($debugInfo === true) {
 				echo $e->getMessage() . EOL . $e->getTraceAsString() . EOL;
 			}
 			// We probably tried an invalid move - move on.
@@ -159,14 +159,14 @@ 
 	}
 
 	public function getBoard() {
-		if($this->board == null) {
+		if ($this->board == null) {
 			$this->db->query('SELECT * FROM chess_game_pieces WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ';');
 			$pieces = array();
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$accountID = $this->db->getInt('account_id');
 				$pieces[] = new ChessPiece($this->chessGameID, $accountID, $this->getColourForAccountID($accountID), $this->db->getInt('piece_id'), $this->db->getInt('x'), $this->db->getInt('y'), $this->db->getInt('piece_no'));
 			}
-			$this->board =& $this->parsePieces($pieces);
+			$this->board = & $this->parsePieces($pieces);
 		}
 		return $this->board;
 	}
@@ -177,11 +177,11 @@ 
 	}
 
 	public function getMoves() {
-		if($this->moves == null) {
+		if ($this->moves == null) {
 			$this->db->query('SELECT * FROM chess_game_moves WHERE chess_game_id = ' . $this->db->escapeNumber($this->chessGameID) . ' ORDER BY move_id;');
 			$this->moves = array();
 			$mate = false;
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$pieceTakenID = $this->db->getField('piece_taken') == null ? null : $this->db->getInt('piece_taken');
 				$this->moves[] = $this->createMove($this->db->getInt('piece_id'), $this->db->getInt('start_x'), $this->db->getInt('start_y'), $this->db->getInt('end_x'), $this->db->getInt('end_y'), $pieceTakenID, $this->db->getField('checked'), $this->db->getInt('move_id') % 2 == 1 ? self::PLAYER_WHITE : self::PLAYER_BLACK, $this->db->getField('castling'), $this->db->getBoolean('en_passant'), $this->db->getInt('promote_piece_id'));
 				$mate = $this->db->getField('checked') == 'MATE';
@@ -196,11 +196,11 @@ 
 						)
 					);
 			}
-			if(!$mate && $this->hasEnded()) {
-				if($this->getWinner() != 0) {
+			if (!$mate && $this->hasEnded()) {
+				if ($this->getWinner() != 0) {
 					$this->moves[] = ($this->getWinner() == $this->getWhiteID() ? 'Black' : 'White') . ' Resigned.';
 				}
-				else if(count($this->moves) < 2) {
+				else if (count($this->moves) < 2) {
 					$this->moves[] = 'Game Cancelled.';
 				}
 				else {
@@ -213,30 +213,30 @@ 
 
 	public function getFENString() {
 		$fen = '';
-		$board =& $this->getBoard();
+		$board = & $this->getBoard();
 		$blanks = 0;
-		for($y=0; $y < 8; $y++) {
-			if($y > 0) {
+		for ($y = 0; $y < 8; $y++) {
+			if ($y > 0) {
 				$fen .= '/';
 			}
-			for($x=0; $x < 8; $x++) {
-				if($board[$y][$x] == null) {
+			for ($x = 0; $x < 8; $x++) {
+				if ($board[$y][$x] == null) {
 					$blanks++;
 				}
 				else {
-					if($blanks > 0) {
+					if ($blanks > 0) {
 						$fen .= $blanks;
 						$blanks = 0;
 					}
 					$fen .= $board[$y][$x]->getPieceLetter();
 				}
 			}
-			if($blanks > 0) {
+			if ($blanks > 0) {
 				$fen .= $blanks;
 				$blanks = 0;
 			}
 		}
-		switch($this->getCurrentTurnColour()) {
+		switch ($this->getCurrentTurnColour()) {
 			case self::PLAYER_WHITE:
 				$fen .= ' w ';
 			break;
@@ -247,30 +247,30 @@ 
 
 		// Castling
 		$castling = '';
-		if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::KING] !== true) {
-			if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['King'] !== true) {
+		if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::KING] !== true) {
+			if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['King'] !== true) {
 				$castling .= 'K';
 			}
-			if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['Queen'] !== true) {
+			if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['Queen'] !== true) {
 				$castling .= 'Q';
 			}
 		}
-		if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::KING] !== true) {
-			if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['King'] !== true) {
+		if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::KING] !== true) {
+			if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['King'] !== true) {
 				$castling .= 'k';
 			}
-			if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['Queen'] !== true) {
+			if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['Queen'] !== true) {
 				$castling .= 'q';
 			}
 		}
-		if($castling == '') {
+		if ($castling == '') {
 			$castling = '-';
 		}
 		$fen .= $castling . ' ';
 
-		if($this->hasMoved[ChessPiece::PAWN][0] != -1) {
+		if ($this->hasMoved[ChessPiece::PAWN][0] != -1) {
 			$fen .= chr(ord('a') + $this->hasMoved[ChessPiece::PAWN][0]);
-			switch($this->hasMoved[ChessPiece::PAWN][1]) {
+			switch ($this->hasMoved[ChessPiece::PAWN][1]) {
 				case 3:
 					$fen .= '6';
 				break;
@@ -282,7 +282,7 @@ 
 		else {
 			$fen .= '-';
 		}
-		$fen .= ' 0 ' . floor(count($this->moves)/2);
+		$fen .= ' 0 ' . floor(count($this->moves) / 2);
 
 		return $fen;
 	}
@@ -312,17 +312,17 @@ 
 	public static function &parsePieces(array &$pieces) {
 		$board = array();
 		$row = array();
-		for($i=0;$i<8;$i++) {
+		for ($i = 0; $i < 8; $i++) {
 			$row[] = null;
 		}
-		for($i=0;$i<8;$i++) {
+		for ($i = 0; $i < 8; $i++) {
 			$board[] = $row;
 		}
-		foreach($pieces as &$piece) {
-			if($board[$piece->getY()][$piece->getX()] != null) {
+		foreach ($pieces as &$piece) {
+			if ($board[$piece->getY()][$piece->getX()] != null) {
 				throw new Exception('Two pieces found in the same tile.');
 			}
-			$board[$piece->getY()][$piece->getX()] =& $piece;
+			$board[$piece->getY()][$piece->getX()] = & $piece;
 		}
 		return $board;
 	}
@@ -330,8 +330,7 @@ 
 	public static function getStandardGame($gameID, AbstractSmrPlayer &$whitePlayer, AbstractSmrPlayer &$blackPlayer) {
 		$white = $whitePlayer->getAccountID();
 		$black = $blackPlayer->getAccountID();
-		return array
-			(
+		return array(
 				new ChessPiece($gameID, $black, self::PLAYER_BLACK, ChessPiece::ROOK, 0, 0),
 				new ChessPiece($gameID, $black, self::PLAYER_BLACK, ChessPiece::KNIGHT, 1, 0),
 				new ChessPiece($gameID, $black, self::PLAYER_BLACK, ChessPiece::BISHOP, 2, 0),
@@ -371,7 +370,7 @@ 
 	}
 
 	public static function insertNewGame($startDate, $endDate, AbstractSmrPlayer &$whitePlayer, AbstractSmrPlayer &$blackPlayer) {
-		if($startDate == null) {
+		if ($startDate == null) {
 			throw new Exception('Start date cannot be null.');
 		}
 
@@ -389,7 +388,7 @@ 
 	private static function insertPieces($chessGameID, AbstractSmrPlayer &$whitePlayer, AbstractSmrPlayer &$blackPlayer) {
 		$db = new SmrMySqlDatabase();
 		$pieces = self::getStandardGame($chessGameID, $whitePlayer, $blackPlayer);
-		foreach($pieces as $p) {
+		foreach ($pieces as $p) {
 			$db->query('INSERT INTO chess_game_pieces' .
 			'(chess_game_id,account_id,piece_id,x,y)' .
 			'values' .
@@ -399,61 +398,61 @@ 
 
 	public function createMove($pieceID, $startX, $startY, $endX, $endY, $pieceTaken, $checking, $playerColour, $castling, $enPassant, $promotionPieceID) {
 		$otherPlayerColour = self::getOtherColour($playerColour);
-		if($pieceID == ChessPiece::KING) {
+		if ($pieceID == ChessPiece::KING) {
 			$this->hasMoved[$playerColour][ChessPiece::KING] = true;
 		}
 		// Check if the piece moving is a rook and mark it as moved to stop castling.
-		if($pieceID == ChessPiece::ROOK && ($startX == 0 || $startX == 7) && ($startY == ($playerColour == self::PLAYER_WHITE ? 7 : 0))) {
-			$this->hasMoved[$playerColour][ChessPiece::ROOK][$startX==0?'Queen':'King'] = true;
+		if ($pieceID == ChessPiece::ROOK && ($startX == 0 || $startX == 7) && ($startY == ($playerColour == self::PLAYER_WHITE ? 7 : 0))) {
+			$this->hasMoved[$playerColour][ChessPiece::ROOK][$startX == 0 ? 'Queen' : 'King'] = true;
 		}
 		// Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle.
-		if($pieceTaken == ChessPiece::ROOK && ($endX == 0 || $endX == 7) && $endY == ($otherPlayerColour == self::PLAYER_WHITE ? 7 : 0)) {
-			$this->hasMoved[$otherPlayerColour][ChessPiece::ROOK][$endX==0?'Queen':'King'] = true;
+		if ($pieceTaken == ChessPiece::ROOK && ($endX == 0 || $endX == 7) && $endY == ($otherPlayerColour == self::PLAYER_WHITE ? 7 : 0)) {
+			$this->hasMoved[$otherPlayerColour][ChessPiece::ROOK][$endX == 0 ? 'Queen' : 'King'] = true;
 		}
-		if($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
+		if ($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
 			$this->hasMoved[ChessPiece::PAWN] = array($endX, $endY);
 		}
 		else {
-			$this->hasMoved[ChessPiece::PAWN] = array(-1,-1);
+			$this->hasMoved[ChessPiece::PAWN] = array(-1, -1);
 		}
 		return ($castling == 'Queen' ? '0-0-0' : ($castling == 'King' ? '0-0' : ''))
 			. ChessPiece::getSymbolForPiece($pieceID, $playerColour)
-			. chr(ord('a')+$startX)
-			. (8-$startY)
+			. chr(ord('a') + $startX)
+			. (8 - $startY)
 			. ' '
 			. ($pieceTaken == null ? '' : ChessPiece::getSymbolForPiece($pieceTaken, $otherPlayerColour))
-			. chr(ord('a')+$endX)
-			. (8-$endY)
+			. chr(ord('a') + $endX)
+			. (8 - $endY)
 			. ($promotionPieceID == null ? '' : ChessPiece::getSymbolForPiece($promotionPieceID, $playerColour))
 			. ' '
-			. ($checking == null ? '' : ($checking == 'CHECK' ? '+' : '++') )
+			. ($checking == null ? '' : ($checking == 'CHECK' ? '+' : '++'))
 			. ($enPassant ? ' e.p.' : '');
 	}
 
 	public function isCheckmated($colour) {
-		$board =& $this->board;
-		$hasMoved =& $this->getHasMoved();
+		$board = & $this->board;
+		$hasMoved = & $this->getHasMoved();
 		$king = null;
-		foreach($board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->pieceID == ChessPiece::KING && $piece->colour == $colour) {
+		foreach ($board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->pieceID == ChessPiece::KING && $piece->colour == $colour) {
 					$king = $piece;
 					break;
 				}
 			}
 		}
-		if($king == null) {
+		if ($king == null) {
 			throw new Exception('Could not find the king: game id = ' . $this->chessGameID);
 		}
-		if(!self::isPlayerChecked($board, $hasMoved, $colour)) {
+		if (!self::isPlayerChecked($board, $hasMoved, $colour)) {
 			return false;
 		}
-		foreach($board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->colour == $colour) {
+		foreach ($board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->colour == $colour) {
 					$moves = $piece->getPossibleMoves($board, $hasMoved);
 					//There are moves we can make, we are clearly not checkmated.
-					if(count($moves) > 0) {
+					if (count($moves) > 0) {
 						return false;
 					}
 				}
@@ -464,15 +463,15 @@ 
 
 	public static function isCastling($x, $toX) {
 		$movement = $toX - $x;
-		if(abs($movement) == 2) {
+		if (abs($movement) == 2) {
 			//To the left.
-			if($movement == -2) {
+			if ($movement == -2) {
 				return array('Type' => 'Queen',
 						'X' => 0,
 						'ToX' => 3
 					);
 			} //To the right
-			else if($movement == 2) {
+			else if ($movement == 2) {
 				return array('Type' => 'King',
 						'X' => 7,
 						'ToX' => 5
@@ -483,36 +482,36 @@ 
 	}
 
 	public static function movePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $pawnPromotionPiece = ChessPiece::QUEEN) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
 		$pieceTaken = $board[$toY][$toX];
 		$board[$toY][$toX] = $board[$y][$x];
-		$p =& $board[$toY][$toX];
+		$p = & $board[$toY][$toX];
 		$board[$y][$x] = null;
-		if($p == null) {
+		if ($p == null) {
 			throw new Exception('Trying to move non-existent piece: ' . var_export($board, true));
 		}
 		$p->setX($toX);
 		$p->setY($toY);
 
 		$oldPawnMovement = $hasMoved[ChessPiece::PAWN];
-		$nextPawnMovement = array(-1,-1);
+		$nextPawnMovement = array(-1, -1);
 		$castling = false;
 		$enPassant = false;
 		$rookMoved = false;
 		$rookTaken = false;
 		$pawnPromotion = false;
-		if($p->pieceID == ChessPiece::KING) {
+		if ($p->pieceID == ChessPiece::KING) {
 			//Castling?
 			$castling = self::isCastling($x, $toX);
-			if($castling !== false) {
+			if ($castling !== false) {
 				$hasMoved[$p->colour][ChessPiece::KING] = true;
 				$hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = true;
-				if($board[$y][$castling['X']] == null) {
+				if ($board[$y][$castling['X']] == null) {
 					throw new Exception('Cannot castle with non-existent castle.');
 				}
 				$board[$toY][$castling['ToX']] = $board[$y][$castling['X']];
@@ -520,37 +519,37 @@ 
 				$board[$y][$castling['X']] = null;
 			}
 		}
-		else if($p->pieceID == ChessPiece::PAWN) {
-			if($toY == 0 || $toY == 7) {
+		else if ($p->pieceID == ChessPiece::PAWN) {
+			if ($toY == 0 || $toY == 7) {
 				$pawnPromotion = $p->promote($pawnPromotionPiece, $board);
 			}
 			//Double move to track?
-			else if(($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
+			else if (($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
 				$nextPawnMovement = array($toX, $toY);
 			}
 			//En passant?
-			else if($hasMoved[ChessPiece::PAWN][0] == $toX &&
+			else if ($hasMoved[ChessPiece::PAWN][0] == $toX &&
 					($hasMoved[ChessPiece::PAWN][1] == 3 && $toY == 2 || $hasMoved[ChessPiece::PAWN][1] == 4 && $toY == 5)) {
 				$enPassant = true;
 				$pieceTaken = $board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]];
-				if($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
+				if ($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
 					throw new Exception('Cannot en passant a non-existent pawn.');
 				}
 				$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null;
 			}
 		}
-		else if($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
+		else if ($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
 			//Rook moved?
-			if($hasMoved[$p->colour][ChessPiece::ROOK][$x==0?'Queen':'King'] === false) {
+			if ($hasMoved[$p->colour][ChessPiece::ROOK][$x == 0 ? 'Queen' : 'King'] === false) {
 				// We set rook moved in here as it's used for move info.
-				$rookMoved = $x==0?'Queen':'King';
+				$rookMoved = $x == 0 ? 'Queen' : 'King';
 				$hasMoved[$p->colour][ChessPiece::ROOK][$rookMoved] = true;
 			}
 		}
 		// Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle.
-		if($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
-			if($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX==0?'Queen':'King'] === false) {
-				$rookTaken = $toX==0?'Queen':'King';
+		if ($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
+			if ($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX == 0 ? 'Queen' : 'King'] === false) {
+				$rookTaken = $toX == 0 ? 'Queen' : 'King';
 				$hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$rookTaken] = true;
 			}
 		}
@@ -567,18 +566,18 @@ 
 	}
 
 	public static function undoMovePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $moveInfo) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
-		if($board[$y][$x] != null) {
+		if ($board[$y][$x] != null) {
 			throw new Exception('Undoing move onto another piece? x=' . $x . ', y=' . $y);
 		}
 		$board[$y][$x] = $board[$toY][$toX];
-		$p =& $board[$y][$x];
-		if($p == null) {
+		$p = & $board[$y][$x];
+		if ($p == null) {
 			throw new Exception('Trying to undo move of a non-existent piece: ' . var_export($board, true));
 		}
 		$board[$toY][$toX] = $moveInfo['PieceTaken'];
@@ -587,12 +586,12 @@ 
 
 		$hasMoved[ChessPiece::PAWN] = $moveInfo['OldPawnMovement'];
 		//Castling
-		if($p->pieceID == ChessPiece::KING) {
+		if ($p->pieceID == ChessPiece::KING) {
 			$castling = self::isCastling($x, $toX);
-			if($castling !== false) {
+			if ($castling !== false) {
 				$hasMoved[$p->colour][ChessPiece::KING] = false;
 				$hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = false;
-				if($board[$toY][$castling['ToX']] == null) {
+				if ($board[$toY][$castling['ToX']] == null) {
 					throw new Exception('Cannot undo castle with non-existent castle.');
 				}
 				$board[$y][$castling['X']] = $board[$toY][$castling['ToX']];
@@ -600,25 +599,25 @@ 
 				$board[$toY][$castling['ToX']] = null;
 			}
 		}
-		else if($moveInfo['EnPassant'] === true) {
+		else if ($moveInfo['EnPassant'] === true) {
 			$board[$toY][$toX] = null;
 			$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = $moveInfo['PieceTaken'];
 		}
-		else if($moveInfo['RookMoved'] !== false) {
+		else if ($moveInfo['RookMoved'] !== false) {
 			$hasMoved[$p->colour][ChessPiece::ROOK][$moveInfo['RookMoved']] = false;
 		}
-		if($moveInfo['RookTaken'] !== false) {
+		if ($moveInfo['RookTaken'] !== false) {
 			$hasMoved[$moveInfo['PieceTaken']->colour][ChessPiece::ROOK][$moveInfo['RookTaken']] = false;
 		}
 	}
 
 	public function tryAlgebraicMove($move) {
-		if(strlen($move) != 4 && strlen($move) != 5) {
+		if (strlen($move) != 4 && strlen($move) != 5) {
 			throw new Exception('Move of length "' . strlen($move) . '" is not valid, full move: ' . $move);
 		}
 		$aVal = ord('a');
 		$hVal = ord('h');
-		if(ord($move[0]) < $aVal || ord($move[2]) < $aVal
+		if (ord($move[0]) < $aVal || ord($move[2]) < $aVal
 				|| ord($move[0]) > $hVal || ord($move[2]) > $hVal
 				|| $move[1] < 1 || $move[3] < 1
 				|| $move[1] > 8 || $move[3] > 8) {
@@ -629,73 +628,73 @@ 
 		$toX = ord($move[2]) - $aVal;
 		$toY = 8 - $move[3];
 		$pawnPromotionPiece = null;
-		if(isset($move[4])) {
+		if (isset($move[4])) {
 			$pawnPromotionPiece = ChessPiece::getPieceForLetter($move[4]);
 		}
 		return $this->tryMove($x, $y, $toX, $toY, $this->getCurrentTurnAccountID(), $pawnPromotionPiece);
 	}
 
 	public function tryMove($x, $y, $toX, $toY, $forAccountID, $pawnPromotionPiece) {
-		if($this->hasEnded()) {
+		if ($this->hasEnded()) {
 			return 5;
 		}
-		if($this->getCurrentTurnAccountID() != $forAccountID) {
+		if ($this->getCurrentTurnAccountID() != $forAccountID) {
 			return 4;
 		}
-		$lastTurnPlayer =& $this->getCurrentTurnPlayer();
+		$lastTurnPlayer = & $this->getCurrentTurnPlayer();
 		$this->getBoard();
 		$p = $this->board[$y][$x];
-		if($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
+		if ($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
 			return 2;
 		}
 
 		$moves = $p->getPossibleMoves($this->board, $this->getHasMoved(), $forAccountID);
-		foreach($moves as $move) {
-			if($move[0]==$toX && $move[1]==$toY) {
+		foreach ($moves as $move) {
+			if ($move[0] == $toX && $move[1] == $toY) {
 				$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
-				$currentPlayer =& $this->getCurrentTurnPlayer();
+				$currentPlayer = & $this->getCurrentTurnPlayer();
 
 				$moveInfo = ChessGame::movePiece($this->board, $this->getHasMoved(), $x, $y, $toX, $toY, $pawnPromotionPiece);
 
 				//We have taken the move, we should refresh $p
-				$p =& $this->board[$toY][$toX];
+				$p = & $this->board[$toY][$toX];
 
 				$pieceTakenID = null;
-				if($moveInfo['PieceTaken'] != null) {
+				if ($moveInfo['PieceTaken'] != null) {
 					$pieceTakenID = $moveInfo['PieceTaken']->pieceID;
-					if($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
+					if ($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
 						throw new Exception('King was taken.');
 					}
 				}
 
 				$pieceID = $p->pieceID;
 				$pieceNo = $p->pieceNo;
-				if($moveInfo['PawnPromotion'] !== false) {
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$p->pieceID = $moveInfo['PawnPromotion']['PieceID'];
 					$p->pieceNo = $moveInfo['PawnPromotion']['PieceNo'];
 				}
 
 				$checking = null;
-				if($p->isAttacking($this->board, $this->getHasMoved(), true)) {
+				if ($p->isAttacking($this->board, $this->getHasMoved(), true)) {
 					$checking = 'CHECK';
 				}
-				if($this->isCheckmated(self::getOtherColour($p->colour))) {
+				if ($this->isCheckmated(self::getOtherColour($p->colour))) {
 					$checking = 'MATE';
 				}
-				if($this->moves!=null) {
+				if ($this->moves != null) {
 					$this->moves[] = $this->createMove($pieceID, $x, $y, $toX, $toY, $pieceTakenID, $checking, $this->getCurrentTurnColour(), $moveInfo['Castling']['Type'], $moveInfo['EnPassant'], $moveInfo['PawnPromotion'] === false ? null : $moveInfo['PawnPromotion']['PieceID']);
 				}
-				if(self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
+				if (self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
 					return 3;
 				}
 
-				$otherPlayer =& $this->getCurrentTurnPlayer();
-				if($moveInfo['PawnPromotion'] !== false) {
+				$otherPlayer = & $this->getCurrentTurnPlayer();
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$piecePromotedSymbol = $p->getPieceSymbol();
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted','Total'), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted','Total'), HOF_PUBLIC);
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
 				}
 				$this->db->query('INSERT INTO chess_game_moves
 								(chess_game_id,piece_id,start_x,start_y,end_x,end_y,checked,piece_taken,castling,en_passant,promote_piece_id)
@@ -703,37 +702,37 @@ 
 								(' . $this->db->escapeNumber($p->gameID) . ',' . $this->db->escapeNumber($pieceID) . ',' . $this->db->escapeNumber($x) . ',' . $this->db->escapeNumber($y) . ',' . $this->db->escapeNumber($toX) . ',' . $this->db->escapeNumber($toY) . ',' . $this->db->escapeString($checking, true, true) . ',' . ($moveInfo['PieceTaken'] == null ? 'NULL' : $this->db->escapeNumber($moveInfo['PieceTaken']->pieceID)) . ',' . $this->db->escapeString($moveInfo['Castling']['Type'], true, true) . ',' . $this->db->escapeBoolean($moveInfo['EnPassant']) . ',' . ($moveInfo['PawnPromotion'] == false ? 'NULL' : $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceID'])) . ');');
 
 
-				$currentPlayer->increaseHOF(1, array($chessType,'Moves','Total Taken'), HOF_PUBLIC);
-				if($moveInfo['PieceTaken'] != null) {
+				$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Total Taken'), HOF_PUBLIC);
+				if ($moveInfo['PieceTaken'] != null) {
 					$this->db->query('DELETE FROM chess_game_pieces
 									WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($moveInfo['PieceTaken']->accountID) . ' AND piece_id=' . $this->db->escapeNumber($moveInfo['PieceTaken']->pieceID) . ' AND piece_no=' . $this->db->escapeNumber($moveInfo['PieceTaken']->pieceNo) . ';');
 
 					$pieceTakenSymbol = $moveInfo['PieceTaken']->getPieceSymbol();
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pieces Taken','Total'), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Own Pieces Taken','Total'), HOF_PUBLIC);
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pieces Taken',$pieceTakenSymbol), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Own Pieces Taken',$pieceTakenSymbol), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pieces Taken', 'Total'), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pieces Taken', 'Total'), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pieces Taken', $pieceTakenSymbol), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pieces Taken', $pieceTakenSymbol), HOF_PUBLIC);
 				}
 				$this->db->query('UPDATE chess_game_pieces
 							SET x=' . $this->db->escapeNumber($toX) . ', y=' . $this->db->escapeNumber($toY) .
 								($moveInfo['PawnPromotion'] !== false ? ', piece_id=' . $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceID']) . ', piece_no=' . $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceNo']) : '') . '
 							WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($p->accountID) . ' AND piece_id=' . $this->db->escapeNumber($pieceID) . ' AND piece_no=' . $this->db->escapeNumber($pieceNo) . ';');
-				if($moveInfo['Castling'] !== false) {
+				if ($moveInfo['Castling'] !== false) {
 					$this->db->query('UPDATE chess_game_pieces
 								SET x=' . $this->db->escapeNumber($moveInfo['Castling']['ToX']) . '
 								WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($p->accountID) . ' AND x = ' . $this->db->escapeNumber($moveInfo['Castling']['X']) . ' AND y = ' . $this->db->escapeNumber($y) . ';');
 				}
 				$return = 0;
-				if($checking == 'MATE') {
+				if ($checking == 'MATE') {
 					$this->setWinner($forAccountID);
 					$return = 1;
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'You have just lost [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
 				}
 				else {
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'It is now your turn in [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
-					if($checking == 'CHECK') {
-						$currentPlayer->increaseHOF(1, array($chessType,'Moves','Check Given'), HOF_PUBLIC);
-						$otherPlayer->increaseHOF(1, array($chessType,'Moves','Check Received'), HOF_PUBLIC);
+					if ($checking == 'CHECK') {
+						$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Check Given'), HOF_PUBLIC);
+						$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Check Received'), HOF_PUBLIC);
 					}
 				}
 				$currentPlayer->saveHOF();
@@ -760,7 +759,7 @@ 
 		try {
 			return SmrPlayer::getPlayer($this->whiteID, $this->getGameID());
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -774,7 +773,7 @@ 
 		try {
 			return SmrPlayer::getPlayer($this->blackID, $this->getGameID());
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -785,10 +784,10 @@ 
 	}
 
 	public function getColourID($colour) {
-		if($colour == self::PLAYER_WHITE) {
+		if ($colour == self::PLAYER_WHITE) {
 			return $this->getWhiteID();
 		}
-		if($colour == self::PLAYER_BLACK) {
+		if ($colour == self::PLAYER_BLACK) {
 			return $this->getBlackID();
 		}
 	}
@@ -797,17 +796,17 @@ 
 		try {
 			return SmrPlayer::getPlayer($this->getColourID($colour), $this->getGameID());
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$null = null;
 			return $null;
 		}
 	}
 
 	public function getColourForAccountID($accountID) {
-		if($accountID == $this->getWhiteID()) {
+		if ($accountID == $this->getWhiteID()) {
 			return self::PLAYER_WHITE;
 		}
-		if($accountID == $this->getBlackID()) {
+		if ($accountID == $this->getBlackID()) {
 			return self::PLAYER_BLACK;
 		}
 		return false;
@@ -834,8 +833,8 @@ 
 		$winningPlayer = $this->getColourPlayer($winnerColour);
 		$losingPlayer = $this->getColourPlayer(self::getOtherColour($winnerColour));
 		$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
-		$winningPlayer->increaseHOF(1, array($chessType,'Games','Won'), HOF_PUBLIC);
-		$losingPlayer->increaseHOF(1, array($chessType,'Games','Lost'), HOF_PUBLIC);
+		$winningPlayer->increaseHOF(1, array($chessType, 'Games', 'Won'), HOF_PUBLIC);
+		$losingPlayer->increaseHOF(1, array($chessType, 'Games', 'Lost'), HOF_PUBLIC);
 		return array('Winner' => $winningPlayer, 'Loser' => $losingPlayer);
 	}
 
@@ -855,7 +854,7 @@ 
 		try {
 			return SmrPlayer::getPlayer($this->getCurrentTurnAccountID(), $this->getGameID());
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$null = null;
 			return $null;
 		}
@@ -882,21 +881,21 @@ 
 	}
 
 	public static function getOtherColour($colour) {
-		if($colour == self::PLAYER_WHITE) {
+		if ($colour == self::PLAYER_WHITE) {
 			return self::PLAYER_BLACK;
 		}
-		if($colour == self::PLAYER_BLACK) {
+		if ($colour == self::PLAYER_BLACK) {
 			return self::PLAYER_WHITE;
 		}
 		return false;
 	}
 
 	public function resign($accountID) {
-		if($this->hasEnded() || !$this->getColourForAccountID($accountID)) {
+		if ($this->hasEnded() || !$this->getColourForAccountID($accountID)) {
 			return false;
 		}
 		// If only 1 person has moved then just end the game.
-		if(count($this->getMoves()) < 2) {
+		if (count($this->getMoves()) < 2) {
 			$this->endDate = TIME;
 			$this->db->query('UPDATE chess_game
 							SET end_time=' . $this->db->escapeNumber(TIME) . '
@@ -908,17 +907,17 @@ 
 			$winnerAccountID = $this->getColourID(self::getOtherColour($loserColour));
 			$results = $this->setWinner($winnerAccountID);
 			$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
-			$results['Loser']->increaseHOF(1, array($chessType,'Games','Resigned'), HOF_PUBLIC);
+			$results['Loser']->increaseHOF(1, array($chessType, 'Games', 'Resigned'), HOF_PUBLIC);
 			SmrPlayer::sendMessageFromCasino($results['Winner']->getGameID(), $results['Winner']->getPlayerID(), '[player=' . $results['Loser']->getPlayerID() . '] just resigned against you in [chess=' . $this->getChessGameID() . '].');
 			return 0;
 		}
 	}
 
 	public function getPlayGameHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','chess_play.php',array('ChessGameID' => $this->chessGameID)));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'chess_play.php', array('ChessGameID' => $this->chessGameID)));
 	}
 
 	public function getResignHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','chess_resign_processing.php',array('ChessGameID' => $this->chessGameID)));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'chess_resign_processing.php', array('ChessGameID' => $this->chessGameID)));
 	}
 }

lib/Default/SmrCombatDrones.class.inc

Spacing +60 added lines, -60 removed lines

@@ -4,12 +4,12 @@ 
 	const MAX_CDS_RAND = 54;
 	protected $numberOfCDs;
 	
-	public function __construct($gameTypeID,$numberOfCDs,$portPlanetDrones = false) {
+	public function __construct($gameTypeID, $numberOfCDs, $portPlanetDrones = false) {
 		$this->gameTypeID = $gameTypeID;
 		$this->numberOfCDs = $numberOfCDs;
 		$this->name = 'Combat Drones';
 		$this->raceID = 0;
-		if($portPlanetDrones===false) {
+		if ($portPlanetDrones === false) {
 			$this->maxDamage = 2;
 			$this->shieldDamage = 2;
 			$this->armourDamage = 2;
@@ -33,91 +33,91 @@ 
 		return $modifiedAccuracy;
 	}
 	
-	protected function getModifiedAccuracyAgainstForcesUsingRandom(AbstractSmrPlayer $weaponPlayer,SmrForce $forces, $random) {
+	protected function getModifiedAccuracyAgainstForcesUsingRandom(AbstractSmrPlayer $weaponPlayer, SmrForce $forces, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy += $random;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	public function getMaxModifiedAccuracyAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		return $this->getModifiedAccuracyAgainstForcesUsingRandom($weaponPlayer,$forces,self::MAX_CDS_RAND);
+		return $this->getModifiedAccuracyAgainstForcesUsingRandom($weaponPlayer, $forces, self::MAX_CDS_RAND);
 	}
 	public function getModifiedAccuracyAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		return $this->getModifiedAccuracyAgainstForcesUsingRandom($weaponPlayer,$forces,mt_rand(3,self::MAX_CDS_RAND));
+		return $this->getModifiedAccuracyAgainstForcesUsingRandom($weaponPlayer, $forces, mt_rand(3, self::MAX_CDS_RAND));
 	}
 	
-	protected function getModifiedAccuracyAgainstPortUsingRandom(AbstractSmrPlayer $weaponPlayer,SmrPort $port, $random) {
+	protected function getModifiedAccuracyAgainstPortUsingRandom(AbstractSmrPlayer $weaponPlayer, SmrPort $port, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy += $random;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	public function getMaxModifiedAccuracyAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		return $this->getModifiedAccuracyAgainstPortUsingRandom($weaponPlayer,$port,self::MAX_CDS_RAND);
+		return $this->getModifiedAccuracyAgainstPortUsingRandom($weaponPlayer, $port, self::MAX_CDS_RAND);
 	}
 	public function getModifiedAccuracyAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		return $this->getModifiedAccuracyAgainstPortUsingRandom($weaponPlayer,$port,mt_rand(3,self::MAX_CDS_RAND));
+		return $this->getModifiedAccuracyAgainstPortUsingRandom($weaponPlayer, $port, mt_rand(3, self::MAX_CDS_RAND));
 	}
 	
-	protected function getModifiedAccuracyAgainstPlanetUsingRandom(AbstractSmrPlayer $weaponPlayer,SmrPlanet $planet, $random) {
+	protected function getModifiedAccuracyAgainstPlanetUsingRandom(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy += $random;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	public function getMaxModifiedAccuracyAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		return $this->getModifiedAccuracyAgainstPlanetUsingRandom($weaponPlayer,$planet,self::MAX_CDS_RAND);
+		return $this->getModifiedAccuracyAgainstPlanetUsingRandom($weaponPlayer, $planet, self::MAX_CDS_RAND);
 	}
 	public function getModifiedAccuracyAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		return $this->getModifiedAccuracyAgainstPlanetUsingRandom($weaponPlayer,$planet,mt_rand(3,self::MAX_CDS_RAND));
+		return $this->getModifiedAccuracyAgainstPlanetUsingRandom($weaponPlayer, $planet, mt_rand(3, self::MAX_CDS_RAND));
 	}
 	
 	
 	public function getModifiedAccuracyAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedAccuracyAgainstPlayerUsingRandom($weaponPlayer,$targetPlayer,mt_rand(3,self::MAX_CDS_RAND));
+		return $this->getModifiedAccuracyAgainstPlayerUsingRandom($weaponPlayer, $targetPlayer, mt_rand(3, self::MAX_CDS_RAND));
 	}
 	
 	protected function getModifiedAccuracyAgainstPlayerUsingRandom(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
-		$modifiedAccuracy += ($random + mt_rand($weaponPlayer->getLevelID() / 2,$weaponPlayer->getLevelID()) - ($targetPlayer->getLevelID() - $weaponPlayer->getLevelID())/3)/1.5;
+		$modifiedAccuracy += ($random + mt_rand($weaponPlayer->getLevelID() / 2, $weaponPlayer->getLevelID()) - ($targetPlayer->getLevelID() - $weaponPlayer->getLevelID()) / 3) / 1.5;
 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff/MR_FACTOR)/100;
+		if ($mrDiff > 0)
+			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	
 	public function getMaxModifiedAccuracyAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedAccuracyAgainstPlayerUsingRandom($weaponPlayer,$targetPlayer,self::MAX_CDS_RAND);
+		return $this->getModifiedAccuracyAgainstPlayerUsingRandom($weaponPlayer, $targetPlayer, self::MAX_CDS_RAND);
 	}
 	
-	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,mt_rand(3,self::MAX_CDS_RAND));
+	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, mt_rand(3, self::MAX_CDS_RAND));
 	}
 	
-	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces,AbstractSmrPlayer $targetPlayer, $random) {
+	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy += $random;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	
-	protected function getModifiedPortAccuracyAgainstPlayer(SmrPort $port,AbstractSmrPlayer $targetPlayer) {
+	protected function getModifiedPortAccuracyAgainstPlayer(SmrPort $port, AbstractSmrPlayer $targetPlayer) {
 		return 100;
 	}
 	
-	protected function getModifiedPlanetAccuracyAgainstPlayer(SmrPlanet $planet,AbstractSmrPlayer $targetPlayer) {
+	protected function getModifiedPlanetAccuracyAgainstPlayer(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
 		return 100;
 	}
 	
-	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,self::MAX_CDS_RAND);
+	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, self::MAX_CDS_RAND);
 	}
 	
-	public function getMaxModifiedPortAccuracyAgainstPlayer(SmrPort $forces,AbstractSmrPlayer $targetPlayer) {
+	public function getMaxModifiedPortAccuracyAgainstPlayer(SmrPort $forces, AbstractSmrPlayer $targetPlayer) {
 		return 100;
 	}
 	
@@ -127,13 +127,13 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if(!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer,$forces) / 100);
+		$damage = & $this->getModifiedDamage();
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
-		if($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR
-			$damage['Kamikaze'] = min($damage['Launched'],$forces->getMines());
+		if ($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR
+			$damage['Kamikaze'] = min($damage['Launched'], $forces->getMines());
 			$damage['Launched'] -= $damage['Kamikaze'];
 		}
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
@@ -149,10 +149,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if(!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer,$port) / 100);
+		$damage = & $this->getModifiedDamage();
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -161,10 +161,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if(!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer,$planet) / 100);
+		$damage = & $this->getModifiedDamage();
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage'] * $planetMod);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield'] * $planetMod);
@@ -174,17 +174,17 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
-		if($targetPlayer->getShip()->hasDCS()) {
+		$damage = & $this->getModifiedDamage();
+		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
 			$damage['Armour'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
 		}
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlayer($weaponPlayer,$targetPlayer) / 100);
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlayer($weaponPlayer, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -192,19 +192,19 @@ 
 	}
 	
 	public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
-		if($targetPlayer->getShip()->hasDCS()) {
+		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT;
 			$damage['Armour'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT;
 		}
 		
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces,$targetPlayer) / 100);
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -212,18 +212,18 @@ 
 	}
 	
 	public function &getModifiedPortDamageAgainstPlayer(SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
-		if($targetPlayer->getShip()->hasDCS()) {
+		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT;
 			$damage['Armour'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT;
 		}
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedPortAccuracyAgainstPlayer($port,$targetPlayer) / 100);
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedPortAccuracyAgainstPlayer($port, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -231,18 +231,18 @@ 
 	}
 	
 	public function &getModifiedPlanetDamageAgainstPlayer(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
-		if($targetPlayer->getShip()->hasDCS()) {
+		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT;
 			$damage['Armour'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT;
 		}
-		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedPlanetAccuracyAgainstPlayer($planet,$targetPlayer) / 100);
+		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedPlanetAccuracyAgainstPlayer($planet, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -251,8 +251,8 @@ 
 	
 	public function &shootForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		$return = array('Weapon' => $this, 'TargetForces' => $forces, 'Hit' => true);
-		$this->doPlayerDamageToForce($return,$weaponPlayer, $forces);
-		if($return['WeaponDamage']['Kamikaze'] > 0) {
+		$this->doPlayerDamageToForce($return, $weaponPlayer, $forces);
+		if ($return['WeaponDamage']['Kamikaze'] > 0) {
 			$weaponPlayer->getShip()->decreaseCDs($return['WeaponDamage']['Kamikaze']);
 		}
 		return $return;
@@ -260,12 +260,12 @@ 
 	
 	public function &shootPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$return = array('Weapon' => $this, 'TargetPort' => $port, 'Hit' => true);
-		return $this->doPlayerDamageToPort($return,$weaponPlayer, $port);
+		return $this->doPlayerDamageToPort($return, $weaponPlayer, $port);
 	}
 	
 	public function &shootPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
 		$return = array('Weapon' => $this, 'TargetPlanet' => $planet, 'Hit' => true);
-		return $this->doPlayerDamageToPlanet($return,$weaponPlayer, $planet, $delayed);
+		return $this->doPlayerDamageToPlanet($return, $weaponPlayer, $planet, $delayed);
 	}
 	
 	public function &shootPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {

lib/Default/VoteSite.class.inc

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 				'img_default' => 'twg.png',
 				'img_star' => 'twg_vote.png',
 				'url_base' => 'http://topwebgames.com/in.aspx?ID=136&alwaysreward=1',
-				'url_func' => function ($baseUrl, $accountId, $gameId, $linkId) {
+				'url_func' => function($baseUrl, $accountId, $gameId, $linkId) {
 					$query = array('account' => $accountId, 'game' => $gameId, 'link' => $linkId);
 					return $baseUrl . '&' . http_build_query($query);
 				},
@@ -27,7 +27,7 @@ 
 				'img_default' => 'dog.png',
 				'img_star' => 'dog_vote.png',
 				'url_base' => 'http://www.directoryofgames.com/main.php?view=topgames&action=vote&v_tgame=2315',
-				'url_func' => function ($baseUrl, $accountId, $gameId, $linkId) {
+				'url_func' => function($baseUrl, $accountId, $gameId, $linkId) {
 					return "$baseUrl&votedef=$accountId,$gameId,$linkId";
 				},
 			),

lib/Default/smr.inc

Spacing +195 added lines, -195 removed lines

@@ -10,14 +10,14 @@ 
 }
 
 function htmliseMessage($message) {
-	$message = htmlentities($message,ENT_COMPAT,'utf-8');
-	$message = str_replace('&lt;br /&gt;','<br />',$message);
+	$message = htmlentities($message, ENT_COMPAT, 'utf-8');
+	$message = str_replace('&lt;br /&gt;', '<br />', $message);
 	return $message;
 }
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0))
+	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0))
 		return false;
 	return (bool)$check;
 }
@@ -25,7 +25,7 @@ 
 function smrBBCode($bbParser, $action, $tagName, $default, $tagParams, $tagContent) {
 	global $overrideGameID, $disableBBLinks, $player, $account, $var;
 	try {
-		switch($tagName) {
+		switch ($tagName) {
 			case 'combatlog':
 				$logID = (is_numeric($default)) ? $default : $tagParams['id'];
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
@@ -37,14 +37,14 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if(!is_numeric($playerID))
+				if (!is_numeric($playerID))
 					$playerID = $tagParams['id'];
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
 				$showAlliance = isset($tagParams['showalliance']) ? parseBoolean($tagParams['showalliance']) : false;
-				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					return $bbPlayer->getLinkedDisplayName($showAlliance);
 				}
 				return $bbPlayer->getDisplayName($showAlliance);
@@ -52,14 +52,14 @@ 
 			case 'alliance':
 				$db = new SmrMySqlDatabase();
 				$allianceID = $default;
-				if(!is_numeric($allianceID))
+				if (!is_numeric($allianceID))
 					$allianceID = $tagParams['id'];
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
 
-				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
 					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
@@ -73,12 +73,12 @@ 
 			case 'race':
 				$raceNameID = $default;
 				foreach (Globals::getRaces() as $raceID => $raceInfo) {
-					if((is_numeric($raceNameID) && $raceNameID == $raceID)
+					if ((is_numeric($raceNameID) && $raceNameID == $raceID)
 						|| $raceNameID == $raceInfo['Race Name']) {
 						if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 							return true;
 						}
-						$linked = $disableBBLinks===false && $overrideGameID==SmrSession::getGameID();
+						$linked = $disableBBLinks === false && $overrideGameID == SmrSession::getGameID();
 						return AbstractSmrPlayer::getColouredRaceNameOrDefault($raceID, $player, $linked);
 					}
 				}
@@ -89,14 +89,14 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if(is_object($account))
+					if (is_object($account))
 						$time += $account->getOffset() * 3600;
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
 			case 'chess':
 				$chessGameID = $default;
-				$chessGame =& ChessGame::getChessGame($chessGameID);
+				$chessGame = & ChessGame::getChessGame($chessGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
@@ -114,10 +114,10 @@ 
 
 				// The use of $var here is for a corner case where an admin can check reported messages whilst being in-game.
 				// Ugly but working, probably want a better mechanism to check if more BBCode tags get added
-				if(is_numeric($sectorID)
+				if (is_numeric($sectorID)
 					&& SmrSession::hasGame()
 					&& SmrSector::sectorExists($overrideGameID, $sectorID)
-					&& $disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+					&& $disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					return '<a href="' . Globals::getPlotCourseHREF($player->getSectorID(), $sectorID) . '">' . $sectorTag . '</a>';
 				}
 
@@ -151,9 +151,9 @@ 
 	return str_replace(',', '', html_entity_decode($text));
 }
 
-function bbifyMessage($message, $noLinks=false) {
+function bbifyMessage($message, $noLinks = false) {
 	static $bbParser;
-	if(!isset($bbParser)) {
+	if (!isset($bbParser)) {
 		$bbParser = new \Nbbc\BBCode();
 		$bbParser->SetEnableSmileys(false);
 		$bbParser->RemoveRule('wiki');
@@ -169,23 +169,23 @@ 
 				'end_tag' => \Nbbc\BBCode::BBCODE_PROHIBIT,
 				'content' => \Nbbc\BBCode::BBCODE_PROHIBIT,
 			);
-		$bbParser->AddRule('combatlog',$smrRule);
-		$bbParser->AddRule('player',$smrRule);
-		$bbParser->AddRule('alliance',$smrRule);
-		$bbParser->AddRule('race',$smrRule);
-		$bbParser->AddRule('servertimetouser',$smrRule);
-		$bbParser->AddRule('chess',$smrRule);
-		$bbParser->AddRule('sector',$smrRule);
-		$bbParser->addRule('join_alliance',$smrRule);
+		$bbParser->AddRule('combatlog', $smrRule);
+		$bbParser->AddRule('player', $smrRule);
+		$bbParser->AddRule('alliance', $smrRule);
+		$bbParser->AddRule('race', $smrRule);
+		$bbParser->AddRule('servertimetouser', $smrRule);
+		$bbParser->AddRule('chess', $smrRule);
+		$bbParser->AddRule('sector', $smrRule);
+		$bbParser->addRule('join_alliance', $smrRule);
 	}
 	global $disableBBLinks;
-	if($noLinks===true)
+	if ($noLinks === true)
 		$disableBBLinks = true;
 	else
 		$disableBBLinks = false;
-	if(strpos($message, '[')!==false) { //We have BBCode so let's do a full parse.
+	if (strpos($message, '[') !== false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
-		$message = str_replace('&lt;br /&gt;','<br />',$message);
+		$message = str_replace('&lt;br /&gt;', '<br />', $message);
 	}
 	else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
@@ -197,7 +197,7 @@ 
 	global $template;
 	$return = '<span class="noWrap">' . implode('</span> | <span class="noWrap">', $menu) . '</span>';
 	$template->unassign('MenuItems');
-	$template->assign('MenuBar',$return);
+	$template->assign('MenuBar', $return);
 }
 
 function create_table() {
@@ -209,29 +209,29 @@ 
 }
 
 function create_form_name($container, $name) {
-	return create_form_parameter($container, 'name="'.$name.'"');
+	return create_form_parameter($container, 'name="' . $name . '"');
 }
 
 function create_form_parameter($container, $param) {
-	return '<form '.$param.' method="POST" action="'.SmrSession::getNewHREF($container).'">';
+	return '<form ' . $param . ' method="POST" action="' . SmrSession::getNewHREF($container) . '">';
 }
 
-function create_button($container,$text) {
-	return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container). '">' . $text . '</a></div>';
+function create_button($container, $text) {
+	return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">' . $text . '</a></div>';
 }
 
-function create_form($container,$actions) {
+function create_form($container, $actions) {
 	static $form_id = 0;
 	$form = array();
 	$form['form'] = '<form class="standard" id="FORM' . $form_id . '" method="POST" action="' . SmrSession::getNewHREF($container) . '">';
 
-	if(!is_array($actions)) {
-		$form['submit'] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
+	if (!is_array($actions)) {
+		$form['submit'] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
 	}
 	else {
 		$form['submit'] = array();
-		foreach($actions as $action) {
-			$form['submit'][$action[0]] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
+		foreach ($actions as $action) {
+			$form['submit'][$action[0]] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
 		}
 	}
 
@@ -241,11 +241,11 @@ 
 }
 
 function create_submit($value) {
-	return ('<input type="submit" name="action" value="'.htmlspecialchars($value).'" id="InputFields" />');
+	return ('<input type="submit" name="action" value="' . htmlspecialchars($value) . '" id="InputFields" />');
 }
 
 function create_error($message) {
-	$container = create_container('skeleton.php','error.php');
+	$container = create_container('skeleton.php', 'error.php');
 	$container['message'] = $message;
 	if (USING_AJAX) {
 		// To avoid the page just not refreshing when an error is encountered
@@ -262,18 +262,18 @@ 
 }
 
 function resetContainer($new_container) {
-	global $sn,$container,$var;
+	global $sn, $container, $var;
 
 	// this sn identifies our container later
 
-	SmrSession::resetLink($new_container,$sn);
+	SmrSession::resetLink($new_container, $sn);
 
 	$var = $new_container;
 	$container = $new_container;
 }
 
 function forward($new_container) {
-	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true)
+	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true)
 		return overrideForward($new_container);
 	resetContainer($new_container);
 	do_voodoo();
@@ -290,7 +290,7 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if(isset($var[$what]))
+	if (isset($var[$what]))
 		$container[$what] = $var[$what];
 
 }
@@ -299,42 +299,42 @@ 
 	$container = $extra;
 	$container['url'] = $file;
 	$container['body'] = $body;
-	if($remainingPageLoads) {
+	if ($remainingPageLoads) {
 		$container['RemainingPageLoads'] = $remainingPageLoads;
 	}
 	return $container;
 }
 
-function create_link($container, $text, $class=null) {
-	return '<a'.($class==null?'':' class="'.$class.'"').' href="' . (is_array($container)?SmrSession::getNewHREF($container):$container) . '">' . $text . '</a>';
+function create_link($container, $text, $class = null) {
+	return '<a' . ($class == null ? '' : ' class="' . $class . '"') . ' href="' . (is_array($container) ?SmrSession::getNewHREF($container) : $container) . '">' . $text . '</a>';
 }
 
 function create_submit_link($container, $text) {
 	return '<a href="' . SmrSession::getNewHREF($container) . '" class="submitStyle">' . $text . '</a>';
 }
 
-function get_colored_text_range($value, $maxValue, $text = null, $minValue = 0, $type='Game', $return_type = 'Normal') {
-	if($text == null) {
+function get_colored_text_range($value, $maxValue, $text = null, $minValue = 0, $type = 'Game', $return_type = 'Normal') {
+	if ($text == null) {
 		$text = number_format($value);
 	}
-	if($maxValue-$minValue==0) {
+	if ($maxValue - $minValue == 0) {
 		return $text;
 	}
 	else {
-		$normalisedValue = round(510*max(0,min($maxValue,$value)-$minValue)/($maxValue-$minValue))-255;
+		$normalisedValue = round(510 * max(0, min($maxValue, $value) - $minValue) / ($maxValue - $minValue)) - 255;
 	}
 	if ($type == 'Game') {
-		if($normalisedValue < 0) {
-			$r_component='ff';
-			$g_component = dechex(255+$normalisedValue);
-			if(strlen($g_component) == 1) {
+		if ($normalisedValue < 0) {
+			$r_component = 'ff';
+			$g_component = dechex(255 + $normalisedValue);
+			if (strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
 		}
-		else if($normalisedValue > 0) {
-			$g_component='ff';
-			$r_component = dechex(255-$normalisedValue);
-			if(strlen($r_component) == 1) {
+		else if ($normalisedValue > 0) {
+			$g_component = 'ff';
+			$r_component = dechex(255 - $normalisedValue);
+			if (strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
 		}
@@ -356,25 +356,25 @@ 
 	}
 }
 
-function get_colored_text($value, $text = null, $type='Game', $return_type = 'Normal') {
+function get_colored_text($value, $text = null, $type = 'Game', $return_type = 'Normal') {
 	return get_colored_text_range($value, 300, $text, -300, $type, $return_type);
 }
 
 function word_filter($string) {
 	static $words;
 
-	if(!is_array($words)) {
+	if (!is_array($words)) {
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT word_value, word_replacement FROM word_filter');
 		$words = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$row = $db->getRow();
-			$words[] = array('word_value' => '/'.str_replace('/','\/',$row['word_value']).'/i','word_replacement'=> $row['word_replacement']);
+			$words[] = array('word_value' => '/' . str_replace('/', '\/', $row['word_value']) . '/i', 'word_replacement'=> $row['word_replacement']);
 		}
 	}
 
 	foreach ($words as $word) {
-		$string = preg_replace($word['word_value'],$word['word_replacement'],$string);
+		$string = preg_replace($word['word_value'], $word['word_replacement'], $string);
 	}
 
 	return $string;
@@ -382,10 +382,10 @@ 
 
 // choose correct pluralization based on amount
 function pluralise($word, $count = 0) {
-	if($count == 1) {
+	if ($count == 1) {
 		return $word;
 	}
-	if(strtolower($word) == 'is') {
+	if (strtolower($word) == 'is') {
 		return 'are';
 	}
 	return $word . 's';
@@ -406,10 +406,10 @@ 
 // This function is a hack around the old style http forward mechanism
 function do_voodoo() {
 	global $lock, $var, $template, $account;
-	if(!defined('AJAX_CONTAINER')) {
+	if (!defined('AJAX_CONTAINER')) {
 		define('AJAX_CONTAINER', isset($var['AJAX']) && $var['AJAX'] === true);
 	}
-	if(!AJAX_CONTAINER && USING_AJAX && SmrSession::$SN != SmrSession::$lastSN)
+	if (!AJAX_CONTAINER && USING_AJAX && SmrSession::$SN != SmrSession::$lastSN)
 		exit;
 //	ob_clean();
 
@@ -417,22 +417,22 @@ 
 		$$key = &$GLOBALS[$key];
 	}
 	// create account object
-	$account =& SmrAccount::getAccount(SmrSession::$account_id);
-	$GLOBALS['account'] =& $account;
+	$account = & SmrAccount::getAccount(SmrSession::$account_id);
+	$GLOBALS['account'] = & $account;
 
-	if(!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT',$account->getShortDateFormat());
-	if(!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT',$account->getShortTimeFormat());
-	if(!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
-	if(!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	if (!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT', $account->getShortDateFormat());
+	if (!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT', $account->getShortTimeFormat());
+	if (!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
+	if (!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
 
 
 	$db = new SmrMySqlDatabase();
-	$GLOBALS['db'] =& $db;
+	$GLOBALS['db'] = & $db;
 
-	if($var['url'] == 'game_play_preprocessing.php') { // Would rather not have these here but if we go through the initialisation based on game id when leaving a classic game it breaks.
+	if ($var['url'] == 'game_play_preprocessing.php') { // Would rather not have these here but if we go through the initialisation based on game id when leaving a classic game it breaks.
 		SmrSession::clearLinks();
 		if (SmrSession::hasGame()) {
-			$account->log(LOG_TYPE_GAME_ENTERING, 'Player left game '.SmrSession::getGameID());
+			$account->log(LOG_TYPE_GAME_ENTERING, 'Player left game ' . SmrSession::getGameID());
 		}
 
 		// reset game id
@@ -453,11 +453,11 @@ 
 		$sector_id = $db->getInt('sector_id');
 
 		global $locksFailed;
-		if(!USING_AJAX //AJAX should never do anything that requires a lock.
+		if (!USING_AJAX //AJAX should never do anything that requires a lock.
 //			&& !isset($var['url']) && ($var['body'] == 'current_sector.php' || $var['body'] == 'map_local.php') //Neither should CS or LM and they gets loaded a lot so should reduce lag issues with big groups.
 			) {
-			if(!$lock && !isset($locksFailed[$sector_id])) {
-				if(!acquire_lock($sector_id)) {
+			if (!$lock && !isset($locksFailed[$sector_id])) {
+				if (!acquire_lock($sector_id)) {
 					create_error('Failed to acquire sector lock');
 				}
 				//Refetch var info in case it changed between grabbing lock.
@@ -472,18 +472,18 @@ 
 		}
 
 		// Now that they've acquire a lock we can move on
-		$player =& SmrPlayer::getPlayer(SmrSession::$account_id, SmrSession::getGameID());
-		$GLOBALS['player'] =& $player;
+		$player = & SmrPlayer::getPlayer(SmrSession::$account_id, SmrSession::getGameID());
+		$GLOBALS['player'] = & $player;
 
-		if($player->isDead() && $var['url'] != 'death_processing.php' && !isset($var['override_death'])) {
+		if ($player->isDead() && $var['url'] != 'death_processing.php' && !isset($var['override_death'])) {
 			forward(create_container('death_processing.php'));
 		}
 
-		$ship	=& $player->getShip();
-		$GLOBALS['ship'] =& $ship;
+		$ship = & $player->getShip();
+		$GLOBALS['ship'] = & $ship;
 
-		$sector	=& $player->getSector();
-		$GLOBALS['sector'] =& $sector;
+		$sector = & $player->getSector();
+		$GLOBALS['sector'] = & $sector;
 
 		// update turns on that player
 		$player->updateTurns();
@@ -494,34 +494,34 @@ 
 			forward(create_container('newbie_warning_processing.php'));
 	}
 
-	if($var['url'] != 'skeleton.php') {
+	if ($var['url'] != 'skeleton.php') {
 		require(get_file_loc($var['url']));
 	}
-	if($var['body']) {
+	if ($var['body']) {
 		$PHP_OUTPUT = '';
-		if ($var['body']=='error.php') { // infinite includes for error pages
+		if ($var['body'] == 'error.php') { // infinite includes for error pages
 			require(get_file_loc($var['body']));
 		}
 		else {
 			require_once(get_file_loc($var['body']));
 		}
 
-		if($PHP_OUTPUT!='')
-			$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		if ($PHP_OUTPUT != '')
+			$template->assign('PHP_OUTPUT', $PHP_OUTPUT);
 	}
 
 	if (SmrSession::hasGame()) {
 		$template->assign('UnderAttack', $ship->removeUnderAttack());
 	}
 
-	if($lock) { //Only save if we have the lock.
+	if ($lock) { //Only save if we have the lock.
 		SmrSector::saveSectors();
 		SmrShip::saveShips();
 		SmrPlayer::savePlayers();
 		SmrForce::saveForces();
 		SmrPort::savePorts();
 		SmrPlanet::savePlanets();
-		if(class_exists('WeightedRandom', false)) {
+		if (class_exists('WeightedRandom', false)) {
 			WeightedRandom::saveWeightedRandoms();
 		}
 		//Update session here to make sure current page $var is up to date before releasing lock.
@@ -531,17 +531,17 @@ 
 
 	//Nothing below this point should require the lock.
 
-	$template->assign('TemplateBody',$var['body']);
+	$template->assign('TemplateBody', $var['body']);
 	if (SmrSession::hasGame()) {
-		$template->assign('ThisSector',$sector);
-		$template->assign('ThisPlayer',$player);
-		$template->assign('ThisShip',$ship);
+		$template->assign('ThisSector', $sector);
+		$template->assign('ThisPlayer', $player);
+		$template->assign('ThisShip', $ship);
 	}
-	$template->assign('ThisAccount',$account);
-	if($account->getCssLink()!=null) {
-		$template->assign('ExtraCSSLink',$account->getCssLink());
+	$template->assign('ThisAccount', $account);
+	if ($account->getCssLink() != null) {
+		$template->assign('ExtraCSSLink', $account->getCssLink());
 	}
-	doSkeletonAssigns($template,$player,$ship,$sector,$db,$account);
+	doSkeletonAssigns($template, $player, $ship, $sector, $db, $account);
 
 	// Set ajax refresh time
 	$ajaxRefresh = $var['AllowAjax'] ?? true; // hack for bar_gambling_processing.php
@@ -571,26 +571,26 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if($lock)
+	if ($lock)
 		return true;
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::$account_id) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
 	$lock = $db->getInsertID();
 
-	for($i=0;$i<250;++$i) {
-		if(time() - TIME >= LOCK_DURATION - LOCK_BUFFER) {
+	for ($i = 0; $i < 250; ++$i) {
+		if (time() - TIME >= LOCK_DURATION - LOCK_BUFFER) {
 			break;
 		}
 		// If there is someone else before us in the queue we sleep for a while
 		$db->query('SELECT COUNT(*) FROM locks_queue WHERE lock_id<' . $db->escapeNumber($lock) . ' AND sector_id=' . $db->escapeNumber($sector) . ' AND game_id=' . $db->escapeNumber(SmrSession::getGameID()) . ' AND timestamp > ' . $db->escapeNumber(TIME - LOCK_DURATION));
 		$locksInQueue = -1;
-		if($db->nextRecord() && ($locksInQueue = $db->getInt('COUNT(*)')) > 0) {
+		if ($db->nextRecord() && ($locksInQueue = $db->getInt('COUNT(*)')) > 0) {
 			//usleep(100000 + mt_rand(0,50000));
 
 			// We can only have one lock in the queue, anything more means someone is screwing around
 			$db->query('SELECT COUNT(*) FROM locks_queue WHERE account_id=' . $db->escapeNumber(SmrSession::$account_id) . ' AND sector_id=' . $db->escapeNumber($sector) . ' AND timestamp > ' . $db->escapeNumber(TIME - LOCK_DURATION));
-			if($db->nextRecord() && $db->getInt('COUNT(*)') > 1) {
+			if ($db->nextRecord() && $db->getInt('COUNT(*)') > 1) {
 				release_lock();
 				$locksFailed[$sector] = true;
 				create_error('Multiple actions cannot be performed at the same time!');
@@ -611,7 +611,7 @@ 
 
 function release_lock() {
 	global $db, $lock;
-	if($lock) {
+	if ($lock) {
 		$db->query('DELETE from locks_queue WHERE lock_id=' . $db->escapeNumber($lock) . ' OR timestamp<' . $db->escapeNumber(TIME - LOCK_DURATION));
 	}
 
@@ -620,15 +620,15 @@ 
 
 function doTickerAssigns($template, $player, $db) {
 	//any ticker news?
-	if($player->hasTickers()) {
+	if ($player->hasTickers()) {
 		$ticker = array();
 		$max = TIME - 60;
-		if($player->hasTicker('NEWS')) {
+		if ($player->hasTicker('NEWS')) {
 			$text = '';
 			//get recent news (5 mins)
 
-			$db->query('SELECT time,news_message FROM news WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND time >= '.$max.' ORDER BY time DESC LIMIT 4');
-			while($db->nextRecord()) {
+			$db->query('SELECT time,news_message FROM news WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND time >= ' . $max . ' ORDER BY time DESC LIMIT 4');
+			while ($db->nextRecord()) {
 				$ticker[] = array('Time' => date(DATE_FULL_SHORT, $db->getField('time')),
 								'Message'=>$db->getField('news_message'));
 			}
@@ -639,15 +639,15 @@ 
 						AND game_id=' . $db->escapeNumber($player->getGameID()) . '
 						AND message_type_id=' . $db->escapeNumber(MSG_SCOUT) . '
 						AND send_time>=' . $db->escapeNumber($max) . '
-						AND sender_id NOT IN (SELECT account_id FROM player_has_ticker WHERE type='.$db->escapeString('BLOCK').' AND expires > ' . $db->escapeNumber(TIME) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ') AND receiver_delete = \'FALSE\'
+						AND sender_id NOT IN (SELECT account_id FROM player_has_ticker WHERE type='.$db->escapeString('BLOCK') . ' AND expires > ' . $db->escapeNumber(TIME) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ') AND receiver_delete = \'FALSE\'
 						ORDER BY send_time DESC
 						LIMIT 4');
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$ticker[] = array('Time' => date(DATE_FULL_SHORT, $db->getField('send_time')),
 								'Message'=>$db->getField('message_text'));
 			}
 		}
-		$template->assign('Ticker',$ticker);
+		$template->assign('Ticker', $ticker);
 	}
 }
 
@@ -656,7 +656,7 @@ 
 	$template->assign('CSSColourLink', $account->getCssColourUrl());
 
 	$template->assign('FontSize', $account->getFontSize() - 20);
-	$template->assign('timeDisplay',date(DATE_FULL_SHORT_SPLIT,TIME));
+	$template->assign('timeDisplay', date(DATE_FULL_SHORT_SPLIT, TIME));
 
 	$container = create_container('skeleton.php');
 
@@ -665,172 +665,172 @@ 
 		$template->assign('GameName', Globals::getGameName(SmrSession::getGameID()));
 		$template->assign('GameID', SmrSession::getGameID());
 
-		$template->assign('PlotCourseLink',Globals::getPlotCourseHREF());
+		$template->assign('PlotCourseLink', Globals::getPlotCourseHREF());
 
-		$template->assign('TraderLink',Globals::getTraderStatusHREF());
+		$template->assign('TraderLink', Globals::getTraderStatusHREF());
 
-		$template->assign('PoliticsLink',Globals::getPoliticsHREF());
+		$template->assign('PoliticsLink', Globals::getPoliticsHREF());
 
 		$container['body'] = 'combat_log_list.php';
-		$template->assign('CombatLogsLink',SmrSession::getNewHREF($container));
+		$template->assign('CombatLogsLink', SmrSession::getNewHREF($container));
 
-		$template->assign('PlanetLink',Globals::getPlanetListHREF($player->getAllianceID()));
+		$template->assign('PlanetLink', Globals::getPlanetListHREF($player->getAllianceID()));
 
 		$container['body'] = 'forces_list.php';
-		$template->assign('ForcesLink',SmrSession::getNewHREF($container));
+		$template->assign('ForcesLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'message_view.php';
-		$template->assign('MessagesLink',SmrSession::getNewHREF($container));
+		$template->assign('MessagesLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'news_read_current.php';
-		$template->assign('ReadNewsLink',SmrSession::getNewHREF($container));
+		$template->assign('ReadNewsLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'galactic_post_current.php';
-		$template->assign('GalacticPostLink',SmrSession::getNewHREF($container));
+		$template->assign('GalacticPostLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'trader_search.php';
-		$template->assign('SearchForTraderLink',SmrSession::getNewHREF($container));
+		$template->assign('SearchForTraderLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'rankings_player_experience.php';
-		$template->assign('RankingsLink',SmrSession::getNewHREF($container));
+		$template->assign('RankingsLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'hall_of_fame_new.php';
 		$container['game_id'] = $player->getGameID();
-		$template->assign('CurrentHallOfFameLink',SmrSession::getNewHREF($container));
+		$template->assign('CurrentHallOfFameLink', SmrSession::getNewHREF($container));
 	}
 
 	if (SmrSession::$account_id > 0) {
 		$container = create_container('skeleton.php', 'hall_of_fame_new.php');
-		$template->assign('HallOfFameLink',SmrSession::getNewHREF($container));
+		$template->assign('HallOfFameLink', SmrSession::getNewHREF($container));
 
-		$template->assign('AccountID',SmrSession::$account_id);
-		$template->assign('PlayGameLink',SmrSession::getNewHREF(create_container('game_play_preprocessing.php')));
+		$template->assign('AccountID', SmrSession::$account_id);
+		$template->assign('PlayGameLink', SmrSession::getNewHREF(create_container('game_play_preprocessing.php')));
 
-		$template->assign('LogoutLink',SmrSession::getNewHREF(create_container('logoff.php')));
+		$template->assign('LogoutLink', SmrSession::getNewHREF(create_container('logoff.php')));
 	}
 
 	$container = create_container('skeleton.php', 'preferences.php');
-	$template->assign('PreferencesLink',SmrSession::getNewHREF($container));
+	$template->assign('PreferencesLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'admin_tools.php';
-	$template->assign('AdminToolsLink',SmrSession::getNewHREF($container));
+	$template->assign('AdminToolsLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'album_edit.php';
-	$template->assign('EditPhotoLink',SmrSession::getNewHREF($container));
+	$template->assign('EditPhotoLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'bug_report.php';
-	$template->assign('ReportABugLink',SmrSession::getNewHREF($container));
+	$template->assign('ReportABugLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'contact.php';
-	$template->assign('ContactFormLink',SmrSession::getNewHREF($container));
+	$template->assign('ContactFormLink', SmrSession::getNewHREF($container));
 
 	if (SmrSession::hasGame()) {
 		$container['body'] = 'chat_rules.php';
-		$template->assign('IRCLink',SmrSession::getNewHREF($container));
+		$template->assign('IRCLink', SmrSession::getNewHREF($container));
 	}
 
 	$container['body'] = 'donation.php';
-	$template->assign('DonateLink',SmrSession::getNewHREF($container));
+	$template->assign('DonateLink', SmrSession::getNewHREF($container));
 
 
 
 	if (SmrSession::hasGame()) {
 		$db->query('SELECT message_type_id,COUNT(*) FROM player_has_unread_messages WHERE account_id=' . $db->escapeNumber($player->getAccountID()) . ' AND game_id=' . $db->escapeNumber($player->getGameID()) . ' GROUP BY message_type_id');
 
-		if($db->getNumRows()) {
+		if ($db->getNumRows()) {
 			$messages = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$messages[$db->getInt('message_type_id')] = $db->getInt('COUNT(*)');
 			}
 
-			$container = create_container('skeleton.php','message_view.php');
+			$container = create_container('skeleton.php', 'message_view.php');
 
-			if(isset($messages[MSG_GLOBAL])) {
+			if (isset($messages[MSG_GLOBAL])) {
 				$container['folder_id'] = MSG_GLOBAL;
-				$template->assign('MessageGlobalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageGlobalNum',$messages[MSG_GLOBAL]);
+				$template->assign('MessageGlobalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageGlobalNum', $messages[MSG_GLOBAL]);
 			}
 
-			if(isset($messages[MSG_PLAYER])) {
+			if (isset($messages[MSG_PLAYER])) {
 				$container['folder_id'] = MSG_PLAYER;
-				$template->assign('MessagePersonalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePersonalNum',$messages[MSG_PLAYER]);
+				$template->assign('MessagePersonalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePersonalNum', $messages[MSG_PLAYER]);
 			}
 
-			if(isset($messages[MSG_SCOUT])) {
+			if (isset($messages[MSG_SCOUT])) {
 				$container['folder_id'] = MSG_SCOUT;
-				$template->assign('MessageScoutLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageScoutNum',$messages[MSG_SCOUT]);
+				$template->assign('MessageScoutLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageScoutNum', $messages[MSG_SCOUT]);
 			}
 
-			if(isset($messages[MSG_POLITICAL])) {
+			if (isset($messages[MSG_POLITICAL])) {
 				$container['folder_id'] = MSG_POLITICAL;
-				$template->assign('MessagePoliticalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePoliticalNum',$messages[MSG_POLITICAL]);
+				$template->assign('MessagePoliticalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePoliticalNum', $messages[MSG_POLITICAL]);
 			}
 
-			if(isset($messages[MSG_ALLIANCE])) {
+			if (isset($messages[MSG_ALLIANCE])) {
 				$container['folder_id'] = MSG_ALLIANCE;
-				$template->assign('MessageAllianceLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageAllianceNum',$messages[MSG_ALLIANCE]);
+				$template->assign('MessageAllianceLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageAllianceNum', $messages[MSG_ALLIANCE]);
 			}
 
-			if(isset($messages[MSG_ADMIN])) {
+			if (isset($messages[MSG_ADMIN])) {
 				$container['folder_id'] = MSG_ADMIN;
-				$template->assign('MessageAdminLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageAdminNum',$messages[MSG_ADMIN]);
+				$template->assign('MessageAdminLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageAdminNum', $messages[MSG_ADMIN]);
 			}
 
-			if(isset($messages[MSG_CASINO])) {
+			if (isset($messages[MSG_CASINO])) {
 				$container['folder_id'] = MSG_CASINO;
-				$template->assign('MessageCasinoLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageCasinoNum',$messages[MSG_CASINO]);
+				$template->assign('MessageCasinoLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageCasinoNum', $messages[MSG_CASINO]);
 			}
 
-			if(isset($messages[MSG_PLANET])) {
+			if (isset($messages[MSG_PLANET])) {
 				$container = create_container('planet_msg_processing.php');
-				$template->assign('MessagePlanetLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePlanetNum',$messages[MSG_PLANET]);
+				$template->assign('MessagePlanetLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePlanetNum', $messages[MSG_PLANET]);
 			}
 		}
 
 		$container = create_container('skeleton.php', 'trader_search_result.php');
-		$container['player_id']	= $player->getPlayerID();
-		$template->assign('PlayerNameLink',SmrSession::getNewHREF($container));
+		$container['player_id'] = $player->getPlayerID();
+		$template->assign('PlayerNameLink', SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible',true);
+		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible', true);
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
 
-		$template->assign('HardwareLink',SmrSession::getNewHREF($container));
+		$template->assign('HardwareLink', SmrSession::getNewHREF($container));
 
 		// ******* Forces *******
-		$template->assign('ForceDropLink',SmrSession::getNewHREF(create_container('skeleton.php', 'forces_drop.php')));
+		$template->assign('ForceDropLink', SmrSession::getNewHREF(create_container('skeleton.php', 'forces_drop.php')));
 
 		if ($ship->hasMines()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_mines'] = 1;
-			$template->assign('DropMineLink',SmrSession::getNewHREF($container));
+			$template->assign('DropMineLink', SmrSession::getNewHREF($container));
 		}
 		if ($ship->hasCDs()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_combat_drones'] = 1;
-			$template->assign('DropCDLink',SmrSession::getNewHREF($container));
+			$template->assign('DropCDLink', SmrSession::getNewHREF($container));
 		}
 
 		if ($ship->hasSDs()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_scout_drones'] = 1;
-			$template->assign('DropSDLink',SmrSession::getNewHREF($container));
+			$template->assign('DropSDLink', SmrSession::getNewHREF($container));
 		}
 
-		$template->assign('CargoJettisonLink',SmrSession::getNewHREF(create_container('skeleton.php', 'cargo_dump.php')));
+		$template->assign('CargoJettisonLink', SmrSession::getNewHREF(create_container('skeleton.php', 'cargo_dump.php')));
 
-		$template->assign('WeaponReorderLink',SmrSession::getNewHREF(create_container('skeleton.php', 'weapon_reorder.php')));
+		$template->assign('WeaponReorderLink', SmrSession::getNewHREF(create_container('skeleton.php', 'weapon_reorder.php')));
 
 	}
 
@@ -860,34 +860,34 @@ 
 		$version = create_link($container, 'v' . $db->getField('major_version') . '.' . $db->getField('minor_version') . '.' . $db->getField('patch_level'));
 	}
 
-	$template->assign('Version',$version);
-	$template->assign('CurrentYear',date('Y',TIME));
+	$template->assign('Version', $version);
+	$template->assign('CurrentYear', date('Y', TIME));
 }
 
-function format_time($seconds, $short=false) {
-	$minutes=0;
-	$hours=0;
-	$days=0;
-	$weeks=0;
+function format_time($seconds, $short = false) {
+	$minutes = 0;
+	$hours = 0;
+	$days = 0;
+	$weeks = 0;
 	$string = '';
 	if ($seconds == 0) {
 		$string = '0 seconds';
 		if ($short) $string = '0s';
 	}
 	if ($seconds >= 60) {
-		$minutes = floor($seconds/60);
+		$minutes = floor($seconds / 60);
 		$seconds = $seconds % 60;
 	}
 	if ($minutes >= 60) {
-		$hours = floor($minutes/60);
+		$hours = floor($minutes / 60);
 		$minutes = $minutes % 60;
 	}
 	if ($hours >= 24) {
-		$days = floor($hours/24);
+		$days = floor($hours / 24);
 		$hours = $hours % 24;
 	}
 	if ($days >= 7) {
-		$weeks = floor($days/7);
+		$weeks = floor($days / 7);
 		$days = $days % 7;
 	}
 	if ($weeks > 0) {
@@ -949,19 +949,19 @@ 
 	return $string;
 }
 
-function number_colour_format($number,$justSign = false) {
+function number_colour_format($number, $justSign = false) {
 	$formatted = '<span';
-	if($number > 0)
+	if ($number > 0)
 		$formatted .= ' class="green">+';
-	else if($number < 0)
+	else if ($number < 0)
 		$formatted .= ' class="red">-';
 	else
 		$formatted .= '>';
-	if($justSign===false) {
+	if ($justSign === false) {
 		$decimalPlaces = 0;
-		if(($pos = strpos($number,'.'))!==false)
-			$decimalPlaces = strlen(substr($number,$pos+1));
-		$formatted .= number_format(abs($number),$decimalPlaces);
+		if (($pos = strpos($number, '.')) !== false)
+			$decimalPlaces = strlen(substr($number, $pos + 1));
+		$formatted .= number_format(abs($number), $decimalPlaces);
 	}
 	$formatted .= '</span>';
 	return $formatted;
@@ -982,7 +982,7 @@ 
 	// Normalize the weights so that their sum is much larger than 1.
 	$maxWeight = max($choices);
 	foreach ($choices as $key => &$weight) {
-		$weight = round($weight * 1000/$maxWeight);
+		$weight = round($weight * 1000 / $maxWeight);
 	} unset($weight);
 
 	// Generate a random number that is lower than the sum of the weights.
@@ -1006,5 +1006,5 @@ 
 	if ($length % 2 != 0) {
 		throw new Exception('Length must be a multiple of 2!');
 	}
-	return bin2hex(random_bytes($length/2));
+	return bin2hex(random_bytes($length / 2));
 }

lib/Default/Rankings.class.inc

Spacing +9 added lines, -9 removed lines

@@ -14,7 +14,7 @@ 
 			if ($player->getAllianceID() == $currentAlliance->getAllianceID()) {
 				$class = ' class="bold"';
 			}
-			else if($currentAlliance->hasDisbanded()) {
+			else if ($currentAlliance->hasDisbanded()) {
 				$class = ' class="red"';
 			}
 
@@ -35,15 +35,15 @@ 
 			$rank++;
 			$currentPlayer = SmrPlayer::getPlayer($db->getInt('account_id'), $player->getGameID(), false, $db);
 
-			$class='';
+			$class = '';
 			if ($player->equals($currentPlayer)) {
 				$class .= 'bold';
 			}
-			if($currentPlayer->hasNewbieStatus()) {
-				$class.= ' newbie';
+			if ($currentPlayer->hasNewbieStatus()) {
+				$class .= ' newbie';
 			}
-			if($class!='') {
-				$class = ' class="'.trim($class).'"';
+			if ($class != '') {
+				$class = ' class="' . trim($class) . '"';
 			}
 
 			$rankings[$rank] = array(
@@ -62,7 +62,7 @@ 
 			$minRank = min($_REQUEST['min_rank'], $_REQUEST['max_rank']);
 			$maxRank = max($_REQUEST['min_rank'], $_REQUEST['max_rank']);
 		}
-		elseif(isset($var['MinRank']) && isset($var['MaxRank'])) {
+		elseif (isset($var['MinRank']) && isset($var['MaxRank'])) {
 			$minRank = $var['MinRank'];
 			$maxRank = $var['MaxRank'];
 		}
@@ -78,8 +78,8 @@ 
 
 		$maxRank = min($maxRank, $totalRanks);
 
-		SmrSession::updateVar('MinRank',$minRank);
-		SmrSession::updateVar('MaxRank',$maxRank);
+		SmrSession::updateVar('MinRank', $minRank);
+		SmrSession::updateVar('MaxRank', $maxRank);
 		$template->assign('MinRank', $minRank);
 		$template->assign('MaxRank', $maxRank);
 		$template->assign('TotalRanks', $totalRanks);

lib/Default/hof.functions.inc

Spacing +49 added lines, -49 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
-function getHofRank($view,$viewType,$accountID,$gameID,&$db) {
-	global $account,$player;
-	$gameIDSql = ' AND game_id '.(isset($gameID) ? '= ' . $db->escapeNumber($gameID) : 'IN (SELECT game_id FROM game WHERE ignore_stats = '.$db->escapeBoolean(false).')');
+function getHofRank($view, $viewType, $accountID, $gameID, &$db) {
+	global $account, $player;
+	$gameIDSql = ' AND game_id ' . (isset($gameID) ? '= ' . $db->escapeNumber($gameID) : 'IN (SELECT game_id FROM game WHERE ignore_stats = ' . $db->escapeBoolean(false) . ')');
 
 	$vis = HOF_PUBLIC;
-	$rank = array('Amount'=>0,'Rank'=>0);
-	if($view == DONATION_NAME) {
-		$db->query('SELECT SUM(amount) as amount FROM account_donated WHERE account_id='.$db->escapeNumber($accountID).' GROUP BY account_id LIMIT 1');
+	$rank = array('Amount'=>0, 'Rank'=>0);
+	if ($view == DONATION_NAME) {
+		$db->query('SELECT SUM(amount) as amount FROM account_donated WHERE account_id=' . $db->escapeNumber($accountID) . ' GROUP BY account_id LIMIT 1');
 	}
-	else if($view == USER_SCORE_NAME) {
+	else if ($view == USER_SCORE_NAME) {
 		$statements = SmrAccount::getUserScoreCaseStatement($db);
-		$query = 'SELECT '.$statements['CASE'].' amount FROM (SELECT type, SUM(amount) amount FROM player_hof WHERE type IN ('.$statements['IN'].') AND account_id='.$db->escapeNumber($accountID).$gameIDSql.' GROUP BY account_id,type) x ORDER BY amount DESC';
+		$query = 'SELECT ' . $statements['CASE'] . ' amount FROM (SELECT type, SUM(amount) amount FROM player_hof WHERE type IN (' . $statements['IN'] . ') AND account_id=' . $db->escapeNumber($accountID) . $gameIDSql . ' GROUP BY account_id,type) x ORDER BY amount DESC';
 		$db->query($query);
 	}
 	else {
-		$db->query('SELECT visibility FROM hof_visibility WHERE type='.$db->escapeArray($viewType,false,true,':',false).' LIMIT 1');
-		if(!$db->nextRecord()) {
+		$db->query('SELECT visibility FROM hof_visibility WHERE type=' . $db->escapeArray($viewType, false, true, ':', false) . ' LIMIT 1');
+		if (!$db->nextRecord()) {
 			return $rank;
 		}
 		$vis = $db->getField('visibility');
-		$db->query('SELECT SUM(amount) amount FROM player_hof WHERE type='.$db->escapeArray($viewType,false,true,':',false) .' AND account_id='.$db->escapeNumber($accountID).$gameIDSql.' GROUP BY account_id LIMIT 1');
+		$db->query('SELECT SUM(amount) amount FROM player_hof WHERE type=' . $db->escapeArray($viewType, false, true, ':', false) . ' AND account_id=' . $db->escapeNumber($accountID) . $gameIDSql . ' GROUP BY account_id LIMIT 1');
 	}
 
 	// What we will show for the amount:
@@ -31,15 +31,15 @@ 
 	//  - Current player: real total amount
 	//  - Other Player: total amount from completed games
 	$realAmount = 0;
-	if($db->nextRecord()) {
-		if($db->getField('amount')!=null) {
+	if ($db->nextRecord()) {
+		if ($db->getField('amount') != null) {
 			$realAmount = $db->getField('amount');
 		}
 	}
-	if($vis==HOF_PUBLIC || $account->getAccountID()==$accountID) {
+	if ($vis == HOF_PUBLIC || $account->getAccountID() == $accountID) {
 		$rank['Amount'] = $realAmount;
 	}
-	else if($vis==HOF_ALLIANCE&&$account->getAccountID()!=$accountID) {
+	else if ($vis == HOF_ALLIANCE && $account->getAccountID() != $accountID) {
 		if (isset($gameID)) {
 			$hofPlayer = SmrPlayer::getPlayer($accountID, $gameID);
 			// Only show the real amount if player is in your alliance.
@@ -50,38 +50,38 @@ 
 			}
 		} else {
 			$rank['Amount'] = 0; //default
-			$db->query('SELECT SUM(amount) amount FROM player_hof WHERE type='.$db->escapeArray($viewType,false,true,':',false) .' AND account_id='.$accountID.' AND game_id IN (SELECT game_id FROM game WHERE end_date < '.TIME.' AND ignore_stats = '.$db->escapeBoolean(false).') GROUP BY account_id LIMIT 1');
-			if($db->nextRecord()) {
-				if($db->getField('amount')!=null) {
+			$db->query('SELECT SUM(amount) amount FROM player_hof WHERE type=' . $db->escapeArray($viewType, false, true, ':', false) . ' AND account_id=' . $accountID . ' AND game_id IN (SELECT game_id FROM game WHERE end_date < ' . TIME . ' AND ignore_stats = ' . $db->escapeBoolean(false) . ') GROUP BY account_id LIMIT 1');
+			if ($db->nextRecord()) {
+				if ($db->getField('amount') != null) {
 					$rank['Amount'] = $db->getField('amount');
 				}
 			}
 		}
 	}
 
-	if($view == DONATION_NAME) {
+	if ($view == DONATION_NAME) {
 		$db->query('SELECT COUNT(account_id) rank FROM (SELECT account_id FROM account_donated GROUP BY account_id HAVING SUM(amount)>' . $db->escapeNumber($rank['Amount']) . ') x');
 	}
-	else if($view == USER_SCORE_NAME) {
-		$query = 'SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type IN ('.$statements['IN'].')'.$gameIDSql.' GROUP BY account_id HAVING '.$statements['CASE'].'>' . $db->escapeNumber($rank['Amount']) . ') x';
+	else if ($view == USER_SCORE_NAME) {
+		$query = 'SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type IN (' . $statements['IN'] . ')' . $gameIDSql . ' GROUP BY account_id HAVING ' . $statements['CASE'] . '>' . $db->escapeNumber($rank['Amount']) . ') x';
 		$db->query($query);
 	}
 	else {
-		$db->query('SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type='.$db->escapeArray($viewType,false,true,':',false).$gameIDSql.' GROUP BY account_id HAVING SUM(amount)>'.$db->escapeNumber($realAmount).') x');
+		$db->query('SELECT COUNT(account_id) rank FROM (SELECT account_id FROM player_hof WHERE type=' . $db->escapeArray($viewType, false, true, ':', false) . $gameIDSql . ' GROUP BY account_id HAVING SUM(amount)>' . $db->escapeNumber($realAmount) . ') x');
 	}
-	if($db->nextRecord()) {
+	if ($db->nextRecord()) {
 		$rank['Rank'] = $db->getInt('rank') + 1;
 	}
 	return $rank;
 }
 
-function displayHOFRow($rank,$accountID,$amount) {
-	global $account,$player,$var;
-	if(isset($var['game_id']) && Globals::isValidGame($var['game_id'])) {
+function displayHOFRow($rank, $accountID, $amount) {
+	global $account, $player, $var;
+	if (isset($var['game_id']) && Globals::isValidGame($var['game_id'])) {
 		try {
-			$hofPlayer = SmrPlayer::getPlayer($accountID,$var['game_id']);
+			$hofPlayer = SmrPlayer::getPlayer($accountID, $var['game_id']);
 		}
-		catch(PlayerNotFoundException $e) {
+		catch (PlayerNotFoundException $e) {
 			$hofAccount = SmrAccount::getAccount($accountID);
 		}
 	}
@@ -92,10 +92,10 @@ 
 	if ($accountID == $account->getAccountID()) {
 		$bold = ' class="bold"';
 	}
-	$return=('<tr>');
-	$return.=('<td align="center"'.$bold.'>' . $rank . '</td>');
+	$return = ('<tr>');
+	$return .= ('<td align="center"' . $bold . '>' . $rank . '</td>');
 
-	$container = create_container('skeleton.php','hall_of_fame_player_detail.php');
+	$container = create_container('skeleton.php', 'hall_of_fame_player_detail.php');
 	$container['account_id'] = $accountID;
 
 	if (isset($var['game_id'])) {
@@ -105,29 +105,29 @@ 
 	else {
 		$container['sending_page'] = 'personal_hof';
 	}
-	if(isset($hofPlayer) && is_object($hofPlayer)) {
-		$return.=('<td align="center"'.$bold.'>'.create_link($container, $hofPlayer->getPlayerName()) .'</td>');
+	if (isset($hofPlayer) && is_object($hofPlayer)) {
+		$return .= ('<td align="center"' . $bold . '>' . create_link($container, $hofPlayer->getPlayerName()) . '</td>');
 	}
-	else if(isset($hofAccount) && is_object($hofAccount)) {
-		$return.=('<td align="center"'.$bold.'>'.create_link($container, $hofAccount->getHofName()) .'</td>');
+	else if (isset($hofAccount) && is_object($hofAccount)) {
+		$return .= ('<td align="center"' . $bold . '>' . create_link($container, $hofAccount->getHofName()) . '</td>');
 	}
 	else {
-		$return.=('<td align="center"'.$bold.'>Unknown</td>');
+		$return .= ('<td align="center"' . $bold . '>Unknown</td>');
 	}
-	$return.=('<td align="center"'.$bold.'>' . $amount . '</td>');
-	$return.=('</tr>');
+	$return .= ('<td align="center"' . $bold . '>' . $amount . '</td>');
+	$return .= ('</tr>');
 	return $return;
 }
 
-function buildBreadcrumb(&$var,&$hofTypes,$hofName) {
+function buildBreadcrumb(&$var, &$hofTypes, $hofName) {
 	$container = $var;
 	unset($container['type']);
 	unset($container['view']);
-	$viewing= '<span class="bold">Currently viewing: </span>'.create_link($container,$hofName);
+	$viewing = '<span class="bold">Currently viewing: </span>' . create_link($container, $hofName);
 	$typeList = array();
-	if(isset($var['type'])) {
-		foreach($var['type'] as $type) {
-			if(!is_array($hofTypes[$type])) {
+	if (isset($var['type'])) {
+		foreach ($var['type'] as $type) {
+			if (!is_array($hofTypes[$type])) {
 				$var['type'] = $typeList;
 				$var['view'] = $type;
 				break;
@@ -139,25 +139,25 @@ 
 			$container = $var;
 			$container['type'] = $typeList;
 			unset($container['view']);
-			$viewing.= create_link($container,$type);
+			$viewing .= create_link($container, $type);
 
 			$hofTypes = $hofTypes[$type];
 		}
 	}
-	if(isset($var['view'])) {
+	if (isset($var['view'])) {
 		$viewing .= ' -&gt; ';
-		if(is_array($hofTypes[$var['view']])) {
+		if (is_array($hofTypes[$var['view']])) {
 			$typeList[] = $var['view'];
 			$var['type'] = $typeList;
 		}
 		$container = $var;
-		$viewing .= create_link($container,$var['view']);
+		$viewing .= create_link($container, $var['view']);
 
-		if(is_array($hofTypes[$var['view']])) {
+		if (is_array($hofTypes[$var['view']])) {
 			$hofTypes = $hofTypes[$var['view']];
 			unset($var['view']);
 		}
 	}
-	$viewing.= '<br /><br />';
+	$viewing .= '<br /><br />';
 	return $viewing;
 }

lib/Default/Menu.class.inc

Spacing +82 added lines, -82 removed lines

@@ -12,7 +12,7 @@ 
 		$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Defense');
 		$menuItems[] = array('Link'=>Globals::getPlanetListFinancialHREF($alliance_id), 'Text'=>'Financial');
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<span class="bold">' . $boldItem . '</span>';
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -20,13 +20,13 @@ 
 	static function alliance($alliance_id = null, $alliance_leader_id = FALSE) {
 		global $player, $template, $db;
 
-		if($alliance_id) {
+		if ($alliance_id) {
 			$in_alliance = ($alliance_id == $player->getAllianceID());
 		}
 		else {
 			$in_alliance = $player->hasAlliance();
 		}
-		if(!$in_alliance) {
+		if (!$in_alliance) {
 			$db->query('SELECT mb_read, mod_read, planet_land FROM alliance_treaties
 							WHERE (alliance_id_1 = ' . $db->escapeNumber($alliance_id) . ' OR alliance_id_1 = ' . $db->escapeNumber($player->getAllianceID()) . ')
 							AND (alliance_id_2 = ' . $db->escapeNumber($alliance_id) . ' OR alliance_id_2 = ' . $db->escapeNumber($player->getAllianceID()) . ')
@@ -54,40 +54,40 @@ 
 		//}
 		$menuItems = array();
 		if ($in_alliance || in_array($player->getAccountID(), Globals::getHiddenPlayers()) || $modRead) {
-			$menuItems[] = array('Link'=>Globals::getAllianceMotdHREF($alliance_id),'Text'=>'Message of the Day');
+			$menuItems[] = array('Link'=>Globals::getAllianceMotdHREF($alliance_id), 'Text'=>'Message of the Day');
 		}
-		$menuItems[] = array('Link'=>Globals::getAllianceRosterHREF($alliance_id),'Text'=>'Roster');
+		$menuItems[] = array('Link'=>Globals::getAllianceRosterHREF($alliance_id), 'Text'=>'Roster');
 		if (($send && $in_alliance) || in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
-			$menuItems[] = array('Link'=>Globals::getAllianceMessageHREF($alliance_id),'Text'=>'Send Message');
+			$menuItems[] = array('Link'=>Globals::getAllianceMessageHREF($alliance_id), 'Text'=>'Send Message');
 		}
 		if ($in_alliance || in_array($player->getAccountID(), Globals::getHiddenPlayers()) || $mbRead) {
-			$menuItems[] = array('Link'=>Globals::getAllianceMessageBoardHREF($alliance_id),'Text'=>'Message Board');
+			$menuItems[] = array('Link'=>Globals::getAllianceMessageBoardHREF($alliance_id), 'Text'=>'Message Board');
 		}
 		if ($in_alliance || in_array($player->getAccountID(), Globals::getHiddenPlayers()) || $planetLand) {
-			$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id),'Text'=>'Planets');
+			$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Planets');
 		}
 		if ($in_alliance || in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
-			$menuItems[] = array('Link'=>Globals::getAllianceForcesHREF($alliance_id),'Text'=>'Forces');
-			$menuItems[] = array('Link'=>Globals::getAllianceOptionsHREF($alliance_id),'Text'=>'Options');
+			$menuItems[] = array('Link'=>Globals::getAllianceForcesHREF($alliance_id), 'Text'=>'Forces');
+			$menuItems[] = array('Link'=>Globals::getAllianceOptionsHREF($alliance_id), 'Text'=>'Options');
 		}
-		$menuItems[] = array('Link'=>Globals::getAllianceListHREF(),'Text'=>'List Alliances');
-		$menuItems[] = array('Link'=>Globals::getAllianceNewsHREF($alliance_id?$alliance_id:$player->getAllianceID()),'Text'=>'View News');
+		$menuItems[] = array('Link'=>Globals::getAllianceListHREF(), 'Text'=>'List Alliances');
+		$menuItems[] = array('Link'=>Globals::getAllianceNewsHREF($alliance_id ? $alliance_id : $player->getAllianceID()), 'Text'=>'View News');
 
-		$template->assign('MenuItems',$menuItems);
+		$template->assign('MenuItems', $menuItems);
 	}
 
 	static function galactic_post() {
 		global $template, $player;
 		$menuItems = array();
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('galactic_post_current.php')),'Text'=>'Current Edition');
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_past.php')),'Text'=>'Past Editions');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('galactic_post_current.php')), 'Text'=>'Current Edition');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_past.php')), 'Text'=>'Past Editions');
 		if ($player->isGPWriter()) {
-			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_write_article.php')),'Text'=>'Write an article');
+			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_write_article.php')), 'Text'=>'Write an article');
 		} else {
-			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_application.php')),'Text'=>'Apply as writer!');
+			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post_application.php')), 'Text'=>'Apply as writer!');
 		}
 		if ($player->isGPEditor()) {
-			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post.php')),'Text'=>'Editor Options');
+			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'galactic_post.php')), 'Text'=>'Editor Options');
 		}
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -111,7 +111,7 @@ 
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
 		                'Text' => 'Game News'];
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -119,14 +119,14 @@ 
 	static function messages() {
 		global $player, $template;
 		$menuItems = array();
-		$menuItems[] = array('Link'=>Globals::getViewMessagesHREF(),'Text'=>'View Messages');
-		$menuItems[] = array('Link'=>Globals::getSendGlobalMessageHREF(),'Text'=>'Send Global Message');
+		$menuItems[] = array('Link'=>Globals::getViewMessagesHREF(), 'Text'=>'View Messages');
+		$menuItems[] = array('Link'=>Globals::getSendGlobalMessageHREF(), 'Text'=>'Send Global Message');
 		if ($player->isOnCouncil()) {
-			$menuItems[] = array('Link'=>Globals::getSendCouncilMessageHREF($player->getRaceID()),'Text'=>'Send Council Message');
+			$menuItems[] = array('Link'=>Globals::getSendCouncilMessageHREF($player->getRaceID()), 'Text'=>'Send Council Message');
 		}
-		$menuItems[] = array('Link'=>Globals::getManageBlacklistHREF(),'Text'=>'Manage Blacklist');
+		$menuItems[] = array('Link'=>Globals::getManageBlacklistHREF(), 'Text'=>'Manage Blacklist');
 
-		$template->assign('MenuItems',$menuItems);
+		$template->assign('MenuItems', $menuItems);
 	}
 
 	static function combat_log() {
@@ -136,51 +136,51 @@ 
 		$menuItems = array();
 
 		$container['action'] = COMBAT_LOG_PERSONAL;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Personal');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Personal');
 		$container['action'] = COMBAT_LOG_ALLIANCE;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Alliance');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Alliance');
 		$container['action'] = COMBAT_LOG_FORCE;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Force');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Force');
 		$container['action'] = COMBAT_LOG_PORT;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Port');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Port');
 		$container['action'] = COMBAT_LOG_PLANET;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Planet');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Planet');
 		$container['action'] = COMBAT_LOG_SAVED;
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container),'Text'=>'Saved');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF($container), 'Text'=>'Saved');
 
-		$template->assign('MenuItems',$menuItems);
+		$template->assign('MenuItems', $menuItems);
 	}
 
 	static function trader() {
 		global $player, $template;
 		$template->assign('MenuItems', array(
-						array('Link'=>Globals::getTraderStatusHREF(),'Text'=>'Trader Status'),
-						array('Link'=>Globals::getPlanetListHREF($player->getAllianceID()),'Text'=>'Planets'),
-						array('Link'=>Globals::getAllianceHREF($player->getAllianceID()),'Text'=>'Alliance'),
-						array('Link'=>Globals::getCouncilHREF(),'Text'=>'Politics'),
-						array('Link'=>Globals::getTraderRelationsHREF(),'Text'=>'Relations'),
-						array('Link'=>Globals::getTraderBountiesHREF(),'Text'=>'Bounties')));
+						array('Link'=>Globals::getTraderStatusHREF(), 'Text'=>'Trader Status'),
+						array('Link'=>Globals::getPlanetListHREF($player->getAllianceID()), 'Text'=>'Planets'),
+						array('Link'=>Globals::getAllianceHREF($player->getAllianceID()), 'Text'=>'Alliance'),
+						array('Link'=>Globals::getCouncilHREF(), 'Text'=>'Politics'),
+						array('Link'=>Globals::getTraderRelationsHREF(), 'Text'=>'Relations'),
+						array('Link'=>Globals::getTraderBountiesHREF(), 'Text'=>'Bounties')));
 	}
 
 	static function planet($planet) {
 		global $template;
 
 		$menu_array = array();
-		$menu_array[] = array('Link'=>Globals::getPlanetMainHREF(),'Text'=>'Planet Main');
+		$menu_array[] = array('Link'=>Globals::getPlanetMainHREF(), 'Text'=>'Planet Main');
 		if ($planet->hasMenuOption('CONSTRUCTION')) {
-			$menu_array[] = array('Link'=>Globals::getPlanetConstructionHREF(),'Text'=>'Construction');
+			$menu_array[] = array('Link'=>Globals::getPlanetConstructionHREF(), 'Text'=>'Construction');
 		}
 		if ($planet->hasMenuOption('DEFENSE')) {
-			$menu_array[] = array('Link'=>Globals::getPlanetDefensesHREF(),'Text'=>'Defense');
+			$menu_array[] = array('Link'=>Globals::getPlanetDefensesHREF(), 'Text'=>'Defense');
 		}
 		if ($planet->hasMenuOption('OWNERSHIP')) {
-			$menu_array[] = array('Link'=>Globals::getPlanetOwnershipHREF(),'Text'=>'Ownership');
+			$menu_array[] = array('Link'=>Globals::getPlanetOwnershipHREF(), 'Text'=>'Ownership');
 		}
 		if ($planet->hasMenuOption('STOCKPILE')) {
-			$menu_array[] = array('Link'=>Globals::getPlanetStockpileHREF(),'Text'=>'Stockpile');
+			$menu_array[] = array('Link'=>Globals::getPlanetStockpileHREF(), 'Text'=>'Stockpile');
 		}
 		if ($planet->hasMenuOption('FINANCE')) {
-			$menu_array[] = array('Link'=>Globals::getPlanetFinancesHREF(),'Text'=>'Financial');
+			$menu_array[] = array('Link'=>Globals::getPlanetFinancesHREF(), 'Text'=>'Financial');
 		}
 
 		$template->assign('MenuItems', $menu_array);
@@ -196,14 +196,14 @@ 
 
 		// player rankings
 		$menu_item = array();
-		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_player_experience.php'), 'Player Rankings','nav');
+		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_player_experience.php'), 'Player Rankings', 'nav');
 
 		$menu_subitem = array();
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_experience.php'), 'Experience','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_profit.php'), 'Profit','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_kills.php'), 'Kills','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_death.php'), 'Deaths','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_assists.php'), 'Assists','nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_experience.php'), 'Experience', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_profit.php'), 'Profit', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_kills.php'), 'Kills', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_death.php'), 'Deaths', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_player_assists.php'), 'Assists', 'nav');
 
 		$menu_item['submenu'] = $menu_subitem;
 
@@ -211,14 +211,14 @@ 
 
 		// alliance rankings
 		$menu_item = array();
-		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_alliance_experience.php'), 'Alliance Rankings','nav');
+		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_alliance_experience.php'), 'Alliance Rankings', 'nav');
 
 		$menu_subitem = array();
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_experience.php'), 'Experience','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_profit.php'), 'Profit','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_kills.php'), 'Kills','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_death.php'), 'Deaths','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_vs_alliance.php'), 'Versus','nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_experience.php'), 'Experience', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_profit.php'), 'Profit', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_kills.php'), 'Kills', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_death.php'), 'Deaths', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_alliance_vs_alliance.php'), 'Versus', 'nav');
 
 		$menu_item['submenu'] = $menu_subitem;
 
@@ -226,12 +226,12 @@ 
 
 		// racial rankings
 		$menu_item = array();
-		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_race.php'), 'Racial Standings','nav');
+		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_race.php'), 'Racial Standings', 'nav');
 
 		$menu_subitem = array();
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race.php'), 'Experience','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race_kills.php'), 'Kills','nav');
-		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race_death.php'), 'Deaths','nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race.php'), 'Experience', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race_kills.php'), 'Kills', 'nav');
+		$menu_subitem[] = create_link(create_container('skeleton.php', 'rankings_race_death.php'), 'Deaths', 'nav');
 
 		$menu_item['submenu'] = $menu_subitem;
 
@@ -239,7 +239,7 @@ 
 
 		// sector rankings
 		$menu_item = array();
-		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_sector_kill.php'), 'Sector Kills','nav');
+		$menu_item['entry'] = create_link(create_container('skeleton.php', 'rankings_sector_kill.php'), 'Sector Kills', 'nav');
 		$menu[] = $menu_item;
 
 		create_sub_menu($menu, $active_level1, $active_level2);
@@ -249,14 +249,14 @@ 
 		global $player;
 
 		$menu_items[] = create_link(create_container('skeleton.php', 'bank_personal.php'),
-														'Personal Account','nav');
+														'Personal Account', 'nav');
 
 		if ($player->hasAlliance())
 			$menu_items[] = create_link(create_container('skeleton.php', 'bank_alliance.php'),
-															'Alliance Account','nav');
+															'Alliance Account', 'nav');
 
 		$menu_items[] = create_link(create_container('skeleton.php', 'bank_anon.php'),
-														'Anonymous Account','nav');
+														'Anonymous Account', 'nav');
 		create_menu($menu_items);
 	}
 
@@ -264,24 +264,24 @@ 
 		global $player;
 
 		$menu_items[] = create_link(create_container('skeleton.php', 'council_list.php'),
-														'View Council','nav');
+														'View Council', 'nav');
 
 		$container = create_container('skeleton.php');
 		$container['body'] = 'council_politics.php';
 		$container['race_id'] = $race_id;
-		$menu_items[] = create_link($container, 'Political Status','nav');
+		$menu_items[] = create_link($container, 'Political Status', 'nav');
 
 		$container['body'] = 'council_send_message.php';
 		$container['race_id'] = $race_id;
-		$menu_items[] = create_link($container, 'Send Message','nav');
+		$menu_items[] = create_link($container, 'Send Message', 'nav');
 
-		if($player->getRaceID()==$race_id) {
+		if ($player->getRaceID() == $race_id) {
 			if ($player->isOnCouncil())
 				$menu_items[] = create_link(create_container('skeleton.php', 'council_vote.php'),
-																'Voting Center','nav');
+																'Voting Center', 'nav');
 			if ($player->isPresident())
 				$menu_items[] = create_link(create_container('skeleton.php', 'council_embassy.php'),
-																'Embassy','nav');
+																'Embassy', 'nav');
 		}
 
 		create_menu($menu_items);
@@ -290,29 +290,29 @@ 
 	static function bar() {
 		global $template;
 		$template->assign('MenuItems', array(
-					array('Link'=>Globals::getBarMainHREF(),'Text'=>'Bar Main'),
-					array('Link'=>Globals::getBarLottoPlayHREF(),'Text'=>'Lotto'),
-					array('Link'=>Globals::getBarBlackjackHREF(),'Text'=>'BlackJack')));
+					array('Link'=>Globals::getBarMainHREF(), 'Text'=>'Bar Main'),
+					array('Link'=>Globals::getBarLottoPlayHREF(), 'Text'=>'Lotto'),
+					array('Link'=>Globals::getBarBlackjackHREF(), 'Text'=>'BlackJack')));
 	}
 
 	static function news(&$template) {
 		global $var;
 		$menuItems = array();
 		if (SmrSession::getGameID() == $var['GameID']) {
-			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read_current.php',array('GameID'=>$var['GameID']))),'Text'=>'Read Current News');
+			$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read_current.php', array('GameID'=>$var['GameID']))), 'Text'=>'Read Current News');
 		}
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read.php',array('GameID'=>$var['GameID']))),'Text'=>'Read Latest News');
-		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read_advanced.php',array('GameID'=>$var['GameID']))),'Text'=>'Advanced News');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read.php', array('GameID'=>$var['GameID']))), 'Text'=>'Read Latest News');
+		$menuItems[] = array('Link'=>SmrSession::getNewHREF(create_container('skeleton.php', 'news_read_advanced.php', array('GameID'=>$var['GameID']))), 'Text'=>'Advanced News');
 
 		$template->assign('MenuItems', $menuItems);
 	}
 
 	static function navigation(&$template, &$player) {
 		$menuItems = array();
-		$menuItems[] = array('Link'=>Globals::getPlotCourseHREF(),'Text'=>'Plot A Course');
-		if(!$player->isLandedOnPlanet())
-			$menuItems[] = array('Link'=>Globals::getLocalMapHREF(),'Text'=>'Local Map');
-		$menuItems[] = array('Link'=>'map_galaxy.php" target="gal_map','Text'=>'Galaxy Map');
+		$menuItems[] = array('Link'=>Globals::getPlotCourseHREF(), 'Text'=>'Plot A Course');
+		if (!$player->isLandedOnPlanet())
+			$menuItems[] = array('Link'=>Globals::getLocalMapHREF(), 'Text'=>'Local Map');
+		$menuItems[] = array('Link'=>'map_galaxy.php" target="gal_map', 'Text'=>'Galaxy Map');
 		$template->assign('MenuItems', $menuItems);
 	}
 
@@ -343,7 +343,7 @@ 
 			$active = '';
 
 		// echo entry itself
-		$return .= ('<td align="center"'.$active.'> ' . $entry['entry'] . '</td>');
+		$return .= ('<td align="center"' . $active . '> ' . $entry['entry'] . '</td>');
 
 	}
 	$return .= ('</tr>');
@@ -358,7 +358,7 @@ 
 					$return .= (' | ');
 
 				if ($sub_number == $active_level2)
-					$return .= ('<span class="bold">'.$sub_entry.'</span>');
+					$return .= ('<span class="bold">' . $sub_entry . '</span>');
 				else
 					$return .= ($sub_entry);
 			}
@@ -387,5 +387,5 @@ 
 	$return .= ('</p>');
 	$template->unassign('MenuItems');
 	$template->unassign('MenuBar');
-	$template->assign('SubMenuBar',$return);
+	$template->assign('SubMenuBar', $return);
 }

lib/Default/WeightedRandom.class.inc

Spacing +13 added lines, -13 removed lines

@@ -13,10 +13,10 @@ 
 	protected $typeID;
 	protected $weighting;
 	
-	protected $hasChanged=false;
+	protected $hasChanged = false;
 
 	public static function &getWeightedRandom($gameID, $accountID, $type, $typeID, $forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_RANDOMS[$gameID][$accountID][$type][$typeID])) {
+		if ($forceUpdate || !isset(self::$CACHE_RANDOMS[$gameID][$accountID][$type][$typeID])) {
 			self::$CACHE_RANDOMS[$gameID][$accountID][$type][$typeID] = new WeightedRandom($gameID, $accountID, $type, $typeID);
 		}
 		return self::$CACHE_RANDOMS[$gameID][$accountID][$type][$typeID];
@@ -27,10 +27,10 @@ 
 	}
 	
 	public static function saveWeightedRandoms() {
-		foreach(self::$CACHE_RANDOMS as $gameRandoms) {
-			foreach($gameRandoms as $accountRandoms) {
-				foreach($accountRandoms as $typeRandoms) {
-					foreach($typeRandoms as $random) {
+		foreach (self::$CACHE_RANDOMS as $gameRandoms) {
+			foreach ($gameRandoms as $accountRandoms) {
+				foreach ($accountRandoms as $typeRandoms) {
+					foreach ($typeRandoms as $random) {
 						$random->update();
 					}
 				}
@@ -45,7 +45,7 @@ 
 		$this->typeID = $typeID;
 		
 		$this->db = new SmrMySqlDatabase();
-		$this->db->query('SELECT weighting FROM weighted_random WHERE game_id = '.$this->db->escapeNumber($gameID).' AND account_id = '.$this->db->escapeNumber($accountID).' AND type = '.$this->db->escapeString($type).' AND type_id = '.$this->db->escapeNumber($typeID).' LIMIT 1');
+		$this->db->query('SELECT weighting FROM weighted_random WHERE game_id = ' . $this->db->escapeNumber($gameID) . ' AND account_id = ' . $this->db->escapeNumber($accountID) . ' AND type = ' . $this->db->escapeString($type) . ' AND type_id = ' . $this->db->escapeNumber($typeID) . ' LIMIT 1');
 		if ($this->db->nextRecord()) {
 			$this->weighting = $this->db->getField('weighting');
 		}
@@ -75,22 +75,22 @@ 
 	}
 	
 	public function percentFailed($percent) {
-		$failed = mt_rand(0,99)+$this->weighting >= $percent;
+		$failed = mt_rand(0, 99) + $this->weighting >= $percent;
 		$this->adjustWeightByPercent(!$failed, $percent);
 		return $failed;
 	}
 	
 	public function adjustWeightByPercent($success, $percent) {
-		$percent = $percent/100;
-		if($success) {
+		$percent = $percent / 100;
+		if ($success) {
 			$percent = -1 + $percent;
 		}
-		$this->weighting -= self::WEIGHTING_CHANGE*$percent;
+		$this->weighting -= self::WEIGHTING_CHANGE * $percent;
 		$this->hasChanged = true;
 	}
 	
 	public function update() {
-		if($this->hasChanged===true) {
+		if ($this->hasChanged === true) {
 			$this->db->query('REPLACE INTO weighted_random (game_id,account_id,type,type_id,weighting)
 							values
 							(' . $this->db->escapeNumber($this->getGameID()) .
@@ -98,7 +98,7 @@ 
 							',' . $this->db->escapeString($this->getType()) .
 							',' . $this->db->escapeNumber($this->getTypeID()) .
 							',' . $this->db->escapeNumber($this->getWeighting()) . ')');
-			$this->hasChanged=false;
+			$this->hasChanged = false;
 		}
 	}
 }