jacobemerick / web

utility/environment/BrowserEnvironment.class.inc.php

Spacing +25 added lines, -25 removed lines

@@ -7,27 +7,27 @@ 
 class BrowserEnvironment extends Environment
 {
 
-	private static $MATCH_NOT_OPERA				= '/opera|webtv/i';
-	private static $MATCH_INTERNET_EXPLORER		= '/msie\s([^;\s]+)/i';
-	private static $MATCH_FIREFOX				= 'firefox/';
-	private static $MATCH_FIREFOX_VERSION		= '/firefox\/([^\s]+)/i';
+	private static $MATCH_NOT_OPERA = '/opera|webtv/i';
+	private static $MATCH_INTERNET_EXPLORER = '/msie\s([^;\s]+)/i';
+	private static $MATCH_FIREFOX = 'firefox/';
+	private static $MATCH_FIREFOX_VERSION = '/firefox\/([^\s]+)/i';
 	private static $MATCH_GECKO					= 'gecko/';
 	private static $MATCH_OPERA					= '/opera(\s|\/)(\d+)/i';
-	private static $MATCH_KONQUEROR				= 'konqueror';
+	private static $MATCH_KONQUEROR = 'konqueror';
 	private static $MATCH_CHROME				= 'chrome';
 	private static $MATCH_CHROME_VERSION		= '/chrome\/([^\s]+)/i';
-	private static $MATCH_IRON					= 'iron';
+	private static $MATCH_IRON = 'iron';
 	private static $MATCH_SAFARI				= 'applewebkit';
 	private static $MATCH_SAFARI_VERSION		= '/version\/(\d+)/i';
-	private static $MATCH_MOZILLA				= 'mozilla/';
+	private static $MATCH_MOZILLA = 'mozilla/';
 
-	private static $NAME_INTERNET_EXPLORER		= 'explorer';
-	private static $NAME_FIREFOX				= 'firefox';
+	private static $NAME_INTERNET_EXPLORER = 'explorer';
+	private static $NAME_FIREFOX = 'firefox';
 	private static $NAME_GECKO					= 'gecko';
 	private static $NAME_OPERA					= 'opera';
-	private static $NAME_KONQUEROR				= 'konqueror';
+	private static $NAME_KONQUEROR = 'konqueror';
 	private static $NAME_CHROME					= 'chrome';
-	private static $NAME_IRON					= 'iron';
+	private static $NAME_IRON = 'iron';
 	private static $NAME_SAFARI					= 'safari';
 	private static $NAME_MOZILLA				= 'mozilla';
 	private static $NAME_UNKNOWN				= 'unknown';
@@ -35,7 +35,7 @@ 
 	private $name;
 	public function getName()
 	{
-		if(!isset($this->name))
+		if (!isset($this->name))
 			$this->process();
 		return $this->name;
 	}
@@ -43,55 +43,55 @@ 
 	private $version;
 	public function getVersion()
 	{
-		if(!isset($this->name))
+		if (!isset($this->name))
 			$this->process();
 		return $this->version;
 	}
 
 	private function process()
 	{
-		if(!preg_match(self::$MATCH_NOT_OPERA, $this->user_agent) &&
+		if (!preg_match(self::$MATCH_NOT_OPERA, $this->user_agent) &&
 			preg_match(self::$MATCH_INTERNET_EXPLORER, $this->user_agent, $version))
 		{
 			$this->name = self::$NAME_INTERNET_EXPLORER;
 			$this->version = $version[1];
 		}
-		else if(stristr($this->user_agent, self::$MATCH_FIREFOX))
+		else if (stristr($this->user_agent, self::$MATCH_FIREFOX))
 		{
 			$this->name = self::$NAME_FIREFOX;
-			if(preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version))
+			if (preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version))
 				$this->version = $version[1];
 		}
-		else if(stristr($this->user_agent, self::$MATCH_GECKO))
+		else if (stristr($this->user_agent, self::$MATCH_GECKO))
 		{
 			$this->name = self::$NAME_GECKO;
 		}
-		else if(preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
+		else if (preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
 		{
 			$this->name = self::$NAME_OPERA;
 			$this->version = $version[2];
 		}
-		else if(stristr($this->user_agent, self::$MATCH_KONQUEROR))
+		else if (stristr($this->user_agent, self::$MATCH_KONQUEROR))
 		{
 			$this->name = self::$NAME_KONQUEROR;
 		}
-		else if(stristr($this->user_agent, self::$MATCH_CHROME))
+		else if (stristr($this->user_agent, self::$MATCH_CHROME))
 		{
 			$this->name = self::$NAME_CHROME;
-			if(preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version))
+			if (preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version))
 				$this->version = $version[1];
 		}
-		else if(stristr($this->user_agent, self::$MATCH_IRON))
+		else if (stristr($this->user_agent, self::$MATCH_IRON))
 		{
 			$this->name = self::$NAME_IRON;
 		}
-		else if(stristr($this->user_agent, self::$MATCH_SAFARI))
+		else if (stristr($this->user_agent, self::$MATCH_SAFARI))
 		{
 			$this->name = self::$NAME_SAFARI;
-			if(preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version))
+			if (preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version))
 				$this->version = $version[1];
 		}
-		else if(stristr($this->user_agent, self::$MATCH_MOZILLA))
+		else if (stristr($this->user_agent, self::$MATCH_MOZILLA))
 		{
 			$this->name = self::$NAME_MOZILLA;
 		}

Braces +24 added lines, -28 removed lines

@@ -35,16 +35,18 @@ 
 	private $name;
 	public function getName()
 	{
-		if(!isset($this->name))
-			$this->process();
+		if(!isset($this->name)) {

+					$this->process();

+		}

 		return $this->name;
 	}
 
 	private $version;
 	public function getVersion()
 	{
-		if(!isset($this->name))
-			$this->process();
+		if(!isset($this->name)) {

+					$this->process();

+		}

 		return $this->version;
 	}
 
