Inspection of "Some deprecated asset cleanup" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 7e42fe...9ab714 )

by Jacob

created 2015-12-28 22:32 UTC

Status

Braces +18 added lines, -16 removed lines patch added patch discarded remove patch

@@ -127,8 +127,9 @@  discard block
 block discarded – undo
 
 	public function activate()
 	{
-		if(!$this->json)
-			return $this->error('Could not connect to twitter json feed.');
+		if(!$this->json) {
+					return $this->error('Could not connect to twitter json feed.');
+		}
 		
 		$count = 0;
 		foreach($this->json as $status)
@@ -152,8 +153,7 @@  discard block
 block discarded – undo
 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
 					Database::execute($query);
 				}
-			}
-			else
+			} else
 			{
 				$twitter_id = (string) $status->id_str;
 				
@@ -164,8 +164,7 @@  discard block
 block discarded – undo
 					
 					$text_formatted = $this->prepend_original_user($status->retweeted_status->user, $text_formatted);
 					$text_formatted_full = $this->prepend_original_user($status->retweeted_status->user, $text_formatted_full);
-				}
-				else
+				} else
 				{
 					$text_formatted = $this->get_formatted($status->text, $status->entities);
 					$text_formatted_full = $this->get_formatted($status->text, $status->entities, 'full');
@@ -200,12 +199,14 @@  discard block
 block discarded – undo
 
 	private function get_source($source)
 	{
-		if(stristr($source, 'tweetdeck'))
-			return 'tweetdeck';
-		if(stristr($source, 'windows phone'))
-			return 'phone';
-		else
-			return '';
+		if(stristr($source, 'tweetdeck')) {
+					return 'tweetdeck';
+		}
+		if(stristr($source, 'windows phone')) {
+					return 'phone';
+		} else {
+					return '';
+		}
 	}
 
 	private function get_formatted($text, $entities, $type = 'short')
@@ -253,10 +254,11 @@  discard block
 block discarded – undo
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
 				break;
 			case 'media' :
-				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);
+				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);
+				}
 				break;
 			default :
 				$replace = '';

Please login to merge, or discard this patch.

utility/cron/StreamCron.class.inc.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -64,8 +64,9 @@
 block discarded – undo
 		foreach($result as $key => $row)
 		{
 			$stream_result = ActivityCollector::getPostByFields($row->id, $type);
-			if($stream_result)
-				unset($result[$key]);
+			if($stream_result) {
+							unset($result[$key]);
+			}
 		}
 		return $result;
 	}

Please login to merge, or discard this patch.

utility/cron/ErrorCron.class.inc.php 1 patch

Braces +14 added lines, -11 removed lines patch added patch discarded remove patch

@@ -13,10 +13,11 @@  discard block
 block discarded – undo
 
 	function __construct()
 	{
-		if(Loader::isLive())
-			$handle[] = self::$live_root;
-		else
-			$handle[] = self::$test_root;
+		if(Loader::isLive()) {
+					$handle[] = self::$live_root;
+		} else {
+					$handle[] = self::$test_root;
+		}
 		
 		$i = 0;
 		while(isset($handle[$i]))
@@ -27,10 +28,12 @@  discard block
 block discarded – undo
 			{
 				if($file != '.' && $file != '..')
 				{
-					if(is_dir("{$path}/{$file}"))
-						$handle[] = "{$path}/{$file}";
-					if($file == 'error.log')
-						$this->error_files[] = "{$path}/{$file}";
+					if(is_dir("{$path}/{$file}")) {
+											$handle[] = "{$path}/{$file}";
+					}
+					if($file == 'error.log') {
+											$this->error_files[] = "{$path}/{$file}";
+					}
 				}
 			}
 			closedir($fh);
@@ -50,9 +53,9 @@  discard block
 block discarded – undo
 				$contents = file_get_contents($error_file);
 				$message .= "{$error_file}\n{$contents}\n\n";
 			}
-		}
-		else
-			$message = 'No errors found in the flat-files!';
+		} else {
+					$message = 'No errors found in the flat-files!';
+		}
 		
 		$mail = new Mail();
 		$mail->setToAddress('EMAIL', 'Jacob Emerick');

Please login to merge, or discard this patch.

utility/cron/BookCron.class.inc.php 1 patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

