jacobemerick / web

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 +46 added lines, -46 removed lines

@@ -5,13 +5,13 @@ 
 final class CommentCollector extends Collector
 {
 
-	public static function getCommenterByFields($name, $email, $website)
-	{
-		$name = self::escape($name);
-		$email = self::escape($email);
-		$website = self::escape($website);
+    public static function getCommenterByFields($name, $email, $website)
+    {
+        $name = self::escape($name);
+        $email = self::escape($email);
+        $website = self::escape($website);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -22,14 +22,14 @@ 
 				`url` = '{$website}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCommentByBody($body)
-	{
-		$body = self::escape($body);
+    public static function getCommentByBody($body)
+    {
+        $body = self::escape($body);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -38,14 +38,14 @@ 
 				`body` = '{$body}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCommentPageByURL($path, $site)
-	{
-		$path = self::escape($path);
+    public static function getCommentPageByURL($path, $site)
+    {
+        $path = self::escape($path);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -56,12 +56,12 @@ 
 			LIMIT
 				1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getNotificationForPage($comment_page)
-	{
-		$query = "
+    public static function getNotificationForPage($comment_page)
+    {
+        $query = "
 			SELECT
 				`name`,
 				`email`
@@ -80,12 +80,12 @@ 
 			ORDER BY
 				`date` DESC";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getRecentBlogComments($count)
-	{
-		$query = "
+    public static function getRecentBlogComments($count)
+    {
+        $query = "
 			SELECT
 				`comment_meta`.`id`,
 				`post`.`category`,
@@ -111,8 +111,8 @@ 
 				`comment_meta`.`date` DESC
 			LIMIT {$count}";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getRecentWaterfallComments($count = 5)
     {
@@ -159,16 +159,16 @@ 
         return self::run_query($query);
     }
 
-	public static function getCommentsForURL($site, $path, $commenter = 0)
-	{
-		$path = self::escape($path);
+    public static function getCommentsForURL($site, $path, $commenter = 0)
+    {
+        $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 = "
+        $query = "
 			SELECT
 				`comment_meta`.`id`,
 				`comment_meta`.`reply`,
@@ -194,14 +194,14 @@ 
 			ORDER BY
 				`comment_meta`.`date`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getCommentCountForURL($site, $path)
-	{
-		$path = self::escape($path);
+    public static function getCommentCountForURL($site, $path)
+    {
+        $path = self::escape($path);
 		
-		$query = "
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -218,7 +218,7 @@ 
 			ORDER BY
 				`comment_meta`.`date`";
 		
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

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 +51 added lines, -51 removed lines

@@ -5,9 +5,9 @@ 
 final class LogCollector extends Collector
 {
 
-	public static function getList($total, $offset = 0)
-	{
-		$query = "
+    public static function getList($total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -31,8 +31,8 @@ 
 				`log`.`date` DESC
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getRecentList($total)
     {
@@ -62,21 +62,21 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
-		$query = "
+    public static function getListCount()
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
 				`jpemeric_waterfall`.`log`
 			WHERE
 				`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
-	public static function getCompanionListForLog($log)
-	{
-		$query = "
+    public static function getCompanionListForLog($log)
+    {
+        $query = "
 			SELECT
 				`companion`.`name`,
 				`companion`.`alias`
@@ -87,12 +87,12 @@ 
 							ON `log_companion_map`.`companion` = `companion`.`id`
 			WHERE
 				`log_companion_map`.`log` = '{$log}'";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getWaterfallListForLog($log)
-	{
-		$query = "
+    public static function getWaterfallListForLog($log)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`name`,
 				`waterfall`.`alias`,
@@ -110,12 +110,12 @@ 
 				`waterfall`.`is_public` = '1'
 			ORDER BY
 				`log_waterfall_map`.`order`";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForWaterfall($waterfall)
-	{
-		$query = "
+    public static function getLogListForWaterfall($waterfall)
+    {
+        $query = "
 			SELECT
 				`log`.`title`,
 				`log`.`alias`,
@@ -130,12 +130,12 @@ 
 				`log`.`is_public` = '1'
 			ORDER BY
 				`log`.`date`";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getTagListForLog($log)
-	{
-		$query = "
+    public static function getTagListForLog($log)
+    {
+        $query = "
 			SELECT
 				`tag`.`name`,
 				`tag`.`alias`
@@ -144,14 +144,14 @@ 
 					INNER JOIN
 						`jpemeric_waterfall`.`log_tag_map`
 							ON `log_tag_map`.`tag` = `tag`.`id` && `log_tag_map`.`log` = '{$log}'";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -175,8 +175,8 @@ 
 				`log`.`is_public` = '1'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
     public static function getByDate($date)
     {
@@ -195,9 +195,9 @@ 
         return self::run_row_query($query);
     }
 	
-	public static function getById($log)
-	{
-		$query = "
+    public static function getById($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -208,12 +208,12 @@ 
 				`id` = '{$log}' AND
 				`is_public` = '1'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getPreviousLog($log)
-	{
-		$query = "
+    public static function getPreviousLog($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -233,12 +233,12 @@ 
 				`date` DESC
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getNextLog($log)
-	{
-		$query = "
+    public static function getNextLog($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -258,7 +258,7 @@ 
 				`date` ASC
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }

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 +17 added lines, -17 removed lines

@@ -5,9 +5,9 @@ 
 final class WaterfallCollector extends Collector
 {
 
-	public static function getList($total, $offset = 0)
-	{
-		$query = "
+    public static function getList($total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`id`,
 				`waterfall`.`name`,
@@ -40,8 +40,8 @@ 
 				`watercourse`.`name`
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getMapList()
     {
@@ -74,9 +74,9 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
-		$query = "
+    public static function getListCount()
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -89,8 +89,8 @@ 
 							ON `county`.`id` = `waterfall`.`county`
 			WHERE
 				`waterfall`.`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
     public static function getNearbyList($waterfall)
     {
@@ -137,12 +137,12 @@ 
         return self::run_row_query($query);
     }
 
-	public static function getByAlias($watercourse, $waterfall)
-	{
-		$watercourse = self::escape($watercourse);
-		$waterfall = self::escape($waterfall);
+    public static function getByAlias($watercourse, $waterfall)
+    {
+        $watercourse = self::escape($watercourse);
+        $waterfall = self::escape($waterfall);
 		
-		$query = "
+        $query = "
 			SELECT
 				`waterfall`.`id` AS `id`,
 				`waterfall`.`name`,
@@ -192,7 +192,7 @@ 
 				`waterfall`.`is_public` = '1'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }
\ No newline at end of file

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 +139 added lines, -139 removed lines

@@ -8,81 +8,81 @@ 
 abstract class DefaultPageController extends PageController
 {
 
-	private static $RECENT_COMMENT_COUNT = 10;
-	private static $MINIMUM_TAG_COUNT = 10;
-	protected static $LENGTH_OF_TRIMMED_POST = 300;
+    private static $RECENT_COMMENT_COUNT = 10;
+    private static $MINIMUM_TAG_COUNT = 10;
+    protected static $LENGTH_OF_TRIMMED_POST = 300;
 
-	protected static $BLOG_SITE_ID = 2;
+    protected static $BLOG_SITE_ID = 2;
 
-	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
+    private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
 
-	protected function set_head_data()
-	{
+    protected function set_head_data()
+    {
     $this->set_head('rss_link', [
-      'title' => 'Jacob Emerick Blog Feed',
-      'url' => '/rss.xml'
+        'title' => 'Jacob Emerick Blog Feed',
+        'url' => '/rss.xml'
     ]);
     $this->set_head('rss_comment_link', [
-      'title' => 'Jacob Emerick Blog Comment Feed',
-      'url' => '/rss-comments.xml'
+        'title' => 'Jacob Emerick Blog Comment Feed',
+        'url' => '/rss-comments.xml'
     ]);
 		
-		$this->add_css('normalize');
-		$this->add_css('blog');
-	}
-
-	protected function get_introduction()
-	{
-		return;
-	}
-
-	protected function get_introduction_image($id)
-	{
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::getRow($id);
+        $this->add_css('normalize');
+        $this->add_css('blog');
+    }
+
+    protected function get_introduction()
+    {
+        return;
+    }
+
+    protected function get_introduction_image($id)
+    {
+        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;
-		$size = 'medium';
-		$height = 375;
-		$width = 500;
-		$description = $photo_result->description;
+        $name = $photo_result->name;
+        $category = $photo_result->category;
+        $size = 'medium';
+        $height = 375;
+        $width = 500;
+        $description = $photo_result->description;
 		
-		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
-	}
-
-	protected function set_body_data()
-	{
-		$this->set_body('introduction', $this->get_introduction());
-		$this->set_body('right_side', $this->get_right_side());
-		$this->set_body('activity_array', $this->get_recent_activity());
+        return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
+    }
+
+    protected function set_body_data()
+    {
+        $this->set_body('introduction', $this->get_introduction());
+        $this->set_body('right_side', $this->get_right_side());
+        $this->set_body('activity_array', $this->get_recent_activity());
 		
-		$this->set_body_view('Page');
-	}
+        $this->set_body_view('Page');
+    }
 
-	final protected function format_post($post, $trim = false)
-	{
-		$post_object = new stdclass();
+    final protected function format_post($post, $trim = false)
+    {
+        $post_object = new stdclass();
 		
-		$post_object->title = $post['title'];
-		$post_object->path = "/{$post['category']}/{$post['path']}/";
-		$post_object->category = ucwords(str_replace('-', ' ', $post['category']));
-		$post_object->category_link = "/{$post['category']}/";
-		// $post_object->comment_count = $this->get_comments_for_post($post);
-		$post_object->tags = $this->get_tags_for_post($post);
-		$post_object->image = Content::instance('FetchFirstPhoto', $post['body'])->activate(false, 'small');
-		$post_object->body = $this->get_body_for_post($post, $trim);
-		$post_object->date = $this->get_parsed_date($post['date']);
-
-		return $post_object;
-	}
-
-	final private function get_comments_for_post($post)
-	{
-		$count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
+        $post_object->title = $post['title'];
+        $post_object->path = "/{$post['category']}/{$post['path']}/";
+        $post_object->category = ucwords(str_replace('-', ' ', $post['category']));
+        $post_object->category_link = "/{$post['category']}/";
+        // $post_object->comment_count = $this->get_comments_for_post($post);
+        $post_object->tags = $this->get_tags_for_post($post);
+        $post_object->image = Content::instance('FetchFirstPhoto', $post['body'])->activate(false, 'small');
+        $post_object->body = $this->get_body_for_post($post, $trim);
+        $post_object->date = $this->get_parsed_date($post['date']);
+
+        return $post_object;
+    }
+
+    final private function get_comments_for_post($post)
+    {
+        $count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
     $count_from_service = $this->get_comments_for_post_from_service($post);
 
     if ($count_from_service !== null && $count_from_service != $count) {
@@ -91,7 +91,7 @@ 
         $container['console']->log("{$count}, {$count_from_service} in service");
     }
     return $count;
-	}
+    }
 
     final private function get_comments_for_post_from_service($post)
     {
@@ -127,106 +127,106 @@ 
         return count($comment_response);
     }
 
-	final private function get_tags_for_post($post)
-	{
+    final private function get_tags_for_post($post)
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagsForPost($post['id']);
 
         $tag_array = array();
-		foreach($tag_result as $tag)
-		{
-			$tag_object = new stdclass();
-			$tag_object->name = $tag['tag'];
-			$tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
-			$tag_array[] = $tag_object;
-		}
-		return $tag_array;
-	}
-
-	final private function get_body_for_post($post, $trim)
-	{
-		$body = $post['body'];
+        foreach($tag_result as $tag)
+        {
+            $tag_object = new stdclass();
+            $tag_object->name = $tag['tag'];
+            $tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
+            $tag_array[] = $tag_object;
+        }
+        return $tag_array;
+    }
+
+    final private function get_body_for_post($post, $trim)
+    {
+        $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();
+        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+        $body = Content::instance('MarkupCode', $body)->activate();
 		
-		return $body;
-	}
-
-	final protected function get_right_side()
-	{
-		$side_array = array();
-		$side_array['tags'] = $this->get_tag_cloud();
-		$side_array['comments'] = $this->get_comments();
-		return $side_array;
-	}
-
-	final private function get_tag_cloud()
-	{
+        return $body;
+    }
+
+    final protected function get_right_side()
+    {
+        $side_array = array();
+        $side_array['tags'] = $this->get_tag_cloud();
+        $side_array['comments'] = $this->get_comments();
+        return $side_array;
+    }
+
+    final private function get_tag_cloud()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagCloud();
 		
-		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);
+        $maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
-		$cloud_array = array();
-		foreach($tag_result as $tag)
-		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+        $cloud_array = array();
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] < self::$MINIMUM_TAG_COUNT)
+                continue;
 			
-			$tag_object = new stdclass();
-			$tag_object->name = $tag['tag'];
-			$tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
-			$tag_object->scalar = floor(($tag['count'] - 1) * (9 / ($maximum_tag_count - self::$MINIMUM_TAG_COUNT)));
-			$cloud_array[] = $tag_object;
-		}
+            $tag_object = new stdclass();
+            $tag_object->name = $tag['tag'];
+            $tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
+            $tag_object->scalar = floor(($tag['count'] - 1) * (9 / ($maximum_tag_count - self::$MINIMUM_TAG_COUNT)));
+            $cloud_array[] = $tag_object;
+        }
 		
-		return $cloud_array;
-	}
+        return $cloud_array;
+    }
 
-	final private function get_maximum_tag_count($tag_result)
-	{
-		$maximum = 1;
+    final private function get_maximum_tag_count($tag_result)
+    {
+        $maximum = 1;
 		
-		foreach($tag_result as $tag)
-		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
-		}
-		return $maximum;
-	}
-
-	final private function get_comments()
-	{
-		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] > $maximum)
+                $maximum = $tag['count'];
+        }
+        return $maximum;
+    }
+
+    final private function get_comments()
+    {
+        $comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
 		
-		$array = array();
-		foreach($comment_array as $comment)
-		{
-			$body = $comment->body;
-			$body = strip_tags($body);
+        $array = array();
+        foreach($comment_array as $comment)
+        {
+            $body = $comment->body;
+            $body = strip_tags($body);
 			
-			$comment_obj = new stdclass();
-			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
-			$comment_obj->commenter = $comment->name;
-			$comment_obj->link = Loader::getRootURL() . "{$comment->category}/{$comment->path}/#comment-{$comment->id}";
-			$array[] = $comment_obj;
-		}
+            $comment_obj = new stdclass();
+            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
+            $comment_obj->commenter = $comment->name;
+            $comment_obj->link = Loader::getRootURL() . "{$comment->category}/{$comment->path}/#comment-{$comment->id}";
+            $array[] = $comment_obj;
+        }
 
     $comment_service_array = $this->get_comments_from_service();
     if ($comment_service_array !== null && $comment_service_array !== $array) {
-      global $container;
-      $container['console']->log('Mismatch between comment service and legacy db');
-      $container['console']->log($comment_service_array[0]);
-      $container['console']->log($array[0]);
+        global $container;
+        $container['console']->log('Mismatch between comment service and legacy db');
+        $container['console']->log($comment_service_array[0]);
+        $container['console']->log($array[0]);
+    }
+        return $array;
     }
-		return $array;
-	}
 
     final private function get_comments_from_service()
     {

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

Indentation +231 added lines, -231 removed lines

@@ -5,52 +5,52 @@ 
 abstract class PageController
 {
 
-	private static $TRACKING_CODE = 'UA-11745070-1';
+    private static $TRACKING_CODE = 'UA-11745070-1';
 	
-	protected static $DEPRECATED_BLOGS = array(
-		10 => 63,
-		55 => 67,
-	);
-
-	private $headers;
-	private $css_array = array();
-	private $font_css_array = array();
-	private $js_array = array();
-
-	private $data_array = array();
-	private $body_view_array = array();
-
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
-
-	public function __construct()
-	{
-		$this->set_header_method('sendHTML');
+    protected static $DEPRECATED_BLOGS = array(
+        10 => 63,
+        55 => 67,
+    );
+
+    private $headers;
+    private $css_array = array();
+    private $font_css_array = array();
+    private $js_array = array();
+
+    private $data_array = array();
+    private $body_view_array = array();
+
+    protected function set_head_data() {}
+    protected function set_body_data() {}
+    protected function set_data() {}
+
+    public function __construct()
+    {
+        $this->set_header_method('sendHTML');
 		
-		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
-		$this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
+        $this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
+        $this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
 		
-		$this->set_body('domain_container', $this->get_domain_container());
-		$this->set_body('footer', array(
-			'link' => Loader::getRootUrl('site'),
-			'anchor' => 'jacobemerick.com',
-			'date' => date('Y')));
-	}
-
-	protected function get_domain_container()
-	{
-		$domain_container = new stdclass();
+        $this->set_body('domain_container', $this->get_domain_container());
+        $this->set_body('footer', array(
+            'link' => Loader::getRootUrl('site'),
+            'anchor' => 'jacobemerick.com',
+            'date' => date('Y')));
+    }
+
+    protected function get_domain_container()
+    {
+        $domain_container = new stdclass();
 		
-		$domain_container->blog = Loader::getRootUrl('blog');
-		$domain_container->home = Loader::getRootUrl('home');
-		$domain_container->lifestream = Loader::getRootUrl('lifestream');
-		$domain_container->map = Loader::getRootUrl('map');
-		$domain_container->portfolio = Loader::getRootUrl('portfolio');
-		$domain_container->waterfalls = Loader::getRootUrl('waterfalls');
+        $domain_container->blog = Loader::getRootUrl('blog');
+        $domain_container->home = Loader::getRootUrl('home');
+        $domain_container->lifestream = Loader::getRootUrl('lifestream');
+        $domain_container->map = Loader::getRootUrl('map');
+        $domain_container->portfolio = Loader::getRootUrl('portfolio');
+        $domain_container->waterfalls = Loader::getRootUrl('waterfalls');
 		
-		return $domain_container;
-	}
+        return $domain_container;
+    }
 
     protected function get_recent_activity()
     {
@@ -84,24 +84,24 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
-		$this->set_head_data();
-		$this->set_body_data();
-		$this->set_data();
+    public function activate()
+    {
+        $this->set_head_data();
+        $this->set_body_data();
+        $this->set_data();
 		
-		$this->load_assets();
+        $this->load_assets();
 		
-		$headers = $this->headers;
-		Header::$headers();
-		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']);
-		}
+        $headers = $this->headers;
+        Header::$headers();
+        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 (URLDecode::getSite() == 'waterfalls') {
             Loader::load('view', '/WaterfallFoot');
@@ -109,211 +109,211 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
-	}
-
-	protected function set_header_method($method)
-	{
-		$this->headers = $method;
-	}
-
-	protected function set_title($value)
-	{
-		$this->set_head('title', $value);
-	}
-
-	protected function set_author($value)
-	{
-		$this->set_head('author', $value);
-	}
-
-	protected function set_description($value)
-	{
-		$this->set_head('description', $value);
-	}
-
-	protected function set_keywords($array)
-	{
-		$this->set_head('keywords', implode(', ', $array));
-	}
+        if($view == '/404' || $view == '/503')
+            exit;
+    }
+
+    protected function set_header_method($method)
+    {
+        $this->headers = $method;
+    }
+
+    protected function set_title($value)
+    {
+        $this->set_head('title', $value);
+    }
+
+    protected function set_author($value)
+    {
+        $this->set_head('author', $value);
+    }
+
+    protected function set_description($value)
+    {
+        $this->set_head('description', $value);
+    }
+
+    protected function set_keywords($array)
+    {
+        $this->set_head('keywords', implode(', ', $array));
+    }
 	
-	protected function set_canonical($url)
-	{
-		$this->set_head('canonical', $url);
-	}
-
-	protected function set_head($set, $value)
-	{
-		$this->data_array['head'][$set] = $value;
-	}
-
-	protected function set_body($set, $value)
-	{
-		$this->data_array['body'][$set] = $value;
-	}
-
-	protected function add_css($file, $version = 1)
-	{
-		$this->css_array[] = [$file, $version];
-	}
-
-	protected function add_js($file)
-	{
-		$this->js_array[] = $file;
-	}
-
-	private function load_assets()
-	{
+    protected function set_canonical($url)
+    {
+        $this->set_head('canonical', $url);
+    }
+
+    protected function set_head($set, $value)
+    {
+        $this->data_array['head'][$set] = $value;
+    }
+
+    protected function set_body($set, $value)
+    {
+        $this->data_array['body'][$set] = $value;
+    }
+
+    protected function add_css($file, $version = 1)
+    {
+        $this->css_array[] = [$file, $version];
+    }
+
+    protected function add_js($file)
+    {
+        $this->js_array[] = $file;
+    }
+
+    private function load_assets()
+    {
     $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
+        $path = "/css/{$stylesheet[0]}.css";
+        if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
+        }
+        return $path;
     }, $this->css_array);
     $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
+        if (substr($script, 0, 4) == 'http') {
         return $script;
-      }
-      return "/js/{$script}.min.js";
+        }
+        return "/js/{$script}.min.js";
     }, $this->js_array);
 		
-		$this->set_head('css_link_array', $css_array);
-		$this->set_head('js_link_array', $js_array);
-	}
-
-	protected function set_body_view($view)
-	{
-		$this->body_view_array[] = $view;
-	}
-
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
-	}
-
-	protected function unavailable()
-	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
-	}
-
-	protected function redirect($uri, $method = 301)
-	{
-		switch($method)
-		{
-			case 301 :
-				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();
-				break;
-		}
-	}
-
-	final protected function get_parsed_date($date)
-	{
-		$parsed_date = new stdclass();
+        $this->set_head('css_link_array', $css_array);
+        $this->set_head('js_link_array', $js_array);
+    }
+
+    protected function set_body_view($view)
+    {
+        $this->body_view_array[] = $view;
+    }
+
+    protected function eject()
+    {
+        if(get_class($this) !== 'Error404Controller')
+            Loader::loadNew('controller', '/Error404Controller')->activate();
+    }
+
+    protected function unavailable()
+    {
+        if(get_class($this) !== 'Error503Controller')
+            Loader::loadNew('controller', '/Error503Controller')->activate();
+    }
+
+    protected function redirect($uri, $method = 301)
+    {
+        switch($method)
+        {
+            case 301 :
+                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();
+                break;
+        }
+    }
+
+    final protected function get_parsed_date($date)
+    {
+        $parsed_date = new stdclass();
 		
-		$parsed_date->stamp = date('c', strtotime($date));
-		$parsed_date->friendly = date('F j, Y', strtotime($date));
-		$parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
+        $parsed_date->stamp = date('c', strtotime($date));
+        $parsed_date->friendly = date('F j, Y', strtotime($date));
+        $parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
 		
-		return $parsed_date;
-	}
-
-	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
-		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();
-		}
+        return $parsed_date;
+    }
+
+    private $comment_errors;
+    protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
+    {
+        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();
+        }
 		
-		return;
-	}
+        return;
+    }
 
-	protected function get_comment_array($site, $path)
-	{
-		Loader::load('collector', 'comment/CommentCollector');
+    protected function get_comment_array($site, $path)
+    {
+        Loader::load('collector', 'comment/CommentCollector');
 		
-		$commenter = $this->get_commenter();
+        $commenter = $this->get_commenter();
 		
-		$comment_array = array();
-		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
+        $comment_array = array();
+        $comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
-		{
-			$comment_object = new stdclass();
-			$comment_object->id = $comment->id;
-			$comment_object->body = $comment->body_format;
-			$comment_object->date = date("M j, 'y", strtotime($comment->date));
-			$comment_object->name = $comment->name;
-			$comment_object->url = $comment->url;
-			$comment_object->trusted = $comment->trusted;
+        foreach($comment_result as $comment)
+        {
+            $comment_object = new stdclass();
+            $comment_object->id = $comment->id;
+            $comment_object->body = $comment->body_format;
+            $comment_object->date = date("M j, 'y", strtotime($comment->date));
+            $comment_object->name = $comment->name;
+            $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;
-		}
+            if($comment->reply == 0)
+            {
+                $comment_object->replies = array();
+                $comment_array[$comment->id] = $comment_object;
+            }
+            else
+                $comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+        }
 		
-		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
+        $comment_count = CommentCollector::getCommentCountForURL($site, $path);
 
-		return array(
-			'comments' => $comment_array,
-			'commenter' => $commenter,
-			'errors' => $this->comment_errors,
-			'comment_count' => $comment_count);
-	}
+        return array(
+            'comments' => $comment_array,
+            'commenter' => $commenter,
+            'errors' => $this->comment_errors,
+            'comment_count' => $comment_count);
+    }
 
-	private function get_commenter()
-	{
-		Loader::load('collector', 'comment/CommentCollector');
+    private function get_commenter()
+    {
+        Loader::load('collector', 'comment/CommentCollector');
 
-		$commenter = new stdclass();
+        $commenter = new stdclass();
 		
-		$commenter->id = 0;
-		$commenter->name = '';
-		$commenter->email = '';
-		$commenter->website = '';
+        $commenter->id = 0;
+        $commenter->name = '';
+        $commenter->email = '';
+        $commenter->website = '';
 
     if (!isset($_COOKIE['commenter'])) {
-      return $commenter;
+        return $commenter;
     }
 
-		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
+        $commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		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 : ''));
+        $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;
-		$commenter->email = $commenter_object->email;
-		$commenter->website = $commenter_object->url;
+        $commenter->id = $commenter_object->id;
+        $commenter->name = $commenter_object->name;
+        $commenter->email = $commenter_object->email;
+        $commenter->website = $commenter_object->url;
 		
-		return $commenter;
-	}
+        return $commenter;
+    }
 
 }

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)

