jacobemerick / web

src/Domain/Waterfall/County/MysqlCountyRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlCountyRepository implements CountyRepositoryInterface
-{
+class MysqlCountyRepository implements CountyRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,13 +13,13 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
-    public function getCountyList()
-    {
+    public function getCountyList()

+    {

         $query = "
             SELECT `county`.`name`, `county`.`alias`, COUNT(1) AS `count`
             FROM `jpemeric_waterfall`.`county`

src/Domain/Waterfall/Log/MysqlLogRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlLogRepository implements LogRepositoryInterface
-{
+class MysqlLogRepository implements LogRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,13 +13,13 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
-    public function getActiveLogs($limit = null, $offset = 0)
-    {
+    public function getActiveLogs($limit = null, $offset = 0)

+    {

         $query = "
             SELECT `id`, `title`, `alias`, `date`, `publish_date`, `introduction`
             FROM `jpemeric_waterfall`.`log`

src/Domain/Waterfall/Period/MysqlPeriodRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlPeriodRepository implements PeriodRepositoryInterface
-{
+class MysqlPeriodRepository implements PeriodRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,13 +13,13 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
-    public function getPeriodList()
-    {
+    public function getPeriodList()

+    {

         $query = "
             SELECT `period`.`name`, `period`.`alias`, COUNT(1) AS `count`
             FROM `jpemeric_waterfall`.`period`

src/Domain/Waterfall/Watercourse/MysqlWatercourseRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlWatercourseRepository implements WatercourseRepositoryInterface
-{
+class MysqlWatercourseRepository implements WatercourseRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,14 +13,14 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
     // todo wot are you even serious
-    public function getWatercourseList()
-    {
+    public function getWatercourseList()

+    {

         $query = "
             SELECT `sum_table`.`name`, `sum_table`.`alias`, SUM(`count`) AS `count`
             FROM ((

utility/Loader.class.inc.php

Doc Comments +6 added lines

@@ -59,6 +59,9 @@ 
 		$this->add_posts($youtube_result, 'youtube');

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function remove_existing($result, $type)

 	{

 		foreach($result as $key => $row)

@@ -70,6 +73,9 @@ 
 		return $result;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function add_posts($result, $type)

 	{

 		foreach($result as $row)

Spacing +9 added lines, -9 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -104,15 +104,15 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		foreach ((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -142,7 +142,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -157,7 +157,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();
@@ -180,7 +180,7 @@ 
             if ($site == 'waterfalls' && self::instance()->is_live) {
                 return "{$protocol}://www.waterfallsofthekeweenaw.com/";
             } else {
-                return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+                return $protocol.'://'.(self::instance()->is_live ? '' : 'dev.').$site.'.jacobemerick.com/';
             }
         }
         return '/';

Indentation +160 added lines, -160 removed lines

@@ -3,175 +3,175 @@
 final class Loader
 {
 
-	private $root;
-	private $is_live;
-	private $included_files = array();
-
-	private static $instance;
-
-	private function __construct()
-	{
-		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
-		return $this;
-	}
-
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
-		return self::$instance;
-	}
-
-	private function get_root()
-	{
-		if(!isset($this->root))
-		{
-			$current_directory = dirname(__FILE__);
-			$current_directory = substr($current_directory, 0, -7);
-			$this->root = $current_directory;
-		}
+    private $root;
+    private $is_live;
+    private $included_files = array();
+
+    private static $instance;
+
+    private function __construct()
+    {
+        $this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
+        return $this;
+    }
+
+    public static function instance()
+    {
+        if(!isset(self::$instance))
+            self::$instance = new Loader();
+        return self::$instance;
+    }
+
+    private function get_root()
+    {
+        if(!isset($this->root))
+        {
+            $current_directory = dirname(__FILE__);
+            $current_directory = substr($current_directory, 0, -7);
+            $this->root = $current_directory;
+        }
 		
-		return $this->root;
-	}
-
-	private function get_delimiter()
-	{
-		return (true || $this->is_live) ? '/' : '\\';
-	}
-
-	private function check_delimiters($path)
-	{
-		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
-	}
-
-	private static function get_class_name($path)
-	{
-		$path_array = explode('/', $path);
-		return array_pop($path_array);
-	}
-
-	private static function get_extension($type)
-	{
-		switch($type)
-		{
-			case 'collector' :
-			case 'controller' :
-			case 'model' :
-			case 'module' :
-			case 'router' :
-			case 'utility' :
-				$extension = '.class.inc.php';
-			break;
-			case 'view' :
-				$extension = '.tpl.php';
-			break;
-		}
-		return $extension;
-	}
-
-	public static function getImagePath($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= 'public';
-		$path .= self::instance()->get_delimiter();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
+        return $this->root;
+    }
+
+    private function get_delimiter()
+    {
+        return (true || $this->is_live) ? '/' : '\\';
+    }
+
+    private function check_delimiters($path)
+    {
+        return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
+    }
+
+    private static function get_class_name($path)
+    {
+        $path_array = explode('/', $path);
+        return array_pop($path_array);
+    }
+
+    private static function get_extension($type)
+    {
+        switch($type)
+        {
+            case 'collector' :
+            case 'controller' :
+            case 'model' :
+            case 'module' :
+            case 'router' :
+            case 'utility' :
+                $extension = '.class.inc.php';
+            break;
+            case 'view' :
+                $extension = '.tpl.php';
+            break;
+        }
+        return $extension;
+    }
+
+    public static function getImagePath($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= 'public';
+        $path .= self::instance()->get_delimiter();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
 		
-		return $path;
-	}
-
-	private static function get_path($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
-		$path .= self::get_extension($type);
+        return $path;
+    }
+
+    private static function get_path($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
+        $path .= self::get_extension($type);
 		
-		return $path;
-	}
-
-	private function get_included_files()
-	{
-		return $this->included_files;
-	}
-
-	private function add_included_file($path)
-	{
-		$this->included_files[] = $path;
-	}
-
-	public static function load($type, $files, $data = array())
-	{
-		foreach((array) $files as $file)
-		{
-			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+        return $path;
+    }
+
+    private function get_included_files()
+    {
+        return $this->included_files;
+    }
+
+    private function add_included_file($path)
+    {
+        $this->included_files[] = $path;
+    }
+
+    public static function load($type, $files, $data = array())
+    {
+        foreach((array) $files as $file)
+        {
+            $file_path = self::instance()->get_path($type, $file);
+            if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+                continue;
 			
-			self::instance()->add_included_file($file_path);
+            self::instance()->add_included_file($file_path);
 			
-			switch($type)
-			{
-				case 'images' :
-				case 'scripts' :
-				case 'styles' :
-					echo file_get_contents($file_path);
-				break;
-				case 'view' :
-					extract($data);
-					include($file_path);
-				break;
-				default :
-					include_once($file_path);
-				break;
-			}
-		}
-	}
-
-	private static function create_reflection_class($file)
-	{
-		$class_name = self::instance()->get_class_name($file);
-		return new ReflectionClass($class_name);
-	}
-
-	public static function loadInstance($type, $file)
-	{
-		self::load($type, $file);
+            switch($type)
+            {
+                case 'images' :
+                case 'scripts' :
+                case 'styles' :
+                    echo file_get_contents($file_path);
+                break;
+                case 'view' :
+                    extract($data);
+                    include($file_path);
+                break;
+                default :
+                    include_once($file_path);
+                break;
+            }
+        }
+    }
+
+    private static function create_reflection_class($file)
+    {
+        $class_name = self::instance()->get_class_name($file);
+        return new ReflectionClass($class_name);
+    }
+
+    public static function loadInstance($type, $file)
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if(
-			$reflectionObject->hasMethod('instance') &&
-			$reflectionObject->getMethod('instance')->isStatic())
-		{
-			return $reflectionObject->getMethod('instance')->invoke(null);
-		}
-		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
-	}
-
-	public static function loadNew($type, $file, $data = array())
-	{
-		self::load($type, $file);
+        if(
+            $reflectionObject->hasMethod('instance') &&
+            $reflectionObject->getMethod('instance')->isStatic())
+        {
+            return $reflectionObject->getMethod('instance')->invoke(null);
+        }
+        trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
+    }
+
+    public static function loadNew($type, $file, $data = array())
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
-	}
-
-	public static function getRoot()
-	{
-		return self::instance()->get_root();
-	}
-
-	public static function isLive()
-	{
-		return self::instance()->is_live;
-	}
+        if($reflectionObject->hasMethod('__construct'))
+            return $reflectionObject->newInstanceArgs($data);
+        else
+            return $reflectionObject->newInstance();
+    }
+
+    public static function getRoot()
+    {
+        return self::instance()->get_root();
+    }
+
+    public static function isLive()
+    {
+        return self::instance()->is_live;
+    }
 
     public static function getRootURL($site = '')
     {

Braces +49 added lines, -46 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Loader
-{
+final class Loader

+{

 
 	private $root;
 	private $is_live;
@@ -9,21 +9,22 @@ 
 
 	private static $instance;
 
-	private function __construct()
-	{
+	private function __construct()

+	{

 		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
 		return $this;
 	}
 
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+	public static function instance()

+	{

+		if(!isset(self::$instance)) {

+					self::$instance = new Loader();

+		}

 		return self::$instance;
 	}
 
-	private function get_root()
-	{
+	private function get_root()

+	{

 		if(!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
@@ -34,24 +35,24 @@ 
 		return $this->root;
 	}
 
-	private function get_delimiter()
-	{
+	private function get_delimiter()

+	{

 		return (true || $this->is_live) ? '/' : '\\';
 	}
 
-	private function check_delimiters($path)
-	{
+	private function check_delimiters($path)

+	{

 		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
 	}
 
-	private static function get_class_name($path)
-	{
+	private static function get_class_name($path)

+	{

 		$path_array = explode('/', $path);
 		return array_pop($path_array);
 	}
 
-	private static function get_extension($type)
-	{
+	private static function get_extension($type)

+	{

 		switch($type)
 		{
 			case 'collector' :
@@ -69,8 +70,8 @@ 
 		return $extension;
 	}
 
-	public static function getImagePath($type, $file)
-	{
+	public static function getImagePath($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= 'public';
 		$path .= self::instance()->get_delimiter();
@@ -81,8 +82,8 @@ 
 		return $path;
 	}
 
-	private static function get_path($type, $file)
-	{
+	private static function get_path($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= $type;
 		$path .= self::instance()->get_delimiter();
@@ -92,23 +93,24 @@ 
 		return $path;
 	}
 
-	private function get_included_files()
-	{
+	private function get_included_files()

+	{

 		return $this->included_files;
 	}
 
-	private function add_included_file($path)
-	{
+	private function add_included_file($path)

+	{

 		$this->included_files[] = $path;
 	}
 
-	public static function load($type, $files, $data = array())
-	{
+	public static function load($type, $files, $data = array())

+	{

 		foreach((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -130,14 +132,14 @@ 
 		}
 	}
 
-	private static function create_reflection_class($file)
-	{
+	private static function create_reflection_class($file)

+	{

 		$class_name = self::instance()->get_class_name($file);
 		return new ReflectionClass($class_name);
 	}
 
-	public static function loadInstance($type, $file)
-	{
+	public static function loadInstance($type, $file)

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
@@ -151,30 +153,31 @@ 
 		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
 	}
 
-	public static function loadNew($type, $file, $data = array())
-	{
+	public static function loadNew($type, $file, $data = array())

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
-	public static function getRoot()
-	{
+	public static function getRoot()

+	{

 		return self::instance()->get_root();
 	}
 
-	public static function isLive()
-	{
+	public static function isLive()

+	{

 		return self::instance()->is_live;
 	}
 
-    public static function getRootURL($site = '')
-    {
+    public static function getRootURL($site = '')

+    {

         if (strlen($site) > 0) {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             if ($site == 'waterfalls' && self::instance()->is_live) {

src/Domain/Blog/Post/MysqlPostRepository.php

Doc Comments +10 added lines, -1 removed lines

@@ -11,7 +11,7 @@ 
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {
@@ -41,6 +41,9 @@ 
             ->fetchOne($query, $bindings);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getActivePosts($limit = null, $offset = 0)
     {
         $query = "
@@ -79,6 +82,9 @@ 
             ->fetchValue($query, $bindings);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getActivePostsByTag($tag, $limit = null, $offset = 0)
     {
         $query = "
@@ -122,6 +128,9 @@ 
             ->fetchValue($query, $bindings);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getActivePostsByCategory($category, $limit = null, $offset = 0)
     {
         $query = "

Braces +20 added lines, -20 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlPostRepository implements PostRepositoryInterface
-{
+class MysqlPostRepository implements PostRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
@@ -23,8 +23,8 @@ 
      *
      * @return array|false
      */
-    public function findPostByPath($path)
-    {
+    public function findPostByPath($path)

+    {

         $query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
@@ -41,8 +41,8 @@ 
             ->fetchOne($query, $bindings);
     }
 
-    public function getActivePosts($limit = null, $offset = 0)
-    {
+    public function getActivePosts($limit = null, $offset = 0)

+    {

         $query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
@@ -63,8 +63,8 @@ 
             ->fetchAll($query, $bindings);
     }
 
-    public function getActivePostsCount()
-    {
+    public function getActivePostsCount()

+    {

         $query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
@@ -79,8 +79,8 @@ 
             ->fetchValue($query, $bindings);
     }
 
-    public function getActivePostsByTag($tag, $limit = null, $offset = 0)
-    {
+    public function getActivePostsByTag($tag, $limit = null, $offset = 0)

+    {

         $query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
@@ -104,8 +104,8 @@ 
             ->fetchAll($query, $bindings);
     }
 
-    public function getActivePostsCountByTag($tag)
-    {
+    public function getActivePostsCountByTag($tag)

+    {

         $query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
@@ -123,8 +123,8 @@ 
             ->fetchValue($query, $bindings);
     }
 
-    public function getActivePostsByCategory($category, $limit = null, $offset = 0)
-    {
+    public function getActivePostsByCategory($category, $limit = null, $offset = 0)

+    {

         $query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
@@ -146,8 +146,8 @@ 
             ->fetchAll($query, $bindings);
     }
 
-    public function getActivePostsCountByCategory($category)
-    {
+    public function getActivePostsCountByCategory($category)

+    {

         $query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`
@@ -163,8 +163,8 @@ 
             ->fetchValue($query, $bindings);
     }
 
-    public function getActivePostsByRelatedTags($post, $limit = 4)
-    {
+    public function getActivePostsByRelatedTags($post, $limit = 4)

+    {

         $query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`, COUNT(1) AS `count`
             FROM `jpemeric_blog`.`post`

utility/Search.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -39,20 +39,20 @@ 
 	public function perform()
 	{
 		$weighted_array = array();
-		foreach($this->result as $row)
+		foreach ($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
+			if ($weight > 0)
 				$weighted_array[$row['id']] = $weight;
 		}
 		arsort($weighted_array);
 		
 		$final_array = array();
-		foreach($weighted_array as $id => $weight)
+		foreach ($weighted_array as $id => $weight)
 		{
-			foreach($this->result as $row)
+			foreach ($this->result as $row)
 			{
-				if($row['id'] == $id)
+				if ($row['id'] == $id)
 					$final_array[] = $row;
 			}
 		}
@@ -62,7 +62,7 @@ 
 	private function get_search_weight($row)
 	{
 		$weight = 0;
-		foreach($this->weight as $weight_array)
+		foreach ($this->weight as $weight_array)
 		{
 			$text = $row[$weight_array['field']];
 			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));

Indentation +58 added lines, -58 removed lines

@@ -3,71 +3,71 @@
 final class Search
 {
 
-	private $query;
-	private $result;
-	private $weight;
+    private $query;
+    private $result;
+    private $weight;
 
-	function __construct()
-	{
-		return $this;
-	}
+    function __construct()
+    {
+        return $this;
+    }
 
-	public function setQuery($query)
-	{
-		$this->query = $query;
-		return $this;
-	}
+    public function setQuery($query)
+    {
+        $this->query = $query;
+        return $this;
+    }
 
-	public function setResult($array)
-	{
-		$this->result = $array;
-		return $this;
-	}
+    public function setResult($array)
+    {
+        $this->result = $array;
+        return $this;
+    }
 
-	public function setWeight($weight)
-	{
-		$this->weight = $weight;
-		return $this;
-	}
+    public function setWeight($weight)
+    {
+        $this->weight = $weight;
+        return $this;
+    }
 
-	public static function instance()
-	{
-		$reflection = new ReflectionClass('Search');
-		return $reflection->newInstance();
-	}
+    public static function instance()
+    {
+        $reflection = new ReflectionClass('Search');
+        return $reflection->newInstance();
+    }
 
-	public function perform()
-	{
-		$weighted_array = array();
-		foreach($this->result as $row)
-		{
-			$weight = $this->get_search_weight($row);
-			if($weight > 0)
-				$weighted_array[$row['id']] = $weight;
-		}
-		arsort($weighted_array);
+    public function perform()
+    {
+        $weighted_array = array();
+        foreach($this->result as $row)
+        {
+            $weight = $this->get_search_weight($row);
+            if($weight > 0)
+                $weighted_array[$row['id']] = $weight;
+        }
+        arsort($weighted_array);
 		
-		$final_array = array();
-		foreach($weighted_array as $id => $weight)
-		{
-			foreach($this->result as $row)
-			{
-				if($row['id'] == $id)
-					$final_array[] = $row;
-			}
-		}
-		return $final_array;
-	}
+        $final_array = array();
+        foreach($weighted_array as $id => $weight)
+        {
+            foreach($this->result as $row)
+            {
+                if($row['id'] == $id)
+                    $final_array[] = $row;
+            }
+        }
+        return $final_array;
+    }
 
-	private function get_search_weight($row)
-	{
-		$weight = 0;
-		foreach($this->weight as $weight_array)
-		{
-			$text = $row[$weight_array['field']];
-			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));
-		}
-		return $weight;
-	}
+    private function get_search_weight($row)
+    {
+        $weight = 0;
+        foreach($this->weight as $weight_array)
+        {
+            $text = $row[$weight_array['field']];
+            $weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));
+        }
+        return $weight;
+    }
 
 }

Braces +22 added lines, -20 removed lines

@@ -1,49 +1,50 @@ 
 <?
 
-final class Search
-{
+final class Search

+{

 
 	private $query;
 	private $result;
 	private $weight;
 
-	function __construct()
-	{
+	function __construct()

+	{

 		return $this;
 	}
 
-	public function setQuery($query)
-	{
+	public function setQuery($query)

+	{

 		$this->query = $query;
 		return $this;
 	}
 
-	public function setResult($array)
-	{
+	public function setResult($array)

+	{

 		$this->result = $array;
 		return $this;
 	}
 
-	public function setWeight($weight)
-	{
+	public function setWeight($weight)

+	{

 		$this->weight = $weight;
 		return $this;
 	}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		$reflection = new ReflectionClass('Search');
 		return $reflection->newInstance();
 	}
 
-	public function perform()
-	{
+	public function perform()

+	{

 		$weighted_array = array();
 		foreach($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
-				$weighted_array[$row['id']] = $weight;
+			if($weight > 0) {

+							$weighted_array[$row['id']] = $weight;

+			}

 		}
 		arsort($weighted_array);
 		
@@ -52,15 +53,16 @@ 
 		{
 			foreach($this->result as $row)
 			{
-				if($row['id'] == $id)
-					$final_array[] = $row;
+				if($row['id'] == $id) {

+									$final_array[] = $row;

+				}

 			}
 		}
 		return $final_array;
 	}
 
-	private function get_search_weight($row)
-	{
+	private function get_search_weight($row)

+	{

 		$weight = 0;
 		foreach($this->weight as $weight_array)
 		{

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }
@@ -48,7 +48,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('router', 'Router');
 
-class PortfolioRouter extends Router
-{
+class PortfolioRouter extends Router

+{

 
-    protected function get_redirect_array()
-    {
+    protected function get_redirect_array()

+    {

         $paths = [
             [
                 'pattern' => '@/index.(html|htm|php)$@',
@@ -31,8 +31,8 @@ 
         }, $paths);
     }
 
-    protected function get_direct_array()
-    {
+    protected function get_direct_array()

+    {

         $paths = [
             [
                 'match' => '/',

router/Router.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -65,42 +65,42 @@ 
 
 	final protected function check_for_redirect($redirect_uri)
 	{
-		foreach($this->get_redirect_array() as $check)
+		foreach ($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
 		}
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-            $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+            $redirect_uri = $protocol.'://'.(!Loader::isLive() ? 'dev' : 'www').'.waterfallsofthekeweenaw.com'.$redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
+		if ($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http') {
+		if (substr($redirect_uri, 0, 4) == 'http') {
       $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
+			$controller_check = preg_replace('@^'.$protocol.'://([a-z\.]+)@', '', $redirect_uri);
     }
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			Loader::loadNew('controller', '/Error404Controller')
 				->activate();
 			exit;
 		}
 
-		if(substr($redirect_uri, 0, 4) != 'http')
+		if (substr($redirect_uri, 0, 4) != 'http')
 		{
 			$redirect_uri = substr($redirect_uri, 1);
-			$redirect_uri = URLDecode::getBase() . $redirect_uri;
+			$redirect_uri = URLDecode::getBase().$redirect_uri;
 		}
 		
 		Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
@@ -114,12 +114,12 @@ 
 
 	final private function get_controller($uri)
 	{
-		foreach($this->get_direct_array() as $check)
+		foreach ($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
+			if ($uri == $check->match)
 				return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
+			if (preg_match("@^{$check->match}$@", $uri))
 				return "{$this->get_primary_folder()}/{$check->controller}";
 		}
 		
@@ -128,7 +128,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

Indentation +105 added lines, -105 removed lines

@@ -1,144 +1,144 @@
 <?
 
 Loader::load('utility', array(
-	'Request',
-	'URLDecode'));
+    'Request',
+    'URLDecode'));
 
 abstract class Router
 {
 
-	public function __construct() {}
+    public function __construct() {}
 
-	public static function instance()
-	{
-		$router_name = self::get_router_name();
-		$router = Loader::loadNew('router', $router_name);
-		$router->route();
-	}
+    public static function instance()
+    {
+        $router_name = self::get_router_name();
+        $router = Loader::loadNew('router', $router_name);
+        $router->route();
+    }
 
-	private static function get_router_name()
-	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
+    private static function get_router_name()
+    {
+        if(Request::isAJAX())
+            return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
-		{
-			case 'ajax' :
-				return 'AjaxRouter';
-			break;
-			case 'blog' :
-				return 'BlogRouter';
-			break;
-			case 'home' :
-				return 'HomeRouter';
-			break;
-			case 'lifestream' :
-				return 'LifestreamRouter';
-			break;
-			case 'portfolio' :
-				return 'PortfolioRouter';
-			break;
-			case 'site' :
-				return 'SiteRouter';
-			break;
-			case 'waterfalls' :
-				return 'WaterfallRouter';
-			break;
-		}
+        switch(URLDecode::getSite())
+        {
+            case 'ajax' :
+                return 'AjaxRouter';
+            break;
+            case 'blog' :
+                return 'BlogRouter';
+            break;
+            case 'home' :
+                return 'HomeRouter';
+            break;
+            case 'lifestream' :
+                return 'LifestreamRouter';
+            break;
+            case 'portfolio' :
+                return 'PortfolioRouter';
+            break;
+            case 'site' :
+                return 'SiteRouter';
+            break;
+            case 'waterfalls' :
+                return 'WaterfallRouter';
+            break;
+        }
 		
-		Loader::loadNew('controller', '/Error404Controller')->activate();
-	}
+        Loader::loadNew('controller', '/Error404Controller')->activate();
+    }
 
-	protected function route()
-	{
-		$uri = URLDecode::getURI();
+    protected function route()
+    {
+        $uri = URLDecode::getURI();
 		
-		$this->check_for_redirect($uri);
+        $this->check_for_redirect($uri);
 		
-		$controller = $this->get_controller($uri);
-		Loader::loadNew('controller', $controller)
-			->activate();
-	}
+        $controller = $this->get_controller($uri);
+        Loader::loadNew('controller', $controller)
+            ->activate();
+    }
 
-	abstract protected function get_redirect_array();
-	abstract protected function get_direct_array();
+    abstract protected function get_redirect_array();
+    abstract protected function get_direct_array();
 
-	final protected function check_for_redirect($redirect_uri)
-	{
-		foreach($this->get_redirect_array() as $check)
-		{
-			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
-		}
+    final protected function check_for_redirect($redirect_uri)
+    {
+        foreach($this->get_redirect_array() as $check)
+        {
+            $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
+        }
 		
-		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
+        $redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+        if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+            $redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+        if($redirect_uri == URLDecode::getURI())
+            return;
 		
-		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http') {
-      $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
+        $controller_check = $redirect_uri;
+        if(substr($redirect_uri, 0, 4) == 'http') {
+        $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+            $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
     }
 		
-		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
-		{
-			Loader::loadNew('controller', '/Error404Controller')
-				->activate();
-			exit;
-		}
+        $controller = $this->get_controller($controller_check);
+        if($controller == '/Error404Controller')
+        {
+            Loader::loadNew('controller', '/Error404Controller')
+                ->activate();
+            exit;
+        }
 
-		if(substr($redirect_uri, 0, 4) != 'http')
-		{
-			$redirect_uri = substr($redirect_uri, 1);
-			$redirect_uri = URLDecode::getBase() . $redirect_uri;
-		}
+        if(substr($redirect_uri, 0, 4) != 'http')
+        {
+            $redirect_uri = substr($redirect_uri, 1);
+            $redirect_uri = URLDecode::getBase() . $redirect_uri;
+        }
 		
-		Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
-			->activate();
-	}
+        Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
+            ->activate();
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
-		return $uri;
-	}
+    protected function check_for_special_redirect($uri)
+    {
+        return $uri;
+    }
 
-	final private function get_controller($uri)
-	{
-		foreach($this->get_direct_array() as $check)
-		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+    final private function get_controller($uri)
+    {
+        foreach($this->get_direct_array() as $check)
+        {
+            if($uri == $check->match)
+                return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
-		}
+            if(preg_match("@^{$check->match}$@", $uri))
+                return "{$this->get_primary_folder()}/{$check->controller}";
+        }
 		
-		return '/Error404Controller';
-	}
+        return '/Error404Controller';
+    }
 
-	final private function get_primary_folder()
-	{
-		if(Request::isAjax())
-			return 'ajax';
+    final private function get_primary_folder()
+    {
+        if(Request::isAjax())
+            return 'ajax';
 		
-		return URLDecode::getSite();
-	}
+        return URLDecode::getSite();
+    }
 
-	private function requires_trailing_slash()
-	{
-		return (
-			URLDecode::getExtension() != 'json' &&
+    private function requires_trailing_slash()
+    {
+        return (
+            URLDecode::getExtension() != 'json' &&
             strstr(URLDecode::getURI(), '#') === false);
-	}
+    }
 
 }

Braces +39 added lines, -31 removed lines

@@ -4,22 +4,25 @@ 
 	'Request',
 	'URLDecode'));
 
-abstract class Router
-{
+abstract class Router

+{

 
-	public function __construct() {}
+	public function __construct()

+	{

+}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		$router_name = self::get_router_name();
 		$router = Loader::loadNew('router', $router_name);
 		$router->route();
 	}
 
-	private static function get_router_name()
-	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
+	private static function get_router_name()

+	{

+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -49,8 +52,8 @@ 
 		Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
-	protected function route()
-	{
+	protected function route()

+	{

 		$uri = URLDecode::getURI();
 		
 		$this->check_for_redirect($uri);
@@ -63,8 +66,8 @@ 
 	abstract protected function get_redirect_array();
 	abstract protected function get_direct_array();
 
-	final protected function check_for_redirect($redirect_uri)
-	{
+	final protected function check_for_redirect($redirect_uri)

+	{

 		foreach($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
@@ -72,16 +75,18 @@ 
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		
 		$controller_check = $redirect_uri;
 		if(substr($redirect_uri, 0, 4) == 'http') {
@@ -107,35 +112,38 @@ 
 			->activate();
 	}
 
-	protected function check_for_special_redirect($uri)
-	{
+	protected function check_for_special_redirect($uri)

+	{

 		return $uri;
 	}
 
-	final private function get_controller($uri)
-	{
+	final private function get_controller($uri)

+	{

 		foreach($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}
 		
 		return '/Error404Controller';
 	}
 
-	final private function get_primary_folder()
-	{
-		if(Request::isAjax())
-			return 'ajax';
+	final private function get_primary_folder()

+	{

+		if(Request::isAjax()) {

+					return 'ajax';

+		}

 		
 		return URLDecode::getSite();
 	}
 
-	private function requires_trailing_slash()
-	{
+	private function requires_trailing_slash()

+	{

 		return (
 			URLDecode::getExtension() != 'json' &&
             strstr(URLDecode::getURI(), '#') === false);