@@ -19,13 +19,15 @@  discard block
 block discarded – undo
 
 	public function activate()
 	{
-		if(!$this->xml)
-			return $this->error('Could not connect to feed.');
+		if(!$this->xml) {
+					return $this->error('Could not connect to feed.');
+		}
 		
 		foreach($this->xml->channel->item as $item)
 		{
-			if(strtotime($item->user_read_at) <= 0)
-				continue;
+			if(strtotime($item->user_read_at) <= 0) {
+							continue;
+			}
 			
 			$title = $item->title;
 			$title = trim($title);
@@ -42,8 +44,9 @@  discard block
 block discarded – undo
 			$date_added = date('Y-m-d H:i:s', strtotime($item->user_date_created));
 			
 			$book_result = BookCollector::getBookByFields($title, $author);
-			if($book_result !== null)
-				continue;
+			if($book_result !== null) {
+							continue;
+			}
 			
 			$query = sprintf(self::$QUERY, $title, $author, $link, $description, $image, $date_read, $date_added);
 			Database::execute($query);

Please login to merge, or discard this patch.

utility/cron/DistanceCron.class.inc.php 1 patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -20,8 +20,9 @@  discard block
 block discarded – undo
 
 	public function activate()
 	{
-		if(!$this->json)
-			return $this->error('Could not connect to feed.');
+		if(!$this->json) {
+					return $this->error('Could not connect to feed.');
+		}
 		
 		$count = 0;
 		foreach($this->json->entries as $entry)
@@ -41,8 +42,9 @@  discard block
 block discarded – undo
 			$date = date('Y-m-d H:i:s', strtotime($entry->at));
 			
 			$distance_result = DistanceCollector::getDistanceByFields($date, $type, $distance);
-			if($distance_result !== null)
-				continue;
+			if($distance_result !== null) {
+							continue;
+			}
 			
 			$query = sprintf(self::$QUERY, $type, $distance, $url, $felt, $title, $message, $date);
 			Database::execute($query);

Please login to merge, or discard this patch.

utility/Validate.class.inc.php 1 patch

Braces +27 added lines, -18 removed lines patch added patch discarded remove patch

@@ -11,40 +11,47 @@  discard block
 block discarded – undo
 
 	public static function isBoolean($value, $strict = false)
 	{
-		if($strict && ($value === true || $value === false))
-			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
-			return true;
+		if($strict && ($value === true || $value === false)) {
+					return true;
+		}
+		if(!$strict && ((bool) $value === true || (bool) $value === false)) {
+					return true;
+		}
 		return false;
 	}
 
 	public static function isDate($value)
 	{
-		if(strtotime($value) !== -1)
-			return true;
-		if(date('y', $value) !== false)
-			return true;
+		if(strtotime($value) !== -1) {
+					return true;
+		}
+		if(date('y', $value) !== false) {
+					return true;
+		}
 		return false;
 	}
 
 	public static function isInteger($value, $strict = false)
 	{
-		if($strict)
-			return is_int($value);
+		if($strict) {
+					return is_int($value);
+		}
 		return (int) $value == $value;
 	}
 
 	public static function isIP($value)
 	{
-		if(self::isInteger(ip2long($value)))
-			return true;
+		if(self::isInteger(ip2long($value))) {
+					return true;
+		}
 		return false;
 	}
 
 	public static function isString($value, $strict = false)
 	{
-		if($strict)
-			return is_string($value);
+		if($strict) {
+					return is_string($value);
+		}
 		return (string) $value == $value;
 	}
 
@@ -67,8 +74,9 @@  discard block
 block discarded – undo
 	private static function check_value($pattern, $string)
 	{
 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
-			return false;
+		if(empty($matches)) {
+					return false;
+		}
 		return $matches[0] == $string;
 	}
 
@@ -84,8 +92,9 @@  discard block
 block discarded – undo
 			break;
 		}
 		
-		if($value == false)
-			return false;
+		if($value == false) {
+					return false;
+		}
 		
 		switch($validation)
 		{

Please login to merge, or discard this patch.

utility/environment/BrowserEnvironment.class.inc.php 1 patch

Braces +24 added lines, -28 removed lines patch added patch discarded remove patch

@@ -35,16 +35,18 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		{
 			$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;
 		}

Please login to merge, or discard this patch.

utility/environment/PlatformEnvironment.class.inc.php 1 patch

Braces +186 added lines, -124 removed lines patch added patch discarded remove patch

@@ -153,215 +153,277 @@
 block discarded – undo
 
 	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;
 	}

Please login to merge, or discard this patch.

utility/Request.class.inc.php 1 patch

Braces +12 added lines, -8 removed lines patch added patch discarded remove patch

@@ -20,8 +20,9 @@  discard block
 block discarded – undo
 	{
 		if($key)
 		{
-			if(isset(self::$server[$key]))
-				return self::$server[$key];
+			if(isset(self::$server[$key])) {
+							return self::$server[$key];
+			}
 			return false;
 		}
 		return self::$server;
@@ -29,8 +30,9 @@  discard block
 block discarded – undo
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+		if(self::getServer(self::$AJAX_REQUEST)) {
+					return true;
+		}
 		return false;
 	}
 
@@ -38,8 +40,9 @@  discard block
 block discarded – undo
 	{
 		if($key)
 		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
+			if(isset(self::$get[$key])) {
+							return self::$get[$key];
+			}
 			return false;
 		}
 		return self::$get;
@@ -49,8 +52,9 @@  discard block
 block discarded – undo
 	{
 		if($key)
 		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
+			if(isset(self::$post[$key])) {
+							return self::$post[$key];
+			}
 			return false;
 		}
 		return self::$post;

Please login to merge, or discard this patch.

		@@ -127,8 +127,9 @@ discard block
		block discarded – undo
127	127
128	128	public function activate()
129	129	{
130		- if(!$this->json)
131		- return $this->error('Could not connect to twitter json feed.');
	130	+ if(!$this->json) {
	131	+ return $this->error('Could not connect to twitter json feed.');
	132	+ }
132	133
133	134	$count = 0;
134	135	foreach($this->json as $status)
		@@ -152,8 +153,7 @@ discard block
		block discarded – undo
152	153	$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
153	154	Database::execute($query);
154	155	}
155		- }
156		- else
	156	+ } else
157	157	{
158	158	$twitter_id = (string) $status->id_str;
159	159
		@@ -164,8 +164,7 @@ discard block
		block discarded – undo
164	164
165	165	$text_formatted = $this->prepend_original_user($status->retweeted_status->user, $text_formatted);
166	166	$text_formatted_full = $this->prepend_original_user($status->retweeted_status->user, $text_formatted_full);
167		- }
168		- else
	167	+ } else
