jacobemerick / web

utility/content/ElapsedTimeContent.class.inc.php

Spacing +28 added lines, -28 removed lines

@@ -10,61 +10,61 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
+		if ($current_time <= $previous_time)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
+		else if (($current_time - $previous_time) < 30)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60)
 			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
+		else if (($current_time - $previous_time) < 4 * 60)
 			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
+		else if (($current_time - $previous_time) < 7 * 60)
 			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
+		else if (($current_time - $previous_time) < 12 * 60)
 			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
+		else if (($current_time - $previous_time) < 17 * 60)
 			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
+		else if (($current_time - $previous_time) < 22 * 60)
 			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
+		else if (($current_time - $previous_time) < 37 * 60)
 			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
+		else if (($current_time - $previous_time) < 52 * 60)
 			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60 * 60)
 			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 2.5 * 60 * 60)
 			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 3.5 * 60 * 60)
 			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 4.5 * 60 * 60)
 			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
 			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
 			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
 			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
 			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
 			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
+		else if (($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
 			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
+		else if (($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
 			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
+		else if (($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
 			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
 			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
 			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
 			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
+		else if (($current_time - $previous_time) < 1.25 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
 			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
 			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
 			$this->content = 'several months ago';
 		else
 			$this->content = 'long ago';

Braces +59 added lines, -58 removed lines

@@ -10,64 +10,65 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
+		if($current_time <= $previous_time) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 30) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60) {

+					$this->content = 'a minute ago';

+		} else if(($current_time - $previous_time) < 4 * 60) {

+					$this->content = 'few minutes ago';

+		} else if(($current_time - $previous_time) < 7 * 60) {

+					$this->content = 'five minutes ago';

+		} else if(($current_time - $previous_time) < 12 * 60) {

+					$this->content = 'ten minutes ago';

+		} else if(($current_time - $previous_time) < 17 * 60) {

+					$this->content = 'fifteen minutes ago';

+		} else if(($current_time - $previous_time) < 22 * 60) {

+					$this->content = 'twenty minutes ago';

+		} else if(($current_time - $previous_time) < 37 * 60) {

+					$this->content = 'half hour ago';

+		} else if(($current_time - $previous_time) < 52 * 60) {

+					$this->content = 'forty-five minutes ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60 * 60) {

+					$this->content = 'an hour ago';

+		} else if(($current_time - $previous_time) < 2.5 * 60 * 60) {

+					$this->content = 'two hours ago';

+		} else if(($current_time - $previous_time) < 3.5 * 60 * 60) {

+					$this->content = 'three hours ago';

+		} else if(($current_time - $previous_time) < 4.5 * 60 * 60) {

+					$this->content = 'few hours ago';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm') {

+					$this->content = 'this afternoon';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am') {

+					$this->content = 'this morning';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17) {

+					$this->content = 'yesterday evening';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm') {

+					$this->content = 'yesterday afternoon';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am') {

+					$this->content = 'yesterday morning';

+		} else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2) {

+					$this->content = 'two days ago';

+		} else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3) {

+					$this->content = 'three days ago';

+		} else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time)) {

+					$this->content = 'earlier this week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3) {

+					$this->content = 'late last week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1) {

+					$this->content = 'early last week';

+		} else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60) {

+					$this->content = 'few weeks ago';

+		} else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time)) {

+					$this->content = 'earlier this month';

+		} else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1) {

+					$this->content = 'last month';

+		} else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60) {

+					$this->content = 'several months ago';

+		} else {

+					$this->content = 'long ago';

+		}

 	}
 
 }
\ No newline at end of file