Indentation +40 added lines, -40 removed lines

@@ -5,53 +5,53 @@
 final class MarkupCodeContent extends Content
 {
 
-	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
+    private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
-		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+    protected function execute($title = '')
+    {
+        preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
+        if(count($matches[1]) == 0)
+            return;
 		
-		foreach($matches[3] as $key => $match)
-		{
-			$replacement = $match;
-			$replacement = $this->wrap_in_list($replacement);
-			$replacement = $this->highlight_code($replacement, $matches[2][$key]);
+        foreach($matches[3] as $key => $match)
+        {
+            $replacement = $match;
+            $replacement = $this->wrap_in_list($replacement);
+            $replacement = $this->highlight_code($replacement, $matches[2][$key]);
 			
-			$this->content = str_replace($match, $replacement, $this->content);
-		}
+            $this->content = str_replace($match, $replacement, $this->content);
+        }
 		
-		return;
-	}
+        return;
+    }
 
-	private function wrap_in_list($content)
-	{
-		$content_array = explode("\n", $content);
+    private function wrap_in_list($content)
+    {
+        $content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
-		{
-			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
-			$new_row .= '<p>';
-			$new_row .= $row;
-			$new_row .= '</p>';
-			$new_row .= '</li>';
-			$content_array[$key] = $new_row;
-		}
+        foreach($content_array as $key => $row)
+        {
+            $new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
+            $new_row .= '<p>';
+            $new_row .= $row;
+            $new_row .= '</p>';
+            $new_row .= '</li>';
+            $content_array[$key] = $new_row;
+        }
 		
-		$content = implode($content_array);
-		$content = "<ol>{$content}</ol>";
-		return $content;
-	}
+        $content = implode($content_array);
+        $content = "<ol>{$content}</ol>";
+        return $content;
+    }
 