169	168	{
170	169	$text_formatted = $this->get_formatted($status->text, $status->entities);
171	170	$text_formatted_full = $this->get_formatted($status->text, $status->entities, 'full');
		@@ -200,12 +199,14 @@ discard block
		block discarded – undo
200	199
201	200	private function get_source($source)
202	201	{
203		- if(stristr($source, 'tweetdeck'))
204		- return 'tweetdeck';
205		- if(stristr($source, 'windows phone'))
206		- return 'phone';
207		- else
208		- return '';
	202	+ if(stristr($source, 'tweetdeck')) {
	203	+ return 'tweetdeck';
	204	+ }
	205	+ if(stristr($source, 'windows phone')) {
	206	+ return 'phone';
	207	+ } else {
	208	+ return '';
	209	+ }
209	210	}
210	211
211	212	private function get_formatted($text, $entities, $type = 'short')
		@@ -253,10 +254,11 @@ discard block
		block discarded – undo
253	254	$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
254	255	break;
255	256	case 'media' :
256		- if($type == 'full')
257		- $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);
258		- else
259		- $replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);
	257	+ if($type == 'full') {
	258	+ $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);
	259	+ } else {
	260	+ $replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);
	261	+ }
260	262	break;
261	263	default :
262	264	$replace = '';

		@@ -64,8 +64,9 @@
		block discarded – undo
64	64	foreach($result as $key => $row)
65	65	{
66	66	$stream_result = ActivityCollector::getPostByFields($row->id, $type);
67		- if($stream_result)
68		- unset($result[$key]);
	67	+ if($stream_result) {
	68	+ unset($result[$key]);
	69	+ }
69	70	}
70	71	return $result;
71	72	}

		@@ -13,10 +13,11 @@ discard block
		block discarded – undo
13	13
14	14	function __construct()
15	15	{
16		- if(Loader::isLive())
17		- $handle[] = self::$live_root;
18		- else
19		- $handle[] = self::$test_root;
	16	+ if(Loader::isLive()) {
	17	+ $handle[] = self::$live_root;
	18	+ } else {
	19	+ $handle[] = self::$test_root;
	20	+ }
20	21
21	22	$i = 0;
22	23	while(isset($handle[$i]))
		@@ -27,10 +28,12 @@ discard block
		block discarded – undo
27	28	{
28	29	if($file != '.' && $file != '..')
29	30	{
30		- if(is_dir("{$path}/{$file}"))
31		- $handle[] = "{$path}/{$file}";
32		- if($file == 'error.log')
33		- $this->error_files[] = "{$path}/{$file}";
	31	+ if(is_dir("{$path}/{$file}")) {
	32	+ $handle[] = "{$path}/{$file}";
	33	+ }
	34	+ if($file == 'error.log') {
	35	+ $this->error_files[] = "{$path}/{$file}";
	36	+ }
34	37	}
35	38	}
36	39	closedir($fh);
		@@ -50,9 +53,9 @@ discard block
		block discarded – undo
50	53	$contents = file_get_contents($error_file);
51	54	$message .= "{$error_file}\n{$contents}\n\n";
52	55	}
53		- }
54		- else
55		- $message = 'No errors found in the flat-files!';
	56	+ } else {
	57	+ $message = 'No errors found in the flat-files!';
	58	+ }
56	59
57	60	$mail = new Mail();
58	61	$mail->setToAddress('EMAIL', 'Jacob Emerick');

		@@ -19,13 +19,15 @@ discard block
		block discarded – undo
