jacobemerick / web

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

Braces +26 added lines, -26 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('collector', 'Collector');
 
-final class LogCollector extends Collector
-{
+final class LogCollector extends Collector

+{

 
-	public static function getList($total, $offset = 0)
-	{
+	public static function getList($total, $offset = 0)

+	{

 		$query = "
 			SELECT
 				`log`.`id`,
@@ -34,8 +34,8 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getRecentList($total)
-    {
+    public static function getRecentList($total)

+    {

         $query = "
             SELECT
                 `log`.`title`,
@@ -62,8 +62,8 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
+	public static function getListCount()

+	{

 		$query = "
 			SELECT
 				COUNT(1) AS `count`
@@ -74,8 +74,8 @@ 
 		return self::get_count($query);
 	}
 
-	public static function getCompanionListForLog($log)
-	{
+	public static function getCompanionListForLog($log)

+	{

 		$query = "
 			SELECT
 				`companion`.`name`,
@@ -90,8 +90,8 @@ 
 		return self::run_query($query);
 	}
 
-	public static function getWaterfallListForLog($log)
-	{
+	public static function getWaterfallListForLog($log)

+	{

 		$query = "
 			SELECT
 				`waterfall`.`name`,
@@ -113,8 +113,8 @@ 
 		return self::run_query($query);
 	}
 
-	public static function getLogListForWaterfall($waterfall)
-	{
+	public static function getLogListForWaterfall($waterfall)

+	{

 		$query = "
 			SELECT
 				`log`.`title`,
@@ -133,8 +133,8 @@ 
 		return self::run_query($query);
 	}
 
-	public static function getTagListForLog($log)
-	{
+	public static function getTagListForLog($log)

+	{

 		$query = "
 			SELECT
 				`tag`.`name`,
@@ -147,8 +147,8 @@ 
 		return self::run_query($query);
 	}
 
-	public static function getByAlias($alias)
-	{
+	public static function getByAlias($alias)

+	{

 		$alias = self::escape($alias);
 		
 		$query = "
@@ -178,8 +178,8 @@ 
 		return self::run_row_query($query);
 	}
 
-    public static function getByDate($date)
-    {
+    public static function getByDate($date)

+    {

         $date = self::escape($date);
         
         $query = "
@@ -195,8 +195,8 @@ 
         return self::run_row_query($query);
     }
 	
-	public static function getById($log)
-	{
+	public static function getById($log)

+	{

 		$query = "
 			SELECT
 				`title`,
@@ -211,8 +211,8 @@ 
 		return self::run_row_query($query);
 	}
 
-	public static function getPreviousLog($log)
-	{
+	public static function getPreviousLog($log)

+	{

 		$query = "
 			SELECT
 				`title`,
@@ -236,8 +236,8 @@ 
 		return self::run_row_query($query);
 	}
 
-	public static function getNextLog($log)
-	{
+	public static function getNextLog($log)

+	{

 		$query = "
 			SELECT
 				`title`,

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

Braces +14 added lines, -14 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('collector', 'Collector');
 
-final class WaterfallCollector extends Collector
-{
+final class WaterfallCollector extends Collector

+{

 
-	public static function getList($total, $offset = 0)
-	{
+	public static function getList($total, $offset = 0)

+	{

 		$query = "
 			SELECT
 				`waterfall`.`id`,
@@ -43,8 +43,8 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getMapList()
-    {
+    public static function getMapList()

+    {

         $query = "
             SELECT
                 `waterfall`.`name`,
@@ -74,8 +74,8 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
+	public static function getListCount()

+	{

 		$query = "
 			SELECT
 				COUNT(1) AS `count`
@@ -92,8 +92,8 @@ 
 		return self::get_count($query);
 	}
 
-    public static function getNearbyList($waterfall)
-    {
+    public static function getNearbyList($waterfall)

+    {

         $query = "
             SELECT
                 `waterfall`.`name`,
@@ -117,8 +117,8 @@ 
         return self::run_query($query);
     }
 
-    public static function getByOldAlias($alias)
-    {
+    public static function getByOldAlias($alias)

+    {

         $alias = self::escape($alias);
         
         $query = "
@@ -137,8 +137,8 @@ 
         return self::run_row_query($query);
     }
 
-	public static function getByAlias($watercourse, $waterfall)
-	{
+	public static function getByAlias($watercourse, $waterfall)

+	{

 		$watercourse = self::escape($watercourse);
 		$waterfall = self::escape($waterfall);
 		

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

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

@@ -6,150 +6,150 @@
 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->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_tags_for_post($post)
-	{
+        $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->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_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;
-	}
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] > $maximum)
+                $maximum = $tag['count'];
+        }
+        return $maximum;
+    }
 
     final private function get_comments()
     {

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
+		if ($photo_result == null)
 			return;
 		
 		$name = $photo_result->name;
@@ -84,7 +84,7 @@ 
         $tag_result = $repository->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'];
@@ -98,7 +98,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');
@@ -124,9 +124,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['count'] < self::$MINIMUM_TAG_COUNT)
+			if ($tag['count'] < self::$MINIMUM_TAG_COUNT)
 				continue;
 			
 			$tag_object = new stdclass();
@@ -143,9 +143,9 @@ 
 	{
 		$maximum = 1;
 		
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
+			if ($tag['count'] > $maximum)
 				$maximum = $tag['count'];
 		}
 		return $maximum;
@@ -174,7 +174,7 @@ 
         $container['logger']->info("CommentService | Sidebar | {$elapsed}");
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

Braces +36 added lines, -32 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', '/PageController');
 Loader::load('utility', 'Content');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $RECENT_COMMENT_COUNT = 10;
 	private static $MINIMUM_TAG_COUNT = 10;
@@ -14,8 +14,8 @@ 
 
 	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'
@@ -29,18 +29,19 @@ 
 		$this->add_css('blog');
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		return;
 	}
 
-	protected function get_introduction_image($id)
-	{
+	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;
@@ -52,8 +53,8 @@ 
 		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
 	}
 
-	protected function set_body_data()
-	{
+	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());
@@ -61,8 +62,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	final protected function format_post($post, $trim = false)
-	{
+	final protected function format_post($post, $trim = false)

+	{

 		$post_object = new stdclass();
 		
 		$post_object->title = $post['title'];
@@ -77,8 +78,8 @@ 
 		return $post_object;
 	}
 
-	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']);
@@ -94,12 +95,13 @@ 
 		return $tag_array;
 	}
 
-	final private function get_body_for_post($post, $trim)
-	{
+	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();
@@ -107,16 +109,16 @@ 
 		return $body;
 	}
 
-	final protected function get_right_side()
-	{
+	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()
-	{
+	final private function get_tag_cloud()

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagCloud();
@@ -126,8 +128,9 @@ 
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag['count'] < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -139,20 +142,21 @@ 
 		return $cloud_array;
 	}
 
-	final private function get_maximum_tag_count($tag_result)
-	{
+	final private function get_maximum_tag_count($tag_result)

+	{

 		$maximum = 1;
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {

+							$maximum = $tag['count'];

+			}

 		}
 		return $maximum;
 	}
 
-    final private function get_comments()
-    {
+    final private function get_comments()

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

utility/content/MarkupCodeContent.class.inc.php

Doc Comments +6 added lines

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

 	}

 

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

 	{

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

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

 	}

 

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

 	{

 		switch($type)

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@ 
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
+		if (count($matches[1]) == 0)
 			return;
 		
-		foreach($matches[3] as $key => $match)
+		foreach ($matches[3] as $key => $match)
 		{
 			$replacement = $match;
 			$replacement = $this->wrap_in_list($replacement);
@@ -29,7 +29,7 @@ 
 	{
 		$content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
+		foreach ($content_array as $key => $row)
 		{
 			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
 			$new_row .= '<p>';
@@ -46,7 +46,7 @@ 
 
 	private function highlight_code($content, $type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			default :
 				return $content;

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

Braces +11 added lines, -10 removed lines

@@ -2,16 +2,17 @@ 
 
 Loader::load('utility', 'Content');
 
-final class MarkupCodeContent extends Content
-{
+final class MarkupCodeContent extends Content

+{

 
 	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
+	protected function execute($title = '')

+	{

 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

 		
 		foreach($matches[3] as $key => $match)
 		{
@@ -25,8 +26,8 @@ 
 		return;
 	}
 
-	private function wrap_in_list($content)
-	{
+	private function wrap_in_list($content)

+	{

 		$content_array = explode("\n", $content);
 		
 		foreach($content_array as $key => $row)
@@ -44,8 +45,8 @@ 
 		return $content;
 	}
 
-	private function highlight_code($content, $type)
-	{
+	private function highlight_code($content, $type)

+	{

 		switch($type)
 		{
 			default :

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

Spacing +15 added lines, -15 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			if ($max_length <= $match[1])
 				break;
 			
-			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
+			$content = substr($content, 0, $match[1]).$match[0].substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}
@@ -141,7 +141,7 @@ 
 
 	private function get_tags_preg($tag_array)
 	{
-		return '@</?(' . implode('|', $tag_array) . ')@';
+		return '@</?('.implode('|', $tag_array).')@';
 	}
 
 }

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) . ')@';
+    }
 
 }

Braces +42 added lines, -36 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('utility', 'Content');
 
-class SmartTrimContent extends Content
-{
+class SmartTrimContent extends Content

+{

 
 	private static $EXCLUDE_TAGS = array(
 		'a',
@@ -24,8 +24,8 @@ 
 
 	private $is_trimmed;
 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$args = func_get_args();
 		if(count($args) < 1)
 		{
@@ -33,37 +33,40 @@ 
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
 
-	private function trim_string($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);
+		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;
 	}
 
-	private function trim_html_string($content, $length)
-	{
+	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);
@@ -76,20 +79,22 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {

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

+		}

 		
 		return $content;
 	}
 
-	private function check_exclude_tags()
-	{
+	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);
@@ -105,8 +110,8 @@ 
 		$this->content = $content;
 	}
 
-	private function close_tags($etc)
-	{
+	private function close_tags($etc)

+	{

 		$content = $this->content;
 		$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches);
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,19 +133,20 @@ 
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}
 
-	private function get_tags_preg($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)

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 
 	static function getServer($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$server[$key]))
+			if (isset(self::$server[$key]))
 				return self::$server[$key];
 			return false;
 		}
@@ -29,16 +29,16 @@ 
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
+		if (self::getServer(self::$AJAX_REQUEST))
 			return true;
 		return false;
 	}
 
 	static function getGet($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$get[$key]))
+			if (isset(self::$get[$key]))
 				return self::$get[$key];
 			return false;
 		}
@@ -47,9 +47,9 @@ 
 
 	static function getPost($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$post[$key]))
+			if (isset(self::$post[$key]))
 				return self::$post[$key];
 			return false;
 		}

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

Braces +32 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-class Request
-{
+class Request

+{

 
 	private static $server = array();
 	private static $get = array();
@@ -9,70 +9,74 @@ 
 
 	private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
 
-	static function init()
-	{
+	static function init()

+	{

 		self::make_server();
 		self::make_get();
 		self::make_post();
 	}
 
-	static function getServer($key = null)
-	{
+	static function getServer($key = null)

+	{

 		if($key)
 		{
-			if(isset(self::$server[$key]))
-				return self::$server[$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;
+	static function isAjax()

+	{

+		if(self::getServer(self::$AJAX_REQUEST)) {

+					return true;

+		}

 		return false;
 	}
 
-	static function getGet($key = null)
-	{
+	static function getGet($key = null)

+	{

 		if($key)
 		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
+			if(isset(self::$get[$key])) {

+							return self::$get[$key];

+			}

 			return false;
 		}
 		return self::$get;
 	}
 
-	static function getPost($key = null)
-	{
+	static function getPost($key = null)

+	{

 		if($key)
 		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
+			if(isset(self::$post[$key])) {

+							return self::$post[$key];

+			}

 			return false;
 		}
 		return self::$post;
 	}
 
-	public static function hasPost()
-	{
+	public static function hasPost()

+	{

 		return is_array(self::$post) && !empty(self::$post);
 	}
 
-	static function make_server()
-	{
+	static function make_server()

+	{

 		self::$server = $_SERVER;
 	}
 
-	static function make_get()
-	{
+	static function make_get()

+	{

 		self::$get = $_GET;
 	}
 
-	static function make_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)

Spacing +9 added lines, -9 removed lines

@@ -15,11 +15,11 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
+		if (strpos($uri, '?'))
 			$uri = substr($uri, 0, strpos($uri, '?'));
 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 			$host = substr($host, strpos($host, '.') + 1);
 		
 		self::$array['host'] = $host;
@@ -41,9 +41,9 @@ 
     $base .= '/';
 
 		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+		self::$array['uri'] = '/'.implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
+		if (end($uri_array) == '')
 			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
 		self::$array['pieces'] = (array) $uri_array;
 	}
@@ -71,21 +71,21 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
+		if (substr($file, -1) == '/')
 			return false;
-		return substr($file, strrpos($file, '.') + 1);;
+		return substr($file, strrpos($file, '.') + 1); ;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
+		if (!$piece)
 			return self::$array['pieces'];
 		
-		if($piece == -1)
+		if ($piece == -1)
 			return end(self::$array['pieces']);
 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
+		if (array_key_exists($piece, self::$array['pieces']))
 			return self::$array['pieces'][$piece];
 		return;
 	}

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

Braces +39 added lines, -32 removed lines

@@ -1,26 +1,28 @@ 
 <?php
 
-class URLDecode
-{
+class URLDecode

+{

 
 	private static $array = array();
 
-	static function init()
-	{
+	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)
-	{
+	static private function form_url_array($host, $uri)

+	{

 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		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;
 		
@@ -43,50 +45,55 @@ 
 		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);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
-	static function getSite()
-	{
+	static function getSite()

+	{

 		return self::$array['site'];
 	}
 
-	static function getHost()
-	{
+	static function getHost()

+	{

 		return self::$array['host'];
 	}
 
-	static function getBase()
-	{
+	static function getBase()

+	{

 		return self::$array['base'];
 	}
 
-	static function getURI()
-	{
+	static function getURI()

+	{

 		return self::$array['uri'];
 	}
 
-	static function getExtension()
-	{
+	static function getExtension()

+	{

 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		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];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}
 

utility/Validate.class.inc.php

Doc Comments +5 added lines

@@ -72,6 +72,11 @@
 		return $matches[0] == $string;

 	}

 

+	/**
+	 * @param string $type
+	 * @param string $key
+	 * @param string $validation
+	 */
 	public static function checkRequest($type, $key, $validation, $strict = false)

 	{

 		switch($type)

Spacing +11 added lines, -11 removed lines

@@ -11,39 +11,39 @@ 
 
 	public static function isBoolean($value, $strict = false)
 	{
-		if($strict && ($value === true || $value === false))
+		if ($strict && ($value === true || $value === false))
 			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
+		if (!$strict && ((bool) $value === true || (bool) $value === false))
 			return true;
 		return false;
 	}
 
 	public static function isDate($value)
 	{
-		if(strtotime($value) !== -1)
+		if (strtotime($value) !== -1)
 			return true;
-		if(date('y', $value) !== false)
+		if (date('y', $value) !== false)
 			return true;
 		return false;
 	}
 
 	public static function isInteger($value, $strict = false)
 	{
-		if($strict)
+		if ($strict)
 			return is_int($value);
 		return (int) $value == $value;
 	}
 
 	public static function isIP($value)
 	{
-		if(self::isInteger(ip2long($value)))
+		if (self::isInteger(ip2long($value)))
 			return true;
 		return false;
 	}
 
 	public static function isString($value, $strict = false)
 	{
-		if($strict)
+		if ($strict)
 			return is_string($value);
 		return (string) $value == $value;
 	}
@@ -67,14 +67,14 @@ 
 	private static function check_value($pattern, $string)
 	{
 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
+		if (empty($matches))
 			return false;
 		return $matches[0] == $string;
 	}
 
 	public static function checkRequest($type, $key, $validation, $strict = false)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'server':
 				$value = Request::getServer($key);
@@ -84,10 +84,10 @@ 
 			break;
 		}
 		
-		if($value == false)
+		if ($value == false)
 			return false;
 		
-		switch($validation)
+		switch ($validation)
 		{
 			case 'boolean':
 				return self::isBoolean($value, $strict);

Indentation +91 added lines, -91 removed lines

@@ -5,110 +5,110 @@
 class Validate
 {
 
-	private static $NAME_REGEX = '@[a-z\s\'-]+@i';
-	private static $EMAIL_REGEX = '@(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")\@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])@i';
-	private static $URL_REGEX = '@((https?|ftp)\:\/\/)?([a-z0-9-.]*)\.([a-z]{2,3})(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:\@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?@i';
+    private static $NAME_REGEX = '@[a-z\s\'-]+@i';
+    private static $EMAIL_REGEX = '@(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")\@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])@i';
+    private static $URL_REGEX = '@((https?|ftp)\:\/\/)?([a-z0-9-.]*)\.([a-z]{2,3})(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:\@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?@i';
 
-	public static function isBoolean($value, $strict = false)
-	{
-		if($strict && ($value === true || $value === false))
-			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
-			return true;
-		return false;
-	}
+    public static function isBoolean($value, $strict = false)
+    {
+        if($strict && ($value === true || $value === false))
+            return true;
+        if(!$strict && ((bool) $value === true || (bool) $value === false))
+            return true;
+        return false;
+    }
 
-	public static function isDate($value)
-	{
-		if(strtotime($value) !== -1)
-			return true;
-		if(date('y', $value) !== false)
-			return true;
-		return false;
-	}
+    public static function isDate($value)
+    {
+        if(strtotime($value) !== -1)
+            return true;
+        if(date('y', $value) !== false)
+            return true;
+        return false;
+    }
 
-	public static function isInteger($value, $strict = false)
-	{
-		if($strict)
-			return is_int($value);
-		return (int) $value == $value;
-	}
+    public static function isInteger($value, $strict = false)
+    {
+        if($strict)
+            return is_int($value);
+        return (int) $value == $value;
+    }
 
-	public static function isIP($value)
-	{
-		if(self::isInteger(ip2long($value)))
-			return true;
-		return false;
-	}
+    public static function isIP($value)
+    {
+        if(self::isInteger(ip2long($value)))
+            return true;
+        return false;
+    }
 
-	public static function isString($value, $strict = false)
-	{
-		if($strict)
-			return is_string($value);
-		return (string) $value == $value;
-	}
+    public static function isString($value, $strict = false)
+    {
+        if($strict)
+            return is_string($value);
+        return (string) $value == $value;
+    }
 
-	public static function isURL($value)
-	{
-		return true;
-		return self::check_value(self::$URL_REGEX, $value);
-	}
+    public static function isURL($value)
+    {
+        return true;
+        return self::check_value(self::$URL_REGEX, $value);
+    }
 
-	public static function isName($value)
-	{
-		return self::check_value(self::$NAME_REGEX, $value);
-	}
+    public static function isName($value)
+    {
+        return self::check_value(self::$NAME_REGEX, $value);
+    }
 
-	public static function isEmail($value)
-	{
-		return self::check_value(self::$EMAIL_REGEX, $value);
-	}
+    public static function isEmail($value)
+    {
+        return self::check_value(self::$EMAIL_REGEX, $value);
+    }
 
-	private static function check_value($pattern, $string)
-	{
-		preg_match($pattern, $string, $matches);
-		if(empty($matches))
-			return false;
-		return $matches[0] == $string;
-	}
+    private static function check_value($pattern, $string)
+    {
+        preg_match($pattern, $string, $matches);
+        if(empty($matches))
+            return false;
+        return $matches[0] == $string;
+    }
 
-	public static function checkRequest($type, $key, $validation, $strict = false)
-	{
-		switch($type)
-		{
-			case 'server':
-				$value = Request::getServer($key);
-			break;
-			case 'post':
-				$value = Request::getPost($key);
-			break;
-		}
+    public static function checkRequest($type, $key, $validation, $strict = false)
+    {
+        switch($type)
+        {
+            case 'server':
+                $value = Request::getServer($key);
+            break;
+            case 'post':
+                $value = Request::getPost($key);
+            break;
+        }
 		
-		if($value == false)
-			return false;
+        if($value == false)
+            return false;
 		
-		switch($validation)
-		{
-			case 'boolean':
-				return self::isBoolean($value, $strict);
-			case 'date':
-				return self::isDate($value);
-			case 'integer':
-				return self::isInteger($value, $strict);
-			case 'ip':
-				return self::isIP($value);
-			case 'string':
-				return self::isString($value, $strict);
-			case 'url':
-				return self::isURL($value, $strict);
-			case 'name':
-				return self::isName($value, $strict);
-			case 'email':
-				return self::isEmail($value, $strict);
-		}
+        switch($validation)
+        {
+            case 'boolean':
+                return self::isBoolean($value, $strict);
+            case 'date':
+                return self::isDate($value);
+            case 'integer':
+                return self::isInteger($value, $strict);
+            case 'ip':
+                return self::isIP($value);
+            case 'string':
+                return self::isString($value, $strict);
+            case 'url':
+                return self::isURL($value, $strict);
+            case 'name':
+                return self::isName($value, $strict);
+            case 'email':
+                return self::isEmail($value, $strict);
+        }
 		
-		return false;
-	}
+        return false;
+    }
 
 }
 

Braces +49 added lines, -40 removed lines

@@ -2,78 +2,86 @@ 
 
 Loader::load('utility', 'Request');
 
-class Validate
-{
+class Validate

+{

 
 	private static $NAME_REGEX = '@[a-z\s\'-]+@i';
 	private static $EMAIL_REGEX = '@(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")\@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])@i';
 	private static $URL_REGEX = '@((https?|ftp)\:\/\/)?([a-z0-9-.]*)\.([a-z]{2,3})(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:\@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?@i';
 
-	public static function isBoolean($value, $strict = false)
-	{
-		if($strict && ($value === true || $value === false))
-			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
-			return true;
+	public static function isBoolean($value, $strict = false)

+	{

+		if($strict && ($value === true || $value === false)) {

+					return true;

+		}

+		if(!$strict && ((bool) $value === true || (bool) $value === false)) {

+					return true;

+		}

 		return false;
 	}
 
-	public static function isDate($value)
-	{
-		if(strtotime($value) !== -1)
-			return true;
-		if(date('y', $value) !== false)
-			return true;
+	public static function isDate($value)

+	{

+		if(strtotime($value) !== -1) {

+					return true;

+		}

+		if(date('y', $value) !== false) {

+					return true;

+		}

 		return false;
 	}
 
-	public static function isInteger($value, $strict = false)
-	{
-		if($strict)
-			return is_int($value);
+	public static function isInteger($value, $strict = false)

+	{

+		if($strict) {

+					return is_int($value);

+		}

 		return (int) $value == $value;
 	}
 
-	public static function isIP($value)
-	{
-		if(self::isInteger(ip2long($value)))
-			return true;
+	public static function isIP($value)

+	{

+		if(self::isInteger(ip2long($value))) {

+					return true;

+		}

 		return false;
 	}
 
-	public static function isString($value, $strict = false)
-	{
-		if($strict)
-			return is_string($value);
+	public static function isString($value, $strict = false)

+	{

+		if($strict) {

+					return is_string($value);

+		}

 		return (string) $value == $value;
 	}
 
-	public static function isURL($value)
-	{
+	public static function isURL($value)

+	{

 		return true;
 		return self::check_value(self::$URL_REGEX, $value);
 	}
 
-	public static function isName($value)
-	{
+	public static function isName($value)

+	{

 		return self::check_value(self::$NAME_REGEX, $value);
 	}
 
-	public static function isEmail($value)
-	{
+	public static function isEmail($value)

+	{

 		return self::check_value(self::$EMAIL_REGEX, $value);
 	}
 
-	private static function check_value($pattern, $string)
-	{
+	private static function check_value($pattern, $string)

+	{

 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
-			return false;
+		if(empty($matches)) {

+					return false;

+		}

 		return $matches[0] == $string;
 	}
 
-	public static function checkRequest($type, $key, $validation, $strict = false)
-	{
+	public static function checkRequest($type, $key, $validation, $strict = false)

+	{

 		switch($type)
 		{
 			case 'server':
@@ -84,8 +92,9 @@ 
 			break;
 		}
 		
-		if($value == false)
-			return false;
+		if($value == false) {

+					return false;

+		}

 		
 		switch($validation)
 		{

utility/content/CleanCommentContent.class.inc.php

Doc Comments +8 added lines

@@ -36,6 +36,10 @@ 
 		$this->replace_element_patterns();

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

@@ -75,6 +79,10 @@ 
 		$this->content = strip_tags($this->content);

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

Spacing +6 added lines, -6 removed lines

@@ -40,10 +40,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$placeholder = $this->create_placeholder($full_match);
@@ -56,7 +56,7 @@ 
 
 	private function create_placeholder($text)
 	{
-		return md5($text . rand());
+		return md5($text.rand());
 	}
 
 	private function create_full_match_pattern($text)
@@ -79,10 +79,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$full_match_pattern = $this->create_full_match_pattern($full_match);
@@ -99,7 +99,7 @@ 
 
 	private function replace_element_patterns()
 	{
-		foreach($this->replacement_array as $key => $replace)
+		foreach ($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);
 		}

Indentation +83 added lines, -83 removed lines

@@ -5,104 +5,104 @@
 final class CleanCommentContent extends Content
 {
 
-	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
-	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
-	private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
-	private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
+    private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
+    private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
+    private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
+    private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
 
-	private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
-	private static $BOLD_REPLACE = '<b>%s</b>';
-	private static $ITALIC_REPLACE = '<i>%s</i>';
-	private static $CODE_REPLACE = '<pre>%s</pre>';
+    private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
+    private static $BOLD_REPLACE = '<b>%s</b>';
+    private static $ITALIC_REPLACE = '<i>%s</i>';
+    private static $CODE_REPLACE = '<pre>%s</pre>';
 
-	private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
-	private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
+    private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
+    private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
 
-	private static $LINE_BREAK_REPLACE = '<br />';
+    private static $LINE_BREAK_REPLACE = '<br />';
 
-	private $replacement_array = array();
+    private $replacement_array = array();
 
-	protected function execute()
-	{
-		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
-		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
-		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
-		$this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
+    protected function execute()
+    {
+        $this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
+        $this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
+        $this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
+        $this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
 		
-		$this->strip_extra_tags();
+        $this->strip_extra_tags();
 		
-		$this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
-		$this->add_line_breaks();
-		$this->replace_element_patterns();
-	}
-
-	private function process_element($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+        $this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
+        $this->add_line_breaks();
+        $this->replace_element_patterns();
+    }
+
+    private function process_element($pattern, $replace)
+    {
+        $match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+        if($match_count < 1)
+            return;
 		
-		foreach($matches as $match)
-		{
-			$full_match = array_shift($match);
-			$placeholder = $this->create_placeholder($full_match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $placeholder = $this->create_placeholder($full_match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
 			
-			$this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
-			$this->replacement_array[$placeholder] = vsprintf($replace, $match);
-		}
-	}
-
-	private function create_placeholder($text)
-	{
-		return md5($text . rand());
-	}
-
-	private function create_full_match_pattern($text)
-	{
-		$pattern = '';
-		$pattern .= '@';
-		$pattern .= preg_quote($text, '@');
-		$pattern .= '@';
-		$pattern .= 'i';
+            $this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
+            $this->replacement_array[$placeholder] = vsprintf($replace, $match);
+        }
+    }
+
+    private function create_placeholder($text)
+    {
+        return md5($text . rand());
+    }
+
+    private function create_full_match_pattern($text)
+    {
+        $pattern = '';
+        $pattern .= '@';
+        $pattern .= preg_quote($text, '@');
+        $pattern .= '@';
+        $pattern .= 'i';
 		
-		return $pattern;
-	}
+        return $pattern;
+    }
 
-	private function strip_extra_tags()
-	{
-		$this->content = strip_tags($this->content);
-	}
+    private function strip_extra_tags()
+    {
+        $this->content = strip_tags($this->content);
+    }
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+    private function link_unlinked_urls($pattern, $replace)
+    {
+        $match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+        if($match_count < 1)
+            return;
 		
-		foreach($matches as $match)
-		{
-			$full_match = array_shift($match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
-			$replace = sprintf($replace, $match[0], $match[0]);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
+            $replace = sprintf($replace, $match[0], $match[0]);
 			
-			$this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
-		}
-	}
-
-	private function add_line_breaks()
-	{
-		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
-	}
-
-	private function replace_element_patterns()
-	{
-		foreach($this->replacement_array as $key => $replace)
-		{
-			$this->content = str_replace($key, $replace, $this->content);
-		}
-	}
+            $this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
+        }
+    }
+
+    private function add_line_breaks()
+    {
+        $this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
+    }
+
+    private function replace_element_patterns()
+    {
+        foreach($this->replacement_array as $key => $replace)
+        {
+            $this->content = str_replace($key, $replace, $this->content);
+        }
+    }
 
 }
\ No newline at end of file

Braces +24 added lines, -22 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('utility', 'Content');
 
-final class CleanCommentContent extends Content
-{
+final class CleanCommentContent extends Content

+{

 
 	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
 	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
@@ -22,8 +22,8 @@ 
 
 	private $replacement_array = array();
 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
 		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
 		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
@@ -36,12 +36,13 @@ 
 		$this->replace_element_patterns();
 	}
 
-	private function process_element($pattern, $replace)
-	{
+	private function process_element($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -54,13 +55,13 @@ 
 		}
 	}
 
-	private function create_placeholder($text)
-	{
+	private function create_placeholder($text)

+	{

 		return md5($text . rand());
 	}
 
-	private function create_full_match_pattern($text)
-	{
+	private function create_full_match_pattern($text)

+	{

 		$pattern = '';
 		$pattern .= '@';
 		$pattern .= preg_quote($text, '@');
@@ -70,17 +71,18 @@ 
 		return $pattern;
 	}
 
-	private function strip_extra_tags()
-	{
+	private function strip_extra_tags()

+	{

 		$this->content = strip_tags($this->content);
 	}
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
+	private function link_unlinked_urls($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -92,13 +94,13 @@ 
 		}
 	}
 
-	private function add_line_breaks()
-	{
+	private function add_line_breaks()

+	{

 		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
 	}
 
-	private function replace_element_patterns()
-	{
+	private function replace_element_patterns()

+	{

 		foreach($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);