jacobemerick / web

utility/cron/StreamCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -61,10 +61,10 @@ 
 

 	private function remove_existing($result, $type)

 	{

-		foreach($result as $key => $row)

+		foreach ($result as $key => $row)

 		{

 			$stream_result = ActivityCollector::getPostByFields($row->id, $type);

-			if($stream_result)

+			if ($stream_result)

 				unset($result[$key]);

 		}

 		return $result;

@@ -72,7 +72,7 @@ 
 

 	private function add_posts($result, $type)

 	{

-		foreach($result as $row)

+		foreach ($result as $row)

 		{

 			$query = sprintf(self::$QUERY, $type, $row->id, $row->date);

 			Database::execute($query);

utility/cron/TwitterCron.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
 	private $oauth_array;

 	private function get_oauth_array()

 	{

-		if(!isset($this->oauth_array))

+		if (!isset($this->oauth_array))

 		{

 			$this->oauth_array = array(

 				'screen_name' => self::$SCREEN_NAME,

@@ -116,7 +116,7 @@ 
 	{

 		$encoded_array = array();

 		ksort($array);

-		foreach($array as $key => $value)

+		foreach ($array as $key => $value)

 		{

 			$value = rawurlencode($value);

 			$value = ($wrap_values) ? '"' . $value . '"' : $value;

@@ -127,27 +127,27 @@ 
 

 	public function activate()

 	{

-		if(!$this->json)

+		if (!$this->json)

 			return $this->error('Could not connect to twitter json feed.');

 		

 		$count = 0;

-		foreach($this->json as $status)

+		foreach ($this->json as $status)

 		{

 			$text = Database::escape($status->text);

 			$date = date('Y-m-d H:i:s', strtotime($status->created_at));

 			

 			$tweet_result = TwitterCollector::getTweetByFields($date, $text);

-			if($tweet_result !== null)

+			if ($tweet_result !== null)

 			{

 				$favorites = (int) $status->favorite_count;

-				if($favorites != 0 && $tweet_result->favorites != $favorites)

+				if ($favorites != 0 && $tweet_result->favorites != $favorites)

 				{

 					$query = sprintf(self::$UPDATE_FAVORITES_QUERY, $favorites, $tweet_result->id);

 					Database::execute($query);

 				}

 				

 				$retweets = (int) $status->retweet_count;

-				if($retweets != 0 && $tweet_result->retweets != $retweets)

+				if ($retweets != 0 && $tweet_result->retweets != $retweets)

 				{

 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);

 					Database::execute($query);

@@ -157,7 +157,7 @@ 
 			{

 				$twitter_id = (string) $status->id_str;

 				

-				if(isset($status->retweeted_status))

+				if (isset($status->retweeted_status))

 				{

 					$text_formatted = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities);

 					$text_formatted_full = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities, 'full');

@@ -200,9 +200,9 @@ 
 

 	private function get_source($source)

 	{

-		if(stristr($source, 'tweetdeck'))

+		if (stristr($source, 'tweetdeck'))

 			return 'tweetdeck';

-		if(stristr($source, 'windows phone'))

+		if (stristr($source, 'windows phone'))

 			return 'phone';

 		else

 			return '';

@@ -211,9 +211,9 @@ 
 	private function get_formatted($text, $entities, $type = 'short')

 	{

 		$holder = array();

-		foreach($entities as $entity_type => $entity_collection)

+		foreach ($entities as $entity_type => $entity_collection)

 		{

-			foreach($entity_collection as $entity)

+			foreach ($entity_collection as $entity)

 			{

 				$start = $entity->indices[0];

 				$end = $entity->indices[1];

@@ -228,7 +228,7 @@ 
 		

 		krsort($holder);

 		

-		foreach($holder as $entity)

+		foreach ($holder as $entity)

 		{

 			$text = mb_substr($text, 0, $entity->start, 'UTF-8') . $entity->replace . mb_substr($text, $entity->end, 5000, 'UTF-8');

 		}

@@ -241,7 +241,7 @@ 
 

 	private function get_replace_text($entity_type, $entity, $type)

 	{

-		switch($entity_type)

+		switch ($entity_type)

 		{

 			case 'hashtags' :

 				$replace = sprintf(self::$HASHTAG_LINK, $entity->text);

@@ -253,7 +253,7 @@ 
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);

 				break;

 			case 'media' :

-				if($type == 'full')

+				if ($type == 'full')

 					$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);

 				else

 					$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);

utility/cron/YouTubeCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -20,18 +20,18 @@
 

 	public function activate()

 	{

-		if(!$this->xml)

+		if (!$this->xml)

 			return $this->error('Could not connect to youtube xml feed.');

 		

 		$count = 0;

-		foreach($this->xml->entry as $entry)

+		foreach ($this->xml->entry as $entry)

 		{

 			$video_id = $entry->id;

 			$video_id = explode('/', $video_id);

 			$video_id = array_pop($video_id);

 			

 			$video_exists = YouTubeCollector::checkForVideoByVideoID($video_id);

-			if($video_exists)

+			if ($video_exists)

 				continue;

 			

 			$title = Database::escape($entry->title);

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;

 		}

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;

utility/pqp/Display.class.inc.php

Spacing +55 added lines, -55 removed lines

@@ -568,42 +568,42 @@ 
 

 echo '<div id="pqp-console" class="pqp-box">';

 

-if($logCount ==  0) {

+if ($logCount == 0) {

 	echo '<h3>This panel has no log items.</h3>';

 }

 else {

 	echo '<table class="side" cellspacing="0">

 		<tr>

-			<td class="alt1"><var>'.$output['logs']['log_count'].'</var><h4>Logs</h4></td>

-			<td class="alt2"><var>'.$output['logs']['error_count'].'</var> <h4>Errors</h4></td>

+			<td class="alt1"><var>'.$output['logs']['log_count'] . '</var><h4>Logs</h4></td>

+			<td class="alt2"><var>'.$output['logs']['error_count'] . '</var> <h4>Errors</h4></td>

 		</tr>

 		<tr>

-			<td class="alt3"><var>'.$output['logs']['memory_count'].'</var> <h4>Memory</h4></td>

-			<td class="alt4"><var>'.$output['logs']['speed_count'].'</var> <h4>Speed</h4></td>

+			<td class="alt3"><var>'.$output['logs']['memory_count'] . '</var> <h4>Memory</h4></td>

+			<td class="alt4"><var>'.$output['logs']['speed_count'] . '</var> <h4>Speed</h4></td>

 		</tr>

 		</table>

 		<table class="main" cellspacing="0">';

 		

 		$class = '';

-		foreach($output['logs']['debugger_log'] as $log) {

-			echo '<tr class="log-'.$log['type'].'">

-				<td class="type">'.$log['type'].'</td>

-				<td class="'.$class.'">';

-			if($log['type'] == 'log') {

-				echo '<div><pre>'.$log['data'].'</pre></div>';

+		foreach ($output['logs']['debugger_log'] as $log) {

+			echo '<tr class="log-' . $log['type'] . '">

+				<td class="type">'.$log['type'] . '</td>

+				<td class="'.$class . '">';

+			if ($log['type'] == 'log') {

+				echo '<div><pre>' . $log['data'] . '</pre></div>';

 			}

-			elseif($log['type'] == 'memory') {

-				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['dataType'].'</em>: '.$log['name'].' </div>';

+			elseif ($log['type'] == 'memory') {

+				echo '<div><pre>' . $log['data'] . '</pre> <em>' . $log['dataType'] . '</em>: ' . $log['name'] . ' </div>';

 			}

-			elseif($log['type'] == 'speed') {

-				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';

+			elseif ($log['type'] == 'speed') {

+				echo '<div><pre>' . $log['data'] . '</pre> <em>' . $log['name'] . '</em></div>';

 			}

-			elseif($log['type'] == 'error') {

-				echo '<div><em>Line '.$log['line'].'</em> : '.$log['data'].' <pre>'.$log['file'].'</pre></div>';

+			elseif ($log['type'] == 'error') {

+				echo '<div><em>Line ' . $log['line'] . '</em> : ' . $log['data'] . ' <pre>' . $log['file'] . '</pre></div>';

 			}

 		

 			echo '</td></tr>';

-			if($class == '') $class = 'alt';

+			if ($class == '') $class = 'alt';

 			else $class = '';

 		}

 			

@@ -614,24 +614,24 @@ 
 

 echo '<div id="pqp-speed" class="pqp-box">';

 

-if($output['logs']['speedCount'] ==  0) {

+if ($output['logs']['speedCount'] == 0) {

 	echo '<h3>This panel has no log items.</h3>';

 }

 else {

 	echo '<table class="side" cellspacing="0">

-		  <tr><td><var>'.$output['speedTotals']['total'].'</var><h4>Load Time</h4></td></tr>

-		  <tr><td class="alt"><var>'.$output['speedTotals']['allowed'].'</var> <h4>Max Execution Time</h4></td></tr>

+		  <tr><td><var>'.$output['speedTotals']['total'] . '</var><h4>Load Time</h4></td></tr>

+		  <tr><td class="alt"><var>'.$output['speedTotals']['allowed'] . '</var> <h4>Max Execution Time</h4></td></tr>

 		 </table>

 		<table class="main" cellspacing="0">';

 		

 		$class = '';

-		foreach($output['logs']['console'] as $log) {

-			if($log['type'] == 'speed') {

-				echo '<tr class="log-'.$log['type'].'">

-				<td class="'.$class.'">';

-				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';

+		foreach ($output['logs']['console'] as $log) {

+			if ($log['type'] == 'speed') {

+				echo '<tr class="log-' . $log['type'] . '">

+				<td class="'.$class . '">';

+				echo '<div><pre>' . $log['data'] . '</pre> <em>' . $log['name'] . '</em></div>';

 				echo '</td></tr>';

-				if($class == '') $class = 'alt';

+				if ($class == '') $class = 'alt';

 				else $class = '';

 			}

 		}

@@ -643,32 +643,32 @@ 
 

 echo '<div id="pqp-queries" class="pqp-box">';

 

-if($output['queryTotals']['count'] ==  0) {

+if ($output['queryTotals']['count'] == 0) {

 	echo '<h3>This panel has no log items.</h3>';

 }

 else {

 	echo '<table class="side" cellspacing="0">

-		  <tr><td><var>'.$output['queryTotals']['count'].'</var><h4>Total Queries</h4></td></tr>

-		  <tr><td class="alt"><var>'.$output['queryTotals']['time'].'</var> <h4>Total Time</h4></td></tr>

+		  <tr><td><var>'.$output['queryTotals']['count'] . '</var><h4>Total Queries</h4></td></tr>

+		  <tr><td class="alt"><var>'.$output['queryTotals']['time'] . '</var> <h4>Total Time</h4></td></tr>

 		  <tr><td><var>0</var> <h4>Duplicates</h4></td></tr>

 		 </table>

 		<table class="main" cellspacing="0">';

 		

 		$class = '';

-		foreach($output['queries'] as $query) {

+		foreach ($output['queries'] as $query) {

 			echo '<tr>

-				<td class="'.$class.'">'.$query['sql'];

-			if($query['explain']) {

+				<td class="'.$class . '">' . $query['sql'];

+			if ($query['explain']) {

 					echo '<em>

-						Possible keys: <b>'.$query['explain']['possible_keys'].'</b> &middot; 

-						Key Used: <b>'.$query['explain']['key'].'</b> &middot; 

-						Type: <b>'.$query['explain']['type'].'</b> &middot; 

-						Rows: <b>'.$query['explain']['rows'].'</b> &middot; 

-						Speed: <b>'.$query['time'].'</b>

+						Possible keys: <b>'.$query['explain']['possible_keys'] . '</b> &middot; 

+						Key Used: <b>'.$query['explain']['key'] . '</b> &middot; 

+						Type: <b>'.$query['explain']['type'] . '</b> &middot; 

+						Rows: <b>'.$query['explain']['rows'] . '</b> &middot; 

+						Speed: <b>'.$query['time'] . '</b>

 					</em>';

 			}

 			echo '</td></tr>';

-			if($class == '') $class = 'alt';

+			if ($class == '') $class = 'alt';

 			else $class = '';

 		}

 			

@@ -679,23 +679,23 @@ 
 

 echo '<div id="pqp-memory" class="pqp-box">';

 

-if($output['logs']['memoryCount'] ==  0) {

+if ($output['logs']['memoryCount'] == 0) {

 	echo '<h3>This panel has no log items.</h3>';

 }

 else {

 	echo '<table class="side" cellspacing="0">

-		  <tr><td><var>'.$output['memoryTotals']['used'].'</var><h4>Used Memory</h4></td></tr>

-		  <tr><td class="alt"><var>'.$output['memoryTotals']['total'].'</var> <h4>Total Available</h4></td></tr>

+		  <tr><td><var>'.$output['memoryTotals']['used'] . '</var><h4>Used Memory</h4></td></tr>

+		  <tr><td class="alt"><var>'.$output['memoryTotals']['total'] . '</var> <h4>Total Available</h4></td></tr>

 		 </table>

 		<table class="main" cellspacing="0">';

 		

 		$class = '';

-		foreach($output['logs']['console'] as $log) {

-			if($log['type'] == 'memory') {

-				echo '<tr class="log-'.$log['type'].'">';

-				echo '<td class="'.$class.'"><b>'.$log['data'].'</b> <em>'.$log['dataType'].'</em>: '.$log['name'].'</td>';

+		foreach ($output['logs']['console'] as $log) {

+			if ($log['type'] == 'memory') {

+				echo '<tr class="log-' . $log['type'] . '">';

+				echo '<td class="' . $class . '"><b>' . $log['data'] . '</b> <em>' . $log['dataType'] . '</em>: ' . $log['name'] . '</td>';

 				echo '</tr>';

-				if($class == '') $class = 'alt';

+				if ($class == '') $class = 'alt';

 				else $class = '';

 			}

 		}

@@ -707,21 +707,21 @@ 
 

 echo '<div id="pqp-files" class="pqp-box">';

 

-if($output['fileTotals']['count'] ==  0) {

+if ($output['fileTotals']['count'] == 0) {

 	echo '<h3>This panel has no log items.</h3>';

 }

 else {

 	echo '<table class="side" cellspacing="0">

-		  	<tr><td><var>'.$output['fileTotals']['count'].'</var><h4>Total Files</h4></td></tr>

-			<tr><td class="alt"><var>'.$output['fileTotals']['size'].'</var> <h4>Total Size</h4></td></tr>

-			<tr><td><var>'.$output['fileTotals']['largest'].'</var> <h4>Largest</h4></td></tr>

+		  	<tr><td><var>'.$output['fileTotals']['count'] . '</var><h4>Total Files</h4></td></tr>

+			<tr><td class="alt"><var>'.$output['fileTotals']['size'] . '</var> <h4>Total Size</h4></td></tr>

+			<tr><td><var>'.$output['fileTotals']['largest'] . '</var> <h4>Largest</h4></td></tr>

 		 </table>

 		<table class="main" cellspacing="0">';

 		

-		$class ='';

-		foreach($output['files'] as $file) {

-			echo '<tr><td class="'.$class.'"><b>'.$file['size'].'</b> '.$file['name'].'</td></tr>';

-			if($class == '') $class = 'alt';

+		$class = '';

+		foreach ($output['files'] as $file) {

+			echo '<tr><td class="' . $class . '"><b>' . $file['size'] . '</b> ' . $file['name'] . '</td></tr>';

+			if ($class == '') $class = 'alt';

 			else $class = '';

 		}

 			

utility/pqp/PhpQuickProfiler.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -27,12 +27,12 @@ 
 	private function get_console_log()

 	{

 		$log = $this->console->getLog();

-		if(!isset($log['debugger_log']))

+		if (!isset($log['debugger_log']))

 			return;

 		

-		foreach($log['debugger_log'] as $key => $log_item)

+		foreach ($log['debugger_log'] as $key => $log_item)

 		{

-			switch($log_item['type'])

+			switch ($log_item['type'])

 			{

 				case 'log' :

 				case 'error' :

@@ -55,7 +55,7 @@ 
 		$included_files = $this->get_files();

 		$file_array = array();

 		

-		foreach($included_files as $file)

+		foreach ($included_files as $file)

 		{

 			$file_size = filesize($file);

 			$file_array[] = array(

@@ -74,11 +74,11 @@ 
 		$total_file_size = 0;

 		$largest_file_size = 0;

 		

-		foreach($included_files as $file)

+		foreach ($included_files as $file)

 		{

 			$file_size = filesize($file);

 			$total_file_size += $file_size;

-			if($file_size > $largest_file_size)

+			if ($file_size > $largest_file_size)

 				$largest_file_size = $file_size;

 		}

 		

@@ -130,15 +130,15 @@ 
 

 	private function get_readable_memory_usage($memory)

 	{

-		foreach(self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

+		foreach (self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

 		{

-			if($memory < 1024)

+			if ($memory < 1024)

 				break;

-			if(count(self::$MEMORY_SIZE_ARRAY) != $key + 1)

+			if (count(self::$MEMORY_SIZE_ARRAY) != $key + 1)

 				$memory /= 1024;

 		}

 		

-		if($memory_size == 'bytes')

+		if ($memory_size == 'bytes')

 			return sprintf('%01d %s', $memory, $memory_size);

 		return sprintf('%01.2f %s', $memory, $memory_size);

 	}

@@ -154,9 +154,9 @@ 
 

 	private function get_readable_time($time)

 	{

-		if($time >= 60000)

+		if ($time >= 60000)

 			return number_format(($time / 60000), 3, '.', '') . ' m';

-		else if($time >= 1000 && $time < 60000)

+		else if ($time >= 1000 && $time < 60000)

 			return number_format(($time / 1000), 3, '.', '') . ' s';

 		else

 			return number_format($time, 3, '.', '') . ' ms';