19	19
20	20	public function activate()
21	21	{
22		- if(!$this->xml)
23		- return $this->error('Could not connect to feed.');
	22	+ if(!$this->xml) {
	23	+ return $this->error('Could not connect to feed.');
	24	+ }
24	25
25	26	foreach($this->xml->channel->item as $item)
26	27	{
27		- if(strtotime($item->user_read_at) <= 0)
28		- continue;
	28	+ if(strtotime($item->user_read_at) <= 0) {
	29	+ continue;
	30	+ }
29	31
30	32	$title = $item->title;
31	33	$title = trim($title);
		@@ -42,8 +44,9 @@ discard block
		block discarded – undo
42	44	$date_added = date('Y-m-d H:i:s', strtotime($item->user_date_created));
43	45
44	46	$book_result = BookCollector::getBookByFields($title, $author);
45		- if($book_result !== null)
46		- continue;
	47	+ if($book_result !== null) {
	48	+ continue;
	49	+ }
47	50
48	51	$query = sprintf(self::$QUERY, $title, $author, $link, $description, $image, $date_read, $date_added);
49	52	Database::execute($query);

		@@ -20,8 +20,9 @@ discard block
		block discarded – undo
20	20
21	21	public function activate()
22	22	{
23		- if(!$this->json)
24		- return $this->error('Could not connect to feed.');
	23	+ if(!$this->json) {
	24	+ return $this->error('Could not connect to feed.');
	25	+ }
25	26
26	27	$count = 0;
27	28	foreach($this->json->entries as $entry)
		@@ -41,8 +42,9 @@ discard block
		block discarded – undo
41	42	$date = date('Y-m-d H:i:s', strtotime($entry->at));
42	43
43	44	$distance_result = DistanceCollector::getDistanceByFields($date, $type, $distance);
44		- if($distance_result !== null)
45		- continue;
	45	+ if($distance_result !== null) {
	46	+ continue;
	47	+ }
46	48
47	49	$query = sprintf(self::$QUERY, $type, $distance, $url, $felt, $title, $message, $date);
48	50	Database::execute($query);

		@@ -11,40 +11,47 @@ discard block
		block discarded – undo
11	11
12	12	public static function isBoolean($value, $strict = false)
13	13	{
14		- if($strict && ($value === true \|\| $value === false))
15		- return true;
16		- if(!$strict && ((bool) $value === true \|\| (bool) $value === false))
17		- return true;
	14	+ if($strict && ($value === true \|\| $value === false)) {
	15	+ return true;
	16	+ }
	17	+ if(!$strict && ((bool) $value === true \|\| (bool) $value === false)) {
	18	+ return true;
	19	+ }
18	20	return false;
19	21	}
20	22
21	23	public static function isDate($value)
22	24	{
23		- if(strtotime($value) !== -1)
24		- return true;
25		- if(date('y', $value) !== false)
26		- return true;
	25	+ if(strtotime($value) !== -1) {
	26	+ return true;
	27	+ }
	28	+ if(date('y', $value) !== false) {
	29	+ return true;
	30	+ }
27	31	return false;
28	32	}
29	33
30	34	public static function isInteger($value, $strict = false)
31	35	{
32		- if($strict)
33		- return is_int($value);
	36	+ if($strict) {
	37	+ return is_int($value);
	38	+ }
34	39	return (int) $value == $value;
35	40	}
36	41
37	42	public static function isIP($value)
38	43	{
39		- if(self::isInteger(ip2long($value)))
40		- return true;
	44	+ if(self::isInteger(ip2long($value))) {
	45	+ return true;
	46	+ }
41	47	return false;
42	48	}
43	49
44	50	public static function isString($value, $strict = false)
45	51	{
46		- if($strict)
47		- return is_string($value);
	52	+ if($strict) {
	53	+ return is_string($value);
	54	+ }
48	55	return (string) $value == $value;
49	56	}
50	57
		@@ -67,8 +74,9 @@ discard block
		block discarded – undo
67	74	private static function check_value($pattern, $string)
68	75	{
69	76	preg_match($pattern, $string, $matches);
70		- if(empty($matches))
71		- return false;
	77	+ if(empty($matches)) {
	78	+ return false;
	79	+ }
72	80	return $matches[0] == $string;
73	81	}
74	82
		@@ -84,8 +92,9 @@ discard block
		block discarded – undo
84	92	break;
85	93	}
86	94
87		- if($value == false)
88		- return false;
	95	+ if($value == false) {
	96	+ return false;
	97	+ }
89	98
90	99	switch($validation)
91	100	{

		@@ -35,16 +35,18 @@ discard block
		block discarded – undo
35	35	private $name;
36	36	public function getName()
37	37	{
38		- if(!isset($this->name))
39		- $this->process();
	38	+ if(!isset($this->name)) {
	39	+ $this->process();
	40	+ }
40	41	return $this->name;
41	42	}
42	43
43	44	private $version;
44	45	public function getVersion()
45	46	{
46		- if(!isset($this->name))
47		- $this->process();
	47	+ if(!isset($this->name)) {
	48	+ $this->process();
	49	+ }
48	50	return $this->version;
49	51	}
50	52
		@@ -55,47 +57,41 @@ discard block
		block discarded – undo
55	57	{
56	58	$this->name = self::$NAME_INTERNET_EXPLORER;
57	59	$this->version = $version[1];
58		- }
59		- else if(stristr($this->user_agent, self::$MATCH_FIREFOX))
	60	+ } else if(stristr($this->user_agent, self::$MATCH_FIREFOX))
60	61	{
61	62	$this->name = self::$NAME_FIREFOX;
62		- if(preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version))
63		- $this->version = $version[1];
64		- }
65		- else if(stristr($this->user_agent, self::$MATCH_GECKO))
	63	+ if(preg_match(self::$MATCH_FIREFOX_VERSION, $this->user_agent, $version)) {
	64	+ $this->version = $version[1];
	65	+ }
	66	+ } else if(stristr($this->user_agent, self::$MATCH_GECKO))
66	67	{
67	68	$this->name = self::$NAME_GECKO;
68		- }
69		- else if(preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
	69	+ } else if(preg_match(self::$MATCH_OPERA, $this->user_agent, $version))
70	70	{
71	71	$this->name = self::$NAME_OPERA;
72	72	$this->version = $version[2];
73		- }
74		- else if(stristr($this->user_agent, self::$MATCH_KONQUEROR))
	73	+ } else if(stristr($this->user_agent, self::$MATCH_KONQUEROR))
75	74	{
76	75	$this->name = self::$NAME_KONQUEROR;
77		- }
78		- else if(stristr($this->user_agent, self::$MATCH_CHROME))
	76	+ } else if(stristr($this->user_agent, self::$MATCH_CHROME))
79	77	{
80	78	$this->name = self::$NAME_CHROME;
81		- if(preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version))
82		- $this->version = $version[1];
83		- }
84		- else if(stristr($this->user_agent, self::$MATCH_IRON))
	79	+ if(preg_match(self::$MATCH_CHROME_VERSION, $this->user_agent, $version)) {
	80	+ $this->version = $version[1];
	81	+ }
	82	+ } else if(stristr($this->user_agent, self::$MATCH_IRON))
