smrealms / smr

lib/Default/missions.inc

Braces +2 added lines, -4 removed lines

@@ -135,16 +135,14 @@
 		}
 		if(is_array($values)) {
 			$value = $values[$reqName];
-		}
-		else if(is_object($values)) {
+		} else if(is_object($values)) {
 			$value = $values->$reqName();
 		}
 		if(is_array($req)) {
 			if(checkMissionRequirements($value, $mission, $player, $req) === false) {
 				return false;
 			}
-		}
-		else {
+		} else {
 			if($value != $req) {
 				return false;
 			}

lib/Default/SmrSector.class.inc

Braces +167 added lines, -116 removed lines

@@ -126,15 +126,13 @@ 
 				$this->links['Right'] = $db->getInt('link_right');
 			}
 			$this->warp = $db->getInt('warp');
-		}
-		else if($create) {
+		} else if($create) {
 			$this->battles		= 0;
 			$this->links = array();
 			$this->warp = 0;
 			$this->isNew		= true;
 			return;
-		}
-		else {
+		} else {
 			throw new SectorNotFoundException('No such sector: '.$gameID.'-'.$sectorID);
 		}
 	}
@@ -150,8 +148,7 @@ 
 									', link_left=' . $this->db->escapeNumber($this->getLinkLeft()) .
 									', warp=' . $this->db->escapeNumber($this->getWarp()) .
 								' WHERE ' . $this->SQL . ' LIMIT 1');
-			}
-			else {
+			} else {
 				$this->db->query('INSERT INTO sector(sector_id,game_id,galaxy_id,link_up,link_down,link_left,link_right,warp)
 								values
 								(' . $this->db->escapeNumber($this->getSectorID()) .
@@ -169,21 +166,24 @@ 
 	}
 
 	function markVisited(AbstractSmrPlayer $player) {
-		if($this->hasPort())
-			$this->getPort()->addCachePort($player->getAccountID());
+		if($this->hasPort()) {
+					$this->getPort()->addCachePort($player->getAccountID());
+		}
 
 		//now delete the entry from visited
-		if(!$this->isVisited($player))
-			$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
+		if(!$this->isVisited($player)) {
+					$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
 								 AND account_id = ' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
+		}
 		$this->visited[$player->getAccountID()]=true;
 	}
 
 	function hasWeaponShop() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isWeaponSold())
-				return true;
+			if($location->isWeaponSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -191,8 +191,9 @@ 
 	function hasHQ() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isHQ())
-				return true;
+			if($location->isHQ()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -200,8 +201,9 @@ 
 	function hasUG() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isUG())
-				return true;
+			if($location->isUG()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -209,8 +211,9 @@ 
 	function hasShipShop() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isShipSold())
-				return true;
+			if($location->isShipSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -218,8 +221,9 @@ 
 	function offersFederalProtection() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isFed())
-				return true;
+			if($location->isFed()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -228,8 +232,9 @@ 
 		$raceIDs = array();
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isFed())
-				$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			if($location->isFed()) {
+							$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			}
 		}
 		return $raceIDs;
 	}
@@ -237,8 +242,9 @@ 
 	function hasBar() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isBar())
-				return true;
+			if($location->isBar()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -246,8 +252,9 @@ 
 	function hasHardwareShop() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isHardwareSold())
