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

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		$tag_clause = "'{$tag_clause}'";
 		
 		$exclude_clause = '';
-		if(count($exclude_posts) > 0)
+		if (count($exclude_posts) > 0)
 		{
 			$exclude_clause .= " && `ptlink`.`post_id` NOT IN ('";
 			$exclude_clause .= implode("', '", $exclude_posts);

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 = "

Indentation +5 added lines, -5 removed lines

@@ -114,9 +114,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getRecentWaterfallComments($count = 5)
-    {
-        $query = "
+	public static function getRecentWaterfallComments($count = 5)
+	{
+		$query = "
             SELECT
                 `comment_meta`.`id`,
                 CONCAT('journal/', `log`.`alias`) AS `log_path`,
@@ -156,8 +156,8 @@ 
                 `comment_meta`.`date` DESC
             LIMIT {$count}";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getCommentsForURL($site, $path, $commenter = 0)
 	{

Spacing +1 added lines, -1 removed lines

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

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

Doc Comments +3 added lines

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

 	}

 

+	/**
+	 * @param string $date
+	 */
 	public static function getTweetByFields($date, $text)

 	{

 		$query = "SELECT * FROM `jpemeric_stream`.`twitter` WHERE `date` = '{$date}' && `text` = '{$text}' LIMIT 1";

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

Indentation +11 added lines, -11 removed lines

@@ -34,9 +34,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getRecentList($total)
-    {
-        $query = "
+	public static function getRecentList($total)
+	{
+		$query = "
             SELECT
                 `log`.`title`,
                 `log`.`alias`,
@@ -59,8 +59,8 @@ 
                 `log`.`date` DESC
             LIMIT
                 {$total}";
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -178,11 +178,11 @@ 
 		return self::run_row_query($query);
 	}
 
-    public static function getByDate($date)
-    {
-        $date = self::escape($date);
+	public static function getByDate($date)
+	{
+		$date = self::escape($date);
         
-        $query = "
+		$query = "
             SELECT
                 `log`.`alias`
             FROM
@@ -192,8 +192,8 @@ 
                 `log`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 	
 	public static function getById($log)
 	{

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

Indentation +16 added lines, -16 removed lines

@@ -43,9 +43,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getMapList()
-    {
-        $query = "
+	public static function getMapList()
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias`,
@@ -71,8 +71,8 @@ 
             ORDER BY
                 `waterfall`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -92,9 +92,9 @@ 
 		return self::get_count($query);
 	}
 
-    public static function getNearbyList($waterfall)
-    {
-        $query = "
+	public static function getNearbyList($waterfall)
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias` AS `alias`,
@@ -114,14 +114,14 @@ 
                 `waterfall`.`name`,
                 `watercourse`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
-    public static function getByOldAlias($alias)
-    {
-        $alias = self::escape($alias);
+	public static function getByOldAlias($alias)
+	{
+		$alias = self::escape($alias);
         
-        $query = "
+		$query = "
             SELECT
                 `waterfall`.`alias`,
                 `watercourse`.`alias` AS `watercourse_alias`
@@ -134,8 +134,8 @@ 
                 `waterfall`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 
 	public static function getByAlias($watercourse, $waterfall)
 	{

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;

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		Loader::load('collector', 'blog/TagCollector');
 		
 		$tag_result = TagCollector::getTagsForPost($post->id);
-        $tag_array = array();
+		$tag_array = array();
 		foreach($tag_result as $tag)
 		{
 			$tag_object = new stdclass();

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
+		if ($photo_result == null)
 			return;
 		
 		$name = $photo_result->name;
@@ -87,7 +87,7 @@ 
 		
 		$tag_result = TagCollector::getTagsForPost($post->id);
         $tag_array = array();
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
 			$tag_object = new stdclass();
 			$tag_object->name = $tag->tag;
@@ -101,7 +101,7 @@ 
 	{
 		$body = $post->body;
 		
-		if($trim)
+		if ($trim)
 			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -126,9 +126,9 @@ 
 		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
 		$cloud_array = array();
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
-			if($tag->tag_count < self::$MINIMUM_TAG_COUNT)
+			if ($tag->tag_count < self::$MINIMUM_TAG_COUNT)
 				continue;
 			
 			$tag_object = new stdclass();
@@ -145,9 +145,9 @@ 
 	{
 		$maximum = 1;
 		
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
-			if($tag->tag_count > $maximum)
+			if ($tag->tag_count > $maximum)
 				$maximum = $tag->tag_count;
 		}
 		return $maximum;
@@ -158,7 +158,7 @@ 
 		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
 		
 		$array = array();
-		foreach($comment_array as $comment)
+		foreach ($comment_array as $comment)
 		{
 			$body = $comment->body;
 			$body = strip_tags($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')

Spacing +31 added lines, -31 removed lines

@@ -38,7 +38,7 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
+		if (Database::isConnected() === false)
 			$this->unavailable();
 	}
 
@@ -63,9 +63,9 @@ 
     $post_result = $activityRepository->getPosts(5);
 
 		$post_array = array();
-		foreach($post_result as $row)
+		foreach ($post_result as $row)
 		{
-			$post_array[] = $this->expand_post($row);;
+			$post_array[] = $this->expand_post($row); ;
 		}
 		
 		return $post_array;
@@ -85,7 +85,7 @@ 
 
 		$post = new stdclass();
 		
-		switch($raw_post['type'])
+		switch ($raw_post['type'])
 		{
 			case 'blog' :
 				$row = $blogRepository->getBlogById($raw_post['type_id']);
@@ -96,7 +96,7 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row['url']}\">{$row['title']}</a>.";
 				$post->comments = $row['comments'];
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = Content::instance('FetchFirstPhoto', $row['body'])->activate(false, 'standard');
 			break;
 			case 'book' :
@@ -105,23 +105,23 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row['title']} by {$row['author']}.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = "<img alt=\"{$row['title']} by {$row['author']}\" src=\"{$row['image']}\" />";
 			break;
 			case 'distance' :
 				$row = $distanceRepository->getDistanceById($raw_post['type_id']);
 				
 				$post->type = 'distance';
-				if($row['type'] == 'running')
+				if ($row['type'] == 'running')
 				{
 					$post->title = "Ran {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['message']) > 0)
+					if (strlen($row['message']) > 0)
 						$post->title .= " Afterwards, I was all like '{$row['message']}'.";
 				}
-				else if($row['type'] == 'hiking')
+				else if ($row['type'] == 'hiking')
 				{
 					$post->title = "Hiked {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['title']) > 0)
+					if (strlen($row['title']) > 0)
 						$post->title .= " I was hiking up around the {$row['title']} area.";
 				}
                 else if ($row['type'] == 'walking') {
@@ -139,7 +139,7 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = $row['text_formatted_full'];
 				else
 					$post->title = $row['text_formatted'];
@@ -152,12 +152,12 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = "Favorited {$row['title']} by {$row['author']} on YouTube.";
 				else
 					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row['video_id']}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row['content']}\">{$row['title']}</a> by {$row['author']} on YouTube.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row['video_id']}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
 			break;
 		}
@@ -185,9 +185,9 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
@@ -199,7 +199,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -255,10 +255,10 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       return "/css/{$stylesheet}.css";
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       return "/js/{$script}.js";
     }, $this->js_array);
 		
@@ -273,26 +273,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -312,7 +312,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -330,7 +330,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -340,12 +340,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -376,21 +376,21 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
+		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)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		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)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

Braces +70 added lines, -53 removed lines

@@ -38,8 +38,9 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
-			$this->unavailable();
+		if(Database::isConnected() === false) {

+					$this->unavailable();

+		}

 	}
 
 	protected function get_domain_container()
@@ -96,8 +97,9 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row['url']}\">{$row['title']}</a>.";
 				$post->comments = $row['comments'];
 				
-				if($format == 'full')
-					$post->image = Content::instance('FetchFirstPhoto', $row['body'])->activate(false, 'standard');
+				if($format == 'full') {

+									$post->image = Content::instance('FetchFirstPhoto', $row['body'])->activate(false, 'standard');

+				}

 			break;
 			case 'book' :
 				$row = $bookRepository->getBookById($raw_post['type_id']);
@@ -105,8 +107,9 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row['title']} by {$row['author']}.";
 				
-				if($format == 'full')
-					$post->image = "<img alt=\"{$row['title']} by {$row['author']}\" src=\"{$row['image']}\" />";
+				if($format == 'full') {

+									$post->image = "<img alt=\"{$row['title']} by {$row['author']}\" src=\"{$row['image']}\" />";

+				}

 			break;
 			case 'distance' :
 				$row = $distanceRepository->getDistanceById($raw_post['type_id']);
@@ -115,16 +118,16 @@ 
 				if($row['type'] == 'running')
 				{
 					$post->title = "Ran {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['message']) > 0)
-						$post->title .= " Afterwards, I was all like '{$row['message']}'.";
-				}
-				else if($row['type'] == 'hiking')
+					if(strlen($row['message']) > 0) {

+											$post->title .= " Afterwards, I was all like '{$row['message']}'.";

+					}

+				} else if($row['type'] == 'hiking')
 				{
 					$post->title = "Hiked {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['title']) > 0)
-						$post->title .= " I was hiking up around the {$row['title']} area.";
-				}
-                else if ($row['type'] == 'walking') {
+					if(strlen($row['title']) > 0) {

+											$post->title .= " I was hiking up around the {$row['title']} area.";

+					}

+				} else if ($row['type'] == 'walking') {
                     $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
                 }
 			break;
@@ -139,10 +142,11 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
-					$post->title = $row['text_formatted_full'];
-				else
-					$post->title = $row['text_formatted'];
+				if($format == 'full') {

+									$post->title = $row['text_formatted_full'];

+				} else {

+									$post->title = $row['text_formatted'];

+				}

 				
 				$post->retweets = ($row['is_retweet'] == 0) ? $row['retweets'] : 0;
 				$post->favorites = ($row['is_retweet'] == 0) ? $row['favorites'] : 0;
@@ -152,13 +156,15 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
-					$post->title = "Favorited {$row['title']} by {$row['author']} on YouTube.";
-				else
-					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row['video_id']}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row['content']}\">{$row['title']}</a> by {$row['author']} on YouTube.";
+				if($format == 'full') {

+									$post->title = "Favorited {$row['title']} by {$row['author']} on YouTube.";

+				} else {

+									$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row['video_id']}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row['content']}\">{$row['title']}</a> by {$row['author']} on YouTube.";

+				}

 				
-				if($format == 'full')
-					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row['video_id']}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
+				if($format == 'full') {

+									$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row['video_id']}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

