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

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

Spacing +1 added lines, -1 removed lines

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

Braces +5 added lines, -4 removed lines

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

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

+		} else {

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

+		}

 		
 		$query = "
 			SELECT

collector/waterfall/LogCollector.class.inc.php

Doc Comments +6 added lines

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

 	}

 

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

     {

         $query = "

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

 	}

 

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

     {

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

Indentation +11 added lines, -11 removed lines

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

collector/waterfall/WaterfallCollector.class.inc.php

Doc Comments +3 added lines

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

     }

 

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

     {

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

Indentation +16 added lines, -16 removed lines

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

controller/blog/DefaultPageController.class.inc.php

Doc Comments +3 added lines

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

 	}

 

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

 	{

 		$body = $post->body;

Braces +12 added lines, -8 removed lines

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

+					return;

+		}

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

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

+		}

 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -134,8 +136,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'];
@@ -153,8 +156,9 @@ 
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {

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

+			}

 		}
 		return $maximum;
 	}

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
+		if ($photo_result == null)
 			return;
 		
 		$name = $photo_result->name;
@@ -92,7 +92,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'];
@@ -106,7 +106,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');
@@ -132,9 +132,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();
@@ -151,9 +151,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;
@@ -164,7 +164,7 @@ 
 		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
 		
 		$array = array();
-		foreach($comment_array as $comment)
+		foreach ($comment_array as $comment)
 		{
 			$body = $comment->body;
 			$body = strip_tags($body);
@@ -172,7 +172,7 @@ 
 			$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}";
+			$comment_obj->link = Loader::getRootURL()."{$comment->category}/{$comment->path}/#comment-{$comment->id}";
 			$array[] = $comment_obj;
 		}
 
@@ -201,7 +201,7 @@ 
         $comment_response = $api->getComments(1, self::$RECENT_COMMENT_COUNT, '-date', 'blog.jacobemerick.com');
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = $comment->getBody();
             $body = strip_tags($body);

Indentation +108 added lines, -108 removed lines

@@ -18,14 +18,14 @@ 
 
 	protected function set_head_data()
 	{
-    $this->set_head('rss_link', [
-      'title' => 'Jacob Emerick Blog Feed',
-      'url' => '/rss.xml'
-    ]);
-    $this->set_head('rss_comment_link', [
-      'title' => 'Jacob Emerick Blog Comment Feed',
-      'url' => '/rss-comments.xml'
-    ]);
+	$this->set_head('rss_link', [
+	  'title' => 'Jacob Emerick Blog Feed',
+	  'url' => '/rss.xml'
+	]);
+	$this->set_head('rss_comment_link', [
+	  'title' => 'Jacob Emerick Blog Comment Feed',
+	  'url' => '/rss-comments.xml'
+	]);
 		
 		$this->add_css('normalize');
 		$this->add_css('blog');
@@ -83,57 +83,57 @@ 
 	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) {
-        global $container;
-        $container['console']->log('Mismatch between comment service and legacy db');
-        $container['console']->log("{$count}, {$count_from_service} in service");
-    }
-    return $count;
+	$count_from_service = $this->get_comments_for_post_from_service($post);
+
+	if ($count_from_service !== null && $count_from_service != $count) {
+		global $container;
+		$container['console']->log('Mismatch between comment service and legacy db');
+		$container['console']->log("{$count}, {$count_from_service} in service");
+	}
+	return $count;
 	}
 
-    final private function get_comments_for_post_from_service($post)
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        try {
-            $comment_response = $api->getComments(
-                null,
-                null,
-                null,
-                'blog.jacobemerick.com',
-                "{$post['category']}/{$post['path']}"
-            );
-        } catch (Exception $e) {
-            global $container;
-            $container['logger']->warning("CommentService | Comment Count | {$e->getMessage()}");
-            return;
-        }
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Comment Count | {$elapsed}");
-
-        return count($comment_response);
-    }
+	final private function get_comments_for_post_from_service($post)
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		try {
+			$comment_response = $api->getComments(
+				null,
+				null,
+				null,
+				'blog.jacobemerick.com',
+				"{$post['category']}/{$post['path']}"
+			);
+		} catch (Exception $e) {
+			global $container;
+			$container['logger']->warning("CommentService | Comment Count | {$e->getMessage()}");
+			return;
+		}
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Comment Count | {$elapsed}");
+
+		return count($comment_response);
+	}
 
 	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']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->getTagsForPost($post['id']);
 