-	private function highlight_code($content, $type)
-	{
-		switch($type)
-		{
-			default :
-				return $content;
-			break;
-		}
-	}
+    private function highlight_code($content, $type)
+    {
+        switch($type)
+        {
+            default :
+                return $content;
+            break;
+        }
+    }
 
 }
\ No newline at end of file

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 +114 added lines, -114 removed lines

@@ -5,143 +5,143 @@
 class SmartTrimContent extends Content
 {
 
-	private static $EXCLUDE_TAGS = array(
-		'a',
-		'div',
-		'h4',
-		'pre');
-	private static $INCLUDE_TAGS = array(
-		'li',
-		'ol',
-		'p',
-		'ul');
-	private static $PHOTO_PLACEHOLDER_MATCH = '/{{photo="(.*)"}}/';
-	private static $HTML_TAG_PATTERN = '/<[^>]+>/';
-	private static $CUT_MARKER = '/*/ CUT HERE /*/';
-	private static $RIGHT_BRACKET = '>';
-	private static $LEFT_BRACKET = '<';
-	private static $ETC = '&hellip;';
+    private static $EXCLUDE_TAGS = array(
+        'a',
+        'div',
+        'h4',
+        'pre');
+    private static $INCLUDE_TAGS = array(
+        'li',
+        'ol',
+        'p',
+        'ul');
+    private static $PHOTO_PLACEHOLDER_MATCH = '/{{photo="(.*)"}}/';
+    private static $HTML_TAG_PATTERN = '/<[^>]+>/';
+    private static $CUT_MARKER = '/*/ CUT HERE /*/';
+    private static $RIGHT_BRACKET = '>';
+    private static $LEFT_BRACKET = '<';
+    private static $ETC = '&hellip;';
 
-	private $is_trimmed;
+    private $is_trimmed;
 
-	protected function execute()
-	{
-		$args = func_get_args();
-		if(count($args) < 1)
-		{
-			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
-			return;
-		}
+    protected function execute()
+    {
+        $args = func_get_args();
+        if(count($args) < 1)
+        {
+            trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
+            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];
+        $length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
+        if($length < strlen($this->content))
+            $this->trim_string($length);
         else
             $etc = '';
-		$this->check_exclude_tags();
-		$this->close_tags($etc);
-	}
+        $this->check_exclude_tags();
+        $this->close_tags($etc);
+    }
 
-	private function trim_string($length)
-	{
-		$content = $this->trim_html_string($this->content, $length);
+    private function trim_string($length)
+    {
+        $content = $this->trim_html_string($this->content, $length);
 		
-		$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);
-		$content = trim($content);
+        $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);
+        $content = trim($content);
 		
-		$this->content = $content;
-		$this->is_trimmed = true;
-	}
+        $this->content = $content;
+        $this->is_trimmed = true;
+    }
 