@@ -55,47 +57,41 @@ 
 		{
 			$this->name = self::$NAME_INTERNET_EXPLORER;
 			$this->version = $version[1];
-		}
-		else if(stristr($this->user_agent, self::$MATCH_FIREFOX))
+		} else if(stristr($this->user_agent, self::$MATCH_FIREFOX))
 		{
 			$this->name = self::$NAME_FIREFOX;
-			if(preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version))
-				$this->version = $version[1];
-		}
-		else if(stristr($this->user_agent, self::$MATCH_GECKO))
+			if(preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version)) {

+							$this->version = $version[1];

+			}

+		} else if(stristr($this->user_agent, self::$MATCH_GECKO))
 		{
 			$this->name = self::$NAME_GECKO;
-		}
-		else if(preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
+		} else if(preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
 		{
 			$this->name = self::$NAME_OPERA;
 			$this->version = $version[2];
-		}
-		else if(stristr($this->user_agent, self::$MATCH_KONQUEROR))
+		} else if(stristr($this->user_agent, self::$MATCH_KONQUEROR))
 		{
 			$this->name = self::$NAME_KONQUEROR;
-		}
-		else if(stristr($this->user_agent, self::$MATCH_CHROME))
+		} else if(stristr($this->user_agent, self::$MATCH_CHROME))
 		{
 			$this->name = self::$NAME_CHROME;
-			if(preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version))
-				$this->version = $version[1];
-		}
-		else if(stristr($this->user_agent, self::$MATCH_IRON))
+			if(preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version)) {

+							$this->version = $version[1];

+			}

+		} else if(stristr($this->user_agent, self::$MATCH_IRON))
 		{
 			$this->name = self::$NAME_IRON;
-		}
-		else if(stristr($this->user_agent, self::$MATCH_SAFARI))
+		} else if(stristr($this->user_agent, self::$MATCH_SAFARI))
 		{
 			$this->name = self::$NAME_SAFARI;
-			if(preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version))
-				$this->version = $version[1];
-		}
-		else if(stristr($this->user_agent, self::$MATCH_MOZILLA))
+			if(preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version)) {

+							$this->version = $version[1];

+			}

+		} else if(stristr($this->user_agent, self::$MATCH_MOZILLA))
 		{
 			$this->name = self::$NAME_MOZILLA;
-		}
-		else
+		} else
 		{
 			$this->name = self::$NAME_UNKNOWN;
 		}

utility/environment/PlatformEnvironment.class.inc.php

Spacing +116 added lines, -116 removed lines

@@ -9,9 +9,9 @@ 
 
 	private static $MATCH_MOBILE		= 'j2me';
 	private static $MATCH_IPHONE		= 'iphone';
-	private static $MATCH_WINDOWS_PHONE	= 'windows ce';
+	private static $MATCH_WINDOWS_PHONE = 'windows ce';
 	private static $MATCH_NOKIA			= 'nokia';
-	private static $MATCH_IPOD			= 'ipod';
+	private static $MATCH_IPOD = 'ipod';
 	private static $MATCH_MAC			= 'mac';
 	private static $MATCH_DARWIN		= 'darwin';
 	private static $MATCH_WEBTV			= 'webtv';
@@ -21,23 +21,23 @@ 
 											'windows nt 4.0',
 											'winnt4.0',
 											'winnt');
