smrealms / smr

lib/Default/Distance.class.inc

Braces +5 added lines, -4 removed lines

@@ -56,10 +56,11 @@
 	}
 
 	public function compareTo(Distance $d) {
-		if ($this->equals($d)===true)
-			return 0;
-		else if ($d->getTurns() > $this->getTurns())
-			return -1;
+		if ($this->equals($d)===true) {
+					return 0;
+		} else if ($d->getTurns() > $this->getTurns()) {
+					return -1;
+		}
 		return 1;
 	}
 

lib/Default/ChessPiece.class.inc

Braces +5 added lines, -10 removed lines

@@ -91,8 +91,7 @@ 
 						}
 					}
 				}
-			}
-			else if($this->pieceID==self::KING) {
+			} else if($this->pieceID==self::KING) {
 				for($i = -1; $i < 2; $i++) {
 					for($j = -1; $j < 2; $j++) {
 						if($i!=0 || $j!=0) {
@@ -114,8 +113,7 @@ 
 						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
-			}
-			else if($this->pieceID==self::QUEEN) {
+			} else if($this->pieceID==self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -140,8 +138,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::ROOK) {
+			} else if($this->pieceID==self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
@@ -154,8 +151,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
-			}
-			else if($this->pieceID==self::BISHOP) {
+			} else if($this->pieceID==self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
@@ -168,8 +164,7 @@ 
 				$moveX = $this->x;
 				$moveY = $this->y;
 				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
-			}
-			else if($this->pieceID==self::KNIGHT) {
+			} else if($this->pieceID==self::KNIGHT) {
 				$moveX = $this->x-1;
 				$moveY = $this->y-2;
 				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left

lib/Default/AbstractSmrAccount.class.inc

Braces +226 added lines, -165 removed lines

@@ -96,8 +96,9 @@ 
 		if (empty($login)) { return null; }
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT account_id FROM account WHERE login = '.$db->escapeString($login).' LIMIT 1');
-		if($db->nextRecord())
-			return self::getAccount($db->getField('account_id'),$forceUpdate);
+		if($db->nextRecord()) {
+					return self::getAccount($db->getField('account_id'),$forceUpdate);
+		}
 		$return = null;
 		return $return;
 	}
@@ -232,10 +233,10 @@ 
 			$this->template			= $row['template'];
 			$this->colourScheme		= $row['colour_scheme'];
 
-			if(empty($this->hofName))
-				$this->hofName=$this->login;
-		}
-		else {
+			if(empty($this->hofName)) {
+							$this->hofName=$this->login;
+			}
+		} else {
 			throw new AccountNotFoundException('Account ID '.$accountID.' does not exist!');
 		}
 	}
@@ -257,8 +258,7 @@ 
 				'Reason' => $this->db->getField('reason'),
 				'ReasonID' => $this->db->getInt('reason_id')
 			);
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -314,15 +314,18 @@ 
 		if ($curr_ip != 'unknown' && $curr_ip != 'unknown...' && $curr_ip != 'unknown, unknown') {
 			$curr_ip = $fi.'.'.$se.'.'.$th.'.'.$fo;
 			$host = gethostbyaddr($curr_ip);
-		} else $host = 'unknown';
+		} else {
+			$host = 'unknown';
+		}
 
 		// save...first make sure there isn't one for these keys (someone could double click and get error)
 		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES ('.$this->db->escapeNumber($this->account_id).', '.$this->db->escapeNumber(TIME).', '.$this->db->escapeString($curr_ip).', '.$this->db->escapeString($host).')');
 	}
 
 	public function updateLastLogin() {
-		if($this->last_login == TIME)
-			return;
+		if($this->last_login == TIME) {
+					return;
+		}
 		$this->last_login = TIME;
 		$this->hasChanged = true;
 		$this->update();
@@ -333,8 +336,9 @@ 
 	}
 
 	public function setLoggingEnabled($bool) {
-		if($this->logging==$bool)
-			return;
+		if($this->logging==$bool) {
+					return;
+		}
 		$this->logging=$bool;
 		$this->hasChanged = true;
 		$this->update();
@@ -383,12 +387,14 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
-			return $this->HOF;
+		if($typeList==null) {
+					return $this->HOF;
+		}
 		$hof=$this->HOF;
 		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
-				return 0;
+			if(!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
@@ -396,10 +402,11 @@ 
 
 	function getRankName() {
 		$rankings = Globals::getUserRanking();
-		if(isset($rankings[$this->getRank()]))
-			return $rankings[$this->getRank()];
-		else
-			return end($rankings);
+		if(isset($rankings[$this->getRank()])) {
+					return $rankings[$this->getRank()];
+		} else {
+					return end($rankings);
+		}
 	}
 
 	public function getScore() {
@@ -415,15 +422,17 @@ 
 
 	public function &getIndividualScores(SmrPlayer $player = null) {
 		$gameID=0;
-		if($player!=null)
-			$gameID = $player->getGameID();
+		if($player!=null) {
+					$gameID = $player->getGameID();
+		}
 		if(!isset($this->individualScores[$gameID])) {
 			$this->individualScores[$gameID] = array();
 			foreach(self::USER_RANKINGS_SCORE as $statScore) {
-				if($player==null)
-					$stat = $this->getHOF($statScore[0]);
-				else
-					$stat = $player->getHOF($statScore[0]);
+				if($player==null) {
+									$stat = $this->getHOF($statScore[0]);
+				} else {
+									$stat = $player->getHOF($statScore[0]);
+				}
 				$this->individualScores[$gameID][]=array('Stat'=>$statScore[0],'Score'=>pow($stat*$statScore[1],self::USER_RANKINGS_EACH_STAT_POW)*$statScore[2]);
 			}
 		}
@@ -432,16 +441,19 @@ 
 
 	public function getRank() {
 		$rank = ceil(pow($this->getScore(),self::USER_RANKINGS_TOTAL_SCORE_POW)/self::USER_RANKINGS_RANK_BOUNDARY);
-		if($rank<1)
-			$rank=1;
-		if($rank > $this->maxRankAchieved)
-			$this->updateMaxRankAchieved($rank);
+		if($rank<1) {
+					$rank=1;
+		}
+		if($rank > $this->maxRankAchieved) {
+					$this->updateMaxRankAchieved($rank);
+		}
 		return $rank;
 	}
 
 	protected function updateMaxRankAchieved($rank) {
-		if($rank <= $this->maxRankAchieved)
-			throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
+		if($rank <= $this->maxRankAchieved) {
+					throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
+		}
 		$delta = $rank - $this->maxRankAchieved;
 		if($this->hasReferrer()) {
 			$this->getReferrer()->increaseSmrRewardCredits($delta * CREDITS_PER_DOLLAR);
@@ -488,12 +500,15 @@ 
 	}
 
 	public function decreaseTotalSmrCredits($totalCredits) {
-		if($totalCredits==0)
-			return;
-		if($totalCredits<0)
-			throw new Exception('You cannot use negative total credits');
-		if($totalCredits>$this->getTotalSmrCredits())
-			throw new Exception('You do not have that many credits in total to use');
+		if($totalCredits==0) {
+					return;
+		}
+		if($totalCredits<0) {
+					throw new Exception('You cannot use negative total credits');
+		}
+		if($totalCredits>$this->getTotalSmrCredits()) {
+					throw new Exception('You do not have that many credits in total to use');
+		}
 
 		$rewardCredits=$this->rewardCredits;
 		$credits=$this->credits;
@@ -502,10 +517,11 @@ 
 			$credits+=$rewardCredits;
 			$rewardCredits=0;
 		}
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->credits=$credits;
 		$this->rewardCredits=$rewardCredits;
 	}
@@ -521,48 +537,59 @@ 
 	}
 
 	public function setSmrCredits($credits) {
-		if($this->getSmrCredits()==$credits)
-			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getSmrCredits()==$credits) {
+					return;
+		}
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->credits=$credits;
 	}
 
 	public function increaseSmrCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot gain negative credits');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot gain negative credits');
+		}
 		$this->setSmrCredits($this->getSmrCredits()+$credits);
 	}
 
 	public function decreaseSmrCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot use negative credits');
