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

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

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

Indentation +9 added lines, -9 removed lines

@@ -20,21 +20,21 @@
 	private static $USER_MENTION_LINK = '<a href="https://twitter.com/%1$s" rel="nofollow" target="_blank" title="%2$s (%1$s) on Twitter">@%1$s</a>';
 	private static $MEDIA_LINK = '<a class="photo" href="%s" rel="nofollow" target="_blank" title="%s"><img src="%s:%s" alt="%s" height="%s" width="%s" /></a>';
 
-    private $consumer_key;
-    private $consumer_secret;
-    private $access_token;
-    private $access_secret;
+	private $consumer_key;
+	private $consumer_secret;
+	private $access_token;
+	private $access_secret;
 
 	private $json;
 
 	public function __construct()
 	{
-        global $config;
+		global $config;
 
-        $this->consumer_key = $config->twitter->consumer_key;
-        $this->consumer_secret = $config->twitter->consumer_secret;
-        $this->access_token = $config->twitter->access_token;
-        $this->access_secret = $config->twitter->access_secret;
+		$this->consumer_key = $config->twitter->consumer_key;
+		$this->consumer_secret = $config->twitter->consumer_secret;
+		$this->access_token = $config->twitter->access_token;
+		$this->access_secret = $config->twitter->access_secret;
 
 		$json = $this->get_data();
 		

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
 	private $oauth_array;
 	private function get_oauth_array()
 	{
-		if(!isset($this->oauth_array))
+		if (!isset($this->oauth_array))
 		{
 			$this->oauth_array = array(
 				'screen_name' => self::$SCREEN_NAME,
@@ -116,7 +116,7 @@ 
 	{
 		$encoded_array = array();
 		ksort($array);
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
 			$value = rawurlencode($value);
 			$value = ($wrap_values) ? '"' . $value . '"' : $value;
@@ -127,27 +127,27 @@ 
 
 	public function activate()
 	{
-		if(!$this->json)
+		if (!$this->json)
 			return $this->error('Could not connect to twitter json feed.');
 		
 		$count = 0;
-		foreach($this->json as $status)
+		foreach ($this->json as $status)
 		{
 			$text = Database::escape($status->text);
 			$date = date('Y-m-d H:i:s', strtotime($status->created_at));
 			
 			$tweet_result = TwitterCollector::getTweetByFields($date, $text);
-			if($tweet_result !== null)
+			if ($tweet_result !== null)
 			{
 				$favorites = (int) $status->favorite_count;
-				if($favorites != 0 && $tweet_result->favorites != $favorites)
+				if ($favorites != 0 && $tweet_result->favorites != $favorites)
 				{
 					$query = sprintf(self::$UPDATE_FAVORITES_QUERY, $favorites, $tweet_result->id);
 					Database::execute($query);
 				}
 				
 				$retweets = (int) $status->retweet_count;
-				if($retweets != 0 && $tweet_result->retweets != $retweets)
+				if ($retweets != 0 && $tweet_result->retweets != $retweets)
 				{
 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
 					Database::execute($query);
@@ -157,7 +157,7 @@ 
 			{
 				$twitter_id = (string) $status->id_str;
 				
-				if(isset($status->retweeted_status))
+				if (isset($status->retweeted_status))
 				{
 					$text_formatted = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities);
 					$text_formatted_full = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities, 'full');
@@ -200,9 +200,9 @@ 
 
 	private function get_source($source)
 	{
-		if(stristr($source, 'tweetdeck'))
+		if (stristr($source, 'tweetdeck'))
 			return 'tweetdeck';
-		if(stristr($source, 'windows phone'))
+		if (stristr($source, 'windows phone'))
 			return 'phone';
 		else
 			return '';
@@ -211,9 +211,9 @@ 
 	private function get_formatted($text, $entities, $type = 'short')
 	{
 		$holder = array();
-		foreach($entities as $entity_type => $entity_collection)
+		foreach ($entities as $entity_type => $entity_collection)
 		{
-			foreach($entity_collection as $entity)
+			foreach ($entity_collection as $entity)
 			{
 				$start = $entity->indices[0];
 				$end = $entity->indices[1];
@@ -228,7 +228,7 @@ 
 		
 		krsort($holder);
 		
-		foreach($holder as $entity)
+		foreach ($holder as $entity)
 		{
 			$text = mb_substr($text, 0, $entity->start, 'UTF-8') . $entity->replace . mb_substr($text, $entity->end, 5000, 'UTF-8');
 		}
@@ -241,7 +241,7 @@ 
 
 	private function get_replace_text($entity_type, $entity, $type)
 	{
-		switch($entity_type)
+		switch ($entity_type)
 		{
 			case 'hashtags' :
 				$replace = sprintf(self::$HASHTAG_LINK, $entity->text);
@@ -253,7 +253,7 @@ 
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
 				break;
 			case 'media' :
-				if($type == 'full')
+				if ($type == 'full')
 					$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);
 				else
 					$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);

Braces +18 added lines, -16 removed lines

@@ -127,8 +127,9 @@ 
 
 	public function activate()
 	{
-		if(!$this->json)
-			return $this->error('Could not connect to twitter json feed.');
+		if(!$this->json) {

+					return $this->error('Could not connect to twitter json feed.');

+		}

 		
 		$count = 0;
 		foreach($this->json as $status)
@@ -152,8 +153,7 @@ 
 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
 					Database::execute($query);
 				}
-			}
-			else
+			} else
 			{
 				$twitter_id = (string) $status->id_str;
 				
@@ -164,8 +164,7 @@ 
 					
 					$text_formatted = $this->prepend_original_user($status->retweeted_status->user, $text_formatted);
 					$text_formatted_full = $this->prepend_original_user($status->retweeted_status->user, $text_formatted_full);
-				}
-				else
+				} else
 				{
 					$text_formatted = $this->get_formatted($status->text, $status->entities);
 					$text_formatted_full = $this->get_formatted($status->text, $status->entities, 'full');
@@ -200,12 +199,14 @@ 
 
 	private function get_source($source)
 	{
-		if(stristr($source, 'tweetdeck'))
-			return 'tweetdeck';
-		if(stristr($source, 'windows phone'))
-			return 'phone';
-		else
-			return '';
+		if(stristr($source, 'tweetdeck')) {

+					return 'tweetdeck';

+		}

+		if(stristr($source, 'windows phone')) {

+					return 'phone';

+		} else {

+					return '';

+		}

 	}
 
 	private function get_formatted($text, $entities, $type = 'short')
@@ -253,10 +254,11 @@ 
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
 				break;
 			case 'media' :
-				if($type == 'full')
-					$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);
-				else
-					$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);
+				if($type == 'full') {

+									$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);

+				} else {

+									$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);

+				}

 				break;
 			default :
 				$replace = '';

utility/cron/StreamCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -61,10 +61,10 @@ 
 
 	private function remove_existing($result, $type)
 	{
-		foreach($result as $key => $row)
+		foreach ($result as $key => $row)
 		{
 			$stream_result = ActivityCollector::getPostByFields($row->id, $type);
-			if($stream_result)
+			if ($stream_result)
 				unset($result[$key]);
 		}
 		return $result;
@@ -72,7 +72,7 @@ 
 
 	private function add_posts($result, $type)
 	{
-		foreach($result as $row)
+		foreach ($result as $row)
 		{
 			$query = sprintf(self::$QUERY, $type, $row->id, $row->date);
 			Database::execute($query);

Braces +3 added lines, -2 removed lines

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

+							unset($result[$key]);

+			}

 		}
 		return $result;
 	}

utility/cron/HuluCron.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -20,28 +20,28 @@ 
 
 	public function activate()
 	{
-		if(!$this->xml)
+		if (!$this->xml)
 			return $this->error('Could not connect to feed.');
 		
 		$count = 0;
-		foreach($this->xml->channel->item as $item)
+		foreach ($this->xml->channel->item as $item)
 		{
 			$date = date('Y-m-d H:i:s', strtotime($item->pubDate));
 			
-			if(preg_match_all('/((rated)|(wrote a review about)|(subscribed to)|(watched) )(.+)/', $item->title, $title_array) > 0)
+			if (preg_match_all('/((rated)|(wrote a review about)|(subscribed to)|(watched) )(.+)/', $item->title, $title_array) > 0)
 			{
 				$video = array_pop($title_array);
 				$video = current($video);
 				$video = substr($video, 0, -1);
 			}
-			else if(preg_match_all('/(.*) - (s\d+) | (e\d+) - (.*)/', $item->title, $title_array) > 0)
+			else if (preg_match_all('/(.*) - (s\d+) | (e\d+) - (.*)/', $item->title, $title_array) > 0)
 				$video = "{$title_array[1][0]}: {$title_array[4][1]}";
 			else
 				$video = $item->title;
 			
 			$url = $item->link;
 			
-			if($item->category == 'Vote')
+			if ($item->category == 'Vote')
 			{
 				$description = stristr($video, 'and gave it');
 				$description = substr($description, 12);
@@ -53,7 +53,7 @@ 
 			else
 				$description = '';
 			
-			switch($item->category)
+			switch ($item->category)
 			{
 				case 'ActivityViewedVideo' :
 					$action = 1;
@@ -73,7 +73,7 @@ 
 			}
 			
 			$hulu_result = HuluCollector::getHuluByFields($video, $action);
-			if($hulu_result !== null)
+			if ($hulu_result !== null)
 				continue;
 			
 			$display = (

Braces +14 added lines, -12 removed lines

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

+		}

 		
 		$count = 0;
 		foreach($this->xml->channel->item as $item)
@@ -33,11 +34,11 @@ 
 				$video = array_pop($title_array);
 				$video = current($video);
 				$video = substr($video, 0, -1);
-			}
-			else if(preg_match_all('/(.*) - (s\d+) | (e\d+) - (.*)/', $item->title, $title_array) > 0)
-				$video = "{$title_array[1][0]}: {$title_array[4][1]}";
-			else
-				$video = $item->title;
+			} else if(preg_match_all('/(.*) - (s\d+) | (e\d+) - (.*)/', $item->title, $title_array) > 0) {

+							$video = "{$title_array[1][0]}: {$title_array[4][1]}";

+			} else {

+							$video = $item->title;

+			}

 			
 			$url = $item->link;
 			
@@ -49,9 +50,9 @@ 
 				$description = substr($description, 0, 1);
 				$text = substr($video, 0, strpos($video, 'and gave it') - 1);
 				$video = trim($video);
-			}
-			else
-				$description = '';
+			} else {

+							$description = '';

+			}

 			
 			switch($item->category)
 			{
@@ -73,8 +74,9 @@ 
 			}
 			
 			$hulu_result = HuluCollector::getHuluByFields($video, $action);
-			if($hulu_result !== null)
-				continue;
+			if($hulu_result !== null) {

+							continue;

+			}

 			
 			$display = (
 				Content::instance('Acceptable', $video)->check() === true &&

utility/cron/YouTubeCron.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -20,18 +20,18 @@
 
 	public function activate()
 	{
-		if(!$this->xml)
+		if (!$this->xml)
 			return $this->error('Could not connect to youtube xml feed.');
 		
 		$count = 0;
-		foreach($this->xml->entry as $entry)
+		foreach ($this->xml->entry as $entry)
 		{
 			$video_id = $entry->id;
 			$video_id = explode('/', $video_id);
 			$video_id = array_pop($video_id);
 			
 			$video_exists = YouTubeCollector::checkForVideoByVideoID($video_id);
-			if($video_exists)
+			if ($video_exists)
 				continue;
 			
 			$title = Database::escape($entry->title);

Braces +6 added lines, -4 removed lines

@@ -20,8 +20,9 @@ 
 
 	public function activate()
 	{
-		if(!$this->xml)
-			return $this->error('Could not connect to youtube xml feed.');
+		if(!$this->xml) {

+					return $this->error('Could not connect to youtube xml feed.');

+		}

 		
 		$count = 0;
 		foreach($this->xml->entry as $entry)
@@ -31,8 +32,9 @@ 
 			$video_id = array_pop($video_id);
 			
 			$video_exists = YouTubeCollector::checkForVideoByVideoID($video_id);
-			if($video_exists)
-				continue;
+			if($video_exists) {

+							continue;

+			}

 			
 			$title = Database::escape($entry->title);
 			$content = Database::escape($entry->content);