-	private static $MATCH_WINDOWS_95	= array(
+	private static $MATCH_WINDOWS_95 = array(
 											'windows 95',
 											'win95',
 											'windows_95');
-	private static $MATCH_WINDOWS_98	= array(
+	private static $MATCH_WINDOWS_98 = array(
 											'windows 98',
 											'win98');
-	private static $MATCH_WINDOWS_2000	= array(
+	private static $MATCH_WINDOWS_2000 = array(
 											'windows nt 5.0',
 											'windows 2000');
 	private static $MATCH_WINDOWS_ME	= 'windows me';
-	private static $MATCH_WINDOWS_S_03	= 'windows nt 5.2';
+	private static $MATCH_WINDOWS_S_03 = 'windows nt 5.2';
 	private static $MATCH_WINDOWS_XP	= array(
 											'windows nt 5.1',
 											'windows xp');
-	private static $MATCH_WINDOWS_VISTA	= 'windows nt 6.0';
-	private static $MATCH_WINDOWS_7		= array(
+	private static $MATCH_WINDOWS_VISTA = 'windows nt 6.0';
+	private static $MATCH_WINDOWS_7 = array(
 											'windows nt 6.1',
 											'windows nt 7.0');
 	private static $MATCH_OPENBSD		= 'openbsd';
@@ -46,53 +46,53 @@ 
 	private static $MATCH_LINUX			= array(
 											'linux',
 											'x11');
-	private static $MATCH_GOOGLEBOT		= 'googlebot';
+	private static $MATCH_GOOGLEBOT = 'googlebot';
 	private static $MATCH_GOOGLE_VIEW	= 'google web preview';
-	private static $MATCH_GOOGLE_READER	= 'feedfetcher-google';
+	private static $MATCH_GOOGLE_READER = 'feedfetcher-google';
 	private static $MATCH_GOOGLE_DESK	= 'google desktop';
-	private static $MATCH_BING			= array(
+	private static $MATCH_BING = array(
 											'bingbot',
 											'msnbot');
-	private static $MATCH_ASK			= 'ask jeeves';
+	private static $MATCH_ASK = 'ask jeeves';
 	private static $MATCH_EXABOT		= 'exabot';
-	private static $MATCH_GEOHASH		= 'geohasher';
-	private static $MATCH_POST_RANK		= 'postrank';
+	private static $MATCH_GEOHASH = 'geohasher';
+	private static $MATCH_POST_RANK = 'postrank';
 	private static $MATCH_RADIAN		= 'r6_commentreader';
-	private static $MATCH_BAIDU_SPIDER	= 'baiduspider';
-	private static $MATCH_BLEKKO_SPIDER	= 'scoutjet';
-	private static $MATCH_WLA			= 'wla syndication platform';
-	private static $MATCH_FACEBOOK		= 'facebookexternalhit';
-	private static $MATCH_BLOGLINES		= 'bloglines';
-	private static $MATCH_R6			= 'r6_feedfetcher';
-	private static $MATCH_AOL_FAVICON	= 'ee://aol/http';
+	private static $MATCH_BAIDU_SPIDER = 'baiduspider';
+	private static $MATCH_BLEKKO_SPIDER = 'scoutjet';
+	private static $MATCH_WLA = 'wla syndication platform';
+	private static $MATCH_FACEBOOK = 'facebookexternalhit';
+	private static $MATCH_BLOGLINES = 'bloglines';
+	private static $MATCH_R6 = 'r6_feedfetcher';
+	private static $MATCH_AOL_FAVICON = 'ee://aol/http';
 	private static $MATCH_YAHOO			= 'slurp';
-	private static $MATCH_YAHOO_FEED	= 'yahoocachesystem';
+	private static $MATCH_YAHOO_FEED = 'yahoocachesystem';
 	private static $MATCH_YANDEX		= 'yandexbot';
 	private static $MATCH_HUAWEI		= 'huaweisymantecspider';
 	private static $MATCH_SOGOU			= 'sogou web spider';
 	private static $MATCH_MLBOT			= 'mlbot';
 	private static $MATCH_NETCRAFT		= 'netcraftsurveyagent';
 	private static $MATCH_TURNITIN		= 'turnitinbot';
-	private static $MATCH_LINKEDINBOT	= 'linkedinbot';
+	private static $MATCH_LINKEDINBOT = 'linkedinbot';
 	private static $MATCH_ABOUT_US		= 'aboutusbot';
 	private static $MATCH_COSMIX		= 'voyager';
 	private static $MATCH_PYCURL		= 'pycurl';
 	private static $MATCH_MAJESTIC		= 'mj12bot';
-	private static $MATCH_GIGABOT		= 'gigabot';
+	private static $MATCH_GIGABOT = 'gigabot';
 	private static $MATCH_ZOOKA			= 'zookabot';
-	private static $MATCH_PANSCIENT		= 'panscient';
+	private static $MATCH_PANSCIENT = 'panscient';
 	private static $MATCH_LIBWWW		= 'libwww-perl';
 	private static $MATCH_DOTBOT		= 'dotbot';
 	private static $MATCH_ARCHIVER		= 'ia_archiver';
-	private static $MATCH_ZEND			= 'zend_http_client';
+	private static $MATCH_ZEND = 'zend_http_client';
 	private static $MATCH_PYTHON		= 'python-urllib';
 	private static $MATCH_JAKARATA		= 'jakarta commons';
 
 	private static $NAME_MOBILE			= 'mobile';
 	private static $NAME_IPHONE			= 'iphone';
-	private static $NAME_WINDOWS_PHONE	= 'windows phone';
+	private static $NAME_WINDOWS_PHONE = 'windows phone';
 	private static $NAME_NOKIA			= 'nokia';
-	private static $NAME_IPOD			= 'ipod';
+	private static $NAME_IPOD = 'ipod';
 	private static $NAME_MAC			= 'macintosh';
 	private static $NAME_WEBTV			= 'webtv';
 	private static $NAME_WII			= 'wii';
@@ -104,30 +104,30 @@ 
 	private static $NAME_WINDOWS_ME		= 'windows me';
 	private static $NAME_WINDOWS_S_03	= 'windows server 2003';
 	private static $NAME_WINDOWS_XP		= 'windows xp';
-	private static $NAME_WINDOWS_VISTA	= 'windows vista';
-	private static $NAME_WINDOWS_7		= 'windows 7';
+	private static $NAME_WINDOWS_VISTA = 'windows vista';
+	private static $NAME_WINDOWS_7 = 'windows 7';
 	private static $NAME_OPENBSD		= 'openbsd';
 	private static $NAME_FREEBSD		= 'freebsd';
 	private static $NAME_SUNOS			= 'sun os';
 	private static $NAME_LINUX			= 'linux';
-	private static $NAME_GOOGLEBOT		= 'googlebot';
-	private static $NAME_GOOGLE_READER	= 'google reader';
-	private static $NAME_GOOGLE_VIEW	= 'google preview';
-	private static $NAME_GOOGLE_DESKTOP	= 'google desktop';
-	private static $NAME_BING			= 'bing';
-	private static $NAME_ASK			= 'ask';
+	private static $NAME_GOOGLEBOT = 'googlebot';
+	private static $NAME_GOOGLE_READER = 'google reader';
+	private static $NAME_GOOGLE_VIEW = 'google preview';
+	private static $NAME_GOOGLE_DESKTOP = 'google desktop';
+	private static $NAME_BING = 'bing';
+	private static $NAME_ASK = 'ask';
 	private static $NAME_EXABOT			= 'exabot';
 	private static $NAME_GEOHASH		= 'geohasher';
-	private static $NAME_POST_RANK		= 'post rank';
+	private static $NAME_POST_RANK = 'post rank';
 	private static $NAME_RADIAN			= 'radian comments';
-	private static $NAME_BAIDU_SPIDER	= 'baidu';
-	private static $NAME_BLEKKO_SPIDER	= 'blekko';
+	private static $NAME_BAIDU_SPIDER = 'baidu';
+	private static $NAME_BLEKKO_SPIDER = 'blekko';
 	private static $NAME_WLA			= 'wla bot';
-	private static $NAME_FACEBOOK		= 'facebook';
-	private static $NAME_BLOGLINES		= 'bloglines';
+	private static $NAME_FACEBOOK = 'facebook';
+	private static $NAME_BLOGLINES = 'bloglines';
 	private static $NAME_R6				= 'r6 feedfetcher';
 	private static $NAME_AOL_FAVICON	= 'aol favicon';
-	private static $NAME_YAHOO			= 'yahoo';
+	private static $NAME_YAHOO = 'yahoo';
 	private static $NAME_YAHOO_FEED		= 'yahoo rss';
 	private static $NAME_YANDEX			= 'yandexbox';
 	private static $NAME_HUAWEI			= 'huawei-symantec';
@@ -135,232 +135,232 @@ 
 	private static $NAME_MLBOT			= 'mlbot';
 	private static $NAME_NETCRAFT		= 'netcraftbot';
 	private static $NAME_TURNITIN		= 'turnitinbot';
-	private static $NAME_LINKEDINBOT	= 'linkedinbot';
+	private static $NAME_LINKEDINBOT = 'linkedinbot';
 	private static $NAME_ABOUT_US		= 'aboutusbot';
 	private static $NAME_COSMIX			= 'cosmixbot';
 	private static $NAME_PYCURL			= 'pycurl';
 	private static $NAME_MAJESTIC		= 'majestic 12';
 	private static $NAME_GIGABOT		= 'gigabot';
-	private static $NAME_ZOOKA			= 'zookabot';
-	private static $NAME_PANSCIENT		= 'panscient';
+	private static $NAME_ZOOKA = 'zookabot';
+	private static $NAME_PANSCIENT = 'panscient';
 	private static $NAME_LIBWWW			= 'libwww-perl';
 	private static $NAME_DOTBOT			= 'dotbot';
 	private static $NAME_ARCHIVER		= 'internet archive';
-	private static $NAME_ZEND			= 'zend';
+	private static $NAME_ZEND = 'zend';
 	private static $NAME_PYTHON			= 'python';
 	private static $NAME_JAKARATA		= 'jakarata';
 	private static $NAME_UNKNOWN		= 'unknown';
 
 	public function getName()
 	{
-		if(stristr($this->user_agent, self::$MATCH_MOBILE))
+		if (stristr($this->user_agent, self::$MATCH_MOBILE))
 			return self::$NAME_MOBILE;
 		
-		if(stristr($this->user_agent, self::$MATCH_IPHONE))
+		if (stristr($this->user_agent, self::$MATCH_IPHONE))
 			return self::$NAME_IPHONE;
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE))
+		if (stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE))
 			return self::$NAME_WINDOWS_PHONE;
 		
-		if(stristr($this->user_agent, self::$MATCH_NOKIA))
+		if (stristr($this->user_agent, self::$MATCH_NOKIA))
 			return self::$NAME_NOKIA;
 		
-		if(stristr($this->user_agent, self::$MATCH_IPOD))
+		if (stristr($this->user_agent, self::$MATCH_IPOD))
 			return self::$NAME_IPOD;
 		
-		if(stristr($this->user_agent, self::$MATCH_MAC))
+		if (stristr($this->user_agent, self::$MATCH_MAC))
 			return self::$NAME_MAC;
 		
-		if(stristr($this->user_agent, self::$MATCH_DARWIN))
+		if (stristr($this->user_agent, self::$MATCH_DARWIN))
 			return self::$NAME_MAC;
 		
-		if(stristr($this->user_agent, self::$MATCH_WEBTV))
+		if (stristr($this->user_agent, self::$MATCH_WEBTV))
 			return self::$NAME_WEBTV;
 		
-		if(stristr($this->user_agent, self::$MATCH_WII))
+		if (stristr($this->user_agent, self::$MATCH_WII))
 			return self::$NAME_WII;
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_3))
+		if (stristr($this->user_agent, self::$MATCH_WINDOWS_3))
 			return self::$NAME_WINDOWS_3;
 		
-		foreach(self::$MATCH_WINDOWS_4 as $match)
+		foreach (self::$MATCH_WINDOWS_4 as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_4;
 		}
 		
-		foreach(self::$MATCH_WINDOWS_95 as $match)
+		foreach (self::$MATCH_WINDOWS_95 as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_95;
 		}
 		
-		foreach(self::$MATCH_WINDOWS_98 as $match)
+		foreach (self::$MATCH_WINDOWS_98 as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_98;
 		}
 		
-		foreach(self::$MATCH_WINDOWS_2000 as $match)
+		foreach (self::$MATCH_WINDOWS_2000 as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_2000;
 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_ME))