-		if($credits>$this->getSmrCredits())
-			throw new Exception('You cannot use more credits than you have');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot use negative credits');
+		}
+		if($credits>$this->getSmrCredits()) {
+					throw new Exception('You cannot use more credits than you have');
+		}
 		$this->setSmrCredits($this->getSmrCredits()-$credits);
 	}
 
 	public function setSmrRewardCredits($credits) {
-		if($this->getSmrRewardCredits()==$credits)
-			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getSmrRewardCredits()==$credits) {
+					return;
+		}
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->rewardCredits=$credits;
 	}
 
 	public function increaseSmrRewardCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot gain negative reward credits');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot gain negative reward credits');
+		}
 		$this->setSmrRewardCredits($this->getSmrRewardCredits()+$credits);
 	}
 
@@ -598,8 +625,9 @@ 
 	}
 
 	public function hasOldAccountID($dbName=false) {
-		if($dbName===false)
-			return count($this->getOldAccountIDs())!=0;
+		if($dbName===false) {
+					return count($this->getOldAccountIDs())!=0;
+		}
 		return $this->getOldAccountID($dbName)!=0;
 	}
 
@@ -678,8 +706,9 @@ 
 	}
 
 	public function setFontSize($size) {
-		if($this->fontSize==$size)
-			return;
+		if($this->fontSize==$size) {
+					return;
+		}
 		$this->fontSize = $size;
 		$this->hasChanged = true;
 		$this->update();
@@ -692,8 +721,9 @@ 
 
 	// sets the extra CSS file linked in preferences
 	public function setCssLink($link) {
-		if($this->cssLink==$link)
-			return;
+		if($this->cssLink==$link) {
+					return;
+		}
 		$this->cssLink = $link;
 		$this->hasChanged = true;
 		$this->update();
@@ -704,10 +734,12 @@ 
 	}
 
 	public function setTemplate($template) {
-		if($this->template==$template)
-			return;
-		if(!in_array($template,array_keys(Globals::getAvailableTemplates())))
-			throw new Exception('Template not allowed: '.$template);
+		if($this->template==$template) {
+					return;
+		}
+		if(!in_array($template,array_keys(Globals::getAvailableTemplates()))) {
+					throw new Exception('Template not allowed: '.$template);
+		}
 		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE '.$this->SQL.' LIMIT 1');
 		$this->template = $template;
 		$colourSchemes = Globals::getAvailableColourSchemes($template);
@@ -719,10 +751,12 @@ 
 	}
 
 	public function setColourScheme($colourScheme) {
-		if($this->colourScheme==$colourScheme)
-			return;
-		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
-			throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		if($this->colourScheme==$colourScheme) {
+					return;
+		}
+		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate())))) {
+					throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		}
 		$this->colourScheme = $colourScheme;
 		$this->hasChanged = true;
 		$this->update();
