jacobemerick / web

utility/Request.class.inc.php

Indentation +62 added lines, -62 removed lines

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

utility/Header.class.inc.php

Indentation +72 added lines, -72 removed lines

@@ -3,86 +3,86 @@
 final class Header
 {
 
-	public static function sendJSON()
-	{
-		$array = array(
-			'HTTP/1.1 200 OK',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: application/json',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function sendJSON()
+    {
+        $array = array(
+            'HTTP/1.1 200 OK',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: application/json',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function sendHTML()
-	{
-		$array = array(
-			'HTTP/1.1 200 OK',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function sendHTML()
+    {
+        $array = array(
+            'HTTP/1.1 200 OK',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function redirect($location, $method = 301)
-	{
-		header("Location: {$location}", TRUE, $method);
-		exit();
-	}
+    public static function redirect($location, $method = 301)
+    {
+        header("Location: {$location}", TRUE, $method);
+        exit();
+    }
 
-	public static function send404()
-	{
-		$array = array(
-			'HTTP/1.1 404 Not Found',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function send404()
+    {
+        $array = array(
+            'HTTP/1.1 404 Not Found',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function send503()
-	{
-		$array = array(
-			'HTTP/1.1 503 Service Unavailable',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function send503()
+    {
+        $array = array(
+            'HTTP/1.1 503 Service Unavailable',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	private static function send($array, $gzip = true)
-	{
-		if($gzip)
-			self::start_gzipping();
+    private static function send($array, $gzip = true)
+    {
+        if($gzip)
+            self::start_gzipping();
 		
-		foreach($array as $row)
-		{
-			header($row, TRUE);
-		}
-	}
+        foreach($array as $row)
+        {
+            header($row, TRUE);
+        }
+    }
 
-	private static function get_date($timestamp = false)
-	{
-		if($timestamp == 0)
-			$timestamp = time();
-		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
-	}
+    private static function get_date($timestamp = false)
+    {
+        if($timestamp == 0)
+            $timestamp = time();
+        return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
+    }
 
-	private static function start_gzipping()
-	{
-		if(!ob_start('ob_gzhandler'))
+    private static function start_gzipping()
+    {
+        if(!ob_start('ob_gzhandler'))
             ob_start();
-	}
+    }
 
 }

utility/Validate.class.inc.php

Indentation +91 added lines, -91 removed lines

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

router/HomeRouter.class.inc.php

Indentation +20 added lines, -20 removed lines

@@ -5,26 +5,26 @@
 final class HomeRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => ''));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => ''));
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/contact/',
-				'controller' => 'ContactController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/contact/',
+                'controller' => 'ContactController'));
+    }
 
 }
\ No newline at end of file

router/SiteRouter.class.inc.php

Indentation +23 added lines, -23 removed lines

@@ -5,29 +5,29 @@
 class SiteRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'));
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/terms/',
-				'controller' => 'TermsController'),
-			(object) array(
-				'match' => '/change-log/',
-				'controller' => 'ChangelogController'),
-			(object) array(
-				'match' => '/contact/',
-				'controller' => 'ContactController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/terms/',
+                'controller' => 'TermsController'),
+            (object) array(
+                'match' => '/change-log/',
+                'controller' => 'ChangelogController'),
+            (object) array(
+                'match' => '/contact/',
+                'controller' => 'ContactController'));
+    }
 
 }
\ No newline at end of file

router/Router.class.inc.php

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

router/LifestreamRouter.class.inc.php

Indentation +47 added lines, -47 removed lines

@@ -5,54 +5,54 @@
 class LifestreamRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/1/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@/page_([0-9]+)(/?)$@',
-				'replace' => '/page/$1/'),
-			(object) array(
-				'pattern' => '@/tag/([a-z]+)/$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@',
-				'replace' => '/$1/page/$2/'),
-			(object) array(
-				'pattern' => '@/tag/([a-z-]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@',
-				'replace' => '/'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/1/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@/page_([0-9]+)(/?)$@',
+                'replace' => '/page/$1/'),
+            (object) array(
+                'pattern' => '@/tag/([a-z]+)/$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@',
+                'replace' => '/$1/page/$2/'),
+            (object) array(
+                'pattern' => '@/tag/([a-z-]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@',
+                'replace' => '/'));
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/page/([0-9]+)/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/([a-z]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/([a-z]+)/page/([0-9]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/([a-z]+)/([0-9]+)/',
-				'controller' => 'PostController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/page/([0-9]+)/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/([a-z]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/([a-z]+)/page/([0-9]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/([a-z]+)/([0-9]+)/',
+                'controller' => 'PostController'));
+    }
 
 }
 

router/AJAXRouter.class.inc.php

Indentation +14 added lines, -14 removed lines

@@ -5,22 +5,22 @@
 class AJAXRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@^/$@',
-				'replace' => 'https://home.jacobemerick.com/'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@^/$@',
+                'replace' => 'https://home.jacobemerick.com/'));
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/get/portfolioImage.json',
-				'controller' => 'GetPortfolioImageController'),
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/get/portfolioImage.json',
+                'controller' => 'GetPortfolioImageController'),
     );
-	}
+    }
 
 }
 

router/BlogRouter.class.inc.php

Indentation +105 added lines, -105 removed lines

@@ -5,121 +5,121 @@
 class BlogRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@^/page_([0-9]+)/$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)(/?)$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)(/?)$@',
-				'replace' => '/tag/$1/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/tag/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/blog/(.*)$@',
-				'replace' => '/$1'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@^/page_([0-9]+)/$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)(/?)$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)(/?)$@',
+                'replace' => '/tag/$1/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/tag/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/blog/(.*)$@',
+                'replace' => '/$1'));
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
-		{
+    protected function check_for_special_redirect($uri)
+    {
+        if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($matches[2]);
 
-			if(!$post)
-			{
-				Loader::loadNew('controller', '/Error404Controller')
-					->activate();
-			}
+            if(!$post)
+            {
+                Loader::loadNew('controller', '/Error404Controller')
+                    ->activate();
+            }
 			
-			Loader::load('utility', 'Content');
-			$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-		}
-		else
-		{
-			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
-			{
+            Loader::load('utility', 'Content');
+            $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+        }
+        else
+        {
+            $post_uri = URLDecode::getPiece(1);
+            if($post_uri !== null)
+            {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($post_uri);
 
-				if($post != false)
-				{
-					Loader::load('utility', 'Content');
-					$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-				}
-			}
-		}
-		if($uri == '/search/')
-		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
-			{
-				$uri .= Request::getGet('search');
-				$uri .= '/';
-			}
-		}
-		return $uri;
-	}
+                if($post != false)
+                {
+                    Loader::load('utility', 'Content');
+                    $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+                }
+            }
+        }
+        if($uri == '/search/')
+        {
+            if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+            {
+                $uri .= Request::getGet('search');
+                $uri .= '/';
+            }
+        }
+        return $uri;
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/([0-9]+)/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/([0-9]+)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/tag/([a-z0-9-]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/tag/([a-z-]+)/([0-9]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/([a-z-]+)/([a-z0-9-]+)/',
-				'controller' => 'PostController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/([0-9]+)/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/([0-9]+)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/tag/([a-z0-9-]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/tag/([a-z-]+)/([0-9]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/([a-z-]+)/([a-z0-9-]+)/',
+                'controller' => 'PostController'));
+    }
 
 }