+				}

 			break;
 		}
 		
@@ -187,10 +193,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') {
@@ -199,8 +206,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)
@@ -273,14 +281,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)
@@ -288,12 +298,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;
 		}
 	}
@@ -340,18 +352,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);
@@ -376,22 +389,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;

Indentation +27 added lines, -27 removed lines

@@ -58,9 +58,9 @@ 
 
 	protected function get_recent_activity()
 	{
-    global $container;
-    $activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
-    $post_result = $activityRepository->getPosts(5);
+	global $container;
+	$activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
+	$post_result = $activityRepository->getPosts(5);
 
 		$post_array = array();
 		foreach($post_result as $row)
@@ -75,13 +75,13 @@ 
 	{
 		Loader::load('utility', 'Content');
 
-    global $container;
-    $blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
-    $bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
-    $distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
-    $huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
-    $twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
-    $youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
+	global $container;
+	$blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
+	$bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
+	$distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
+	$huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
+	$twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
+	$youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
 
 		$post = new stdclass();
 		
@@ -124,9 +124,9 @@ 
 					if(strlen($row['title']) > 0)
 						$post->title .= " I was hiking up around the {$row['title']} area.";
 				}
-                else if ($row['type'] == 'walking') {
-                    $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
-                }
+				else if ($row['type'] == 'walking') {
+					$post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
+				}
 			break;
 			case 'hulu' :
 				$row = $huluRepository->getHuluById($raw_post['type_id']);
@@ -193,11 +193,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -255,15 +255,15 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      return "/css/{$stylesheet}.css";
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  return "/css/{$stylesheet}.css";
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);

utility/content/FetchFirstPhotoContent.class.inc.php

Doc Comments +5 added lines

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

 	}

 

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

 	{

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

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