85	83	{
86	84	$this->name = self::$NAME_IRON;
87		- }
88		- else if(stristr($this->user_agent, self::$MATCH_SAFARI))
	85	+ } else if(stristr($this->user_agent, self::$MATCH_SAFARI))
89	86	{
90	87	$this->name = self::$NAME_SAFARI;
91		- if(preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version))
92		- $this->version = $version[1];
93		- }
94		- else if(stristr($this->user_agent, self::$MATCH_MOZILLA))
	88	+ if(preg_match(self::$MATCH_SAFARI_VERSION, $this->user_agent, $version)) {
	89	+ $this->version = $version[1];
	90	+ }
	91	+ } else if(stristr($this->user_agent, self::$MATCH_MOZILLA))
95	92	{
96	93	$this->name = self::$NAME_MOZILLA;
97		- }
98		- else
	94	+ } else
99	95	{
100	96	$this->name = self::$NAME_UNKNOWN;
101	97	}

		@@ -153,215 +153,277 @@
		block discarded – undo
153	153
154	154	public function getName()
155	155	{
156		- if(stristr($this->user_agent, self::$MATCH_MOBILE))
157		- return self::$NAME_MOBILE;
	156	+ if(stristr($this->user_agent, self::$MATCH_MOBILE)) {
	157	+ return self::$NAME_MOBILE;
	158	+ }
158	159
159		- if(stristr($this->user_agent, self::$MATCH_IPHONE))
160		- return self::$NAME_IPHONE;
	160	+ if(stristr($this->user_agent, self::$MATCH_IPHONE)) {
	161	+ return self::$NAME_IPHONE;
	162	+ }
161	163
162		- if(stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE))
163		- return self::$NAME_WINDOWS_PHONE;
	164	+ if(stristr($this->user_agent, self::$MATCH_WINDOWS_PHONE)) {
	165	+ return self::$NAME_WINDOWS_PHONE;
	166	+ }
164	167
165		- if(stristr($this->user_agent, self::$MATCH_NOKIA))
166		- return self::$NAME_NOKIA;
	168	+ if(stristr($this->user_agent, self::$MATCH_NOKIA)) {
	169	+ return self::$NAME_NOKIA;
	170	+ }
167	171
168		- if(stristr($this->user_agent, self::$MATCH_IPOD))
169		- return self::$NAME_IPOD;
	172	+ if(stristr($this->user_agent, self::$MATCH_IPOD)) {
	173	+ return self::$NAME_IPOD;
	174	+ }
170	175
171		- if(stristr($this->user_agent, self::$MATCH_MAC))
172		- return self::$NAME_MAC;
	176	+ if(stristr($this->user_agent, self::$MATCH_MAC)) {
	177	+ return self::$NAME_MAC;
	178	+ }
173	179
174		- if(stristr($this->user_agent, self::$MATCH_DARWIN))
175		- return self::$NAME_MAC;
	180	+ if(stristr($this->user_agent, self::$MATCH_DARWIN)) {
	181	+ return self::$NAME_MAC;
	182	+ }
176	183
177		- if(stristr($this->user_agent, self::$MATCH_WEBTV))
178		- return self::$NAME_WEBTV;
	184	+ if(stristr($this->user_agent, self::$MATCH_WEBTV)) {
	185	+ return self::$NAME_WEBTV;
	186	+ }
179	187
180		- if(stristr($this->user_agent, self::$MATCH_WII))
181		- return self::$NAME_WII;
	188	+ if(stristr($this->user_agent, self::$MATCH_WII)) {
	189	+ return self::$NAME_WII;
	190	+ }
182	191
183		- if(stristr($this->user_agent, self::$MATCH_WINDOWS_3))
184		- return self::$NAME_WINDOWS_3;
	192	+ if(stristr($this->user_agent, self::$MATCH_WINDOWS_3)) {
	193	+ return self::$NAME_WINDOWS_3;
	194	+ }
185	195
186	196	foreach(self::$MATCH_WINDOWS_4 as $match)
187	197	{
188		- if(stristr($this->user_agent, $match))
189		- return self::$NAME_WINDOWS_4;
	198	+ if(stristr($this->user_agent, $match)) {
	199	+ return self::$NAME_WINDOWS_4;
	200	+ }
190	201	}
191	202
192	203	foreach(self::$MATCH_WINDOWS_95 as $match)
193	204	{
194		- if(stristr($this->user_agent, $match))
195		- return self::$NAME_WINDOWS_95;
	205	+ if(stristr($this->user_agent, $match)) {
	206	+ return self::$NAME_WINDOWS_95;
	207	+ }
196	208	}
197	209
198	210	foreach(self::$MATCH_WINDOWS_98 as $match)
199	211	{
200		- if(stristr($this->user_agent, $match))
201		- return self::$NAME_WINDOWS_98;
	212	+ if(stristr($this->user_agent, $match)) {
	213	+ return self::$NAME_WINDOWS_98;
	214	+ }
202	215	}
203	216
204	217	foreach(self::$MATCH_WINDOWS_2000 as $match)
205	218	{
206		- if(stristr($this->user_agent, $match))
207		- return self::$NAME_WINDOWS_2000;
	219	+ if(stristr($this->user_agent, $match)) {
	220	+ return self::$NAME_WINDOWS_2000;
	221	+ }
208	222	}
209	223
210		- if(stristr($this->user_agent, self::$MATCH_WINDOWS_ME))
211		- return self::$NAME_WINDOWS_ME;
	224	+ if(stristr($this->user_agent, self::$MATCH_WINDOWS_ME)) {
	225	+ return self::$NAME_WINDOWS_ME;
	226	+ }
