jacobemerick / web

utility/Request.class.inc.php

Spacing +7 added lines, -7 removed lines

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

Indentation +62 added lines, -62 removed lines

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

Braces +32 added lines, -28 removed lines

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

+{

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

+	{

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

+	{

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

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

+			}

 			return false;
 		}
 		return self::$server;
 	}
 
-	static function isAjax()
-	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+	static function isAjax()

+	{

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

+					return true;

+		}

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

+	{

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

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

+			}

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

+	{

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

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

+			}

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

+	{

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

+	{

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

+	{

 		self::$get = $_GET;
 	}
 
-	static function make_post()
-	{
+	static function make_post()

+	{

 		self::$post = $_POST;
 	}
 

src/Domain/Waterfall/Log/LogRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface LogRepositoryInterface
 {
-    public function getActiveLogs($limit = null, $offset= 0);
+    public function getActiveLogs($limit = null, $offset = 0);
 }

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 namespace Jacobemerick\Web\Domain\Waterfall\Log;
 
-interface LogRepositoryInterface
-{
+interface LogRepositoryInterface

+{

     public function getActiveLogs($limit = null, $offset= 0);
 }

src/Domain/Waterfall/Waterfall/WaterfallRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface WaterfallRepositoryInterface
 {
-    public function getWaterfalls($limit = null, $offset= 0);
+    public function getWaterfalls($limit = null, $offset = 0);
 }

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 namespace Jacobemerick\Web\Domain\Waterfall\Waterfall;
 
-interface WaterfallRepositoryInterface
-{
+interface WaterfallRepositoryInterface

+{

     public function getWaterfalls($limit = null, $offset= 0);
 }

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

public/lifestream/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'lifestream';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/site/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'site';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/waterfalls/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'waterfalls';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');