-				return true;
+			if($location->isHardwareSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -255,8 +262,9 @@ 
 	function hasBank() {
 		$locations = $this->getLocations();
 		foreach($locations as $location) {
-			if($location->isBank())
-				return true;
+			if($location->isBank()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -331,8 +339,9 @@ 
 	}
 
 	public function setGalaxyID($galaxyID) {
-		if($this->galaxyID==$galaxyID)
-			return;
+		if($this->galaxyID==$galaxyID) {
+					return;
+		}
 		$this->galaxyID=$galaxyID;
 		$this->hasChanged=true;
 	}
@@ -343,18 +352,21 @@ 
 
 	public function getNumberOfLinks() {
 		$num=0;
-		if(!is_array($this->getLinks()))
-			return $num;
-		foreach($this->getLinks() as $link)
-			if($link!==0)
+		if(!is_array($this->getLinks())) {
+					return $num;
+		}
+		foreach($this->getLinks() as $link) {
+					if($link!==0)
 				$num++;
+		}
 		return $num;
 	}
 
 	public function getNumberOfConnections() {
 		$links = $this->getNumberOfLinks();
-		if($this->hasWarp())
-			$links++;
+		if($this->hasWarp()) {
+					$links++;
+		}
 		return $links;
 	}
 
@@ -363,30 +375,35 @@ 
 	}
 
 	public function getNeighbourID($dir) {
-		if($this->hasLink($dir))
-			return $this->getLink($dir);
+		if($this->hasLink($dir)) {
+					return $this->getLink($dir);
+		}
 		$galaxy = $this->getGalaxy();
 		$neighbour = $this->getSectorID();
 		switch($dir) {
 			case 'Up':
 				$neighbour -= $galaxy->getWidth();
-				if($neighbour<$galaxy->getStartSector())
-					$neighbour+=$galaxy->getSize();
+				if($neighbour<$galaxy->getStartSector()) {
+									$neighbour+=$galaxy->getSize();
+				}
 			break;
 			case 'Down':
 				$neighbour += $galaxy->getWidth();
-				if($neighbour>$galaxy->getEndSector())
-					$neighbour-=$galaxy->getSize();
+				if($neighbour>$galaxy->getEndSector()) {
+									$neighbour-=$galaxy->getSize();
+				}
 			break;
 			case 'Left':
 				$neighbour -= 1;
-				if((1+$neighbour-$galaxy->getStartSector())%$galaxy->getWidth()==0)
-					$neighbour+=$galaxy->getWidth();
+				if((1+$neighbour-$galaxy->getStartSector())%$galaxy->getWidth()==0) {
+									$neighbour+=$galaxy->getWidth();
+				}
 			break;
 			case 'Right':
 				$neighbour += 1;
-				if(($neighbour-$galaxy->getStartSector())%$galaxy->getWidth()==0)
-					$neighbour-=$galaxy->getWidth();
+				if(($neighbour-$galaxy->getStartSector())%$galaxy->getWidth()==0) {
+									$neighbour-=$galaxy->getWidth();
+				}
 			break;
 			default:
 				throw new Exception($dir.': is not a valid direction');
@@ -395,13 +412,16 @@ 
 	}
 
 	public function getSectorDirection($sectorID) {
-		if($sectorID == $this->getSectorID())
-			return 'Current';
+		if($sectorID == $this->getSectorID()) {
+					return 'Current';
+		}
 		$dir = array_search($sectorID, $this->getLinks());
-		if($dir !== false)
-			return $dir;
-		if($sectorID == $this->getWarp())
-			return 'Warp';
+		if($dir !== false) {
+					return $dir;
+		}
+		if($sectorID == $this->getWarp()) {
+					return 'Warp';
+		}
 		return 'None';
 	}
 
@@ -426,8 +446,9 @@ 
 	}
 
 	public function &getLinkSector($name) {
-		if($this->hasLink($name))
-			return SmrSector::getSector($this->getGameID(),$this->getLink($name));
+		if($this->hasLink($name)) {
+					return SmrSector::getSector($this->getGameID(),$this->getLink($name));
+		}
 		return false;
 	}
 
@@ -435,12 +456,14 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLink($name,$linkID) {
-		if($this->getLink($name)==$linkID)
-			return;
-		if($linkID==0)
-			unset($this->links[$name]);
-		else
-			$this->links[$name] = $linkID;
+		if($this->getLink($name)==$linkID) {
+					return;
+		}
+		if($linkID==0) {
+					unset($this->links[$name]);
+		} else {
+					$this->links[$name] = $linkID;
+		}
 		$this->hasChanged=true;
 	}
 
@@ -448,8 +471,9 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLinkSector($dir,SmrSector $linkSector) {
-		if($this->getLink($dir)==$linkSector->getSectorID()||$linkSector->equals($this))
-			return;
+		if($this->getLink($dir)==$linkSector->getSectorID()||$linkSector->equals($this)) {
+					return;
+		}
 		$this->setLink($dir,$linkSector->getSectorID());
 		$linkSector->setLink(self::oppositeDir($dir),$this->getSectorID());
 		$this->hasChanged=true;
@@ -473,8 +497,7 @@ 
 	public function toggleLink($dir) {
 		if($this->hasLink($dir)) {
 			$this->disableLink($dir);
-		}
-		else {
+		} else {
 			$this->enableLink($dir);
 		}
 	}
@@ -634,21 +657,25 @@ 
 		$locations = SmrLocation::getSectorLocations($this->getGameID(),$this->getSectorID());
 		$hasAction = false;
 		foreach($locations as $location) {
-			if($location->hasAction())
-				$hasAction = true;
+			if($location->hasAction()) {
+							$hasAction = true;
+			}
 		}
 		return $hasAction;
 	}
 
 	public function hasLocation($locationTypeID=false) {
 		$locations = $this->getLocations();
-		if(count($locations) == 0)
-			return false;
-		if($locationTypeID==false)
-			return true;
+		if(count($locations) == 0) {
+					return false;
+		}
+		if($locationTypeID==false) {
+					return true;
+		}
 		foreach($locations as $location) {
-			if($location->getTypeID()==$locationTypeID)
-				return true;
+			if($location->getTypeID()==$locationTypeID) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -689,24 +716,28 @@ 
 	}
 
 	public function hasEnemyForces(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasForces())
-			return false;
+		if($player == null || !$this->hasForces()) {
+					return false;
+		}
 		$forces = $this->getForces();
 		foreach($forces as $force) {
-			if(!$player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if(!$player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function &getEnemyForces(AbstractSmrPlayer $player) {
 		$enemyForces = array();
-		if(!$this->hasForces())
-			return $enemyForces;
+		if(!$this->hasForces()) {
+					return $enemyForces;
+		}
 		$forces = $this->getForces();
 		foreach($forces as $force) {
-			if(!$player->forceNAPAlliance($force->getOwner()))
-				$enemyForces[] = $force;
+			if(!$player->forceNAPAlliance($force->getOwner())) {
+							$enemyForces[] = $force;
+			}
 		}
 		return $enemyForces;
 	}
@@ -724,24 +755,28 @@ 
 	}
 
 	public function hasFriendlyForces(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasForces())
-			return false;
+		if($player == null || !$this->hasForces()) {
+					return false;
+		}
 		$forces = $this->getForces();
 		foreach($forces as $force) {
-			if($player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if($player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function &getFriendlyForces(AbstractSmrPlayer $player) {
 		$friendlyForces = array();
-		if(!$this->hasForces())
-			return $friendlyForces;
+		if(!$this->hasForces()) {
+					return $friendlyForces;
+		}
 		$forces = $this->getForces();
 		foreach($forces as $force) {
-			if($player->forceNAPAlliance($force->getOwner()))
-				$friendlyForces[] = $force;
+			if($player->forceNAPAlliance($force->getOwner())) {
+							$friendlyForces[] = $force;
+			}
 		}
 		return $friendlyForces;
 	}
@@ -769,8 +804,9 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach($otherPlayers as $otherPlayer) {
 			if(!$player->traderNAPAlliance($otherPlayer) 
@@ -783,12 +819,14 @@ 
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach($otherPlayers as $otherPlayer) {
-			if($player->traderNAPAlliance($otherPlayer))
-				return true;
+			if($player->traderNAPAlliance($otherPlayer)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -810,8 +848,9 @@ 
 	}
 
 	public function hasProtectedTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach($otherPlayers as $otherPlayer) {
 			if(!$player->traderNAPAlliance($otherPlayer) 
@@ -830,11 +869,12 @@ 
 	public function &getFightingTradersAgainstPort(AbstractSmrPlayer $attackingPlayer, SmrPort $defendingPort) {
 		$fightingPlayers = array();
 		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID()));
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
+		if(count($alliancePlayers) > 0) {
+					foreach($alliancePlayers as $accountID => $player) {
 				if($player->canFight()) {
 					if($attackingPlayer->traderAttackPortAlliance($player))
 						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+		}
 				}
 			}
 		return self::limitFightingTraders($fightingPlayers, $attackingPlayer, MAXIMUM_PORT_FLEET_SIZE);
@@ -847,8 +887,9 @@ 
 			$planetOwner = $defendingPlanet->getOwner();
 			foreach($alliancePlayers as $accountID => $player) {
 				if($player->canFight()) {
-					if($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player))
-						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					if($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player)) {
+											$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					}
 				}
 			}
 		}
@@ -856,19 +897,21 @@ 
 	}
 
 	public function &getFightingTraders(AbstractSmrPlayer $attackingPlayer, AbstractSmrPlayer $defendingPlayer, $checkForCloak=false) {
-		if($attackingPlayer->traderNAPAlliance($defendingPlayer))
-			throw new Exception('These traders are NAPed.');
+		if($attackingPlayer->traderNAPAlliance($defendingPlayer)) {
+					throw new Exception('These traders are NAPed.');
+		}
 		$fightingPlayers = array('Attackers' => array(), 'Defenders' => array());
 		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID(), $defendingPlayer->getAllianceID()));
 		$attackers = array();
 		$defenders = array();
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
+		if(count($alliancePlayers) > 0) {
+					foreach($alliancePlayers as $accountID => $player) {
 				if($player->canFight()) {
 					if($attackingPlayer->traderAttackTraderAlliance($player) && !$defendingPlayer->traderDefendTraderAlliance($player) && !$defendingPlayer->traderNAPAlliance($player))
 						$attackers[] = $alliancePlayers[$accountID];
-					else if($defendingPlayer->traderDefendTraderAlliance($player) && !$attackingPlayer->traderAttackTraderAlliance($player) && !$attackingPlayer->traderNAPAlliance($player) && ($checkForCloak===false || $attackingPlayer->canSee($player)))
-						$defenders[] = $alliancePlayers[$accountID];
+		} else if($defendingPlayer->traderDefendTraderAlliance($player) && !$attackingPlayer->traderAttackTraderAlliance($player) && !$attackingPlayer->traderNAPAlliance($player) && ($checkForCloak===false || $attackingPlayer->canSee($player))) {
+											$defenders[] = $alliancePlayers[$accountID];
+					}
 				}
 			}
 		$attackers = self::limitFightingTraders($attackers, $attackingPlayer, MAXIMUM_PVP_FLEET_SIZE);
@@ -902,11 +945,12 @@ 
 	public function &getPotentialFightingTraders(AbstractSmrPlayer $attackingPlayer) {
 		$fightingPlayers = array();
 		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID()));
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
+		if(count($alliancePlayers) > 0) {
+					foreach($alliancePlayers as $accountID => $player) {
 				if($player->canFight()) {
 					if($attackingPlayer->traderAttackTraderAlliance($player))
 						$fightingPlayers['Attackers'][$accountID] = $player;
+		}
 				}
 			}
 		return $fightingPlayers;
@@ -917,8 +961,9 @@ 
 	}
 
 	public function setBattles($amount) {
-		if($this->battles == $amount)
-			return;
+		if($this->battles == $amount) {
+					return;
+		}
 		$this->battles = $amount;
 		$this->hasChanged = true;
 	}
@@ -940,8 +985,9 @@ 
 	}
 
 	public function isVisited(AbstractSmrPlayer $player=null) {
-		if($player===null)
-			return true;
+		if($player===null) {
+					return true;
+		}
 		if(!isset($this->visited[$player->getAccountID()])) {
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL . ' AND account_id=' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
 			$this->visited[$player->getAccountID()] = !$this->db->nextRecord();
@@ -982,17 +1028,22 @@ 
 			return $x->contains($this);
 		}
 
-		if(is_array($x) && $x['Type']=='Good') //Check if it's possible for port to have X, hacky but nice performance gains
+		if(is_array($x) && $x['Type']=='Good') {
+			//Check if it's possible for port to have X, hacky but nice performance gains
 			if ($this->hasPort())
 				if ($this->getPort()->hasX($x))
 					return true;
+		}
 
-		if($x instanceof SmrWeapon || (is_array($x) && ($x['Type']=='Ship'||$x['Type']=='Hardware')) || (is_string($x) && ($x=='Bank'||$x=='Bar'||$x=='Fed'||$x=='SafeFed'||$x=='HQ'||$x=='UG'||$x=='Hardware'||$x=='Ship'||$x=='Weapon'))) //Check if it's possible for location to have X, hacky but nice performance gains
+		if($x instanceof SmrWeapon || (is_array($x) && ($x['Type']=='Ship'||$x['Type']=='Hardware')) || (is_string($x) && ($x=='Bank'||$x=='Bar'||$x=='Fed'||$x=='SafeFed'||$x=='HQ'||$x=='UG'||$x=='Hardware'||$x=='Ship'||$x=='Weapon'))) {
+			//Check if it's possible for location to have X, hacky but nice performance gains
 			if ($this->hasLocation()) {
 				$locations = $this->getLocations();
+		}
 				foreach ($locations as $l) {
-					if ($l->hasX($x,$player))
-						return true;
+					if ($l->hasX($x,$player)) {
+											return true;
+					}
 				}
 			}
 		return false;

lib/Default/SmrForce.class.inc

Braces +8 added lines, -12 removed lines

@@ -274,16 +274,16 @@ 
 		}
 		$this->hasChanged = true;
 		$this->expire = $time;
-		if(!$this->isNew)
-			$this->update();
+		if(!$this->isNew) {
+					$this->update();
+		}
 	}
 
 	public function updateExpire() {
 		// Changed (26/10/05) - scout drones count * 2
 		if($this->getCDs() == 0 && $this->getMines() == 0 && $this->getSDs() > 0) {
 			$time = self::TIME_PER_SCOUT_ONLY*$this->getSDs();
-		}
-		else {
+		} else {
 			$time = ($this->getCDs()*self::TIME_PERCENT_PER_COMBAT + $this->getSDs()*self::TIME_PERCENT_PER_SCOUT + $this->getMines()*self::TIME_PERCENT_PER_MINE) * $this->getMaxGalaxyExpireTime();
 		}
 		$this->setExpire(TIME + $time);
@@ -310,11 +310,9 @@ 
 		}
 		if($mines < 10) {
 			$turns = 1;
-		}
-		else if($mines < 25) {
+		} else if($mines < 25) {
 			$turns = 2;
-		}
-		else {
+		} else {
 			$turns = 3;
 		}
 		if($ship->isFederal() || $ship->hasDCS()) {
@@ -369,12 +367,10 @@ 
 			if (!$this->exists()) {
 				$this->db->query('DELETE FROM sector_has_forces WHERE ' . $this->SQL);
 				$this->isNew=true;
-			}
-			else if ($this->hasChanged) {
+			} else if ($this->hasChanged) {
 				$this->db->query('UPDATE sector_has_forces SET combat_drones = '.$this->db->escapeNumber($this->combatDrones).', scout_drones = ' . $this->db->escapeNumber($this->scoutDrones) . ', mines = ' . $this->db->escapeNumber($this->mines) . ', expire_time = ' . $this->db->escapeNumber($this->expire) . ' WHERE ' . $this->SQL);
 			}
-		}
-		else if($this->exists()) {
+		} else if($this->exists()) {
 			$this->db->query('INSERT INTO sector_has_forces (game_id, sector_id, owner_id, combat_drones, scout_drones, mines, expire_time)
 								VALUES('.$this->db->escapeNumber($this->gameID).', '.$this->db->escapeNumber($this->sectorID).', '.$this->db->escapeNumber($this->ownerID).', '.$this->db->escapeNumber($this->combatDrones).', '.$this->db->escapeNumber($this->scoutDrones).', '.$this->db->escapeNumber($this->mines).', '.$this->db->escapeNumber($this->expire).')');
 			$this->isNew=false;

lib/External/OpenID/openid.php

Braces +39 added lines, -13 removed lines

@@ -333,7 +333,9 @@ 
      */
     function discover($url)
     {
-        if (!$url) throw new ErrorException('No identity supplied.');
+        if (!$url) {
+        	throw new ErrorException('No identity supplied.');
+        }
         # Use xri.net proxy to resolve i-name identities
         if (!preg_match('#^https?:#', $url)) {
             $url = "https://xri.net/$url";
@@ -376,7 +378,9 @@ 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
                         if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
-                            if ($type[1] == 'server') $this->identifier_select = true;
+                            if ($type[1] == 'server') {
+                            	$this->identifier_select = true;
+                            }
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
                             preg_match('#<(Local|Canonical)ID>(.*)</\1ID>#', $content, $delegate);
@@ -389,7 +393,9 @@ 
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
                             $server = $server[1];
-                            if (isset($delegate[2])) $this->identity = trim($delegate[2]);
+                            if (isset($delegate[2])) {
+                            	$this->identity = trim($delegate[2]);
+                            }
                             $this->version = 2;
 
                             $this->server = $server;
@@ -410,7 +416,9 @@ 
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
                             $server = $server[1];
-                            if (isset($delegate[1])) $this->identity = $delegate[1];
+                            if (isset($delegate[1])) {
+                            	$this->identity = $delegate[1];
+                            }
                             $this->version = 1;
 
                             $this->server = $server;
@@ -424,7 +432,9 @@ 
                     $content = null;
                     break;
                 }
-                if ($next) continue;
+                if ($next) {
+                	continue;
+                }
 
                 # There are no relevant information in headers, so we search the body.
                 $content = $this->request($url, 'GET');
@@ -435,7 +445,9 @@ 
                 }
             }
 
-            if (!$content) $content = $this->request($url, 'GET');
+            if (!$content) {
+            	$content = $this->request($url, 'GET');
+            }
 
             # At this point, the YADIS Discovery has failed, so we'll switch
             # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
@@ -475,7 +487,9 @@ 
         if ($this->required) {
             $params['openid.sreg.required'] = array();
             foreach ($this->required as $required) {
-                if (!isset(self::$ax_to_sreg[$required])) continue;
+                if (!isset(self::$ax_to_sreg[$required])) {
+                	continue;
+                }
                 $params['openid.sreg.required'][] = self::$ax_to_sreg[$required];
             }
             $params['openid.sreg.required'] = implode(',', $params['openid.sreg.required']);
@@ -484,7 +498,9 @@ 
         if ($this->optional) {
             $params['openid.sreg.optional'] = array();
             foreach ($this->optional as $optional) {
-                if (!isset(self::$ax_to_sreg[$optional])) continue;
+                if (!isset(self::$ax_to_sreg[$optional])) {
+                	continue;
+                }
                 $params['openid.sreg.optional'][] = self::$ax_to_sreg[$optional];
             }
             $params['openid.sreg.optional'] = implode(',', $params['openid.sreg.optional']);
@@ -504,9 +520,13 @@ 
             $optional = array();
             foreach (array('required','optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
-                    if (is_int($alias)) $alias = strtr($field, '/', '_');
+                    if (is_int($alias)) {
+                    	$alias = strtr($field, '/', '_');
+                    }
                     $this->aliases[$alias] = 'http://axschema.org/' . $field;
-                    if (empty($counts[$alias])) $counts[$alias] = 0;
+                    if (empty($counts[$alias])) {
+                    	$counts[$alias] = 0;
+                    }
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
@@ -515,7 +535,9 @@ 
                 $params['openid.ax.type.' . $alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
-                if ($count == 1) continue;
+                if ($count == 1) {
+                	continue;
+                }
                 $params['openid.ax.count.' . $alias] = $count;
             }
 
@@ -592,8 +614,12 @@ 
      */
     function authUrl($immediate = false)
     {
-        if ($this->setup_url && !$immediate) return $this->setup_url;
-        if (!$this->server) $this->discover($this->identity);
+        if ($this->setup_url && !$immediate) {
+        	return $this->setup_url;
+        }
+        if (!$this->server) {
+        	$this->discover($this->identity);
+        }
 
         if ($this->version == 2) {
             return $this->authUrl_v2($immediate);

lib/db_mysql_debug.inc

Braces +9 added lines, -5 removed lines

@@ -87,12 +87,14 @@ 
     if ($table) {
       $this->connect();
       $id = @mysql_list_fields($this->Database, $table);
-      if (!$id)
-        $this->halt('Metadata query failed.');
+      if (!$id) {
+              $this->halt('Metadata query failed.');
+      }
     } else {
       $id = $this->Query_ID;
-      if (!$id)
-        $this->halt('No query specified.');
+      if (!$id) {
+              $this->halt('No query specified.');
+      }
     }
 
     $count = @mysql_num_fields($id);
@@ -120,6 +122,8 @@ 
     }
 
     // free the result only if we were called on a table
-    if ($table) @mysql_free_result($id);
+    if ($table) {
+    	@mysql_free_result($id);
+    }
     return $res;
   }

lib/Album/album_functions.php

Braces +45 added lines, -34 removed lines

@@ -53,9 +53,9 @@ 
 
 			echo('<span style="font-size:85%;"><b>[' . date(defined('DATE_FULL_SHORT')?DATE_FULL_SHORT:DEFAULT_DATE_FULL_SHORT, $created) . ']</b> Picture of <a href="?' . urlencode($nick) . '">'.$nick.'</a> added</span><br />');
 		}
+	} else {
+			echo('<span style="font-size:85%;">no entries</span>');
 	}
-	else
-		echo('<span style="font-size:85%;">no entries</span>');
 	echo('</p>');
 }
 
@@ -66,11 +66,12 @@ 
 	// list of all first letter nicks
 	create_link_list();
 
-	if (SmrSession::$account_id != 0 && $album_id != SmrSession::$account_id)
-		$db->query('UPDATE album
+	if (SmrSession::$account_id != 0 && $album_id != SmrSession::$account_id) {
+			$db->query('UPDATE album
 				SET page_views = page_views + 1
 				WHERE account_id = '.$db->escapeNumber($album_id).' AND
 					approved = \'YES\'');
+	}
 
 	$db->query('SELECT *
 				FROM album
@@ -86,8 +87,7 @@ 
 		$other = nl2br(stripslashes($db->getField('other')));
 		$page_views = $db->getField('page_views');
 		$disabled = $db->getField('disabled') == 'TRUE';
-	}
-	else {
+	} else {
 		echo('<h1>Error</h1>');
 		echo('This user doesn\'t have an entry in our album!');
 		return;
@@ -138,46 +138,54 @@ 
 	echo('<tr>');
 	echo('<td colspan="2" align="center" valign="middle">');
 
-	if ($disabled == false)
-		echo('<img src="../upload/'.$album_id.'">');
-	else
-		echo('<img src="../images/album/disabled.jpg">');
+	if ($disabled == false) {
+			echo('<img src="../upload/'.$album_id.'">');
+	} else {
+			echo('<img src="../images/album/disabled.jpg">');
+	}
 
 	echo('</td>');
 	echo('</tr>');
 
-	if (empty($location))
-		$location = 'N/A';
+	if (empty($location)) {
+			$location = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td align="right" width="10%" style="font-weight:bold;">Location:</td><td>'.$location.'</td>');
 	echo('</tr>');
 
-	if (empty($email))
-		$email = 'N/A';
+	if (empty($email)) {
+			$email = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td align="right" width="10%" style="font-weight:bold;">eMail:</td><td>'.$email.'</td>');
 	echo('</tr>');
 
-	if (empty($website))
-		$website = 'N/A';
-	else
-		$website = '<a href="'.$website.'" target="_new">'.$website.'</a>';
+	if (empty($website)) {
+			$website = 'N/A';
+	} else {
+			$website = '<a href="'.$website.'" target="_new">'.$website.'</a>';
+	}
 	echo('<tr>');
 	echo('<td align="right" width="10%" style="font-weight:bold;">Website:</td><td>'.$website.'</td>');
 	echo('</tr>');
 
 	echo('<tr>');
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month.' / '.$day.' / '.$year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year '.$year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month.' / '.$day.' / '.$year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year '.$year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 	echo('<td align="right" width="10%" style="font-weight:bold;">Birthdate:</td><td>'.$birthdate.'</td>');
 	echo('</tr>');
 
-	if (empty($other))
-		$other = 'N/A';
+	if (empty($other)) {
+			$other = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td align="right" valign="top" width="10%" style="font-weight:bold;">Other&nbsp;Info:<br /><small>(AIM/ICQ)&nbsp;&nbsp;</small></td><td>'.$other.'</td>');
 	echo('</tr>');
@@ -209,15 +217,16 @@ 
 					FROM account_has_permission
 					WHERE account_id = '.$db->escapeNumber(SmrSession::$account_id).' AND
 						permission_id = '.$db->escapeNumber(PERMISSION_MODERATE_PHOTO_ALBUM));
-		if ($db->nextRecord())
-			echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" id="InputFields"></td>');
+		if ($db->nextRecord()) {
+					echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" id="InputFields"></td>');
+		}
 
 		echo('</tr>');
 		echo('</table>');
 		echo('</form>');
+	} else {
+			echo('<p>Please <a href="/login.php?return_page=/album/?' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 	}
-	else
-		echo('<p>Please <a href="/login.php?return_page=/album/?' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 
 	echo('</td>');
 	echo('</tr>');
@@ -244,8 +253,9 @@ 
 
 		echo('<a href="?' . urlencode($nick) . '" style="font-size:80%;">'.$nick.'</a><br />');
 
-		if (floor(sizeof($album_ids) / 4) > 0 && $count % floor(sizeof($album_ids) / 4) == 0)
-			echo('</td><td width="25%" valign="top">');
+		if (floor(sizeof($album_ids) / 4) > 0 && $count % floor(sizeof($album_ids) / 4) == 0) {
+					echo('</td><td width="25%" valign="top">');
+		}
 	}
 	echo('</td></tr>');
 	echo('</table>');
@@ -286,8 +296,9 @@ 
 
 
 function get_album_nick($album_id) {
-	if ($album_id == 0)
-		return 'System';
+	if ($album_id == 0) {
+			return 'System';
+	}
 
 	return SmrAccount::getAccount($album_id)->getHofName();
 }

engine/Default/bounty_claim.php

Braces +2 added lines, -4 removed lines

@@ -6,8 +6,7 @@ 
 if ($sector->hasHQ()) {
 	create_hq_menu();
 	$bounties = $player->getClaimableBounties('HQ');
-}
-else {
+} else {
 	create_ug_menu();
 	$bounties = $player->getClaimableBounties('UG');
 }
@@ -43,8 +42,7 @@ 
 							AND claimer_id = ' . $db->escapeNumber($player->getAccountID()) . '
 							AND bounty_id = ' . $db->escapeNumber($bounty['bounty_id']));
 		}
-	}
-	else {
+	} else {
 		$claimText.=('You have no claimable bounties<br /><br />');
 	}
 	

engine/Default/bank_alliance_exempt_processing.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
 $container['url'] = 'skeleton.php';
 if (isset($var['minVal'])) {
 	$container['body'] = 'bank_alliance.php';
-}
-else {
+} else {
 	$container['body'] = 'alliance_exempt_authorize.php';
 }
 forward($container);

engine/Default/message_blacklist_add.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
 
 if(isset($var['account_id'])) {
 	$blacklisted_id = $var['account_id'];
-}
-else {
+} else {
 	$db = new SmrMySqlDatabase();
 
 	$db->query('SELECT account_id FROM player WHERE player_name=' . $db->escapeString($_REQUEST['PlayerName']) . ' AND game_id=' . $db->escapeNumber($player->getGameID()) . ' LIMIT 1');