212	227
213		- if(stristr($this->user_agent, self::$MATCH_WINDOWS_S_03))
214		- return self::$NAME_WINDOWS_S_03;
	228	+ if(stristr($this->user_agent, self::$MATCH_WINDOWS_S_03)) {
	229	+ return self::$NAME_WINDOWS_S_03;
	230	+ }
215	231
216	232	foreach(self::$MATCH_WINDOWS_XP as $match)
217	233	{
218		- if(stristr($this->user_agent, $match))
219		- return self::$NAME_WINDOWS_XP;
	234	+ if(stristr($this->user_agent, $match)) {
	235	+ return self::$NAME_WINDOWS_XP;
	236	+ }
220	237	}
221	238
222		- if(stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA))
223		- return self::$NAME_WINDOWS_VISTA;
	239	+ if(stristr($this->user_agent, self::$MATCH_WINDOWS_VISTA)) {
	240	+ return self::$NAME_WINDOWS_VISTA;
	241	+ }
224	242
225	243	foreach(self::$MATCH_WINDOWS_7 as $match)
226	244	{
227		- if(stristr($this->user_agent, $match))
228		- return self::$NAME_WINDOWS_7;
	245	+ if(stristr($this->user_agent, $match)) {
	246	+ return self::$NAME_WINDOWS_7;
	247	+ }
229	248	}
230	249
231		- if(stristr($this->user_agent, self::$MATCH_OPENBSD))
232		- return self::$NAME_OPENBSD;
	250	+ if(stristr($this->user_agent, self::$MATCH_OPENBSD)) {
	251	+ return self::$NAME_OPENBSD;
	252	+ }
233	253
234		- if(stristr($this->user_agent, self::$MATCH_FREEBSD))
235		- return self::$NAME_FREEBSD;
	254	+ if(stristr($this->user_agent, self::$MATCH_FREEBSD)) {
	255	+ return self::$NAME_FREEBSD;
	256	+ }
236	257
237		- if(stristr($this->user_agent, self::$MATCH_SUNOS))
238		- return self::$NAME_SUNOS;
	258	+ if(stristr($this->user_agent, self::$MATCH_SUNOS)) {
	259	+ return self::$NAME_SUNOS;
	260	+ }
239	261
240	262	foreach(self::$MATCH_LINUX as $match)
241	263	{
242		- if(stristr($this->user_agent, $match))
243		- return self::$NAME_LINUX;
	264	+ if(stristr($this->user_agent, $match)) {
	265	+ return self::$NAME_LINUX;
	266	+ }
244	267	}
245	268
246		- if(stristr($this->user_agent, self::$MATCH_GOOGLEBOT))
247		- return self::$NAME_GOOGLEBOT;
	269	+ if(stristr($this->user_agent, self::$MATCH_GOOGLEBOT)) {
	270	+ return self::$NAME_GOOGLEBOT;
	271	+ }
248	272
249		- if(stristr($this->user_agent, self::$MATCH_GOOGLE_READER))
250		- return self::$NAME_GOOGLE_READER;
	273	+ if(stristr($this->user_agent, self::$MATCH_GOOGLE_READER)) {
	274	+ return self::$NAME_GOOGLE_READER;
	275	+ }
251	276
252		- if(stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW))
253		- return self::$NAME_GOOGLE_VIEW;
	277	+ if(stristr($this->user_agent, self::$MATCH_GOOGLE_VIEW)) {
	278	+ return self::$NAME_GOOGLE_VIEW;
	279	+ }
254	280
255		- if(stristr($this->user_agent, self::$MATCH_GOOGLE_DESK))
256		- return self::$NAME_GOOGLE_DESKTOP;
	281	+ if(stristr($this->user_agent, self::$MATCH_GOOGLE_DESK)) {
	282	+ return self::$NAME_GOOGLE_DESKTOP;
	283	+ }
257	284
258	285	foreach(self::$MATCH_BING as $match)
259	286	{
260		- if(stristr($this->user_agent, $match))
261		- return self::$NAME_BING;
	287	+ if(stristr($this->user_agent, $match)) {
	288	+ return self::$NAME_BING;
	289	+ }
262	290	}
263	291
264		- if(stristr($this->user_agent, self::$MATCH_ASK))
265		- return self::$NAME_ASK;
	292	+ if(stristr($this->user_agent, self::$MATCH_ASK)) {
	293	+ return self::$NAME_ASK;
	294	+ }
266	295
267		- if(stristr($this->user_agent, self::$MATCH_EXABOT))
268		- return self::$NAME_EXABOT;
	296	+ if(stristr($this->user_agent, self::$MATCH_EXABOT)) {
	297	+ return self::$NAME_EXABOT;
	298	+ }
269	299
270		- if(stristr($this->user_agent, self::$MATCH_GEOHASH))
271		- return self::$NAME_GEOHASH;
	300	+ if(stristr($this->user_agent, self::$MATCH_GEOHASH)) {
	301	+ return self::$NAME_GEOHASH;
	302	+ }
272	303
273		- if(stristr($this->user_agent, self::$MATCH_POST_RANK))
274		- return self::$NAME_POST_RANK;
	304	+ if(stristr($this->user_agent, self::$MATCH_POST_RANK)) {
	305	+ return self::$NAME_POST_RANK;
	306	+ }