-        $tag_array = array();
+		$tag_array = array();
 		foreach($tag_result as $tag)
 		{
 			$tag_object = new stdclass();
@@ -167,9 +167,9 @@ 
 
 	final private function get_tag_cloud()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->getTagCloud();
+		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);
 		
@@ -218,61 +218,61 @@ 
 			$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]);
-    }
+	$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]);
+	}
 		return $array;
 	}
 
-    final private function get_comments_from_service()
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        try {
-            $comment_response = $api->getComments(
-                1,
-                self::$RECENT_COMMENT_COUNT,
-                '-date',
-                'blog.jacobemerick.com'
-            );
-        } catch (Exception $e) {
-            global $container;
-            $container['logger']->warning("CommentService | Sidebar | {$e->getMessage()}");
-            return;
-        }
+	final private function get_comments_from_service()
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		try {
+			$comment_response = $api->getComments(
+				1,
+				self::$RECENT_COMMENT_COUNT,
+				'-date',
+				'blog.jacobemerick.com'
+			);
+		} catch (Exception $e) {
+			global $container;
+			$container['logger']->warning("CommentService | Sidebar | {$e->getMessage()}");
+			return;
+		}
  
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Sidebar | {$elapsed}");
-
-        $array = array();
-        foreach($comment_response as $comment)
-        {
-            $body = $comment->getBody();
-            $body = Content::instance('CleanComment', $body)->activate();
-            $body = strip_tags($body);
-
-            $comment_obj = new stdclass();
-            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
-            $comment_obj->commenter = $comment->getCommenter()->getName();
-            $comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
-            $array[] = $comment_obj;
-        }
-        return $array;
-    }
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Sidebar | {$elapsed}");
+
+		$array = array();
+		foreach($comment_response as $comment)
+		{
+			$body = $comment->getBody();
+			$body = Content::instance('CleanComment', $body)->activate();
+			$body = strip_tags($body);
+
+			$comment_obj = new stdclass();
+			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
+			$comment_obj->commenter = $comment->getCommenter()->getName();
+			$comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
+			$array[] = $comment_obj;
+		}
+		return $array;
+	}
 
 }

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

@@ -57,37 +57,37 @@ 
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
-        global $container;
-        $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-        $post_result = $activityRepository->getActivities(5);
-
-        $post_array = array();
-        foreach($post_result as $row) {
-            array_push($post_array, $this->expand_post($row));
-        }
-
-        return $post_array;
-    }
-
-    protected function expand_post($raw_post, $format = 'short')
-    {
-        $post = [
-            'type' => $raw_post['type'],
-            'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
-            'date' => $this->get_parsed_date($raw_post['datetime']),
-        ];
-
-        if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
-
-            $metadata = json_decode($raw_post['metadata'], true);
-            $post = array_merge($post, $metadata);
-        }
-
-        return (object) $post;
-    }
+	protected function get_recent_activity()
+	{
+		global $container;
+		$activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+		$post_result = $activityRepository->getActivities(5);
+
+		$post_array = array();
+		foreach($post_result as $row) {
+			array_push($post_array, $this->expand_post($row));
+		}
+
+		return $post_array;
+	}
+
+	protected function expand_post($raw_post, $format = 'short')
+	{
+		$post = [
+			'type' => $raw_post['type'],
+			'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
+			'date' => $this->get_parsed_date($raw_post['datetime']),
+		];
+
+		if ($format != 'short') {
+			$post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+
+			$metadata = json_decode($raw_post['metadata'], true);
+			$post = array_merge($post, $metadata);
+		}
+
+		return (object) $post;
+	}
 
 	public function activate()
 	{
@@ -108,11 +108,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -170,19 +170,19 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
-        $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  $path = "/css/{$stylesheet[0]}.css";
+	  if ($stylesheet[1] > 1) {
+		$path .= "?v={$stylesheet[1]}";
+	  }
+	  return $path;
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);
@@ -296,9 +296,9 @@ 
 		$commenter->email = '';
 		$commenter->website = '';
 