@@ -747,8 +781,9 @@ 
 	}
 
 	public function setHofName($name) {
-		if($this->hofName==$name)
-			return;
+		if($this->hofName==$name) {
+					return;
+		}
 		$this->hofName = $name;
 		$this->hasChanged = true;
 		$this->update();
@@ -759,8 +794,9 @@ 
 	}
 
 	public function setIrcNick($nick) {
-		if($this->ircNick==$nick)
-			return;
+		if($this->ircNick==$nick) {
+					return;
+		}
 		$this->ircNick = $nick;
 		$this->hasChanged = true;
 		$this->update();
@@ -788,8 +824,9 @@ 
 	}
 
 	public function setShortDateFormat($format) {
-		if($this->dateShort==$format)
-			return;
+		if($this->dateShort==$format) {
+					return;
+		}
 		$this->dateShort = $format;
 		$this->hasChanged = true;
 		$this->update();
@@ -800,8 +837,9 @@ 
 	}
 
 	public function setShortTimeFormat($format) {
-		if($this->timeShort==$format)
-			return;
+		if($this->timeShort==$format) {
+					return;
+		}
 		$this->timeShort = $format;
 		$this->hasChanged = true;
 		$this->update();
@@ -812,16 +850,18 @@ 
 	}
 
 	protected function setValidationCode($code) {
-		if($this->validation_code == $code)
-			return;
+		if($this->validation_code == $code) {
+					return;
+		}
 		$this->validation_code=$code;
 		$this->hasChanged=true;
 		$this->update();
 	}
 
 	public function setValidated($bool) {
-		if($this->validated == $bool)
-			return;
+		if($this->validated == $bool) {
+					return;
+		}
 		$this->validated = $bool;
 		$this->hasChanged = true;
 		$this->update();
@@ -894,8 +934,9 @@ 
 	}
 
 	protected function setPasswordReset($passwordReset) {
-		if($this->passwordReset == $passwordReset)
-			return;
+		if($this->passwordReset == $passwordReset) {
+					return;
+		}
 		$this->passwordReset=$passwordReset;
 		$this->hasChanged=true;
 		$this->update();
@@ -906,8 +947,9 @@ 
 	}
 
 	public function setDisplayShipImages($yesNo) {
-		if($this->images == $yesNo)
-			return;
+		if($this->images == $yesNo) {
+					return;
+		}
 		$this->images = $yesNo;
 		$this->hasChanged = true;
 		$this->update();
@@ -918,8 +960,9 @@ 
 	}
 
 	public function setUseAJAX($bool) {
-		if($this->useAJAX == $bool)
-			return;
+		if($this->useAJAX == $bool) {
+					return;
+		}
 		$this->useAJAX=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -930,8 +973,9 @@ 
 	}
 
 	public function setDefaultCSSEnabled($bool) {
-		if($this->defaultCSSEnabled == $bool)
-			return;
+		if($this->defaultCSSEnabled == $bool) {
+					return;
+		}
 		$this->defaultCSSEnabled=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -941,8 +985,7 @@ 
 		if($hotkeyType!==false) {
 			if(isset($this->hotkeys[$hotkeyType])) {
 				return $this->hotkeys[$hotkeyType];
-			}
-			else {
+			} else {
 				return array();
 			}
 		}
@@ -950,8 +993,9 @@ 
 	}
 
 	public function setHotkey($hotkeyType,$binding) {
-		if($this->getHotkeys($hotkeyType) == $binding)
-			return;
+		if($this->getHotkeys($hotkeyType) == $binding) {
+					return;
+		}
 		$this->hotkeys[$hotkeyType] = $binding;
 		$this->hasChanged=true;
 		$this->update();
@@ -966,26 +1010,31 @@ 
 	}
 
 	public function setMessageNotifications($messageTypeID,$num) {
-		if($this->getMessageNotifications($messageTypeID) == $num)
-			return;
+		if($this->getMessageNotifications($messageTypeID) == $num) {
+					return;
+		}
 		$this->messageNotifications[$messageTypeID]=$num;
 		$this->hasChanged=true;
 		$this->update();
 	}
 
 	public function increaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
