jacobemerick / web

collector/blog/PostCollector.class.inc.php

Doc Comments +9 added lines

@@ -17,6 +17,9 @@ 
 		return self::run_query($query);

 	}

 

+	/**
+	 * @param integer $total
+	 */
 	public static function getMainList($total, $offset = 0)

 	{

 		$query = "SELECT `post`.`id` AS `id`, `title`, `path`, `date`, `body`, `category` FROM `jpemeric_blog`.`post` WHERE `display` = '1' ORDER BY `date` DESC LIMIT {$offset}, {$total}";

@@ -29,6 +32,9 @@ 
 		return self::get_count($query);

 	}

 

+	/**
+	 * @param integer $total
+	 */
 	public static function getPostsForTag($tag_id, $total, $offset = 0)

 	{

 		$query = "SELECT `post`.`id` AS `id`, `title`, `path`, `date`, `body`, `category` FROM `jpemeric_blog`.`post`,`jpemeric_blog`.`ptlink` WHERE `display` = '1' && `post`.`id` = `ptlink`.`post_id` && `ptlink`.`tag_id` = '{$tag_id}' ORDER BY `date` DESC LIMIT {$offset}, {$total}";

@@ -41,6 +47,9 @@ 
 		return self::get_count($query);

 	}

 

+	/**
+	 * @param integer $total
+	 */
 	public static function getPostsForCategory($category, $total, $offset = 0)

 	{

 		$category = self::escape($category);

collector/comment/CommentCollector.class.inc.php

Doc Comments +3 added lines

@@ -83,6 +83,9 @@
 		return self::run_query($query);

 	}

 

+	/**
+	 * @param integer $count
+	 */
 	public static function getRecentBlogComments($count)

 	{

 		$query = "

Braces +5 added lines, -4 removed lines

@@ -163,10 +163,11 @@
 	{
 		$path = self::escape($path);
 		
-		if($commenter != 0)
-			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
-		else
-			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
+		if($commenter != 0) {

+					$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";

+		} else {

+					$trusted_commenter_clause = "`commenter`.`trusted` = '1'";

+		}

 		
 		$query = "
 			SELECT

collector/portfolio/PortfolioCollector.class.inc.php

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
 		return self::run_row_query($query);

 	}

 

+	/**
+	 * @param integer $type
+	 */
 	public static function getImagesForPiece($piece_id, $type)

 	{

 		$piece_id = self::escape($piece_id);

collector/waterfall/LogCollector.class.inc.php

Doc Comments +6 added lines

@@ -34,6 +34,9 @@ 
 		return self::run_query($query);

 	}

 

+    /**
+     * @param integer $total
+     */
     public static function getRecentList($total)

     {

         $query = "

@@ -178,6 +181,9 @@ 
 		return self::run_row_query($query);

 	}

 

+    /**
+     * @param string $date
+     */
     public static function getByDate($date)

     {

         $date = self::escape($date);

collector/waterfall/WaterfallCollector.class.inc.php

Doc Comments +3 added lines

@@ -117,6 +117,9 @@
         return self::run_query($query);

     }

 

+    /**
+     * @param string $alias
+     */
     public static function getByOldAlias($alias)

     {

         $alias = self::escape($alias);

controller/blog/DefaultPageController.class.inc.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $tag_array;

 	}

 

+	/**
+	 * @param boolean $trim
+	 */
 	final private function get_body_for_post($post, $trim)

 	{

 		$body = $post->body;

Braces +12 added lines, -8 removed lines

@@ -37,8 +37,9 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+		if($photo_result == null) {

+					return;

+		}

 		
 		$name = $photo_result->name;
 		$category = $photo_result->category;
@@ -101,8 +102,9 @@ 
 	{
 		$body = $post->body;
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		if($trim) {

+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		}

 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -128,8 +130,9 @@ 
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag->tag_count < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag->tag_count < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag->tag;
@@ -147,8 +150,9 @@ 
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag->tag_count > $maximum)
-				$maximum = $tag->tag_count;
+			if($tag->tag_count > $maximum) {

+							$maximum = $tag->tag_count;

+			}

 		}
 		return $maximum;
 	}

controller/PageController.class.inc.php

Doc Comments +28 added lines

@@ -204,6 +204,9 @@ 
 			exit;

 	}

 

+	/**
+	 * @param string $method
+	 */
 	protected function set_header_method($method)

 	{

 		$this->headers = $method;

@@ -214,6 +217,9 @@ 
 		$this->set_head('title', $value);

 	}

 

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

 	{

 		$this->set_head('author', $value);

@@ -229,26 +235,41 @@ 
 		$this->set_head('keywords', implode(', ', $array));

 	}

 	

+	/**
+	 * @param string $url
+	 */
 	protected function set_canonical($url)

 	{

 		$this->set_head('canonical', $url);

 	}

 

+	/**
+	 * @param string $set
+	 */
 	protected function set_head($set, $value)

 	{

 		$this->data_array['head'][$set] = $value;

 	}

 

+	/**
+	 * @param string $set
+	 */
 	protected function set_body($set, $value)

 	{

 		$this->data_array['body'][$set] = $value;

 	}

 

+	/**
+	 * @param string $file
+	 */
 	protected function add_css($file)

 	{

 		$this->css_array[] = $file;

 	}

 

+	/**
+	 * @param string $file
+	 */
 	protected function add_js($file)

 	{

 		$this->js_array[] = $file;

@@ -271,6 +292,9 @@ 
 		$this->set_head('js_link_array', $js_array);

 	}

 

+	/**
+	 * @param string $view
+	 */
 	protected function set_body_view($view)

 	{

 		$this->body_view_array[] = $view;

@@ -315,6 +339,10 @@ 
 	}

 

 	private $comment_errors;

+
+	/**
+	 * @param string $redirect_url
+	 */
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)

 	{

 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')

Braces +40 added lines, -29 removed lines

@@ -102,10 +102,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);
 		foreach($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+			if(substr($view, 0, 1) == '/') {

+							Loader::load('view', $view, $this->data_array['body']);

+			} else {

+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			}

 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -114,8 +115,9 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
+		if($view == '/404' || $view == '/503') {

+					exit;

+		}

 	}
 
 	protected function set_header_method($method)
@@ -195,14 +197,16 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
+		if(get_class($this) !== 'Error503Controller') {

+					Loader::loadNew('controller', '/Error503Controller')->activate();

+		}

 	}
 
 	protected function redirect($uri, $method = 301)
@@ -210,12 +214,14 @@ 
 		switch($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error301Controller') {

+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				}

 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error303Controller') {

+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				}

 				break;
 		}
 	}
@@ -262,18 +268,19 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
-				$comment_object->errors = $this->comment_errors;
-			else
-				$comment_object->errors = array();
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {

+							$comment_object->errors = $this->comment_errors;

+			} else {

+							$comment_object->errors = array();

+			}

 			
 			if($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
-			}
-			else
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

+			}

 		}
 		
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -298,22 +305,26 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
-			return $commenter;
+		if(!$commenter_cookie->exists()) {

+					return $commenter;

+		}

 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
-			return $commenter;
+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
-			return $commenter;
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {

+					return $commenter;

+		}

 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		
 		$commenter->id = $commenter_object->id;
 		$commenter->name = $commenter_object->name;

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)

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

Braces +28 added lines, -22 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;
 	}