-	private function trim_html_string($content, $length)
-	{
-		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
-		preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
-		$content = strip_tags($content);
+    private function trim_html_string($content, $length)
+    {
+        $content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
+        preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
+        $content = strip_tags($content);
 		
-		$content = wordwrap($content, $length, self::$CUT_MARKER);
-		$content = explode(self::$CUT_MARKER, $content);
-		$content = current($content);
+        $content = wordwrap($content, $length, self::$CUT_MARKER);
+        $content = explode(self::$CUT_MARKER, $content);
+        $content = current($content);
 		
-		$max_length = $length;
-		foreach($matches[0] as $match)
-		{
-			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+        $max_length = $length;
+        foreach($matches[0] as $match)
+        {
+            $max_length += strlen($match[0]);
+            if($max_length <= $match[1])
+                break;
 			
-			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
-		}
+            $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;
-	}
+        return $content;
+    }
 
-	private function check_exclude_tags()
-	{
-		$content = $this->content;
-		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
-		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
+    private function check_exclude_tags()
+    {
+        $content = $this->content;
+        $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)
-		{
-			$cut_tag = end($matches[1]);
-			$cut_tag_position = $cut_tag[1] - 1;
-			$content = substr($content, 0, $cut_tag_position);
-		}
-		$content = trim($content);
+        if(count($matches[1]) % 2 == 1)
+        {
+            $cut_tag = end($matches[1]);
+            $cut_tag_position = $cut_tag[1] - 1;
+            $content = substr($content, 0, $cut_tag_position);
+        }
+        $content = trim($content);
 		
-		$this->content = $content;
-	}
+        $this->content = $content;
+    }
 