-			return;
-		if($num<0)
-			throw new Exception('You cannot increase by a negative amount');
+		if($num==0) {
+					return;
+		}
+		if($num<0) {
+					throw new Exception('You cannot increase by a negative amount');
+		}
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) + $num);
 	}
 
 	public function decreaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
-			return;
-		if($num<0)
-			throw new Exception('You cannot decrease by a negative amount');
+		if($num==0) {
+					return;
+		}
+		if($num<0) {
+					throw new Exception('You cannot decrease by a negative amount');
+		}
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) - $num);
 	}
 
@@ -994,8 +1043,9 @@ 
 	}
 
 	public function setCenterGalaxyMapOnPlayer($bool) {
-		if($this->centerGalaxyMapOnPlayer == $bool)
-			return;
+		if($this->centerGalaxyMapOnPlayer == $bool) {
+					return;
+		}
 		$this->centerGalaxyMapOnPlayer=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -1010,8 +1060,9 @@ 
 	}
 
 	public function setMailBanned($time) {
-		if($this->mailBanned == $time)
-			return;
+		if($this->mailBanned == $time) {
+					return;
+		}
 		$this->mailBanned=$time;
 		$this->hasChanged=true;
 	}
@@ -1065,53 +1116,59 @@ 
 
 	public function setPoints($numPoints,$lastUpdate=false) {
 		$numPoints = max($numPoints,0);
-		if($this->getPoints()==$numPoints)
-			return;
-		if ($this->points==0)
-			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
-		else if($numPoints<=0)
-			$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
-		else
-			$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getPoints()==$numPoints) {
+					return;
+		}
+		if ($this->points==0) {
+					$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
+		} else if($numPoints<=0) {
+					$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
+		} else {
+					$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->points=$numPoints;
 	}
 
 	public function removePoints($numPoints,$lastUpdate=false) {
-		if($numPoints>0)
-			$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+		if($numPoints>0) {
+					$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+		}
 	}
 
 	public function addPoints($numPoints,SmrAccount $admin,$reasonID,$suspicion) {
 		//do we have points
 		$this->setPoints($this->getPoints() + $numPoints,TIME);
 		$totalPoints = $this->getPoints();
-		if ($totalPoints < 10)
-			return false;//leave scripts its only a warning
-		elseif ($totalPoints < 20)
-			$days = 2;
-		elseif ($totalPoints < 30)
-			$days = 4;
-		elseif ($totalPoints < 50)
-			$days = 7;
-		elseif ($totalPoints < 75)
-			$days = 15 ;
-		elseif ($totalPoints < 100)
-			$days = 30;
-		elseif ($totalPoints < 125)
-			$days = 60;
-		elseif ($totalPoints < 150)
-			$days = 120;
-		elseif ($totalPoints < 175)
-			$days = 240;
-		elseif ($totalPoints < 200)
-			$days = 480;
-		else
-			$days = 0; //Forever/indefinite
+		if ($totalPoints < 10) {
+					return false;
+		}
+		//leave scripts its only a warning
+		elseif ($totalPoints < 20) {
+					$days = 2;
+		} elseif ($totalPoints < 30) {
+					$days = 4;
+		} elseif ($totalPoints < 50) {
+					$days = 7;
+		} elseif ($totalPoints < 75) {
+					$days = 15 ;
+		} elseif ($totalPoints < 100) {
+					$days = 30;
+		} elseif ($totalPoints < 125) {
+					$days = 60;
+		} elseif ($totalPoints < 150) {
+					$days = 120;
+		} elseif ($totalPoints < 175) {
+					$days = 240;
+		} elseif ($totalPoints < 200) {
+					$days = 480;
+		} else {
+					$days = 0;
+		}
+		//Forever/indefinite
 
 		if($days==0) {
 			$expireTime = 0;
-		}
-		else {
+		} else {
 			$expireTime = TIME + $days * 86400;
 		}
 		$this->banAccount($expireTime,$admin,$reasonID,$suspicion);
@@ -1166,26 +1223,30 @@ 
 			$player->update();
 		}
 		$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account closed by ' . $admin->getLogin() . '.');