+		if (stristr($this->user_agent, self::$MATCH_WINDOWS_ME))
 			return self::$NAME_WINDOWS_ME;
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_S_03))
+		if (stristr($this->user_agent, self::$MATCH_WINDOWS_S_03))
 			return self::$NAME_WINDOWS_S_03;
 		
-		foreach(self::$MATCH_WINDOWS_XP as $match)
+		foreach (self::$MATCH_WINDOWS_XP as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_XP;
 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA))
+		if (stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA))
 			return self::$NAME_WINDOWS_VISTA;
 		
-		foreach(self::$MATCH_WINDOWS_7 as $match)
+		foreach (self::$MATCH_WINDOWS_7 as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_WINDOWS_7;
 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_OPENBSD))
+		if (stristr($this->user_agent, self::$MATCH_OPENBSD))
 			return self::$NAME_OPENBSD;
 		
-		if(stristr($this->user_agent, self::$MATCH_FREEBSD))
+		if (stristr($this->user_agent, self::$MATCH_FREEBSD))
 			return self::$NAME_FREEBSD;
 		
-		if(stristr($this->user_agent, self::$MATCH_SUNOS))
+		if (stristr($this->user_agent, self::$MATCH_SUNOS))
 			return self::$NAME_SUNOS;
 		
-		foreach(self::$MATCH_LINUX as $match)
+		foreach (self::$MATCH_LINUX as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_LINUX;
 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLEBOT))
+		if (stristr($this->user_agent, self::$MATCH_GOOGLEBOT))
 			return self::$NAME_GOOGLEBOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_READER))
+		if (stristr($this->user_agent, self::$MATCH_GOOGLE_READER))
 			return self::$NAME_GOOGLE_READER;
 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW))
+		if (stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW))
 			return self::$NAME_GOOGLE_VIEW;
 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_DESK))
+		if (stristr($this->user_agent, self::$MATCH_GOOGLE_DESK))
 			return self::$NAME_GOOGLE_DESKTOP;
 		
-		foreach(self::$MATCH_BING as $match)
+		foreach (self::$MATCH_BING as $match)
 		{
-			if(stristr($this->user_agent, $match))
+			if (stristr($this->user_agent, $match))
 				return self::$NAME_BING;
 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_ASK))
+		if (stristr($this->user_agent, self::$MATCH_ASK))
 			return self::$NAME_ASK;
 		
