jacobemerick / web

utility/content/FixInternalLinkContent.class.inc.php

Doc Comments +4 added lines

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

 	}

 

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

 	{

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

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

utility/content/FixPhotoContent.class.inc.php

Doc Comments +5 added lines

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

 	}

 

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

 	{

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

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

 	}

utility/content/MarkupCodeContent.class.inc.php

Doc Comments +6 added lines

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

 	}

 

+	/**
+	 * @param string $content
+	 */
 	private function wrap_in_list($content)

 	{

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

@@ -44,6 +47,9 @@ 
 		return $content;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function highlight_code($content, $type)

 	{

 		switch($type)

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;

Braces +3 added lines, -2 removed lines

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

 	{

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

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

-			return;

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

+					return;

+		}

 		

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

 		{

utility/content/SmartTrimContent.class.inc.php

Doc Comments +3 added lines

@@ -62,6 +62,9 @@
 		$this->is_trimmed = true;

 	}

 

+	/**
+	 * @param string $content
+	 */
 	private function trim_html_string($content, $length)

 	{

 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		

 		if($length < strlen($this->content))

 			$this->trim_string($length);

-        else

-            $etc = '';

+		else

+			$etc = '';

 		$this->check_exclude_tags();

 		$this->close_tags($etc);

 	}

Spacing +13 added lines, -13 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()

 	{

 		$args = func_get_args();

-		if(count($args) < 1)

+		if (count($args) < 1)

 		{

 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');

 			return;

 		}

 		

-		if(count($args) == 2)

+		if (count($args) == 2)

 			$etc = $args[1];

 		else

 			$etc = self::$ETC;

 		

 		$length = $args[0];

 		

-		if($length < strlen($this->content))

+		if ($length < strlen($this->content))

 			$this->trim_string($length);

         else

             $etc = '';

@@ -54,7 +54,7 @@ 
 		

 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);

 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);

-		if($last_left_bracket_position > $last_right_bracket_position)

+		if ($last_left_bracket_position > $last_right_bracket_position)

 			$content = substr($content, 0, $last_left_bracket_position);

 		$content = trim($content);

 		

@@ -73,16 +73,16 @@ 
 		$content = current($content);

 		

 		$max_length = $length;

-		foreach($matches[0] as $match)

+		foreach ($matches[0] as $match)

 		{

 			$max_length += strlen($match[0]);

-			if($max_length <= $match[1])

+			if ($max_length <= $match[1])

 				break;

 			

 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);

 		}

 		

-		if(substr($content, -7) == '</p><p>')

+		if (substr($content, -7) == '</p><p>')

 			$content = substr($content, 0, -7);

 		

 		return $content;

@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);

 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);

 		

-		if(count($matches[1]) % 2 == 1)

+		if (count($matches[1]) % 2 == 1)

 		{

 			$cut_tag = end($matches[1]);

 			$cut_tag_position = $cut_tag[1] - 1;

@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);

 		$open_tags = array();

 		

-		foreach($matches[1] as $tag)

+		foreach ($matches[1] as $tag)

 		{

-			if(in_array($tag, $open_tags))

+			if (in_array($tag, $open_tags))

 			{

 				$key = array_search($tag, $open_tags);

 				unset($open_tags[$key]);

@@ -124,11 +124,11 @@ 
 		}

 		

 		$open_tags = array_reverse($open_tags);

-		if(count($open_tags) > 0)

+		if (count($open_tags) > 0)

 		{

-			foreach($open_tags as $key => $open_tag)

+			foreach ($open_tags as $key => $open_tag)

 			{

-				if($key == count($open_tags) - 1)

+				if ($key == count($open_tags) - 1)

 					$content .= $etc;

 				$content .= "</{$open_tag}>";

 			}

Braces +26 added lines, -20 removed lines

@@ -33,17 +33,19 @@ 
 			return;

 		}

 		

-		if(count($args) == 2)

-			$etc = $args[1];

-		else

-			$etc = self::$ETC;

+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		

 		$length = $args[0];

 		

-		if($length < strlen($this->content))

-			$this->trim_string($length);

-        else

-            $etc = '';

+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();

 		$this->close_tags($etc);

 	}

@@ -54,8 +56,9 @@ 
 		

 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);

 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);

-		if($last_left_bracket_position > $last_right_bracket_position)

-			$content = substr($content, 0, $last_left_bracket_position);

+		if($last_left_bracket_position > $last_right_bracket_position) {

+					$content = substr($content, 0, $last_left_bracket_position);

+		}

 		$content = trim($content);

 		

 		$this->content = $content;