-		if($removeExceptions!==false)
-			$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
+		if($removeExceptions!==false) {
+					$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
+		}
 	}
 
 	public function unbanAccount(SmrAccount $admin = null,$currException=false) {
 		$adminID = 0;
-		if($admin!==null)
-			$adminID = $admin->getAccountID();
+		if($admin!==null) {
+					$adminID = $admin->getAccountID();
+		}
 		$this->db->query('DELETE FROM account_is_closed WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->query('INSERT INTO account_has_closing_history
 						(account_id, time, admin_id, action)
 						VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeNumber($adminID) . ', ' . $this->db->escapeString('Opened') . ')');
 		$this->db->query('UPDATE player SET last_turn_update = GREATEST(' . $this->db->escapeNumber(TIME) . ', last_turn_update) WHERE ' . $this->SQL);
-		if($admin!==null)
-			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
-		else
-			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
-		if($currException!==false)
-			$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
+		if($admin!==null) {
+					$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
+		} else {
+					$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
+		}
+		if($currException!==false) {
+					$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
 							VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeString($currException) . ')');
+		}
 	}
 
 	public function getToggleAJAXHREF() {

lib/Default/Globals.class.inc

Braces +2 added lines, -4 removed lines

@@ -359,8 +359,7 @@ 
 	public static function getPlotCourseHREF($fromSector = false, $toSector = false) {
 		if($fromSector === false && $toSector === false) {
 			return self::$AVAILABLE_LINKS['PlotCourse'] = SmrSession::getNewHREF(create_container('skeleton.php','course_plot.php'));
-		}
-		else {
+		} else {
 			return SmrSession::getNewHREF(create_container('course_plot_processing.php','',array('from'=>$fromSector,'to'=>$toSector)));
 		}
 	}
@@ -392,8 +391,7 @@ 
 	public static function getAllianceHREF($allianceID = null) {
 		if ($allianceID > 0) {
 			return self::getAllianceMotdHREF($allianceID);
-		}
-		else {
+		} else {
 			return self::getAllianceListHREF();
 		}
 	}

lib/Default/SmrShip.class.inc

Braces +4 added lines, -4 removed lines

@@ -126,8 +126,7 @@ 
 			$amount = $this->getHardware($hardwareTypeID);
 			if ($amount > 0) {
 				$this->db->query('REPLACE INTO ship_has_hardware (account_id, game_id, hardware_type_id, amount, old_amount) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($hardwareTypeID) . ', ' . $this->db->escapeNumber($amount) . ', ' . $this->db->escapeNumber($this->getOldHardware($hardwareTypeID)) . ')');
-			}
-			else {
+			} else {
 				$this->db->query('DELETE FROM ship_has_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID));
 			}
 		}
@@ -181,8 +180,9 @@ 
 	}
 	
 	public function isCloaked() {
-		if(!$this->hasCloak())
-			return false;
+		if(!$this->hasCloak()) {
+					return false;
+		}
 		if(!isset($this->isCloaked)) {
 			$this->db->query('SELECT 1 FROM ship_is_cloaked WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->isCloaked = $this->db->getNumRows()>0;

lib/Default/shop_goods.inc

Braces +46 added lines, -35 removed lines

@@ -1,17 +1,21 @@ 
 <?php
 
 function checkPortTradeable(&$port,&$player) {
-	if($port->getSectorID()!=$player->getSectorID())
-		return 'That port is not in this sector!';
+	if($port->getSectorID()!=$player->getSectorID()) {
+			return 'That port is not in this sector!';
+	}
 	
-	if(!$port->exists())
-		return 'There is no port in this sector!';
+	if(!$port->exists()) {
+			return 'There is no port in this sector!';
+	}
 	
-	if($player->getRelation($port->getRaceID()) <= RELATIONS_WAR)
-		return 'We will not trade with our enemies!';
+	if($player->getRelation($port->getRaceID()) <= RELATIONS_WAR) {
+			return 'We will not trade with our enemies!';
+	}
 	
-	if($port->getReinforceTime() > TIME)
-		return 'We are still repairing damage caused during the last raid.';
+	if($port->getReinforceTime() > TIME) {
+			return 'We are still repairing damage caused during the last raid.';
+	}
 	
 	return true;
 }
@@ -55,39 +59,43 @@ 
 		if (abs($port_off_rel) > abs($trader_off_rel)) {
 			// get a random number between
 			// (port_off) and (100 +/- $trader_off_rel)
-			if (100 + $trader_off_rel < $port_off)
-				$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
-			else
-				$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			if (100 + $trader_off_rel < $port_off) {
+							$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
+			} else {
+							$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			}
 
 			$container['offered_price'] = round($container['ideal_price'] * $offer_modifier / 100);
 		}
+	} else {
+			$container['overall_number_of_bargains'] = mt_rand(2, 5);
+	}
 	}
-	else
-		$container['overall_number_of_bargains'] = mt_rand(2, 5);
-}
 
 function get_amount() {
 	global $var, $_REQUEST;
 
 	// retrieve amount
-	if (isset($var['amount']))
-		$amount = $var['amount'];
-	else if (isset($_REQUEST['amount']))
-		$amount = $_REQUEST['amount'];
-	else
-		$amount = 0;
+	if (isset($var['amount'])) {
+			$amount = $var['amount'];
+	} else if (isset($_REQUEST['amount'])) {
+			$amount = $_REQUEST['amount'];
+	} else {
+			$amount = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($amount))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($amount)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$amount = floor($amount);
 
 	// no negative amounts are allowed
-	if ($amount <= 0)
-		create_error('You must actually enter an amount > 0!');
+	if ($amount <= 0) {
+			create_error('You must actually enter an amount > 0!');
+	}
 
 	return $amount;
 }
