jacobemerick / web

utility/content/AcceptableContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -11,8 +11,9 @@ 
 		$is_acceptable = true;

 		foreach($this->getUnacceptableWords() as $unacceptableWord)

 		{

-			if(stristr($unacceptableWord->word, $this->content))

-				$is_acceptable = false;

+			if(stristr($unacceptableWord->word, $this->content)) {

+							$is_acceptable = false;

+			}

 		}

 		return $is_acceptable;

 	}

@@ -20,8 +21,9 @@ 
 	private $unacceptableWords;

 	private function getUnacceptableWords()

 	{

-		if(!$this->unacceptableWords)

-			$this->unacceptableWords = UnacceptableWordCollector::getWords();

+		if(!$this->unacceptableWords) {

+					$this->unacceptableWords = UnacceptableWordCollector::getWords();

+		}

 		return $this->unacceptableWords;

 	}

 

utility/content/AutolinkTwitterHashContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, '#') === false)

-			return;

+		if(stristr($this->content, '#') === false) {

+					return;

+		}

 		

 		// yeah yeah, i'm currently ignoring the link, whatevs

 		$parameters = func_get_args();

@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_hash === false || $found_hash === 0)

-			return;

+		if($found_hash === false || $found_hash === 0) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

utility/content/AutolinkTwitterURLContent.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, 'http') === false)

-			return;

+		if(stristr($this->content, 'http') === false) {

+					return;

+		}

 		

 		$parameters = func_get_args();

 		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

@@ -22,8 +23,9 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_link === false || $found_link === 0)

-			return;

+		if($found_link === false || $found_link === 0) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

@@ -70,15 +72,17 @@ 
 	private function check_for_redirect($url)

 	{

 		$headers = @get_headers($url);

-		if($headers === false)

-			$headers = $this->get_headers($url);

+		if($headers === false) {

+					$headers = $this->get_headers($url);

+		}

 		

 		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)

 		{

 			foreach($headers as $header)

 			{

-				if(substr($header, 0, 9) == 'Location:')

-					break;

+				if(substr($header, 0, 9) == 'Location:') {

+									break;

+				}

 			}

 			

 			$url = substr($header, 10);

utility/content/AutolinkTwitterUserContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, '@') === false)

-			return;

+		if(stristr($this->content, '@') === false) {

+					return;

+		}

 		

 		// yeah yeah, i'm currently ignoring the link, whatevs

 		$parameters = func_get_args();

@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_user === false || $found_user === 0)

-			return;

+		if($found_user === false || $found_user === 0) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

utility/content/CleanCommentContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -40,8 +40,9 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

-			return;

+		if($match_count < 1) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

@@ -79,8 +80,9 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

-			return;

+		if($match_count < 1) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

utility/content/ElapsedTimeContent.class.inc.php

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/content/FetchFirstPhotoContent.class.inc.php

Braces +11 added lines, -8 removed lines

@@ -11,10 +11,11 @@ 
 

 	protected function execute($is_absolute = false, $size = 'thumb')

 	{

-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)

-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);

-		else

-			$this->content = self::$DEFAULT_RETURN;

+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {

+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);

+		} else {

+					$this->content = self::$DEFAULT_RETURN;

+		}

 		return;

 	}

 

@@ -34,16 +35,18 @@ 
 		

 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::fetchRow($category, $photo);

-		if($photo_result == false)

-			return '';

+		if($photo_result == false) {

+					return '';

+		}

 		

 		$height = $file_size[1];

 		$width = $file_size[0];

 		$description = $photo_result->description;

 		

 		$domain = '/';

-		if($is_absolute)

-			$domain = Loader::getRootUrl();

+		if($is_absolute) {

+					$domain = Loader::getRootUrl();

+		}

 		

 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

 	}

utility/content/FixInternalLinkContent.class.inc.php

Braces +17 added lines, -12 removed lines

@@ -14,10 +14,11 @@ 
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);

 		foreach($matches[1] as $key => $match)

 		{

-			if(isset($matches[3][$key]))

-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

-			else

-				$link_content = $this->get_link($match, $is_absolute);

+			if(isset($matches[3][$key])) {

+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

+			} else {

+							$link_content = $this->get_link($match, $is_absolute);

+			}

 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);

 		}

 		return;

@@ -35,14 +36,16 @@ 
 				Loader::load('collector', 'blog/PostCollector');

 				$post = PostCollector::getPostByURI($uri);

 				

-				if($post === NULL)

-					return;

+				if($post === NULL) {

+									return;

+				}

 				

 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';

 				$link .= "{$post->category}/{$post->path}/";

 				

-				if($anchor == '')

-					$anchor = $post->title;

+				if($anchor == '') {

+									$anchor = $post->title;

+				}

 				

 				break;

 			case 'blog-tag' :

@@ -61,14 +64,16 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');

 				$log = LogCollector::getByAlias($uri);

 				

-				if($log === NULL)

-					return;

+				if($log === NULL) {

+									return;

+				}

 				

 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';

 				$link .= "journal/{$log->alias}/";

 				

-				if($anchor == '')

-					$anchor = $log->title;

+				if($anchor == '') {

+									$anchor = $log->title;

+				}

 				

 				break;

 			case 'falls' :

utility/content/FixPhotoContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 		

 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::fetchRow($category, $photo);

-		if($photo_result == false)

-			return '';

+		if($photo_result == false) {

+					return '';

+		}

 		

 		$height = $file_size[1];

 		$width = $file_size[0];

@@ -49,8 +50,9 @@ 
         }

 		

 		$domain = '/';

-		if($is_absolute)

-			$domain = Loader::getRootUrl('blog');

+		if($is_absolute) {

+					$domain = Loader::getRootUrl('blog');

+		}

 		

 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);

 	}