-		if(stristr($this->user_agent, self::$MATCH_EXABOT))
+		if (stristr($this->user_agent, self::$MATCH_EXABOT))
 			return self::$NAME_EXABOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_GEOHASH))
+		if (stristr($this->user_agent, self::$MATCH_GEOHASH))
 			return self::$NAME_GEOHASH;
 		
-		if(stristr($this->user_agent, self::$MATCH_POST_RANK))
+		if (stristr($this->user_agent, self::$MATCH_POST_RANK))
 			return self::$NAME_POST_RANK;
 		
-		if(stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER))
+		if (stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER))
 			return self::$NAME_BAIDU_SPIDER;
 		
-		if(stristr($this->user_agent, self::$MATCH_RADIAN))
+		if (stristr($this->user_agent, self::$MATCH_RADIAN))
 			return self::$NAME_RADIAN;
 		
-		if(stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER))
+		if (stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER))
 			return self::$NAME_BLEKKO_SPIDER;
 		
-		if(stristr($this->user_agent, self::$MATCH_WLA))
+		if (stristr($this->user_agent, self::$MATCH_WLA))
 			return self::$NAME_WLA;
 		
-		if(stristr($this->user_agent, self::$MATCH_FACEBOOK))
+		if (stristr($this->user_agent, self::$MATCH_FACEBOOK))
 			return self::$NAME_FACEBOOK;
 		
-		if(stristr($this->user_agent, self::$MATCH_BLOGLINES))
+		if (stristr($this->user_agent, self::$MATCH_BLOGLINES))
 			return self::$NAME_BLOGLINES;
 		
-		if(stristr($this->user_agent, self::$MATCH_R6))
+		if (stristr($this->user_agent, self::$MATCH_R6))
 			return self::$NAME_R6;
 		
-		if(stristr($this->user_agent, self::$MATCH_AOL_FAVICON))
+		if (stristr($this->user_agent, self::$MATCH_AOL_FAVICON))
 			return self::$NAME_AOL_FAVICON;
 		
-		if(stristr($this->user_agent, self::$MATCH_YAHOO))
+		if (stristr($this->user_agent, self::$MATCH_YAHOO))
 			return self::$NAME_YAHOO;
 		
-		if(stristr($this->user_agent, self::$MATCH_YAHOO_FEED))
+		if (stristr($this->user_agent, self::$MATCH_YAHOO_FEED))
 			return self::$NAME_YAHOO_FEED;
 		
-		if(stristr($this->user_agent, self::$MATCH_YANDEX))
+		if (stristr($this->user_agent, self::$MATCH_YANDEX))
 			return self::$NAME_YANDEX;
 		
-		if(stristr($this->user_agent, self::$MATCH_HUAWEI))
+		if (stristr($this->user_agent, self::$MATCH_HUAWEI))
 			return self::$NAME_HUAWEI;
 		
-		if(stristr($this->user_agent, self::$MATCH_SOGOU))
+		if (stristr($this->user_agent, self::$MATCH_SOGOU))
 			return self::$NAME_SOGOU;
 		
-		if(stristr($this->user_agent, self::$MATCH_MLBOT))
+		if (stristr($this->user_agent, self::$MATCH_MLBOT))
 			return self::$NAME_MLBOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_NETCRAFT))
+		if (stristr($this->user_agent, self::$MATCH_NETCRAFT))
 			return self::$NAME_NETCRAFT;
 		
-		if(stristr($this->user_agent, self::$MATCH_TURNITIN))
+		if (stristr($this->user_agent, self::$MATCH_TURNITIN))
 			return self::$NAME_TURNITIN;
 		
-		if(stristr($this->user_agent, self::$MATCH_LINKEDINBOT))
+		if (stristr($this->user_agent, self::$MATCH_LINKEDINBOT))
 			return self::$NAME_LINKEDINBOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_ABOUT_US))
+		if (stristr($this->user_agent, self::$MATCH_ABOUT_US))
 			return self::$NAME_ABOUT_US;
 		
-		if(stristr($this->user_agent, self::$MATCH_COSMIX))
+		if (stristr($this->user_agent, self::$MATCH_COSMIX))
 			return self::$NAME_COSMIX;
 		
-		if(stristr($this->user_agent, self::$MATCH_PYCURL))
+		if (stristr($this->user_agent, self::$MATCH_PYCURL))
 			return self::$NAME_PYCURL;
 		
-		if(stristr($this->user_agent, self::$MATCH_MAJESTIC))
+		if (stristr($this->user_agent, self::$MATCH_MAJESTIC))
 			return self::$NAME_MAJESTIC;
 		
-		if(stristr($this->user_agent, self::$MATCH_GIGABOT))
+		if (stristr($this->user_agent, self::$MATCH_GIGABOT))
 			return self::$NAME_GIGABOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_ZOOKA))
+		if (stristr($this->user_agent, self::$MATCH_ZOOKA))
 			return self::$NAME_ZOOKA;
 		
-		if(stristr($this->user_agent, self::$MATCH_PANSCIENT))
+		if (stristr($this->user_agent, self::$MATCH_PANSCIENT))
 			return self::$NAME_PANSCIENT;
 		
-		if(stristr($this->user_agent, self::$MATCH_LIBWWW))
+		if (stristr($this->user_agent, self::$MATCH_LIBWWW))
 			return self::$NAME_LIBWWW;
 		
-		if(stristr($this->user_agent, self::$MATCH_DOTBOT))
+		if (stristr($this->user_agent, self::$MATCH_DOTBOT))
 			return self::$NAME_DOTBOT;
 		
-		if(stristr($this->user_agent, self::$MATCH_ARCHIVER))
+		if (stristr($this->user_agent, self::$MATCH_ARCHIVER))
 			return self::$NAME_ARCHIVER;
 		
-		if(stristr($this->user_agent, self::$MATCH_ZEND))
+		if (stristr($this->user_agent, self::$MATCH_ZEND))
 			return self::$NAME_ZEND;
 		