275	307
276		- if(stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER))
277		- return self::$NAME_BAIDU_SPIDER;
	308	+ if(stristr($this->user_agent, self::$MATCH_BAIDU_SPIDER)) {
	309	+ return self::$NAME_BAIDU_SPIDER;
	310	+ }
278	311
279		- if(stristr($this->user_agent, self::$MATCH_RADIAN))
280		- return self::$NAME_RADIAN;
	312	+ if(stristr($this->user_agent, self::$MATCH_RADIAN)) {
	313	+ return self::$NAME_RADIAN;
	314	+ }
281	315
282		- if(stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER))
283		- return self::$NAME_BLEKKO_SPIDER;
	316	+ if(stristr($this->user_agent, self::$MATCH_BLEKKO_SPIDER)) {
	317	+ return self::$NAME_BLEKKO_SPIDER;
	318	+ }
284	319
285		- if(stristr($this->user_agent, self::$MATCH_WLA))
286		- return self::$NAME_WLA;
	320	+ if(stristr($this->user_agent, self::$MATCH_WLA)) {
	321	+ return self::$NAME_WLA;
	322	+ }
287	323
288		- if(stristr($this->user_agent, self::$MATCH_FACEBOOK))
289		- return self::$NAME_FACEBOOK;
	324	+ if(stristr($this->user_agent, self::$MATCH_FACEBOOK)) {
	325	+ return self::$NAME_FACEBOOK;
	326	+ }
290	327
291		- if(stristr($this->user_agent, self::$MATCH_BLOGLINES))
292		- return self::$NAME_BLOGLINES;
	328	+ if(stristr($this->user_agent, self::$MATCH_BLOGLINES)) {
	329	+ return self::$NAME_BLOGLINES;
	330	+ }
293	331
294		- if(stristr($this->user_agent, self::$MATCH_R6))
295		- return self::$NAME_R6;
	332	+ if(stristr($this->user_agent, self::$MATCH_R6)) {
	333	+ return self::$NAME_R6;
	334	+ }
296	335
297		- if(stristr($this->user_agent, self::$MATCH_AOL_FAVICON))
298		- return self::$NAME_AOL_FAVICON;
	336	+ if(stristr($this->user_agent, self::$MATCH_AOL_FAVICON)) {
	337	+ return self::$NAME_AOL_FAVICON;
	338	+ }
299	339
300		- if(stristr($this->user_agent, self::$MATCH_YAHOO))
301		- return self::$NAME_YAHOO;
	340	+ if(stristr($this->user_agent, self::$MATCH_YAHOO)) {
	341	+ return self::$NAME_YAHOO;
	342	+ }
302	343
303		- if(stristr($this->user_agent, self::$MATCH_YAHOO_FEED))
304		- return self::$NAME_YAHOO_FEED;
	344	+ if(stristr($this->user_agent, self::$MATCH_YAHOO_FEED)) {
	345	+ return self::$NAME_YAHOO_FEED;
	346	+ }
305	347
306		- if(stristr($this->user_agent, self::$MATCH_YANDEX))
307		- return self::$NAME_YANDEX;
	348	+ if(stristr($this->user_agent, self::$MATCH_YANDEX)) {
	349	+ return self::$NAME_YANDEX;
	350	+ }
308	351
309		- if(stristr($this->user_agent, self::$MATCH_HUAWEI))
310		- return self::$NAME_HUAWEI;
	352	+ if(stristr($this->user_agent, self::$MATCH_HUAWEI)) {
	353	+ return self::$NAME_HUAWEI;
	354	+ }
311	355
312		- if(stristr($this->user_agent, self::$MATCH_SOGOU))
313		- return self::$NAME_SOGOU;
	356	+ if(stristr($this->user_agent, self::$MATCH_SOGOU)) {
	357	+ return self::$NAME_SOGOU;
	358	+ }
314	359
315		- if(stristr($this->user_agent, self::$MATCH_MLBOT))
316		- return self::$NAME_MLBOT;
	360	+ if(stristr($this->user_agent, self::$MATCH_MLBOT)) {
	361	+ return self::$NAME_MLBOT;
	362	+ }
317	363
318		- if(stristr($this->user_agent, self::$MATCH_NETCRAFT))
319		- return self::$NAME_NETCRAFT;
	364	+ if(stristr($this->user_agent, self::$MATCH_NETCRAFT)) {
	365	+ return self::$NAME_NETCRAFT;
	366	+ }
320	367
321		- if(stristr($this->user_agent, self::$MATCH_TURNITIN))
322		- return self::$NAME_TURNITIN;
	368	+ if(stristr($this->user_agent, self::$MATCH_TURNITIN)) {
	369	+ return self::$NAME_TURNITIN;
	370	+ }
323	371
324		- if(stristr($this->user_agent, self::$MATCH_LINKEDINBOT))
325		- return self::$NAME_LINKEDINBOT;
	372	+ if(stristr($this->user_agent, self::$MATCH_LINKEDINBOT)) {
	373	+ return self::$NAME_LINKEDINBOT;
	374	+ }
326	375
327		- if(stristr($this->user_agent, self::$MATCH_ABOUT_US))
328		- return self::$NAME_ABOUT_US;
	376	+ if(stristr($this->user_agent, self::$MATCH_ABOUT_US)) {
	377	+ return self::$NAME_ABOUT_US;
	378	+ }
329	379
330		- if(stristr($this->user_agent, self::$MATCH_COSMIX))
331		- return self::$NAME_COSMIX;
	380	+ if(stristr($this->user_agent, self::$MATCH_COSMIX)) {
	381	+ return self::$NAME_COSMIX;
	382	+ }