@@ -76,14 +79,16 @@ 
 		foreach($matches[0] as $match)

 		{

 			$max_length += strlen($match[0]);

-			if($max_length <= $match[1])

-				break;

+			if($max_length <= $match[1]) {

+							break;

+			}

 			

 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);

 		}

 		

-		if(substr($content, -7) == '</p><p>')

-			$content = substr($content, 0, -7);

+		if(substr($content, -7) == '</p><p>') {

+					$content = substr($content, 0, -7);

+		}

 		

 		return $content;

 	}

@@ -118,9 +123,9 @@ 
 			{

 				$key = array_search($tag, $open_tags);

 				unset($open_tags[$key]);

+			} else {

+							$open_tags[] = $tag;

 			}

-			else

-				$open_tags[] = $tag;

 		}

 		

 		$open_tags = array_reverse($open_tags);

@@ -128,13 +133,14 @@ 
 		{

 			foreach($open_tags as $key => $open_tag)

 			{

-				if($key == count($open_tags) - 1)

-					$content .= $etc;

+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";

 			}

+		} else {

+					$content .= $etc;

 		}

-		else

-			$content .= $etc;

 		

 		$this->content = $content;

 	}

utility/Cookie.class.inc.php

Doc Comments +17 added lines

@@ -14,9 +14,20 @@ 
 		$this->class_new = $class_name;

 	}

 

+	/**
+	 * @return string
+	 */
 	abstract protected function getName();

 	abstract protected function getDuration();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getDomain();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getPath();

 

 	public function setValue($value)

@@ -28,6 +39,9 @@ 
 		return $this;

 	}

 

+	/**
+	 * @return string|null
+	 */
 	public function getValue()

 	{

 		if(!$this->is_loaded)

@@ -118,6 +132,9 @@ 
 		return $set_cookie;

 	}

 

+	/**
+	 * @param string $class_name
+	 */
 	public static function instance($class_name)

 	{

 		return Loader::loadNew('utility', "cookie/{$class_name}Cookie", (array) $class_name);

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 

 	public function setValue($value)

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		

 		$this->value = $value;

@@ -30,7 +30,7 @@ 
 

 	public function getValue()

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		return $this->value;

 	}

@@ -42,7 +42,7 @@ 
 

 	public function exists()

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		return $this->exists;

 	}