-		if(stristr($this->user_agent, self::$MATCH_PYTHON))
+		if (stristr($this->user_agent, self::$MATCH_PYTHON))
 			return self::$NAME_PYTHON;
 		
-		if(stristr($this->user_agent, self::$MATCH_JAKARATA))
+		if (stristr($this->user_agent, self::$MATCH_JAKARATA))
 			return self::$NAME_JAKARATA;
 		
 		return self::$NAME_UNKNOWN;

Braces +186 added lines, -124 removed lines

@@ -153,215 +153,277 @@
 
 	public function getName()
 	{
-		if(stristr($this->user_agent, self::$MATCH_MOBILE))
-			return self::$NAME_MOBILE;
+		if(stristr($this->user_agent, self::$MATCH_MOBILE)) {

+					return self::$NAME_MOBILE;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_IPHONE))
-			return self::$NAME_IPHONE;
+		if(stristr($this->user_agent, self::$MATCH_IPHONE)) {

+					return self::$NAME_IPHONE;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE))
-			return self::$NAME_WINDOWS_PHONE;
+		if(stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE)) {

+					return self::$NAME_WINDOWS_PHONE;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_NOKIA))
-			return self::$NAME_NOKIA;
+		if(stristr($this->user_agent, self::$MATCH_NOKIA)) {

+					return self::$NAME_NOKIA;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_IPOD))
-			return self::$NAME_IPOD;
+		if(stristr($this->user_agent, self::$MATCH_IPOD)) {

+					return self::$NAME_IPOD;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_MAC))
-			return self::$NAME_MAC;
+		if(stristr($this->user_agent, self::$MATCH_MAC)) {

+					return self::$NAME_MAC;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_DARWIN))
-			return self::$NAME_MAC;
+		if(stristr($this->user_agent, self::$MATCH_DARWIN)) {

+					return self::$NAME_MAC;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WEBTV))
-			return self::$NAME_WEBTV;
+		if(stristr($this->user_agent, self::$MATCH_WEBTV)) {

+					return self::$NAME_WEBTV;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WII))
-			return self::$NAME_WII;
+		if(stristr($this->user_agent, self::$MATCH_WII)) {

+					return self::$NAME_WII;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_3))
-			return self::$NAME_WINDOWS_3;
+		if(stristr($this->user_agent, self::$MATCH_WINDOWS_3)) {

+					return self::$NAME_WINDOWS_3;

+		}

 		
 		foreach(self::$MATCH_WINDOWS_4 as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_4;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_4;

+			}

 		}
 		
 		foreach(self::$MATCH_WINDOWS_95 as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_95;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_95;

+			}

 		}
 		
 		foreach(self::$MATCH_WINDOWS_98 as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_98;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_98;

+			}

 		}
 		
 		foreach(self::$MATCH_WINDOWS_2000 as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_2000;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_2000;

+			}

 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_ME))
-			return self::$NAME_WINDOWS_ME;
+		if(stristr($this->user_agent, self::$MATCH_WINDOWS_ME)) {

+					return self::$NAME_WINDOWS_ME;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_S_03))
-			return self::$NAME_WINDOWS_S_03;
+		if(stristr($this->user_agent, self::$MATCH_WINDOWS_S_03)) {

+					return self::$NAME_WINDOWS_S_03;

+		}

 		
 		foreach(self::$MATCH_WINDOWS_XP as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_XP;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_XP;

+			}

 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA))
-			return self::$NAME_WINDOWS_VISTA;
+		if(stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA)) {

+					return self::$NAME_WINDOWS_VISTA;

+		}

 		
 		foreach(self::$MATCH_WINDOWS_7 as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_WINDOWS_7;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_WINDOWS_7;

+			}

 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_OPENBSD))
-			return self::$NAME_OPENBSD;
+		if(stristr($this->user_agent, self::$MATCH_OPENBSD)) {

+					return self::$NAME_OPENBSD;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_FREEBSD))
-			return self::$NAME_FREEBSD;
+		if(stristr($this->user_agent, self::$MATCH_FREEBSD)) {

+					return self::$NAME_FREEBSD;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_SUNOS))
-			return self::$NAME_SUNOS;
+		if(stristr($this->user_agent, self::$MATCH_SUNOS)) {

+					return self::$NAME_SUNOS;

+		}

 		
 		foreach(self::$MATCH_LINUX as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_LINUX;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_LINUX;

+			}

 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLEBOT))
-			return self::$NAME_GOOGLEBOT;
+		if(stristr($this->user_agent, self::$MATCH_GOOGLEBOT)) {

+					return self::$NAME_GOOGLEBOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_READER))
-			return self::$NAME_GOOGLE_READER;
+		if(stristr($this->user_agent, self::$MATCH_GOOGLE_READER)) {

+					return self::$NAME_GOOGLE_READER;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW))
-			return self::$NAME_GOOGLE_VIEW;
+		if(stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW)) {

+					return self::$NAME_GOOGLE_VIEW;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_GOOGLE_DESK))
-			return self::$NAME_GOOGLE_DESKTOP;
+		if(stristr($this->user_agent, self::$MATCH_GOOGLE_DESK)) {

+					return self::$NAME_GOOGLE_DESKTOP;

+		}

 		
 		foreach(self::$MATCH_BING as $match)
 		{
-			if(stristr($this->user_agent, $match))
-				return self::$NAME_BING;
+			if(stristr($this->user_agent, $match)) {

+							return self::$NAME_BING;

+			}

 		}
 		