@@ -96,23 +104,26 @@ 
 	global $_REQUEST,$var;
 
 	// we get it from form
-	if (isset($_REQUEST['bargain_price']))
-		$price = $_REQUEST['bargain_price'];
-	else if (isset($var['bargain_price']))
-		$price = $var['bargain_price'];
-	else
-		$price = 0;
+	if (isset($_REQUEST['bargain_price'])) {
+			$price = $_REQUEST['bargain_price'];
+	} else if (isset($var['bargain_price'])) {
+			$price = $var['bargain_price'];
+	} else {
+			$price = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($price))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($price)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$price = floor($price);
 
 	// no negative amounts are allowed
-	if ($price < 0)
-		create_error('No negative prices are allowed!');
+	if ($price < 0) {
+			create_error('No negative prices are allowed!');
+	}
 
 	return $price;
 }

lib/Default/MySqlDatabase.class.inc

Braces +50 added lines, -39 removed lines

@@ -40,8 +40,9 @@ 
 	}
 	
 	public function nextRecord() {
-		if(!$this->dbResult)
-			$this->error('No resource to get record from.');
+		if(!$this->dbResult) {
+					$this->error('No resource to get record from.');
+		}
 		
 		if($this->dbRecord = $this->dbResult->fetch_assoc()) {
 			return true;
@@ -56,9 +57,10 @@ 
 	}
 	
 	public function getBoolean($name) {
-		if($this->dbRecord[$name] == 'TRUE')
-			return true;
-//		if($this->dbRecord[$name] == 'FALSE')
+		if($this->dbRecord[$name] == 'TRUE') {
+					return true;
+		}
+		//		if($this->dbRecord[$name] == 'FALSE')
 		return false;
 //		throw new Exception('Field is not a boolean');
 	}
@@ -91,8 +93,9 @@ 
 	
 	public function getObject($name,$compressed=false) {
 		$object = $this->getField($name);
-		if($compressed===true)
-			$object = gzuncompress($object);
+		if($compressed===true) {
+					$object = gzuncompress($object);
+		}
 		return unserialize($object);
 	}
 	
@@ -134,38 +137,43 @@ 
 	
 	public function escape($escape,$autoQuotes=true,$quotes=true) {
 		if(is_bool($escape)) {
-			if($autoQuotes)
-				return $this->escapeBoolean($escape);
-			else
-				return $this->escapeBoolean($escape,$quotes);
+			if($autoQuotes) {
+							return $this->escapeBoolean($escape);
+			} else {
+							return $this->escapeBoolean($escape,$quotes);
+			}
 		}
 		if(is_numeric($escape)) {
 			return $this->escapeNumber($escape);
 		}
 		if(is_string($escape)) {
-			if($autoQuotes)
-				return $this->escapeString($escape);
-			else
-				return $this->escapeString($escape,$quotes);
+			if($autoQuotes) {
+							return $this->escapeString($escape);
+			} else {
+							return $this->escapeString($escape,$quotes);
+			}
 		}
 		if(is_array($escape)) {
 			return $this->escapeArray($escape,$autoQuotes,$quotes);
 		}
 		if(is_object($escape)) {
-			if($autoQuotes)
-				return $this->escapeObject($escape);
-			else
-				return $this->escapeObject($escape,$quotes);
+			if($autoQuotes) {
+							return $this->escapeObject($escape);
+			} else {
+							return $this->escapeObject($escape,$quotes);
+			}
 		}
 	}
 	
 	public function escapeString($string,$quotes=true,$nullable=false) {
-		if($nullable===true && ($string===null || $string===''))
-			return 'NULL';
-		if($string===true)
-			$string = 'TRUE';
-		else if($string===false)
-			$string = 'FALSE';
+		if($nullable===true && ($string===null || $string==='')) {
+					return 'NULL';
+		}
+		if($string===true) {
+					$string = 'TRUE';
+		} else if($string===false) {
+					$string = 'FALSE';
+		}
 		if(is_array($string)) {
 			$escapedString = '';
 			foreach($string as $value) {
@@ -187,14 +195,14 @@ 
 		$string = '';
 		if($escapeIndividually) {
 			foreach($array as $value) {
-				if(is_array($value))
-					$string .= $this->escapeArray($value,$autoQuotes,$quotes,$implodeString,$escapeIndividually).$implodeString;
-				else
-					$string .= $this->escape($value, $autoQuotes, $quotes).$implodeString;
+				if(is_array($value)) {
+									$string .= $this->escapeArray($value,$autoQuotes,$quotes,$implodeString,$escapeIndividually).$implodeString;
+				} else {
+									$string .= $this->escape($value, $autoQuotes, $quotes).$implodeString;
+				}
 			}
 			$string = substr($string,0,-1);
-		}
-		else {
+		} else {
 			$string = $this->escape(implode($implodeString,$array), $autoQuotes, $quotes);
 		}
 		return $string;
@@ -217,17 +225,20 @@ 
 	}
 	
 	public function escapeBoolean($bool,$quotes=true) {
-		if($bool===true)
-			return $this->escapeString('TRUE',$quotes);
-		else if($bool===false)
-			return $this->escapeString('FALSE',$quotes);
-		else
-			throw new Exception('Not a boolean!'); //TEST
+		if($bool===true) {
+					return $this->escapeString('TRUE',$quotes);
+		} else if($bool===false) {
+					return $this->escapeString('FALSE',$quotes);
+		} else {
+					throw new Exception('Not a boolean!');
+		}
+		//TEST
 	}
 	
 	public function escapeObject($object,$compress=false,$quotes=true,$nullable=false) {
-		if($compress===true)
-			return $this->escapeBinary(gzcompress(serialize($object)));
+		if($compress===true) {
+					return $this->escapeBinary(gzcompress(serialize($object)));
+		}
 		return $this->escapeString(serialize($object),$quotes,$nullable);
 	}
 

lib/Default/AbstractSmrLocation.class.inc

Braces +55 added lines, -46 removed lines

@@ -74,8 +74,7 @@ 
 			$this->name = $db->getField('location_name');
 			$this->processor = $db->getField('location_processor');
 			$this->image = $db->getField('location_image');
-		}
-		else {
+		} else {
 			throw new Exception('Cannot find location: '.$locationTypeID);
 		}
 	}
@@ -134,8 +133,7 @@ 
 		if($bool===true) {
 			$this->db->query('INSERT IGNORE INTO location_is_fed (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->fed = true;
-		}
-		else if($bool===false) {
+		} else if($bool===false) {
 			$this->db->query('DELETE FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = false;
 		}
@@ -150,13 +148,13 @@ 
 	}
 	
 	public function setBank($bool) {
-		if($this->bank===$bool)
-			return;
+		if($this->bank===$bool) {
+					return;
+		}
 		if($bool===true) {
 			$this->db->query('INSERT INTO location_is_bank (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bank = true;
-		}
-		else if($bool===false) {
+		} else if($bool===false) {
 			$this->db->query('DELETE FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = false;
 		}
@@ -171,13 +169,13 @@ 
 	}
 	
 	public function setBar($bool) {
-		if($this->bar===$bool)
-			return;
+		if($this->bar===$bool) {
+					return;
+		}
 		if($bool===true) {
 			$this->db->query('INSERT IGNORE INTO location_is_bar (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bar = true;
-		}
-		else if($bool===false) {
+		} else if($bool===false) {
 			$this->db->query('DELETE FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = false;
 		}
@@ -192,13 +190,13 @@ 
 	}
 	
 	public function setHQ($bool) {
-		if($this->HQ===$bool)
-			return;
+		if($this->HQ===$bool) {
+					return;
+		}
 		if($bool===true) {
 			$this->db->query('INSERT IGNORE INTO location_is_hq (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->HQ = true;
-		}
-		else if($bool===false) {
+		} else if($bool===false) {
 			$this->db->query('DELETE FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = false;
 		}
@@ -213,13 +211,13 @@ 
 	}
 	
 	public function setUG($bool) {
-		if($this->UG===$bool)
-			return;
+		if($this->UG===$bool) {
+					return;
+		}
 		if($bool===true) {
 			$this->db->query('INSERT INTO location_is_ug (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->UG = true;
-		}
-		else if($bool===false) {
+		} else if($bool===false) {
 			$this->db->query('DELETE FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = false;
 		}
@@ -245,18 +243,21 @@ 
 	}
 	
 	public function addHardwareSold($hardwareTypeID) {
-		if($this->isHardwareSold($hardwareTypeID))
-			return;
+		if($this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('SELECT * FROM hardware_type WHERE hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
-		if(!$this->db->nextRecord())
-			throw new Exception('Invalid hardware type id given');
+		if(!$this->db->nextRecord()) {
+					throw new Exception('Invalid hardware type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_hardware (location_type_id,hardware_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($hardwareTypeID) . ')');
 		$this->hardwareSold[$hardwareTypeID] = $this->db->getField('hardware_name');
 	}
 	
 	public function removeHardwareSold($hardwareTypeID) {
-		if(!$this->isHardwareSold($hardwareTypeID))
-			return;
+		if(!$this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
 		unset($this->hardwareSold[$hardwareTypeID]);
 	}
@@ -274,24 +275,28 @@ 
 	
 	public function isShipSold($shipTypeID=false) {
 		$ships = $this->getShipsSold();
-		if($shipTypeID===false)
-			return count($ships)!=0;
+		if($shipTypeID===false) {
+					return count($ships)!=0;
+		}
 		return isset($ships[$shipTypeID]);
 	}
 	
 	public function addShipSold($shipTypeID) {
-		if($this->isShipSold($shipTypeID))
-			return;
+		if($this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$ship = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $shipTypeID);
-		if($ship===false)
-			throw new Exception('Invalid ship type id given');
+		if($ship===false) {
+					throw new Exception('Invalid ship type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_ships (location_type_id,ship_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($shipTypeID) . ')');
 		$this->shipsSold[$shipTypeID] = $ship;
 	}
 	
 	public function removeShipSold($shipTypeID) {
-		if(!$this->isShipSold($shipTypeID))
-			return;
+		if(!$this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_ships WHERE ' . $this->SQL . ' AND ship_type_id = ' . $this->db->escapeNumber($shipTypeID) . ' LIMIT 1');
 		unset($this->shipsSold[$shipTypeID]);
 	}
@@ -300,32 +305,37 @@ 
 		if(!isset($this->weaponsSold)) {
 			$this->weaponsSold = array();
 			$this->db->query('SELECT * FROM location_sells_weapons JOIN weapon_type USING (weapon_type_id) WHERE ' . $this->SQL);
-			while($this->db->nextRecord())
-				$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			while($this->db->nextRecord()) {
+							$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			}
 		}
 		return $this->weaponsSold;
 	}
 	
 	public function isWeaponSold($weaponTypeID=false) {
 		$weapons = $this->getWeaponsSold();
-		if($weaponTypeID===false)
-			return count($weapons)!=0;
+		if($weaponTypeID===false) {
+					return count($weapons)!=0;
+		}
 		return isset($weapons[$weaponTypeID]);
 	}
 	
 	public function addWeaponSold($weaponTypeID) {
-		if($this->isWeaponSold($weaponTypeID))
-			return;
+		if($this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$weapon = SmrWeapon::getWeapon($weaponTypeID);
-		if($weapon===false)
-			throw new Exception('Invalid weapon type id given');
+		if($weapon===false) {
+					throw new Exception('Invalid weapon type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_weapons (location_type_id,weapon_type_id) values (' . $this->db->escapeNumber($this->getTypeID()). ',' . $this->db->escapeNumber($weaponTypeID) . ')');
 		$this->weaponsSold[$weaponTypeID] = $weapon;
 	}
 	
 	public function removeWeaponSold($weaponTypeID) {
-		if(!$this->isWeaponSold($weaponTypeID))
-			return;
+		if(!$this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_weapons WHERE ' . $this->SQL . ' AND weapon_type_id = ' . $this->db->escapeNumber($weaponTypeID) . ' LIMIT 1');
 		unset($this->weaponsSold[$weaponTypeID]);
 	}
@@ -336,8 +346,7 @@ 
 			if($this->getTypeID()==LOCATION_TYPE_FEDERAL_HQ) {
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_BEACON);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_MINT);
-			}
-			else {
+			} else {
 				$raceID = $this->getRaceID();
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS+$raceID);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS+$raceID);

lib/Default/SocialLogin.class.inc

Braces +2 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
 			$this->userID = $userInfo->getId();
 			$this->email = $userInfo->getEmail();
 			$this->valid = true;
-		}
-		else if($loginType == self::TWITTER) {
+		} else if($loginType == self::TWITTER) {
 			if (session_status() === PHP_SESSION_NONE) {
 				session_start();
 			}
@@ -118,8 +117,7 @@ 
 				$this->email = $userInfo->email;
 				$this->valid = true;
 			}
-		}
-		else if($loginType == self::GOOGLE) {
+		} else if($loginType == self::GOOGLE) {
 			if(self::getOpenIdObj()->validate()) {
 				if(strripos(self::getOpenIdObj()->identity, self::$OPEN_ID_IDENTITIES[$loginType]) === 0) {
 					$this->userID=self::getOpenIdObj()->identity;