jacobemerick / web

utility/content/AutolinkTwitterUserContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 

 	protected function execute()

 	{

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

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

 			return;

 		

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

 		$parameters = func_get_args();

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

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

 		{

 			trigger_error('Unexpected parameters passed into AutolinkTwitterUser!');

 			return;

@@ -23,10 +23,10 @@ 
 		$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)

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

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$replacement = $this->get_replacement_link($match[1], $match[0]);

 			$this->content = str_replace($match[0], $replacement, $this->content);

utility/content/CleanCommentContent.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -40,10 +40,10 @@ 
 	{

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

 		

-		if($match_count < 1)

+		if ($match_count < 1)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$full_match = array_shift($match);

 			$placeholder = $this->create_placeholder($full_match);

@@ -79,10 +79,10 @@ 
 	{

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

 		

-		if($match_count < 1)

+		if ($match_count < 1)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$full_match = array_shift($match);

 			$full_match_pattern = $this->create_full_match_pattern($full_match);

@@ -99,7 +99,7 @@ 
 

 	private function replace_element_patterns()

 	{

-		foreach($this->replacement_array as $key => $replace)

+		foreach ($this->replacement_array as $key => $replace)

 		{

 			$this->content = str_replace($key, $replace, $this->content);

 		}

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';

utility/content/FetchFirstPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 

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

 	{

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

+		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;

@@ -34,7 +34,7 @@ 
 		

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

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

-		if($photo_result == false)

+		if ($photo_result == false)

 			return '';

 		

 		$height = $file_size[1];

@@ -42,7 +42,7 @@ 
 		$description = $photo_result->description;

 		

 		$domain = '/';

-		if($is_absolute)

+		if ($is_absolute)

 			$domain = Loader::getRootUrl();

 		

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

utility/content/FixImageContent.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	protected function execute($is_absolute = false)

 	{

 		preg_match_all(self::$IMAGE_PLACEHOLDER_MATCH, $this->content, $matches);

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

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

 		{

 			$image_path = $this->get_file_path($match);

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

utility/content/FixInternalLinkContent.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,9 +12,9 @@ 
 	protected function execute($is_absolute = true)

 	{

 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);

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

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

 		{

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

+			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);

@@ -29,19 +29,19 @@ 
 		

 		$link = '';

 		

-		switch($type)

+		switch ($type)

 		{

 			case 'blog' :

 				Loader::load('collector', 'blog/PostCollector');

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

 				

-				if($post === NULL)

+				if ($post === NULL)

 					return;

 				

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

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

 				

-				if($anchor == '')

+				if ($anchor == '')

 					$anchor = $post->title;

 				

 				break;

@@ -49,7 +49,7 @@ 
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';

 				$link .= "tag/{$uri}/";

 				

-				if($anchor == '')

+				if ($anchor == '')

 				{

 					$anchor = $uri;

 					$anchor = str_replace('-', ' ', $anchor);

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

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

 				

-				if($log === NULL)

+				if ($log === NULL)

 					return;

 				

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

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

 				

-				if($anchor == '')

+				if ($anchor == '')

 					$anchor = $log->title;

 				

 				break;

utility/content/FixPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	protected function execute($is_absolute = false, $size = 'medium')

 	{

 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);

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

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

 		{

 			$photo_content = $this->get_photo_content($match, $size, $is_absolute);

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

@@ -37,7 +37,7 @@ 
 		

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

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

-		if($photo_result == false)

+		if ($photo_result == false)

 			return '';

 		

 		$height = $file_size[1];

@@ -49,7 +49,7 @@ 
         }

 		

 		$domain = '/';

-		if($is_absolute)

+		if ($is_absolute)

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

 		

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

utility/content/FixUnacceptableCharacterContent.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 

 	protected function execute()

 	{

-		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)

+		foreach (self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)

 		{

-			if(stristr($this->content, $match))

+			if (stristr($this->content, $match))

 				$this->content = str_replace($match, $replace, $this->content);

 		}

 		return;

utility/content/MarkupCodeContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@ 
 	protected function execute($title = '')

 	{

 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);

-		if(count($matches[1]) == 0)

+		if (count($matches[1]) == 0)

 			return;

 		

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

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

 		{

 			$replacement = $match;

 			$replacement = $this->wrap_in_list($replacement);

@@ -29,7 +29,7 @@ 
 	{

 		$content_array = explode("\n", $content);

 		

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

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

 		{

 			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';

 			$new_row .= '<p>';

@@ -46,7 +46,7 @@ 
 

 	private function highlight_code($content, $type)

 	{

-		switch($type)

+		switch ($type)

 		{

 			default :

 				return $content;