-    if (!isset($_COOKIE['commenter'])) {
-      return $commenter;
-    }
+	if (!isset($_COOKIE['commenter'])) {
+	  return $commenter;
+	}
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		

Spacing +20 added lines, -20 removed lines

@@ -64,7 +64,7 @@ 
         $post_result = $activityRepository->getActivities(5);
 
         $post_array = array();
-        foreach($post_result as $row) {
+        foreach ($post_result as $row) {
             array_push($post_array, $this->expand_post($row));
         }
 
@@ -80,7 +80,7 @@ 
         ];
 
         if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+            $post['url'] = Loader::getRootUrl('lifestream')."{$raw_post['type']}/{$raw_post['id']}/";
 
             $metadata = json_decode($raw_post['metadata'], true);
             $post = array_merge($post, $metadata);
@@ -100,12 +100,12 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+				Loader::load('view', URLDecode::getSite().'/'.$view, $this->data_array['body']);
 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -114,7 +114,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -170,14 +170,14 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
       }
       return $path;
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       if (substr($script, 0, 4) == 'http') {
         return $script;
       }
@@ -195,26 +195,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -234,7 +234,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -252,7 +252,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -262,12 +262,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -302,15 +302,15 @@ 
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		if($commenter_cookie_value === NULL)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
 			return $commenter;
 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

Braces +37 added lines, -27 removed lines

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

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

+			} else {

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

+			}

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

+					exit;

+		}

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

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

+		}

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

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

+		}

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

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

+				}

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

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

+				}

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

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

+			} else {

+							$comment_object->errors = array();

+			}

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

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

+			}

 		}
 		
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -302,16 +309,19 @@ 
 
 		$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 : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+		if($commenter_object === NULL) {

+					return $commenter;

+		}

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

utility/content/MarkupCodeContent.class.inc.php

Doc Comments +6 added lines

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

 	}

 

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

 	{

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

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

 	}

 

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

 	{

 		switch($type)

Spacing +4 added lines, -4 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

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

utility/content/SmartTrimContent.class.inc.php

Doc Comments +3 added lines

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

 	}

 

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

 	{

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

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		
 		if($length < strlen($this->content))
 			$this->trim_string($length);
-        else
-            $etc = '';
+		else
+			$etc = '';
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}

Braces +28 added lines, -22 removed lines

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

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

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

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
@@ -54,8 +56,9 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {

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

+		}

 		$content = trim($content);
 		
 		$this->content = $content;
@@ -76,14 +79,16 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

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

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

+		}

 		
 		return $content;
 	}
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

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

+									$content .= $etc;

+				}

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

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}

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

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

Braces +12 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
 	{
 		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;
@@ -29,8 +30,9 @@ 
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+		if(self::getServer(self::$AJAX_REQUEST)) {

+					return true;

+		}

 		return false;
 	}
 
@@ -38,8 +40,9 @@ 
 	{
 		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;
@@ -49,8 +52,9 @@ 
 	{
 		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;

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)

Braces +21 added lines, -14 removed lines

@@ -15,12 +15,14 @@ 
 	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;
 		
@@ -33,8 +35,9 @@ 
 		self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';
 		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;
 	}
 
@@ -61,22 +64,26 @@ 
 	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'];
+		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;
 	}
 

Indentation +10 added lines, -10 removed lines

@@ -24,21 +24,21 @@
 		
 		self::$array['host'] = $host;
 		
-    if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
-      $host == 'waterfallsofthekeweenaw.com'
-    ) {
+	if (
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
+	  $host == 'waterfallsofthekeweenaw.com'
+	) {
 			self::$array['site'] = 'waterfalls';
 		} else {
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));
 		}
 
-    $base = '';
-    $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-    $base .= '://';
-    $base .= (!Loader::isLive()) ? 'dev.' : '';
-    $base .= $host;
-    $base .= '/';
+	$base = '';
+	$base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+	$base .= '://';
+	$base .= (!Loader::isLive()) ? 'dev.' : '';
+	$base .= $host;
+	$base .= '/';
 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);

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