-	private function close_tags($etc)
-	{
-		$content = $this->content;
-		$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
-		preg_match_all($tags_preg, $content, $matches);
-		$open_tags = array();
+    private function close_tags($etc)
+    {
+        $content = $this->content;
+        $tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
+        preg_match_all($tags_preg, $content, $matches);
+        $open_tags = array();
 		
-		foreach($matches[1] as $tag)
-		{
-			if(in_array($tag, $open_tags))
-			{
-				$key = array_search($tag, $open_tags);
-				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
-		}
+        foreach($matches[1] as $tag)
+        {
+            if(in_array($tag, $open_tags))
+            {
+                $key = array_search($tag, $open_tags);
+                unset($open_tags[$key]);
+            }
+            else
+                $open_tags[] = $tag;
+        }
 		
-		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
-		{
-			foreach($open_tags as $key => $open_tag)
-			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
-				$content .= "</{$open_tag}>";
-			}
-		}
-		else
-			$content .= $etc;
+        $open_tags = array_reverse($open_tags);
+        if(count($open_tags) > 0)
+        {
+            foreach($open_tags as $key => $open_tag)
+            {
+                if($key == count($open_tags) - 1)
+                    $content .= $etc;
+                $content .= "</{$open_tag}>";
+            }
+        }
+        else
+            $content .= $etc;
 		
-		$this->content = $content;
-	}
+        $this->content = $content;
+    }
 