-		if(stristr($this->user_agent, self::$MATCH_ASK))
-			return self::$NAME_ASK;
+		if(stristr($this->user_agent, self::$MATCH_ASK)) {

+					return self::$NAME_ASK;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_EXABOT))
-			return self::$NAME_EXABOT;
+		if(stristr($this->user_agent, self::$MATCH_EXABOT)) {

+					return self::$NAME_EXABOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_GEOHASH))
-			return self::$NAME_GEOHASH;
+		if(stristr($this->user_agent, self::$MATCH_GEOHASH)) {

+					return self::$NAME_GEOHASH;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_POST_RANK))
-			return self::$NAME_POST_RANK;
+		if(stristr($this->user_agent, self::$MATCH_POST_RANK)) {

+					return self::$NAME_POST_RANK;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER))
-			return self::$NAME_BAIDU_SPIDER;
+		if(stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER)) {

+					return self::$NAME_BAIDU_SPIDER;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_RADIAN))
-			return self::$NAME_RADIAN;
+		if(stristr($this->user_agent, self::$MATCH_RADIAN)) {

+					return self::$NAME_RADIAN;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER))
-			return self::$NAME_BLEKKO_SPIDER;
+		if(stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER)) {

+					return self::$NAME_BLEKKO_SPIDER;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_WLA))
-			return self::$NAME_WLA;
+		if(stristr($this->user_agent, self::$MATCH_WLA)) {

+					return self::$NAME_WLA;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_FACEBOOK))
-			return self::$NAME_FACEBOOK;
+		if(stristr($this->user_agent, self::$MATCH_FACEBOOK)) {

+					return self::$NAME_FACEBOOK;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_BLOGLINES))
-			return self::$NAME_BLOGLINES;
+		if(stristr($this->user_agent, self::$MATCH_BLOGLINES)) {

+					return self::$NAME_BLOGLINES;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_R6))
-			return self::$NAME_R6;
+		if(stristr($this->user_agent, self::$MATCH_R6)) {

+					return self::$NAME_R6;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_AOL_FAVICON))
-			return self::$NAME_AOL_FAVICON;
+		if(stristr($this->user_agent, self::$MATCH_AOL_FAVICON)) {

+					return self::$NAME_AOL_FAVICON;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_YAHOO))
-			return self::$NAME_YAHOO;
+		if(stristr($this->user_agent, self::$MATCH_YAHOO)) {

+					return self::$NAME_YAHOO;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_YAHOO_FEED))
-			return self::$NAME_YAHOO_FEED;
+		if(stristr($this->user_agent, self::$MATCH_YAHOO_FEED)) {

+					return self::$NAME_YAHOO_FEED;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_YANDEX))
-			return self::$NAME_YANDEX;
+		if(stristr($this->user_agent, self::$MATCH_YANDEX)) {

+					return self::$NAME_YANDEX;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_HUAWEI))
-			return self::$NAME_HUAWEI;
+		if(stristr($this->user_agent, self::$MATCH_HUAWEI)) {

+					return self::$NAME_HUAWEI;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_SOGOU))
-			return self::$NAME_SOGOU;
+		if(stristr($this->user_agent, self::$MATCH_SOGOU)) {

+					return self::$NAME_SOGOU;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_MLBOT))
-			return self::$NAME_MLBOT;
+		if(stristr($this->user_agent, self::$MATCH_MLBOT)) {

+					return self::$NAME_MLBOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_NETCRAFT))
-			return self::$NAME_NETCRAFT;
+		if(stristr($this->user_agent, self::$MATCH_NETCRAFT)) {

+					return self::$NAME_NETCRAFT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_TURNITIN))
-			return self::$NAME_TURNITIN;
+		if(stristr($this->user_agent, self::$MATCH_TURNITIN)) {

+					return self::$NAME_TURNITIN;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_LINKEDINBOT))
-			return self::$NAME_LINKEDINBOT;
+		if(stristr($this->user_agent, self::$MATCH_LINKEDINBOT)) {

+					return self::$NAME_LINKEDINBOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_ABOUT_US))
-			return self::$NAME_ABOUT_US;
+		if(stristr($this->user_agent, self::$MATCH_ABOUT_US)) {

+					return self::$NAME_ABOUT_US;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_COSMIX))
-			return self::$NAME_COSMIX;
+		if(stristr($this->user_agent, self::$MATCH_COSMIX)) {

+					return self::$NAME_COSMIX;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_PYCURL))
-			return self::$NAME_PYCURL;
+		if(stristr($this->user_agent, self::$MATCH_PYCURL)) {

+					return self::$NAME_PYCURL;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_MAJESTIC))
-			return self::$NAME_MAJESTIC;
+		if(stristr($this->user_agent, self::$MATCH_MAJESTIC)) {

+					return self::$NAME_MAJESTIC;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_GIGABOT))
-			return self::$NAME_GIGABOT;
+		if(stristr($this->user_agent, self::$MATCH_GIGABOT)) {

+					return self::$NAME_GIGABOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_ZOOKA))
-			return self::$NAME_ZOOKA;
+		if(stristr($this->user_agent, self::$MATCH_ZOOKA)) {

+					return self::$NAME_ZOOKA;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_PANSCIENT))
-			return self::$NAME_PANSCIENT;
+		if(stristr($this->user_agent, self::$MATCH_PANSCIENT)) {

+					return self::$NAME_PANSCIENT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_LIBWWW))
-			return self::$NAME_LIBWWW;
+		if(stristr($this->user_agent, self::$MATCH_LIBWWW)) {

+					return self::$NAME_LIBWWW;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_DOTBOT))
-			return self::$NAME_DOTBOT;
+		if(stristr($this->user_agent, self::$MATCH_DOTBOT)) {

+					return self::$NAME_DOTBOT;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_ARCHIVER))
-			return self::$NAME_ARCHIVER;
+		if(stristr($this->user_agent, self::$MATCH_ARCHIVER)) {

+					return self::$NAME_ARCHIVER;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_ZEND))
-			return self::$NAME_ZEND;
+		if(stristr($this->user_agent, self::$MATCH_ZEND)) {

+					return self::$NAME_ZEND;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_PYTHON))
-			return self::$NAME_PYTHON;
+		if(stristr($this->user_agent, self::$MATCH_PYTHON)) {

+					return self::$NAME_PYTHON;

+		}

 		
-		if(stristr($this->user_agent, self::$MATCH_JAKARATA))
-			return self::$NAME_JAKARATA;
+		if(stristr($this->user_agent, self::$MATCH_JAKARATA)) {

+					return self::$NAME_JAKARATA;

+		}

 		
 		return self::$NAME_UNKNOWN;
 	}