332	383
333		- if(stristr($this->user_agent, self::$MATCH_PYCURL))
334		- return self::$NAME_PYCURL;
	384	+ if(stristr($this->user_agent, self::$MATCH_PYCURL)) {
	385	+ return self::$NAME_PYCURL;
	386	+ }
335	387
336		- if(stristr($this->user_agent, self::$MATCH_MAJESTIC))
337		- return self::$NAME_MAJESTIC;
	388	+ if(stristr($this->user_agent, self::$MATCH_MAJESTIC)) {
	389	+ return self::$NAME_MAJESTIC;
	390	+ }
338	391
339		- if(stristr($this->user_agent, self::$MATCH_GIGABOT))
340		- return self::$NAME_GIGABOT;
	392	+ if(stristr($this->user_agent, self::$MATCH_GIGABOT)) {
	393	+ return self::$NAME_GIGABOT;
	394	+ }
341	395
342		- if(stristr($this->user_agent, self::$MATCH_ZOOKA))
343		- return self::$NAME_ZOOKA;
	396	+ if(stristr($this->user_agent, self::$MATCH_ZOOKA)) {
	397	+ return self::$NAME_ZOOKA;
	398	+ }
344	399
345		- if(stristr($this->user_agent, self::$MATCH_PANSCIENT))
346		- return self::$NAME_PANSCIENT;
	400	+ if(stristr($this->user_agent, self::$MATCH_PANSCIENT)) {
	401	+ return self::$NAME_PANSCIENT;
	402	+ }
347	403
348		- if(stristr($this->user_agent, self::$MATCH_LIBWWW))
349		- return self::$NAME_LIBWWW;
	404	+ if(stristr($this->user_agent, self::$MATCH_LIBWWW)) {
	405	+ return self::$NAME_LIBWWW;
	406	+ }
350	407
351		- if(stristr($this->user_agent, self::$MATCH_DOTBOT))
352		- return self::$NAME_DOTBOT;
	408	+ if(stristr($this->user_agent, self::$MATCH_DOTBOT)) {
	409	+ return self::$NAME_DOTBOT;
	410	+ }
353	411
354		- if(stristr($this->user_agent, self::$MATCH_ARCHIVER))
355		- return self::$NAME_ARCHIVER;
	412	+ if(stristr($this->user_agent, self::$MATCH_ARCHIVER)) {
	413	+ return self::$NAME_ARCHIVER;
	414	+ }
356	415
357		- if(stristr($this->user_agent, self::$MATCH_ZEND))
358		- return self::$NAME_ZEND;
	416	+ if(stristr($this->user_agent, self::$MATCH_ZEND)) {
	417	+ return self::$NAME_ZEND;
	418	+ }
359	419
360		- if(stristr($this->user_agent, self::$MATCH_PYTHON))
361		- return self::$NAME_PYTHON;
	420	+ if(stristr($this->user_agent, self::$MATCH_PYTHON)) {
	421	+ return self::$NAME_PYTHON;
	422	+ }
362	423
363		- if(stristr($this->user_agent, self::$MATCH_JAKARATA))
364		- return self::$NAME_JAKARATA;
	424	+ if(stristr($this->user_agent, self::$MATCH_JAKARATA)) {
	425	+ return self::$NAME_JAKARATA;
	426	+ }
365	427
366	428	return self::$NAME_UNKNOWN;
367	429	}

		@@ -20,8 +20,9 @@ discard block
		block discarded – undo
20	20	{
21	21	if($key)
22	22	{
23		- if(isset(self::$server[$key]))
24		- return self::$server[$key];
	23	+ if(isset(self::$server[$key])) {
	24	+ return self::$server[$key];
	25	+ }
25	26	return false;
26	27	}
27	28	return self::$server;
		@@ -29,8 +30,9 @@ discard block
		block discarded – undo
29	30
30	31	static function isAjax()
31	32	{
32		- if(self::getServer(self::$AJAX_REQUEST))
33		- return true;
	33	+ if(self::getServer(self::$AJAX_REQUEST)) {
	34	+ return true;
	35	+ }
34	36	return false;
35	37	}
36	38
		@@ -38,8 +40,9 @@ discard block
		block discarded – undo
38	40	{
39	41	if($key)
40	42	{
41		- if(isset(self::$get[$key]))
42		- return self::$get[$key];
	43	+ if(isset(self::$get[$key])) {
	44	+ return self::$get[$key];
	45	+ }
43	46	return false;
44	47	}
45	48	return self::$get;
		@@ -49,8 +52,9 @@ discard block
		block discarded – undo
49	52	{
50	53	if($key)
51	54	{
52		- if(isset(self::$post[$key]))
53		- return self::$post[$key];
	55	+ if(isset(self::$post[$key])) {
	56	+ return self::$post[$key];
	57	+ }
54	58	return false;
55	59	}
56	60	return self::$post;

jacobemerick / web

Push — master ( 7e42fe...9ab714 )

Status

Category

Braces +18 added lines, -16 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Braces +14 added lines, -11 removed lines patch added patch discarded remove patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Braces +27 added lines, -18 removed lines patch added patch discarded remove patch

Braces +24 added lines, -28 removed lines patch added patch discarded remove patch

Braces +186 added lines, -124 removed lines patch added patch discarded remove patch

Braces +12 added lines, -8 removed lines patch added patch discarded remove patch