-	private function get_tags_preg($tag_array)
-	{
-		return '@</?(' . implode('|', $tag_array) . ')@';
-	}
+    private function get_tags_preg($tag_array)
+    {
+        return '@</?(' . implode('|', $tag_array) . ')@';
+    }
 
 }

utility/Request.class.inc.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return false;

 	}

 

+	/**
+	 * @param string $key
+	 */
 	static function getGet($key = null)

 	{

 		if($key)

Indentation +62 added lines, -62 removed lines

@@ -3,78 +3,78 @@
 class Request
 {
 
-	private static $server = array();
-	private static $get = array();
-	private static $post = array();
+    private static $server = array();
+    private static $get = array();
+    private static $post = array();
 
-	private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
+    private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
 
-	static function init()
-	{
-		self::make_server();
-		self::make_get();
-		self::make_post();
-	}
+    static function init()
+    {
+        self::make_server();
+        self::make_get();
+        self::make_post();
+    }
 
-	static function getServer($key = null)
-	{
-		if($key)
-		{
-			if(isset(self::$server[$key]))
-				return self::$server[$key];
-			return false;
-		}
-		return self::$server;
-	}
+    static function getServer($key = null)
+    {
+        if($key)
+        {
+            if(isset(self::$server[$key]))
+                return self::$server[$key];
+            return false;
+        }
+        return self::$server;
+    }
 
-	static function isAjax()
-	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
-		return false;
-	}
+    static function isAjax()
+    {
+        if(self::getServer(self::$AJAX_REQUEST))
+            return true;
+        return false;
+    }
 
-	static function getGet($key = null)
-	{
-		if($key)
-		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
-			return false;
-		}
-		return self::$get;
-	}
+    static function getGet($key = null)
+    {
+        if($key)
+        {
+            if(isset(self::$get[$key]))
+                return self::$get[$key];
+            return false;
+        }
+        return self::$get;
+    }
 