utility/Search.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -39,20 +39,20 @@ 
 	public function perform()
 	{
 		$weighted_array = array();
-		foreach($this->result as $row)
+		foreach ($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
+			if ($weight > 0)
 				$weighted_array[$row->id] = $weight;
 		}
 		arsort($weighted_array);
 		
 		$final_array = array();
-		foreach($weighted_array as $id => $weight)
+		foreach ($weighted_array as $id => $weight)
 		{
-			foreach($this->result as $row)
+			foreach ($this->result as $row)
 			{
-				if($row->id == $id)
+				if ($row->id == $id)
 					$final_array[] = $row;
 			}
 		}
@@ -62,7 +62,7 @@ 
 	private function get_search_weight($row)
 	{
 		$weight = 0;
-		foreach($this->weight as $weight_array)
+		foreach ($this->weight as $weight_array)
 		{
 			$text = $row->{$weight_array['field']};
 			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 		foreach($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
-				$weighted_array[$row->id] = $weight;
+			if($weight > 0) {

+							$weighted_array[$row->id] = $weight;

+			}

 		}
 		arsort($weighted_array);
 		
@@ -52,8 +53,9 @@ 
 		{
 			foreach($this->result as $row)
 			{
-				if($row->id == $id)
-					$final_array[] = $row;
+				if($row->id == $id) {

+									$final_array[] = $row;

+				}

 			}
 		}
 		return $final_array;

controller/lifestream/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,11 @@
 	final private function get_list_posts()
 	{
 		$post_array = array();
-		foreach($this->get_list_results() as $post)
+		foreach ($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
 			$this->eject();
 		return $post_array;
 	}

Braces +3 added lines, -2 removed lines

@@ -60,8 +60,9 @@
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;
 	}
 

controller/home/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 	public function __construct()
 	{
-        global $config;
+		global $config;
 		$this->headers['From'] = self::$FROM;
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_result['email'] = 'please enter a valid email';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

bootstrap.php

Indentation +26 added lines, -26 removed lines

@@ -7,7 +7,7 @@ 
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load config");
+	throw new RuntimeException("Could not load config");
 }
 $config = fread($handle, filesize($config_path));
 fclose($handle);
@@ -15,40 +15,40 @@ 
 $config = json_decode($config);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse config - JSON error detected");
+	throw new RuntimeException("Could not parse config - JSON error detected");
 }
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($config) {
-    $connection = $config->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($config) {
-    $connection = $config->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($config) {
-    $connection = $config->database->slave;
-    $pdo = new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
-
-    $profiler = new Aura\Sql\Profiler();
-    $profiler->setActive(true);
-    $pdo->setProfiler($profiler);
-
-    return $pdo;
+	$connection = $config->database->slave;
+	$pdo = new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
+
+	$profiler = new Aura\Sql\Profiler();
+	$profiler->setActive(true);
+	$pdo->setProfiler($profiler);
+
+	return $pdo;
 });
 
 // setup the service locator

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($config) {
+$db_connections->setDefault(function() use ($config) {
     $connection = $config->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -28,7 +28,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($config) {
+$db_connections->setWrite('master', function() use ($config) {
     $connection = $config->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -36,7 +36,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($config) {
+$db_connections->setRead('slave', function() use ($config) {
     $connection = $config->database->slave;
     $pdo = new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",

src/Domain/Stream/YouTube/MysqlYouTubeRepository.php

Doc Comments +1 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     protected $connections;
 
     /**
-     * @param ConnectonLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {
@@ -41,7 +41,6 @@ 
     }
 
     /**
-     * @param string $title
      *
      * @return array|false
      */

Indentation +52 added lines, -52 removed lines

@@ -7,75 +7,75 @@
 class MysqlYouTubeRepository implements YouTubeRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $id
-     *
-     * @return array|false
-     */
-    public function getYouTubeById($id)
-    {
-        $query = "
+	/**
+	 * @param integer $id
+	 *
+	 * @return array|false
+	 */
+	public function getYouTubeById($id)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `id` = :id
             LIMIT 1";
-        $bindings = [
-            'id' => $id,
-        ];
+		$bindings = [
+			'id' => $id,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    /**
-     * @param string $title
-     *
-     * @return array|false
-     */
-    public function getYouTubeByVideoId($videoId)
-    {
-        $query = "
+	/**
+	 * @param string $title
+	 *
+	 * @return array|false
+	 */
+	public function getYouTubeByVideoId($videoId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `video_id` = :video_id
             LIMIT 1";
-        $bindings = [
-            'video_id' => $videoId,
-        ];
+		$bindings = [
+			'video_id' => $videoId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    /**
-     * @return array|false
-     */
-    public function getUnmappedYouTubes()
-    {
-        $query = "
+	/**
+	 * @return array|false
+	 */
+	public function getUnmappedYouTubes()
+	{
+		$query = "
             SELECT `id`, `date`
             FROM `jpemeric_stream`.`youtube`
             LEFT JOIN `jpemeric_stream`.`post`
             ON `post`.`type_id` = `youtube`.`id` AND `post`.`id` IS NULL";
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 }

controller/lifestream/DefaultPageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
   public function __construct()
   {
-    parent::__construct();
+	parent::__construct();
 
-    global $container;
-    $this->postRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
+	global $container;
+	$this->postRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
   }
 
 	protected function set_head_data()

controller/lifestream/PostController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
+		if (!$id || !is_numeric($id))
 			$this->eject();
 		
 		$post = $this->postRepository->getPostById($id);
-		if(!$post)
+		if (!$post)
 			$this->eject();
 		
-		if(URLDecode::getPiece(1) != $post['type'])
+		if (URLDecode::getPiece(1) != $post['type'])
 			$this->eject();
 		
 		$this->post = $post;
@@ -59,7 +59,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Jacob blogged';
@@ -84,7 +84,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';

Braces +9 added lines, -6 removed lines

@@ -20,15 +20,18 @@
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		
 		$post = $this->postRepository->getPostById($id);
-		if(!$post)
-			$this->eject();
+		if(!$post) {

+					$this->eject();

+		}

 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+		if(URLDecode::getPiece(1) != $post['type']) {

+					$this->eject();

+		}

 		
 		$this->post = $post;
 	}