@@ -50,10 +50,10 @@ 
 	private final function load()

 	{

 		$name = $this->getName();

-		if(isset($_COOKIE[$name]))

+		if (isset($_COOKIE[$name]))

 			$value = $_COOKIE[$name];

 		

-		if(isset($value))

+		if (isset($value))

 		{

 			$this->value = $value;

 			$this->exists = true;

@@ -66,13 +66,13 @@ 
 

 	public final function save()

 	{

-		if(!$this->check_values())

+		if (!$this->check_values())

 		{

 			Debugger::error('Attempt to create a cookie without all of the values being set!');

 			return false;

 		}

 		

-		if(!$this->set_cookie())

+		if (!$this->set_cookie())

 		{

 			Debugger::log('There was a problem saving the cookie.');

 			return false;

@@ -84,23 +84,23 @@ 
 	private final function check_values()

 	{

 		$name = $this->getName();

-		if(empty($name) || strlen($name) < 1)

+		if (empty($name) || strlen($name) < 1)

 			return false;

 		

 		$value = $this->getValue();

-		if(!isset($value) || strlen($value) < 1)

+		if (!isset($value) || strlen($value) < 1)

 			return false;

 		

 		$expiration = $this->getExpiration();

-		if(!isset($expiration) || !is_int($expiration))

+		if (!isset($expiration) || !is_int($expiration))

 			return false;

 		

 		$domain = $this->getDomain();

-		if(!isset($domain) || strlen($domain) < 1)

+		if (!isset($domain) || strlen($domain) < 1)

 			return false;

 		

 		$path = $this->getPath();

-		if(!isset($path) || strlen($path) < 1)

+		if (!isset($path) || strlen($path) < 1)

 			return false;

 		

 		return true;

Braces +29 added lines, -20 removed lines

@@ -21,8 +21,9 @@ 
 

 	public function setValue($value)

 	{

-		if(!$this->is_loaded)

-			$this->load();

+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		

 		$this->value = $value;

 		return $this;

@@ -30,8 +31,9 @@ 
 

 	public function getValue()

 	{

-		if(!$this->is_loaded)

-			$this->load();

+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->value;

 	}

 

@@ -42,24 +44,26 @@ 
 

 	public function exists()

 	{

-		if(!$this->is_loaded)

-			$this->load();

+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->exists;

 	}

 

 	private final function load()

 	{

 		$name = $this->getName();

-		if(isset($_COOKIE[$name]))

-			$value = $_COOKIE[$name];

+		if(isset($_COOKIE[$name])) {

+					$value = $_COOKIE[$name];

+		}

 		

 		if(isset($value))

 		{

 			$this->value = $value;

 			$this->exists = true;

+		} else {

+					$this->exists = false;

 		}

-		else

-			$this->exists = false;

 		

 		$this->is_loaded = true;

 	}

@@ -84,24 +88,29 @@ 
 	private final function check_values()

 	{

 		$name = $this->getName();

-		if(empty($name) || strlen($name) < 1)

-			return false;

+		if(empty($name) || strlen($name) < 1) {

+					return false;

+		}

 		

 		$value = $this->getValue();

-		if(!isset($value) || strlen($value) < 1)

-			return false;

+		if(!isset($value) || strlen($value) < 1) {

+					return false;

+		}

 		

 		$expiration = $this->getExpiration();

-		if(!isset($expiration) || !is_int($expiration))

-			return false;

+		if(!isset($expiration) || !is_int($expiration)) {

+					return false;

+		}

 		

 		$domain = $this->getDomain();

-		if(!isset($domain) || strlen($domain) < 1)

-			return false;

+		if(!isset($domain) || strlen($domain) < 1) {

+					return false;

+		}

 		

 		$path = $this->getPath();

-		if(!isset($path) || strlen($path) < 1)

-			return false;

+		if(!isset($path) || strlen($path) < 1) {

+					return false;

+		}

 		

 		return true;

 	}

utility/cron/ChangelogCron.class.inc.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 		Database::execute($query);

 	}

 

+	/**
+	 * @return string
+	 */
 	private function get_changeset_to_check()

 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

Spacing +5 added lines, -5 removed lines

@@ -16,16 +16,16 @@ 
 	public function activate()

 	{

 		$loop_count = 0;

-		for($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)

+		for ($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)

 		{

 			$changeset_to_check = $this->get_changeset_to_check();

 			$data = $this->get_changeset_page_data($changeset_to_check);

 			

-			if(!isset($data))

+			if (!isset($data))

 				break;

 			

 			$this->save_changeset_data($data);

-			if($loop_count > 20)

+			if ($loop_count > 20)

 				exit;

 		}

 		

@@ -53,7 +53,7 @@ 
 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

 		

-		if($changeset === null)

+		if ($changeset === null)

 			return 1;

 		

 		$number = $changeset->number;

@@ -66,7 +66,7 @@ 
 		$changeset_page = $this->get_changeset_page($page);

 		

 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);

-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)

+		if (stristr($match[1], 'Error: Invalid Changeset Number') !== false)

 			return;

 		

 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);

Braces +12 added lines, -8 removed lines

@@ -21,12 +21,14 @@ 
 			$changeset_to_check = $this->get_changeset_to_check();

 			$data = $this->get_changeset_page_data($changeset_to_check);

 			

-			if(!isset($data))

-				break;

+			if(!isset($data)) {

+							break;

+			}

 			

 			$this->save_changeset_data($data);

-			if($loop_count > 20)

-				exit;

+			if($loop_count > 20) {

+							exit;

+			}

 		}

 		

 		return true;

@@ -53,8 +55,9 @@ 
 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

 		

-		if($changeset === null)

-			return 1;

+		if($changeset === null) {

+					return 1;

+		}

 		

 		$number = $changeset->number;

 		$number++;

@@ -66,8 +69,9 @@ 
 		$changeset_page = $this->get_changeset_page($page);

 		

 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);

-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)

-			return;

+		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false) {

+					return;

+		}

 		

 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);

 		$number = $match[1];

utility/cron/Cron.class.inc.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 

 	abstract public function activate();

 

+	/**
+	 * @param string $value
+	 */
 	protected function error($value)

 	{

 		trigger_error("Cron failed: {$value}");

utility/cron/StreamCron.class.inc.php

Doc Comments +6 added lines

@@ -59,6 +59,9 @@ 
 		$this->add_posts($youtube_result, 'youtube');

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function remove_existing($result, $type)

 	{

 		foreach($result as $key => $row)

@@ -70,6 +73,9 @@ 
 		return $result;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function add_posts($result, $type)

 	{

 		foreach($result as $row)

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

Doc Comments +3 added lines

@@ -239,6 +239,9 @@
 		return $text;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function get_replace_text($entity_type, $entity, $type)

 	{

 		switch($entity_type)

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