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

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

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

 		}

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)

 		{

Doc Comments +8 added lines

@@ -36,6 +36,10 @@ 
 		$this->replace_element_patterns();

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)

 	{

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

@@ -75,6 +79,10 @@ 
 		$this->content = strip_tags($this->content);

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)

 	{

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

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/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

Indentation +26 added lines, -26 removed lines

@@ -72,38 +72,38 @@
 				

 				break;

 			case 'falls' :

-                $pieces = explode('/', $uri);

-                if (count($pieces) == 1) {

-                    Loader::load('collector', 'waterfall/WatercourseCollector');

-                    list ($watercourse_alias) = $pieces;

-                    $watercourse = WatercourseCollector::getByAlias($watercourse_alias);

+				$pieces = explode('/', $uri);

+				if (count($pieces) == 1) {

+					Loader::load('collector', 'waterfall/WatercourseCollector');

+					list ($watercourse_alias) = $pieces;

+					$watercourse = WatercourseCollector::getByAlias($watercourse_alias);

                     

-                    if ($watercourse == null) {

-                        return;

-                    }

+					if ($watercourse == null) {

+						return;

+					}

                     

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

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

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

+					$link .= "{$watercourse->alias}/";

                     

-                    if ($anchor == '') {

-                        $anchor = $watercourse->name;

-                    }

-                } else if (count($pieces) == 2) {

-                    Loader::load('collector', 'waterfall/WaterfallCollector');

-                    list ($watercourse_alias, $waterfall_alias) = $pieces;

-                    $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);

+					if ($anchor == '') {

+						$anchor = $watercourse->name;

+					}

+				} else if (count($pieces) == 2) {

+					Loader::load('collector', 'waterfall/WaterfallCollector');

+					list ($watercourse_alias, $waterfall_alias) = $pieces;

+					$waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);

                     

-                    if ($waterfall == null) {

-                        return;

-                    }

+					if ($waterfall == null) {

+						return;

+					}

                     

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

-                    $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";

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

+					$link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";

                     

-                    if ($anchor == '') {

-                        $anchor = $waterfall->name;

-                    }

-                }

+					if ($anchor == '') {

+						$anchor = $waterfall->name;

+					}

+				}

 				break;

 			default :

 				break;

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;

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

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
 		return;

 	}

 

+	/**
+	 * @param boolean $is_absolute
+	 */
 	private function get_link($string, $is_absolute, $anchor = '')

 	{

 		list($type, $uri) = explode('/', $string, 2);

utility/content/FixPhotoContent.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
 		$width = $file_size[0];

 		$description = $photo_result->description;

         

-        if ($description == '') {

-            Debugger::logMessage("No description for {$category}/{$photo}");

-        }

+		if ($description == '') {

+			Debugger::logMessage("No description for {$category}/{$photo}");

+		}

 		

 		$domain = '/';

 		if($is_absolute)

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

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

 	}

Doc Comments +4 added lines

@@ -26,6 +26,10 @@
 		return Loader::getImagePath('photo', $path);

 	}

 

+	/**
+	 * @param string $size
+	 * @param boolean $is_absolute
+	 */
 	private function get_photo_content($string, $size, $is_absolute)

 	{

 		list($category, $file_name) = explode('/', $string);

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;

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 	{

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

 		{

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

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

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

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

+			}

 		}

 		return;

 	}

utility/content/ImperialUnitContent.class.inc.php

Indentation +46 added lines, -46 removed lines

@@ -5,56 +5,56 @@
 final class ImperialUnitContent extends Content

 {

 

-    protected function execute($type = '')

-    {

-        $number = floatval($this->content);

-        $number *= 39.37; // convert to inches

+	protected function execute($type = '')

+	{

+		$number = floatval($this->content);

+		$number *= 39.37; // convert to inches

         

-        if ($type == '') {

-            if ($number > (12 * 3 * 1760 * 5)) {

-                $type = 'full miles';

-            } else if ($number > (12 * 3 * 1760 * .5)) {

-                $type = 'tenth miles';

-            } else if ($number > (12 * 3 * 150)) {

-                $type = 'yards';

-            } else if ($number > (12 * 10)) {

-                $type = 'feet';

-            } else {

-                $type = 'inches';

-            }

-        }

+		if ($type == '') {

+			if ($number > (12 * 3 * 1760 * 5)) {

+				$type = 'full miles';

+			} else if ($number > (12 * 3 * 1760 * .5)) {

+				$type = 'tenth miles';

+			} else if ($number > (12 * 3 * 150)) {

+				$type = 'yards';

+			} else if ($number > (12 * 10)) {

+				$type = 'feet';

+			} else {

+				$type = 'inches';

+			}

+		}

         

-        switch ($type) {

-            case 'full miles' :

-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';

-                break;

-            case 'tenth miles' :

-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';

-                break;

-            case 'yards' :

-                $this->content = number_format(round($number / (12 * 3))) . ' yards';

-                break;

-            case 'feet' :

-                $this->content = number_format(round($number / 12)) . "'";

-                break;

-            case 'inches' :

-                $feet = floor($number / 12);

+		switch ($type) {

+			case 'full miles' :

+				$this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';

+				break;

+			case 'tenth miles' :

+				$this->content = round($number / (12 * 3 * 1760), 1) . ' miles';

+				break;

+			case 'yards' :

+				$this->content = number_format(round($number / (12 * 3))) . ' yards';

+				break;

+			case 'feet' :

+				$this->content = number_format(round($number / 12)) . "'";

+				break;

+			case 'inches' :

+				$feet = floor($number / 12);

                 

-                $inches = $number - $feet * 12;

-                $inches = round($inches);

+				$inches = $number - $feet * 12;

+				$inches = round($inches);

                 

-                if ($inches == 12) {

-                    $feet++;

-                    $inches = 0;

-                }

+				if ($inches == 12) {

+					$feet++;

+					$inches = 0;

+				}

                 

-                $this->content = '';

-                $this->content .= number_format($feet) . "'";

-                if (isset($inches) && $inches > 0) {

-                    $this->content .= " {$inches}\"";

-                }

-                break;

-        }

-    }

+				$this->content = '';

+				$this->content .= number_format($feet) . "'";

+				if (isset($inches) && $inches > 0) {

+					$this->content .= " {$inches}\"";

+				}

+				break;

+		}

+	}

 

 }
\ No newline at end of file

utility/cookie/CommenterCookie.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
 

 	protected function getDomain()

 	{

-        $site = URLDecode::getSite();

-        if ($site == 'waterfalls' && Loader::isLive()) {

-            return 'waterfallsofthekeweenaw.com';

-        }

+		$site = URLDecode::getSite();

+		if ($site == 'waterfalls' && Loader::isLive()) {

+			return 'waterfallsofthekeweenaw.com';

+		}

 		return self::$COOKIE_DOMAIN;

 	}

 

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 {

 

 	private static $COOKIE_NAME			= 'commenter';

-	private static $COOKIE_DURATION		= 31536000; // one year

-	private static $COOKIE_DOMAIN		= 'jacobemerick.com';

+	private static $COOKIE_DURATION = 31536000; // one year

+	private static $COOKIE_DOMAIN = 'jacobemerick.com';

 	private static $COOKIE_PATH			= '/';

 

 	protected function getName()