-	static function getPost($key = null)
-	{
-		if($key)
-		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
-			return false;
-		}
-		return self::$post;
-	}
+    static function getPost($key = null)
+    {
+        if($key)
+        {
+            if(isset(self::$post[$key]))
+                return self::$post[$key];
+            return false;
+        }
+        return self::$post;
+    }
 
-	public static function hasPost()
-	{
-		return is_array(self::$post) && !empty(self::$post);
-	}
+    public static function hasPost()
+    {
+        return is_array(self::$post) && !empty(self::$post);
+    }
 
-	static function make_server()
-	{
-		self::$server = $_SERVER;
-	}
+    static function make_server()
+    {
+        self::$server = $_SERVER;
+    }
 
-	static function make_get()
-	{
-		self::$get = $_GET;
-	}
+    static function make_get()
+    {
+        self::$get = $_GET;
+    }
 
-	static function make_post()
-	{
-		self::$post = $_POST;
-	}
+    static function make_post()
+    {
+        self::$post = $_POST;
+    }
 
 }
 

utility/URLDecode.class.inc.php

Doc Comments +6 added lines

@@ -38,6 +38,9 @@ 
 		self::$array['pieces'] = (array) $uri_array;

 	}

 

+	/**
+	 * @return string
+	 */
 	static function getSite()

 	{

 		return self::$array['site'];

@@ -66,6 +69,9 @@ 
 		return substr($file, strrpos($file, '.') + 1);;

 	}

 