utility/cron/BlogCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -22,13 +22,13 @@
 
 	public function activate()
 	{
-		foreach($this->post_array as $post)
+		foreach ($this->post_array as $post)
 		{
 			$blog_result = BlogCollector::getBlogByTitle($post->title);
-			if($blog_result !== null)
+			if ($blog_result !== null)
 			{
 				$comments = CommentCollector::getCommentCountForURL(2, $post->path);
-				if($blog_result->comments != $comments)
+				if ($blog_result->comments != $comments)
 				{
 					$query = sprintf(self::$UPDATE_COMMENTS_QUERY, $comments, $blog_result->id);
 					Database::execute($query);

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
 					$query = sprintf(self::$UPDATE_COMMENTS_QUERY, $comments, $blog_result->id);
 					Database::execute($query);
 				}
-			}
-			else
+			} else
 			{
 				$title = Database::escape($post->title);
 				$category = Database::escape($post->category);

utility/cron/ErrorCron.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -13,23 +13,23 @@ 
 
 	function __construct()
 	{
-		if(Loader::isLive())
+		if (Loader::isLive())
 			$handle[] = self::$live_root;
 		else
 			$handle[] = self::$test_root;
 		
 		$i = 0;
-		while(isset($handle[$i]))
+		while (isset($handle[$i]))
 		{
 			$path = $handle[$i];
 			$fh = opendir($path);
-			while(false !== ($file = readdir($fh)))
+			while (false !== ($file = readdir($fh)))
 			{
-				if($file != '.' && $file != '..')
+				if ($file != '.' && $file != '..')
 				{
-					if(is_dir("{$path}/{$file}"))
+					if (is_dir("{$path}/{$file}"))
 						$handle[] = "{$path}/{$file}";
-					if($file == 'error.log')
+					if ($file == 'error.log')
 						$this->error_files[] = "{$path}/{$file}";
 				}
 			}
@@ -42,10 +42,10 @@ 
 	{
 		$message = '';
 		
-		if(count($this->error_files) > 0)
+		if (count($this->error_files) > 0)
 		{
 			$message .= "Errors from flat-file logs.\n\n";
-			foreach($this->error_files as $error_file)
+			foreach ($this->error_files as $error_file)
 			{
 				$contents = file_get_contents($error_file);
 				$message .= "{$error_file}\n{$contents}\n\n";
@@ -60,9 +60,9 @@ 
 		$mail->setMessage($message);
 		$mail->send();
 		
-		if(count($this->error_files) > 0)
+		if (count($this->error_files) > 0)
 		{
-			foreach($this->error_files as $error_file)
+			foreach ($this->error_files as $error_file)
 			{
 			//	if(file_exists($error_file))
 			//		unlink($error_file);

Braces +14 added lines, -11 removed lines

@@ -13,10 +13,11 @@ 
 
 	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 @@ 
 			{
 				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 @@ 
 				$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');

utility/cron/BookCron.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@ 
 
 	public function activate()
 	{
-		if(!$this->xml)
+		if (!$this->xml)
 			return $this->error('Could not connect to feed.');
 		
-		foreach($this->xml->channel->item as $item)
+		foreach ($this->xml->channel->item as $item)
 		{
-			if(strtotime($item->user_read_at) <= 0)
+			if (strtotime($item->user_read_at) <= 0)
 				continue;
 			
 			$title = $item->title;
@@ -42,7 +42,7 @@ 
 			$date_added = date('Y-m-d H:i:s', strtotime($item->user_date_created));
 			
 			$book_result = BookCollector::getBookByFields($title, $author);
-			if($book_result !== null)
+			if ($book_result !== null)
 				continue;
 			
 			$query = sprintf(self::$QUERY, $title, $author, $link, $description, $image, $date_read, $date_added);

Braces +9 added lines, -6 removed lines

@@ -19,13 +19,15 @@ 
 
 	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 @@ 
 			$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);

utility/cron/DistanceCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -20,11 +20,11 @@ 
 
 	public function activate()
 	{
-		if(!$this->json)
+		if (!$this->json)
 			return $this->error('Could not connect to feed.');
 		
 		$count = 0;
-		foreach($this->json->entries as $entry)
+		foreach ($this->json->entries as $entry)
 		{
 			$type = $entry->workout->activity_type;
 			$type = strtolower($type);
@@ -41,7 +41,7 @@ 
 			$date = date('Y-m-d H:i:s', strtotime($entry->at));
 			
 			$distance_result = DistanceCollector::getDistanceByFields($date, $type, $distance);
-			if($distance_result !== null)
+			if ($distance_result !== null)
 				continue;
 			
 			$query = sprintf(self::$QUERY, $type, $distance, $url, $felt, $title, $message, $date);

Braces +6 added lines, -4 removed lines

@@ -20,8 +20,9 @@ 
 
 	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 @@ 
 			$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);

utility/Header.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -186,10 +186,10 @@ 
 
 	private static function send($array, $gzip = true)
 	{
-		if($gzip)
+		if ($gzip)
 			self::start_gzipping();
 		
-		foreach($array as $row)
+		foreach ($array as $row)
 		{
 			header($row, TRUE);
 		}
@@ -197,14 +197,14 @@ 
 
 	private static function get_date($timestamp = false)
 	{
-		if($timestamp == 0)
+		if ($timestamp == 0)
 			$timestamp = time();
 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
 	}
 
 	private static function start_gzipping()
 	{
-		if(!ob_start('ob_gzhandler'))
+		if (!ob_start('ob_gzhandler'))
             ob_start();
 	}
 

Doc Comments +3 added lines

@@ -131,6 +131,9 @@
 		self::send($array);
 	}
 
+	/**
+	 * @param string[] $array
+	 */
 	private static function send($array, $gzip = true)
 	{
 		if($gzip)

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 	private static function start_gzipping()
 	{
 		if(!ob_start('ob_gzhandler'))
-            ob_start();
+			ob_start();
 	}
 
 }

Braces +9 added lines, -6 removed lines

@@ -133,8 +133,9 @@ 
 
 	private static function send($array, $gzip = true)
 	{
-		if($gzip)
-			self::start_gzipping();
+		if($gzip) {

+					self::start_gzipping();

+		}

 		
 		foreach($array as $row)
 		{
@@ -144,15 +145,17 @@ 
 
 	private static function get_date($timestamp = false)
 	{
-		if($timestamp == 0)
-			$timestamp = time();
+		if($timestamp == 0) {

+					$timestamp = time();

+		}

 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
 	}
 
 	private static function start_gzipping()
 	{
-		if(!ob_start('ob_gzhandler'))
-            ob_start();
+		if(!ob_start('ob_gzhandler')) {

+		            ob_start();

+		}

 	}
 
 }

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;