+	/**
+	 * @param integer $piece
+	 */
 	static function getPiece($piece = null)

 	{

 		if(!$piece)

Indentation +61 added lines, -61 removed lines

@@ -3,35 +3,35 @@ 
 class URLDecode
 {
 
-	private static $array = array();
+    private static $array = array();
 
-	static function init()
-	{
-		$host = $_SERVER['HTTP_HOST'];
-		$uri = $_SERVER['REQUEST_URI'];
-		self::form_url_array($host, $uri);
-	}
+    static function init()
+    {
+        $host = $_SERVER['HTTP_HOST'];
+        $uri = $_SERVER['REQUEST_URI'];
+        self::form_url_array($host, $uri);
+    }
 
-	static private function form_url_array($host, $uri)
-	{
-		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
-		$uri_array = explode('/', $uri);
+    static private function form_url_array($host, $uri)
+    {
+        $uri = substr($uri, 1);
+        if(strpos($uri, '?'))
+            $uri = substr($uri, 0, strpos($uri, '?'));
+        $uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+        if(!Loader::isLive())
+            $host = substr($host, strpos($host, '.') + 1);
 		
-		self::$array['host'] = $host;
+        self::$array['host'] = $host;
 		
     if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
+        $host == 'www.waterfallsofthekeweenaw.com' ||
       $host == 'waterfallsofthekeweenaw.com'
     ) {
-			self::$array['site'] = 'waterfalls';
-		} else {
-			self::$array['site'] = substr($host, 0, strpos($host, '.'));
-		}
+            self::$array['site'] = 'waterfalls';
+        } else {
+            self::$array['site'] = substr($host, 0, strpos($host, '.'));
+        }
 
     $base = '';
     $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
@@ -40,55 +40,55 @@ 
     $base .= $host;
     $base .= '/';
 
-		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+        self::$array['base'] = $base;
+        self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
-		self::$array['pieces'] = (array) $uri_array;
-	}
+        if(end($uri_array) == '')
+            $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+        self::$array['pieces'] = (array) $uri_array;
+    }
 
-	static function getSite()
-	{
-		return self::$array['site'];
-	}
+    static function getSite()
+    {
+        return self::$array['site'];
+    }
 
-	static function getHost()
-	{
-		return self::$array['host'];
-	}
+    static function getHost()
+    {
+        return self::$array['host'];
+    }
 
-	static function getBase()
-	{
-		return self::$array['base'];
-	}
+    static function getBase()
+    {
+        return self::$array['base'];
+    }
 
-	static function getURI()
-	{
-		return self::$array['uri'];
-	}
+    static function getURI()
+    {
+        return self::$array['uri'];
+    }
 
-	static function getExtension()
-	{
-		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
-		return substr($file, strrpos($file, '.') + 1);;
-	}
+    static function getExtension()
+    {
+        $file = self::getPiece(-1);
+        if(substr($file, -1) == '/')
+            return false;
+        return substr($file, strrpos($file, '.') + 1);;
+    }
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+    static function getPiece($piece = null)
+    {
+        if(!$piece)
+            return self::$array['pieces'];
 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+        if($piece == -1)
+            return end(self::$array['pieces']);
 		
-		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
-		return;
-	}
+        $piece = $piece - 1;
+        if(array_key_exists($piece, self::$array['pieces']))
+            return self::$array['pieces'][$piece];
+        return;
+    }
 
 }