Inspection of "Cast as array, because generated client assumes nu..." - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6d742b...a712f0 )

by Jacob

created 2017-06-14 02:56 UTC

Status

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -3,78 +3,78 @@
 block discarded – undo
 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;
+    }
 
 }
 

Please login to merge, or discard this patch.

utility/Header.class.inc.php 1 patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

@@ -3,86 +3,86 @@
 block discarded – undo
 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();
-	}
+    }
 
 }

Please login to merge, or discard this patch.

utility/Validate.class.inc.php 1 patch

Indentation +91 added lines, -91 removed lines patch added patch discarded remove patch

@@ -5,110 +5,110 @@
 block discarded – undo
 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;
+    }
 
 }
 

Please login to merge, or discard this patch.

router/WaterfallRouter.class.inc.php 1 patch

Indentation +127 added lines, -127 removed lines patch added patch discarded remove patch

@@ -8,24 +8,24 @@  discard block
 block discarded – undo
 class WaterfallRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/home(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/falls/by-rating(/?)$@',
-				'replace' => '/falls/'),
-			(object) array(
-				'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
-				'replace' => '/falls/'),
-			(object) array(
-				'pattern' => '@^/falls/results(/?)$@',
-				'replace' => '/falls/'),
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/home(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/falls/by-rating(/?)$@',
+                'replace' => '/falls/'),
+            (object) array(
+                'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
+                'replace' => '/falls/'),
+            (object) array(
+                'pattern' => '@^/falls/results(/?)$@',
+                'replace' => '/falls/'),
             (object) array(
                 'pattern' => '@^/log(/?)$@',
                 'replace' => '/journal/'),
@@ -35,44 +35,44 @@  discard block
 block discarded – undo
             (object) array(
                 'pattern' => '@^/map/([^/]+)(/?)$@',
                 'replace' => '/map/'),
-			(object) array(
-				'pattern' => '@^/about/([a-z]*)(/?)$@',
-				'replace' => '/about/'),
-			(object) array(
-				'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
-				'replace' => '/birch-creek/gold-mine-falls/'),
-			(object) array(
-				'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
-				'replace' => '/big-iron-river/greenwood-falls/'),
-			(object) array(
-				'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
-				'replace' => '/east-branch-huron-river/east-branch-falls/'),
-			(object) array(
-				'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
-				'replace' => '/montreal-river/montreal-falls/'),
-			(object) array(
-				'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
-				'replace' => '/manganese-creek/manganese-falls/'),
-			(object) array(
-				'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
-				'replace' => '/dead-river/tourist-park-falls/'),
-			(object) array(
-				'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
-				'replace' => '/sturgeon-river/little-spruce-falls/'),
-			(object) array(
-				'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
-				'replace' => '/tahquamenon-river/tahquamenon-falls/'),
-			(object) array(
-				'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
-				'replace' => '/west-branch-huron-river/west-branch-falls/'),
-			(object) array(
-				'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
-				'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
-		);
-	}
+            (object) array(
+                'pattern' => '@^/about/([a-z]*)(/?)$@',
+                'replace' => '/about/'),
+            (object) array(
+                'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
+                'replace' => '/birch-creek/gold-mine-falls/'),
+            (object) array(
+                'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
+                'replace' => '/big-iron-river/greenwood-falls/'),
+            (object) array(
+                'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
+                'replace' => '/east-branch-huron-river/east-branch-falls/'),
+            (object) array(
+                'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
+                'replace' => '/montreal-river/montreal-falls/'),
+            (object) array(
+                'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
+                'replace' => '/manganese-creek/manganese-falls/'),
+            (object) array(
+                'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
+                'replace' => '/dead-river/tourist-park-falls/'),
+            (object) array(
+                'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
+                'replace' => '/sturgeon-river/little-spruce-falls/'),
+            (object) array(
+                'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
+                'replace' => '/tahquamenon-river/tahquamenon-falls/'),
+            (object) array(
+                'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
+                'replace' => '/west-branch-huron-river/west-branch-falls/'),
+            (object) array(
+                'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
+                'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
+        );
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
+    protected function check_for_special_redirect($uri)
+    {
         if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
             $alias = $matches[1];
             $alias = str_replace("'", '', $alias);
@@ -125,81 +125,81 @@  discard block
 block discarded – undo
             }
         }
         
-		return $uri;
-	}
+        return $uri;
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/falls/',
-				'controller' => 'WaterfallListController'),
-			(object) array(
-				'match' => '/falls/([0-9]+)/',
-				'controller' => 'WaterfallListController'),
-			(object) array(
-				'match' => '/([a-z]+)-county/',
-				'controller' => 'CountyListController'),
-			(object) array(
-				'match' => '/([a-z]+)-county/([0-9]+)/',
-				'controller' => 'CountyListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/',
-				'controller' => 'WatercourseListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/',
-				'controller' => 'WatercourseListController'),
-			(object) array(
-				'match' => '/category/([a-z]+)/',
-				'controller' => 'CategoryListController'),
-			(object) array(
-				'match' => '/category/([a-z]+)/([0-9]+)/',
-				'controller' => 'CategoryListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/',
-				'controller' => 'WaterfallController'),
-			(object) array(
-				'match' => '/map/',
-				'controller' => 'MapController'),
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/falls/',
+                'controller' => 'WaterfallListController'),
+            (object) array(
+                'match' => '/falls/([0-9]+)/',
+                'controller' => 'WaterfallListController'),
+            (object) array(
+                'match' => '/([a-z]+)-county/',
+                'controller' => 'CountyListController'),
+            (object) array(
+                'match' => '/([a-z]+)-county/([0-9]+)/',
+                'controller' => 'CountyListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/',
+                'controller' => 'WatercourseListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/',
+                'controller' => 'WatercourseListController'),
+            (object) array(
+                'match' => '/category/([a-z]+)/',
+                'controller' => 'CategoryListController'),
+            (object) array(
+                'match' => '/category/([a-z]+)/([0-9]+)/',
+                'controller' => 'CategoryListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/',
+                'controller' => 'WaterfallController'),
+            (object) array(
+                'match' => '/map/',
+                'controller' => 'MapController'),
             (object) array(
                 'match' => '/map/#[a-z-/]+',
                 'controller' => 'MapController'),
-			(object) array(
-				'match' => '/journal/',
-				'controller' => 'LogListController'),
-			(object) array(
-				'match' => '/journal/([0-9]+)/',
-				'controller' => 'LogListController'),
-			(object) array(
-				'match' => '/journal/[a-z-]+/',
-				'controller' => 'LogController'),
-			(object) array(
-				'match' => '/companion/([a-z-]+)/',
-				'controller' => 'CompanionListController'),
-			(object) array(
-				'match' => '/companion/([a-z-]+)/([0-9]+)/',
-				'controller' => 'CompanionListController'),
-			(object) array(
-				'match' => '/period/([a-z-]+)/',
-				'controller' => 'PeriodListController'),
-			(object) array(
-				'match' => '/period/([a-z-]+)/([0-9]+)/',
-				'controller' => 'PeriodListController'),
-			(object) array(
-				'match' => '/journal/tag/([a-z-]+)/',
-				'controller' => 'LogTagListController'),
-			(object) array(
-				'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
-				'controller' => 'LogTagListController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/contact/',
-				'controller' => 'ContactController'));
-	}
+            (object) array(
+                'match' => '/journal/',
+                'controller' => 'LogListController'),
+            (object) array(
+                'match' => '/journal/([0-9]+)/',
+                'controller' => 'LogListController'),
+            (object) array(
+                'match' => '/journal/[a-z-]+/',
+                'controller' => 'LogController'),
+            (object) array(
+                'match' => '/companion/([a-z-]+)/',
+                'controller' => 'CompanionListController'),
+            (object) array(
+                'match' => '/companion/([a-z-]+)/([0-9]+)/',
+                'controller' => 'CompanionListController'),
+            (object) array(
+                'match' => '/period/([a-z-]+)/',
+                'controller' => 'PeriodListController'),
+            (object) array(
+                'match' => '/period/([a-z-]+)/([0-9]+)/',
+                'controller' => 'PeriodListController'),
+            (object) array(
+                'match' => '/journal/tag/([a-z-]+)/',
+                'controller' => 'LogTagListController'),
+            (object) array(
+                'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
+                'controller' => 'LogTagListController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/contact/',
+                'controller' => 'ContactController'));
+    }
 
 }

Please login to merge, or discard this patch.

router/HomeRouter.class.inc.php 1 patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -5,26 +5,26 @@
 block discarded – undo
 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

Please login to merge, or discard this patch.

router/SiteRouter.class.inc.php 1 patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -5,29 +5,29 @@
 block discarded – undo
 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

Please login to merge, or discard this patch.

router/Router.class.inc.php 1 patch

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

@@ -1,144 +1,144 @@
 block discarded – undo
 <?
 
 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);
-	}
+    }
 
 }

Please login to merge, or discard this patch.

router/LifestreamRouter.class.inc.php 1 patch

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -5,54 +5,54 @@
 block discarded – undo
 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'));
+    }
 
 }
 

Please login to merge, or discard this patch.

router/AJAXRouter.class.inc.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -5,22 +5,22 @@
 block discarded – undo
 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'),
     );
-	}
+    }
 
 }
 

Please login to merge, or discard this patch.

		@@ -3,78 +3,78 @@
		block discarded – undo
3	3	class Request
4	4	{
5	5
6		- private static $server = array();
7		- private static $get = array();
8		- private static $post = array();
	6	+ private static $server = array();
	7	+ private static $get = array();
	8	+ private static $post = array();
9	9
10		- private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
	10	+ private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
11	11
12		- static function init()
13		- {
14		- self::make_server();
15		- self::make_get();
16		- self::make_post();
17		- }
	12	+ static function init()
	13	+ {
	14	+ self::make_server();
	15	+ self::make_get();
	16	+ self::make_post();
	17	+ }
18	18
19		- static function getServer($key = null)
20		- {
21		- if($key)
22		- {
23		- if(isset(self::$server[$key]))
24		- return self::$server[$key];
25		- return false;
26		- }
27		- return self::$server;
28		- }
	19	+ static function getServer($key = null)
	20	+ {
	21	+ if($key)
	22	+ {
	23	+ if(isset(self::$server[$key]))
	24	+ return self::$server[$key];
	25	+ return false;
	26	+ }
	27	+ return self::$server;
	28	+ }
29	29
30		- static function isAjax()
31		- {
32		- if(self::getServer(self::$AJAX_REQUEST))
33		- return true;
34		- return false;
35		- }
	30	+ static function isAjax()
	31	+ {
	32	+ if(self::getServer(self::$AJAX_REQUEST))
	33	+ return true;
	34	+ return false;
	35	+ }
36	36
37		- static function getGet($key = null)
38		- {
39		- if($key)
40		- {
41		- if(isset(self::$get[$key]))
42		- return self::$get[$key];
43		- return false;
44		- }
45		- return self::$get;
46		- }
	37	+ static function getGet($key = null)
	38	+ {
	39	+ if($key)
	40	+ {
	41	+ if(isset(self::$get[$key]))
	42	+ return self::$get[$key];
	43	+ return false;
	44	+ }
	45	+ return self::$get;
	46	+ }
47	47
48		- static function getPost($key = null)
49		- {
50		- if($key)
51		- {
52		- if(isset(self::$post[$key]))
53		- return self::$post[$key];
54		- return false;
55		- }
56		- return self::$post;
57		- }
	48	+ static function getPost($key = null)
	49	+ {
	50	+ if($key)
	51	+ {
	52	+ if(isset(self::$post[$key]))
	53	+ return self::$post[$key];
	54	+ return false;
	55	+ }
	56	+ return self::$post;
	57	+ }
58	58
59		- public static function hasPost()
60		- {
61		- return is_array(self::$post) && !empty(self::$post);
62		- }
	59	+ public static function hasPost()
	60	+ {
	61	+ return is_array(self::$post) && !empty(self::$post);
	62	+ }
63	63
64		- static function make_server()
65		- {
66		- self::$server = $_SERVER;
67		- }
	64	+ static function make_server()
	65	+ {
	66	+ self::$server = $_SERVER;
	67	+ }
68	68
69		- static function make_get()
70		- {
71		- self::$get = $_GET;
72		- }
	69	+ static function make_get()
	70	+ {
	71	+ self::$get = $_GET;
	72	+ }
73	73
74		- static function make_post()
75		- {
76		- self::$post = $_POST;
77		- }
	74	+ static function make_post()
	75	+ {
	76	+ self::$post = $_POST;
	77	+ }
78	78
79	79	}
80	80

		@@ -3,86 +3,86 @@
		block discarded – undo
3	3	final class Header
4	4	{
5	5
6		- public static function sendJSON()
7		- {
8		- $array = array(
9		- 'HTTP/1.1 200 OK',
10		- 'Cache-Control: no-cache',
11		- 'Content-Language: en',
12		- 'Content-Type: application/json',
13		- 'Expires: ' . self::get_date(time() - 1),
14		- 'Last-Modified: ' . self::get_date(),
15		- 'X-Powered-By: jacobemerick.com');
16		- self::send($array);
17		- }
	6	+ public static function sendJSON()
	7	+ {
	8	+ $array = array(
	9	+ 'HTTP/1.1 200 OK',
	10	+ 'Cache-Control: no-cache',
	11	+ 'Content-Language: en',
	12	+ 'Content-Type: application/json',
	13	+ 'Expires: ' . self::get_date(time() - 1),
	14	+ 'Last-Modified: ' . self::get_date(),
	15	+ 'X-Powered-By: jacobemerick.com');
	16	+ self::send($array);
	17	+ }
18	18
19		- public static function sendHTML()
20		- {
21		- $array = array(
22		- 'HTTP/1.1 200 OK',
23		- 'Cache-Control: no-cache',
24		- 'Content-Language: en',
25		- 'Content-Type: text/html',
26		- 'Expires: ' . self::get_date(time() - 1),
27		- 'Last-Modified: ' . self::get_date(),
28		- 'X-Powered-By: jacobemerick.com');
29		- self::send($array);
30		- }
	19	+ public static function sendHTML()
	20	+ {
	21	+ $array = array(
	22	+ 'HTTP/1.1 200 OK',
	23	+ 'Cache-Control: no-cache',
	24	+ 'Content-Language: en',
	25	+ 'Content-Type: text/html',
	26	+ 'Expires: ' . self::get_date(time() - 1),
	27	+ 'Last-Modified: ' . self::get_date(),
	28	+ 'X-Powered-By: jacobemerick.com');
	29	+ self::send($array);
	30	+ }
31	31
32		- public static function redirect($location, $method = 301)
33		- {
34		- header("Location: {$location}", TRUE, $method);
35		- exit();
36		- }
	32	+ public static function redirect($location, $method = 301)
	33	+ {
	34	+ header("Location: {$location}", TRUE, $method);
	35	+ exit();
	36	+ }
37	37
38		- public static function send404()
39		- {
40		- $array = array(
41		- 'HTTP/1.1 404 Not Found',
42		- 'Cache-Control: no-cache',
43		- 'Content-Language: en',
44		- 'Content-Type: text/html',
45		- 'Expires: ' . self::get_date(time() - 1),
46		- 'Last-Modified: ' . self::get_date(),
47		- 'X-Powered-By: jacobemerick.com');
48		- self::send($array);
49		- }
	38	+ public static function send404()
	39	+ {
	40	+ $array = array(
	41	+ 'HTTP/1.1 404 Not Found',
	42	+ 'Cache-Control: no-cache',
	43	+ 'Content-Language: en',
	44	+ 'Content-Type: text/html',
	45	+ 'Expires: ' . self::get_date(time() - 1),
	46	+ 'Last-Modified: ' . self::get_date(),
	47	+ 'X-Powered-By: jacobemerick.com');
	48	+ self::send($array);
	49	+ }
50	50
51		- public static function send503()
52		- {
53		- $array = array(
54		- 'HTTP/1.1 503 Service Unavailable',
55		- 'Cache-Control: no-cache',
56		- 'Content-Language: en',
57		- 'Content-Type: text/html',
58		- 'Expires: ' . self::get_date(time() - 1),
59		- 'Last-Modified: ' . self::get_date(),
60		- 'X-Powered-By: jacobemerick.com');
61		- self::send($array);
62		- }
	51	+ public static function send503()
	52	+ {
	53	+ $array = array(
	54	+ 'HTTP/1.1 503 Service Unavailable',
	55	+ 'Cache-Control: no-cache',
	56	+ 'Content-Language: en',
	57	+ 'Content-Type: text/html',
	58	+ 'Expires: ' . self::get_date(time() - 1),
	59	+ 'Last-Modified: ' . self::get_date(),
	60	+ 'X-Powered-By: jacobemerick.com');
	61	+ self::send($array);
	62	+ }
63	63
64		- private static function send($array, $gzip = true)
65		- {
66		- if($gzip)
67		- self::start_gzipping();
	64	+ private static function send($array, $gzip = true)
	65	+ {
	66	+ if($gzip)
	67	+ self::start_gzipping();
68	68
69		- foreach($array as $row)
70		- {
71		- header($row, TRUE);
72		- }
73		- }
	69	+ foreach($array as $row)
	70	+ {
	71	+ header($row, TRUE);
	72	+ }
	73	+ }
74	74
75		- private static function get_date($timestamp = false)
76		- {
77		- if($timestamp == 0)
78		- $timestamp = time();
79		- return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
80		- }
	75	+ private static function get_date($timestamp = false)
	76	+ {
	77	+ if($timestamp == 0)
	78	+ $timestamp = time();
	79	+ return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
	80	+ }
81	81
82		- private static function start_gzipping()
83		- {
84		- if(!ob_start('ob_gzhandler'))
	82	+ private static function start_gzipping()
	83	+ {
	84	+ if(!ob_start('ob_gzhandler'))
85	85	ob_start();
86		- }
	86	+ }
87	87
88	88	}

		@@ -5,110 +5,110 @@
		block discarded – undo
5	5	class Validate
6	6	{
7	7
8		- private static $NAME_REGEX = '@[a-z\s\'-]+@i';
9		- 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';
10		- 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';
	8	+ private static $NAME_REGEX = '@[a-z\s\'-]+@i';
	9	+ 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';
	10	+ 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';
11	11
12		- public static function isBoolean($value, $strict = false)
13		- {
14		- if($strict && ($value === true \|\| $value === false))
15		- return true;
16		- if(!$strict && ((bool) $value === true \|\| (bool) $value === false))
17		- return true;
18		- return false;
19		- }
	12	+ public static function isBoolean($value, $strict = false)
	13	+ {
	14	+ if($strict && ($value === true \|\| $value === false))
	15	+ return true;
	16	+ if(!$strict && ((bool) $value === true \|\| (bool) $value === false))
	17	+ return true;
	18	+ return false;
	19	+ }
20	20
21		- public static function isDate($value)
22		- {
23		- if(strtotime($value) !== -1)
24		- return true;
25		- if(date('y', $value) !== false)
26		- return true;
27		- return false;
28		- }
	21	+ public static function isDate($value)
	22	+ {
	23	+ if(strtotime($value) !== -1)
	24	+ return true;
	25	+ if(date('y', $value) !== false)
	26	+ return true;
	27	+ return false;
	28	+ }
29	29
30		- public static function isInteger($value, $strict = false)
31		- {
32		- if($strict)
33		- return is_int($value);
34		- return (int) $value == $value;
35		- }
	30	+ public static function isInteger($value, $strict = false)
	31	+ {
	32	+ if($strict)
	33	+ return is_int($value);
	34	+ return (int) $value == $value;
	35	+ }
36	36
37		- public static function isIP($value)
38		- {
39		- if(self::isInteger(ip2long($value)))
40		- return true;
41		- return false;
42		- }
	37	+ public static function isIP($value)
	38	+ {
	39	+ if(self::isInteger(ip2long($value)))
	40	+ return true;
	41	+ return false;
	42	+ }
43	43
44		- public static function isString($value, $strict = false)
45		- {
46		- if($strict)
47		- return is_string($value);
48		- return (string) $value == $value;
49		- }
	44	+ public static function isString($value, $strict = false)
	45	+ {
	46	+ if($strict)
	47	+ return is_string($value);
	48	+ return (string) $value == $value;
	49	+ }
50	50
51		- public static function isURL($value)
52		- {
53		- return true;
54		- return self::check_value(self::$URL_REGEX, $value);
55		- }
	51	+ public static function isURL($value)
	52	+ {
	53	+ return true;
	54	+ return self::check_value(self::$URL_REGEX, $value);
	55	+ }
56	56
57		- public static function isName($value)
58		- {
59		- return self::check_value(self::$NAME_REGEX, $value);
60		- }
	57	+ public static function isName($value)
	58	+ {
	59	+ return self::check_value(self::$NAME_REGEX, $value);
	60	+ }
61	61
62		- public static function isEmail($value)
63		- {
64		- return self::check_value(self::$EMAIL_REGEX, $value);
65		- }
	62	+ public static function isEmail($value)
	63	+ {
	64	+ return self::check_value(self::$EMAIL_REGEX, $value);
	65	+ }
66	66
67		- private static function check_value($pattern, $string)
68		- {
69		- preg_match($pattern, $string, $matches);
70		- if(empty($matches))
71		- return false;
72		- return $matches[0] == $string;
73		- }
	67	+ private static function check_value($pattern, $string)
	68	+ {
	69	+ preg_match($pattern, $string, $matches);
	70	+ if(empty($matches))
	71	+ return false;
	72	+ return $matches[0] == $string;
	73	+ }
74	74
75		- public static function checkRequest($type, $key, $validation, $strict = false)
76		- {
77		- switch($type)
78		- {
79		- case 'server':
80		- $value = Request::getServer($key);
81		- break;
82		- case 'post':
83		- $value = Request::getPost($key);
84		- break;
85		- }
	75	+ public static function checkRequest($type, $key, $validation, $strict = false)
	76	+ {
	77	+ switch($type)
	78	+ {
	79	+ case 'server':
	80	+ $value = Request::getServer($key);
	81	+ break;
	82	+ case 'post':
	83	+ $value = Request::getPost($key);
	84	+ break;
	85	+ }
86	86
87		- if($value == false)
88		- return false;
	87	+ if($value == false)
	88	+ return false;
89	89
90		- switch($validation)
91		- {
92		- case 'boolean':
93		- return self::isBoolean($value, $strict);
94		- case 'date':
95		- return self::isDate($value);
96		- case 'integer':
97		- return self::isInteger($value, $strict);
98		- case 'ip':
99		- return self::isIP($value);
100		- case 'string':
101		- return self::isString($value, $strict);
102		- case 'url':
103		- return self::isURL($value, $strict);
104		- case 'name':
105		- return self::isName($value, $strict);
106		- case 'email':
107		- return self::isEmail($value, $strict);
108		- }
	90	+ switch($validation)
	91	+ {
	92	+ case 'boolean':
	93	+ return self::isBoolean($value, $strict);
	94	+ case 'date':
	95	+ return self::isDate($value);
	96	+ case 'integer':
	97	+ return self::isInteger($value, $strict);
	98	+ case 'ip':
	99	+ return self::isIP($value);
	100	+ case 'string':
	101	+ return self::isString($value, $strict);
	102	+ case 'url':
	103	+ return self::isURL($value, $strict);
	104	+ case 'name':
	105	+ return self::isName($value, $strict);
	106	+ case 'email':
	107	+ return self::isEmail($value, $strict);
	108	+ }
109	109
110		- return false;
111		- }
	110	+ return false;
	111	+ }
112	112
113	113	}
114	114

		@@ -8,24 +8,24 @@ discard block
		block discarded – undo
8	8	class WaterfallRouter extends Router
9	9	{
10	10
11		- protected function get_redirect_array()
12		- {
13		- return array(
14		- (object) array(
15		- 'pattern' => '@/index.(html\|htm\|php)$@',
16		- 'replace' => '/'),
17		- (object) array(
18		- 'pattern' => '@^/home(/?)$@',
19		- 'replace' => '/'),
20		- (object) array(
21		- 'pattern' => '@^/falls/by-rating(/?)$@',
22		- 'replace' => '/falls/'),
23		- (object) array(
24		- 'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
25		- 'replace' => '/falls/'),
26		- (object) array(
27		- 'pattern' => '@^/falls/results(/?)$@',
28		- 'replace' => '/falls/'),
	11	+ protected function get_redirect_array()
	12	+ {
	13	+ return array(
	14	+ (object) array(
	15	+ 'pattern' => '@/index.(html\|htm\|php)$@',
	16	+ 'replace' => '/'),
	17	+ (object) array(
	18	+ 'pattern' => '@^/home(/?)$@',
	19	+ 'replace' => '/'),
	20	+ (object) array(
	21	+ 'pattern' => '@^/falls/by-rating(/?)$@',
	22	+ 'replace' => '/falls/'),
	23	+ (object) array(
	24	+ 'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
	25	+ 'replace' => '/falls/'),
	26	+ (object) array(
	27	+ 'pattern' => '@^/falls/results(/?)$@',
	28	+ 'replace' => '/falls/'),
29	29	(object) array(
30	30	'pattern' => '@^/log(/?)$@',
31	31	'replace' => '/journal/'),
		@@ -35,44 +35,44 @@ discard block
		block discarded – undo
35	35	(object) array(
36	36	'pattern' => '@^/map/([^/]+)(/?)$@',
37	37	'replace' => '/map/'),
38		- (object) array(
39		- 'pattern' => '@^/about/([a-z]*)(/?)$@',
40		- 'replace' => '/about/'),
41		- (object) array(
42		- 'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
43		- 'replace' => '/birch-creek/gold-mine-falls/'),
44		- (object) array(
45		- 'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
46		- 'replace' => '/big-iron-river/greenwood-falls/'),
47		- (object) array(
48		- 'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
49		- 'replace' => '/east-branch-huron-river/east-branch-falls/'),
50		- (object) array(
51		- 'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
52		- 'replace' => '/montreal-river/montreal-falls/'),
53		- (object) array(
54		- 'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
55		- 'replace' => '/manganese-creek/manganese-falls/'),
56		- (object) array(
57		- 'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
58		- 'replace' => '/dead-river/tourist-park-falls/'),
59		- (object) array(
60		- 'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
61		- 'replace' => '/sturgeon-river/little-spruce-falls/'),
62		- (object) array(
63		- 'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
64		- 'replace' => '/tahquamenon-river/tahquamenon-falls/'),
65		- (object) array(
66		- 'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
67		- 'replace' => '/west-branch-huron-river/west-branch-falls/'),
68		- (object) array(
69		- 'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
70		- 'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
71		- );
72		- }
	38	+ (object) array(
	39	+ 'pattern' => '@^/about/([a-z]*)(/?)$@',
	40	+ 'replace' => '/about/'),
	41	+ (object) array(
	42	+ 'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
	43	+ 'replace' => '/birch-creek/gold-mine-falls/'),
	44	+ (object) array(
	45	+ 'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
	46	+ 'replace' => '/big-iron-river/greenwood-falls/'),
	47	+ (object) array(
	48	+ 'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
	49	+ 'replace' => '/east-branch-huron-river/east-branch-falls/'),
	50	+ (object) array(
	51	+ 'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
	52	+ 'replace' => '/montreal-river/montreal-falls/'),
	53	+ (object) array(
	54	+ 'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
	55	+ 'replace' => '/manganese-creek/manganese-falls/'),
	56	+ (object) array(
	57	+ 'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
	58	+ 'replace' => '/dead-river/tourist-park-falls/'),
	59	+ (object) array(
	60	+ 'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
	61	+ 'replace' => '/sturgeon-river/little-spruce-falls/'),
	62	+ (object) array(
	63	+ 'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
	64	+ 'replace' => '/tahquamenon-river/tahquamenon-falls/'),
	65	+ (object) array(
	66	+ 'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
	67	+ 'replace' => '/west-branch-huron-river/west-branch-falls/'),
	68	+ (object) array(
	69	+ 'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
	70	+ 'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
	71	+ );
	72	+ }
73	73
74		- protected function check_for_special_redirect($uri)
75		- {
	74	+ protected function check_for_special_redirect($uri)
	75	+ {
76	76	if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
77	77	$alias = $matches[1];
78	78	$alias = str_replace("'", '', $alias);
		@@ -125,81 +125,81 @@ discard block
		block discarded – undo
125	125	}
126	126	}
127	127
128		- return $uri;
129		- }
	128	+ return $uri;
	129	+ }
130	130
131		- protected function get_direct_array()
132		- {
133		- return array(
134		- (object) array(
135		- 'match' => '/',
136		- 'controller' => 'HomeController'),
137		- (object) array(
138		- 'match' => '/falls/',
139		- 'controller' => 'WaterfallListController'),
140		- (object) array(
141		- 'match' => '/falls/([0-9]+)/',
142		- 'controller' => 'WaterfallListController'),
143		- (object) array(
144		- 'match' => '/([a-z]+)-county/',
145		- 'controller' => 'CountyListController'),
146		- (object) array(
147		- 'match' => '/([a-z]+)-county/([0-9]+)/',
148		- 'controller' => 'CountyListController'),
149		- (object) array(
150		- 'match' => '/([a-z0-9-]+)-(creek\|river)/',
151		- 'controller' => 'WatercourseListController'),
152		- (object) array(
153		- 'match' => '/([a-z0-9-]+)-(creek\|river)/([0-9]+)/',
154		- 'controller' => 'WatercourseListController'),
155		- (object) array(
156		- 'match' => '/category/([a-z]+)/',
157		- 'controller' => 'CategoryListController'),
158		- (object) array(
159		- 'match' => '/category/([a-z]+)/([0-9]+)/',
160		- 'controller' => 'CategoryListController'),
161		- (object) array(
162		- 'match' => '/([a-z0-9-]+)-(creek\|river)/([a-z-]+)/',
163		- 'controller' => 'WaterfallController'),
164		- (object) array(
165		- 'match' => '/map/',
166		- 'controller' => 'MapController'),
	131	+ protected function get_direct_array()
	132	+ {
	133	+ return array(
	134	+ (object) array(
	135	+ 'match' => '/',
	136	+ 'controller' => 'HomeController'),
	137	+ (object) array(
	138	+ 'match' => '/falls/',
	139	+ 'controller' => 'WaterfallListController'),
	140	+ (object) array(
	141	+ 'match' => '/falls/([0-9]+)/',
	142	+ 'controller' => 'WaterfallListController'),
	143	+ (object) array(
	144	+ 'match' => '/([a-z]+)-county/',
	145	+ 'controller' => 'CountyListController'),
	146	+ (object) array(
	147	+ 'match' => '/([a-z]+)-county/([0-9]+)/',
	148	+ 'controller' => 'CountyListController'),
	149	+ (object) array(
	150	+ 'match' => '/([a-z0-9-]+)-(creek\|river)/',
	151	+ 'controller' => 'WatercourseListController'),
	152	+ (object) array(
	153	+ 'match' => '/([a-z0-9-]+)-(creek\|river)/([0-9]+)/',
	154	+ 'controller' => 'WatercourseListController'),
	155	+ (object) array(
	156	+ 'match' => '/category/([a-z]+)/',
	157	+ 'controller' => 'CategoryListController'),
	158	+ (object) array(
	159	+ 'match' => '/category/([a-z]+)/([0-9]+)/',
	160	+ 'controller' => 'CategoryListController'),
	161	+ (object) array(
	162	+ 'match' => '/([a-z0-9-]+)-(creek\|river)/([a-z-]+)/',
	163	+ 'controller' => 'WaterfallController'),
	164	+ (object) array(
	165	+ 'match' => '/map/',
	166	+ 'controller' => 'MapController'),
167	167	(object) array(
168	168	'match' => '/map/#[a-z-/]+',
169	169	'controller' => 'MapController'),
170		- (object) array(
171		- 'match' => '/journal/',
172		- 'controller' => 'LogListController'),
173		- (object) array(
174		- 'match' => '/journal/([0-9]+)/',
175		- 'controller' => 'LogListController'),
176		- (object) array(
177		- 'match' => '/journal/[a-z-]+/',
178		- 'controller' => 'LogController'),
179		- (object) array(
180		- 'match' => '/companion/([a-z-]+)/',
181		- 'controller' => 'CompanionListController'),
182		- (object) array(
183		- 'match' => '/companion/([a-z-]+)/([0-9]+)/',
184		- 'controller' => 'CompanionListController'),
185		- (object) array(
186		- 'match' => '/period/([a-z-]+)/',
187		- 'controller' => 'PeriodListController'),
188		- (object) array(
189		- 'match' => '/period/([a-z-]+)/([0-9]+)/',
190		- 'controller' => 'PeriodListController'),
191		- (object) array(
192		- 'match' => '/journal/tag/([a-z-]+)/',
193		- 'controller' => 'LogTagListController'),
194		- (object) array(
195		- 'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
196		- 'controller' => 'LogTagListController'),
197		- (object) array(
198		- 'match' => '/about/',
199		- 'controller' => 'AboutController'),
200		- (object) array(
201		- 'match' => '/contact/',
202		- 'controller' => 'ContactController'));
203		- }
	170	+ (object) array(
	171	+ 'match' => '/journal/',
	172	+ 'controller' => 'LogListController'),
	173	+ (object) array(
	174	+ 'match' => '/journal/([0-9]+)/',
	175	+ 'controller' => 'LogListController'),
	176	+ (object) array(
	177	+ 'match' => '/journal/[a-z-]+/',
	178	+ 'controller' => 'LogController'),
	179	+ (object) array(
	180	+ 'match' => '/companion/([a-z-]+)/',
	181	+ 'controller' => 'CompanionListController'),
	182	+ (object) array(
	183	+ 'match' => '/companion/([a-z-]+)/([0-9]+)/',
	184	+ 'controller' => 'CompanionListController'),
	185	+ (object) array(
	186	+ 'match' => '/period/([a-z-]+)/',
	187	+ 'controller' => 'PeriodListController'),
	188	+ (object) array(
	189	+ 'match' => '/period/([a-z-]+)/([0-9]+)/',
	190	+ 'controller' => 'PeriodListController'),
	191	+ (object) array(
	192	+ 'match' => '/journal/tag/([a-z-]+)/',
	193	+ 'controller' => 'LogTagListController'),
	194	+ (object) array(
	195	+ 'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
	196	+ 'controller' => 'LogTagListController'),
	197	+ (object) array(
	198	+ 'match' => '/about/',
	199	+ 'controller' => 'AboutController'),
	200	+ (object) array(
	201	+ 'match' => '/contact/',
	202	+ 'controller' => 'ContactController'));
	203	+ }
204	204
205	205	}

		@@ -5,26 +5,26 @@
		block discarded – undo
5	5	final class HomeRouter extends Router
6	6	{
7	7
8		- protected function get_redirect_array()
9		- {
10		- return array(
11		- (object) array(
12		- 'pattern' => '@/index.(html\|htm\|php)$@',
13		- 'replace' => ''));
14		- }
	8	+ protected function get_redirect_array()
	9	+ {
	10	+ return array(
	11	+ (object) array(
	12	+ 'pattern' => '@/index.(html\|htm\|php)$@',
	13	+ 'replace' => ''));
	14	+ }
15	15
16		- protected function get_direct_array()
17		- {
18		- return array(
19		- (object) array(
20		- 'match' => '/',
21		- 'controller' => 'HomeController'),
22		- (object) array(
23		- 'match' => '/about/',
24		- 'controller' => 'AboutController'),
25		- (object) array(
26		- 'match' => '/contact/',
27		- 'controller' => 'ContactController'));
28		- }
	16	+ protected function get_direct_array()
	17	+ {
	18	+ return array(
	19	+ (object) array(
	20	+ 'match' => '/',
	21	+ 'controller' => 'HomeController'),
	22	+ (object) array(
	23	+ 'match' => '/about/',
	24	+ 'controller' => 'AboutController'),
	25	+ (object) array(
	26	+ 'match' => '/contact/',
	27	+ 'controller' => 'ContactController'));
	28	+ }
29	29
30	30	}
31	31	\ No newline at end of file

		@@ -5,29 +5,29 @@
		block discarded – undo
5	5	class SiteRouter extends Router
6	6	{
7	7
8		- protected function get_redirect_array()
9		- {
10		- return array(
11		- (object) array(
12		- 'pattern' => '@/index.(html\|htm\|php)$@',
13		- 'replace' => '/'));
14		- }
	8	+ protected function get_redirect_array()
	9	+ {
	10	+ return array(
	11	+ (object) array(
	12	+ 'pattern' => '@/index.(html\|htm\|php)$@',
	13	+ 'replace' => '/'));
	14	+ }
15	15
16		- protected function get_direct_array()
17		- {
18		- return array(
19		- (object) array(
20		- 'match' => '/',
21		- 'controller' => 'HomeController'),
22		- (object) array(
23		- 'match' => '/terms/',
24		- 'controller' => 'TermsController'),
25		- (object) array(
26		- 'match' => '/change-log/',
27		- 'controller' => 'ChangelogController'),
28		- (object) array(
29		- 'match' => '/contact/',
30		- 'controller' => 'ContactController'));
31		- }
	16	+ protected function get_direct_array()
	17	+ {
	18	+ return array(
	19	+ (object) array(
	20	+ 'match' => '/',
	21	+ 'controller' => 'HomeController'),
	22	+ (object) array(
	23	+ 'match' => '/terms/',
	24	+ 'controller' => 'TermsController'),
	25	+ (object) array(
	26	+ 'match' => '/change-log/',
	27	+ 'controller' => 'ChangelogController'),
	28	+ (object) array(
	29	+ 'match' => '/contact/',
	30	+ 'controller' => 'ContactController'));
	31	+ }
32	32
33	33	}
34	34	\ No newline at end of file

		@@ -1,144 +1,144 @@
		block discarded – undo
1	1	<?
2	2
3	3	Loader::load('utility', array(
4		- 'Request',
5		- 'URLDecode'));
	4	+ 'Request',
	5	+ 'URLDecode'));
6	6
7	7	abstract class Router
8	8	{
9	9
10		- public function __construct() {}
	10	+ public function __construct() {}
11	11
12		- public static function instance()
13		- {
14		- $router_name = self::get_router_name();
15		- $router = Loader::loadNew('router', $router_name);
16		- $router->route();
17		- }
	12	+ public static function instance()
	13	+ {
	14	+ $router_name = self::get_router_name();
	15	+ $router = Loader::loadNew('router', $router_name);
	16	+ $router->route();
	17	+ }
18	18
19		- private static function get_router_name()
20		- {
21		- if(Request::isAJAX())
22		- return 'AJAXRouter';
	19	+ private static function get_router_name()
	20	+ {
	21	+ if(Request::isAJAX())
	22	+ return 'AJAXRouter';
23	23
24		- switch(URLDecode::getSite())
25		- {
26		- case 'ajax' :
27		- return 'AjaxRouter';
28		- break;
29		- case 'blog' :
30		- return 'BlogRouter';
31		- break;
32		- case 'home' :
33		- return 'HomeRouter';
34		- break;
35		- case 'lifestream' :
36		- return 'LifestreamRouter';
37		- break;
38		- case 'portfolio' :
39		- return 'PortfolioRouter';
40		- break;
41		- case 'site' :
42		- return 'SiteRouter';
43		- break;
44		- case 'waterfalls' :
45		- return 'WaterfallRouter';
46		- break;
47		- }
	24	+ switch(URLDecode::getSite())
	25	+ {
	26	+ case 'ajax' :
	27	+ return 'AjaxRouter';
	28	+ break;
	29	+ case 'blog' :
	30	+ return 'BlogRouter';
	31	+ break;
	32	+ case 'home' :
	33	+ return 'HomeRouter';
	34	+ break;
	35	+ case 'lifestream' :
	36	+ return 'LifestreamRouter';
	37	+ break;
	38	+ case 'portfolio' :
	39	+ return 'PortfolioRouter';
	40	+ break;
	41	+ case 'site' :
	42	+ return 'SiteRouter';
	43	+ break;
	44	+ case 'waterfalls' :
	45	+ return 'WaterfallRouter';
	46	+ break;
	47	+ }
48	48
49		- Loader::loadNew('controller', '/Error404Controller')->activate();
50		- }
	49	+ Loader::loadNew('controller', '/Error404Controller')->activate();
	50	+ }
51	51
52		- protected function route()
53		- {
54		- $uri = URLDecode::getURI();
	52	+ protected function route()
	53	+ {
	54	+ $uri = URLDecode::getURI();
55	55
56		- $this->check_for_redirect($uri);
	56	+ $this->check_for_redirect($uri);
57	57
58		- $controller = $this->get_controller($uri);
59		- Loader::loadNew('controller', $controller)
60		- ->activate();
61		- }
	58	+ $controller = $this->get_controller($uri);
	59	+ Loader::loadNew('controller', $controller)
	60	+ ->activate();
	61	+ }
62	62
63		- abstract protected function get_redirect_array();
64		- abstract protected function get_direct_array();
	63	+ abstract protected function get_redirect_array();
	64	+ abstract protected function get_direct_array();
65	65
66		- final protected function check_for_redirect($redirect_uri)
67		- {
68		- foreach($this->get_redirect_array() as $check)
69		- {
70		- $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
71		- }
	66	+ final protected function check_for_redirect($redirect_uri)
	67	+ {
	68	+ foreach($this->get_redirect_array() as $check)
	69	+ {
	70	+ $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
	71	+ }
72	72
73		- $redirect_uri = $this->check_for_special_redirect($redirect_uri);
	73	+ $redirect_uri = $this->check_for_special_redirect($redirect_uri);
74	74
75		- if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
76		- $redirect_uri .= '/';
	75	+ if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
	76	+ $redirect_uri .= '/';
77	77
78	78	if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
79	79	$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
80	80	$redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
81	81	}
82	82
83		- if($redirect_uri == URLDecode::getURI())
84		- return;
	83	+ if($redirect_uri == URLDecode::getURI())
	84	+ return;
85	85
86		- $controller_check = $redirect_uri;
87		- if(substr($redirect_uri, 0, 4) == 'http') {
88		- $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
89		- $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
	86	+ $controller_check = $redirect_uri;
	87	+ if(substr($redirect_uri, 0, 4) == 'http') {
	88	+ $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
	89	+ $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
90	90	}
91	91
92		- $controller = $this->get_controller($controller_check);
93		- if($controller == '/Error404Controller')
94		- {
95		- Loader::loadNew('controller', '/Error404Controller')
96		- ->activate();
97		- exit;
98		- }
	92	+ $controller = $this->get_controller($controller_check);
	93	+ if($controller == '/Error404Controller')
	94	+ {
	95	+ Loader::loadNew('controller', '/Error404Controller')
	96	+ ->activate();
	97	+ exit;
	98	+ }
99	99
100		- if(substr($redirect_uri, 0, 4) != 'http')
101		- {
102		- $redirect_uri = substr($redirect_uri, 1);
103		- $redirect_uri = URLDecode::getBase() . $redirect_uri;
104		- }
	100	+ if(substr($redirect_uri, 0, 4) != 'http')
	101	+ {
	102	+ $redirect_uri = substr($redirect_uri, 1);
	103	+ $redirect_uri = URLDecode::getBase() . $redirect_uri;
	104	+ }
105	105
106		- Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
107		- ->activate();
108		- }
	106	+ Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
	107	+ ->activate();
	108	+ }
109	109
110		- protected function check_for_special_redirect($uri)
111		- {
112		- return $uri;
113		- }
	110	+ protected function check_for_special_redirect($uri)
	111	+ {
	112	+ return $uri;
	113	+ }
114	114
115		- final private function get_controller($uri)
116		- {
117		- foreach($this->get_direct_array() as $check)
118		- {
119		- if($uri == $check->match)
120		- return "{$this->get_primary_folder()}/{$check->controller}";
	115	+ final private function get_controller($uri)
	116	+ {
	117	+ foreach($this->get_direct_array() as $check)
	118	+ {
	119	+ if($uri == $check->match)
	120	+ return "{$this->get_primary_folder()}/{$check->controller}";
121	121
122		- if(preg_match("@^{$check->match}$@", $uri))
123		- return "{$this->get_primary_folder()}/{$check->controller}";
124		- }
	122	+ if(preg_match("@^{$check->match}$@", $uri))
	123	+ return "{$this->get_primary_folder()}/{$check->controller}";
	124	+ }
125	125
126		- return '/Error404Controller';
127		- }
	126	+ return '/Error404Controller';
	127	+ }
128	128
129		- final private function get_primary_folder()
130		- {
131		- if(Request::isAjax())
132		- return 'ajax';
	129	+ final private function get_primary_folder()
	130	+ {
	131	+ if(Request::isAjax())
	132	+ return 'ajax';
133	133
134		- return URLDecode::getSite();
135		- }
	134	+ return URLDecode::getSite();
	135	+ }
136	136
137		- private function requires_trailing_slash()
138		- {
139		- return (
140		- URLDecode::getExtension() != 'json' &&
	137	+ private function requires_trailing_slash()
	138	+ {
	139	+ return (
	140	+ URLDecode::getExtension() != 'json' &&
141	141	strstr(URLDecode::getURI(), '#') === false);
142		- }
	142	+ }
143	143
144	144	}

		@@ -5,54 +5,54 @@
		block discarded – undo
5	5	class LifestreamRouter extends Router
6	6	{
7	7
8		- protected function get_redirect_array()
9		- {
10		- return array(
11		- (object) array(
12		- 'pattern' => '@/index.(html\|htm\|php)$@',
13		- 'replace' => '/'),
14		- (object) array(
15		- 'pattern' => '@^/1/$@',
16		- 'replace' => '/'),
17		- (object) array(
18		- 'pattern' => '@/page_([0-9]+)(/?)$@',
19		- 'replace' => '/page/$1/'),
20		- (object) array(
21		- 'pattern' => '@/tag/([a-z]+)/$@',
22		- 'replace' => '/$1/'),
23		- (object) array(
24		- 'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@',
25		- 'replace' => '/$1/page/$2/'),
26		- (object) array(
27		- 'pattern' => '@/tag/([a-z-]+)/$@',
28		- 'replace' => '/'),
29		- (object) array(
30		- 'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@',
31		- 'replace' => '/'));
32		- }
	8	+ protected function get_redirect_array()
	9	+ {
	10	+ return array(
	11	+ (object) array(
	12	+ 'pattern' => '@/index.(html\|htm\|php)$@',
	13	+ 'replace' => '/'),
	14	+ (object) array(
	15	+ 'pattern' => '@^/1/$@',
	16	+ 'replace' => '/'),
	17	+ (object) array(
	18	+ 'pattern' => '@/page_([0-9]+)(/?)$@',
	19	+ 'replace' => '/page/$1/'),
	20	+ (object) array(
	21	+ 'pattern' => '@/tag/([a-z]+)/$@',
	22	+ 'replace' => '/$1/'),
	23	+ (object) array(
	24	+ 'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@',
	25	+ 'replace' => '/$1/page/$2/'),
	26	+ (object) array(
	27	+ 'pattern' => '@/tag/([a-z-]+)/$@',
	28	+ 'replace' => '/'),
	29	+ (object) array(
	30	+ 'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@',
	31	+ 'replace' => '/'));
	32	+ }
33	33
34		- protected function get_direct_array()
35		- {
36		- return array(
37		- (object) array(
38		- 'match' => '/',
39		- 'controller' => 'HomeController'),
40		- (object) array(
41		- 'match' => '/about/',
42		- 'controller' => 'AboutController'),
43		- (object) array(
44		- 'match' => '/page/([0-9]+)/',
45		- 'controller' => 'HomeController'),
46		- (object) array(
47		- 'match' => '/([a-z]+)/',
48		- 'controller' => 'TagController'),
49		- (object) array(
50		- 'match' => '/([a-z]+)/page/([0-9]+)/',
51		- 'controller' => 'TagController'),
52		- (object) array(
53		- 'match' => '/([a-z]+)/([0-9]+)/',
54		- 'controller' => 'PostController'));
55		- }
	34	+ protected function get_direct_array()
	35	+ {
	36	+ return array(
	37	+ (object) array(
	38	+ 'match' => '/',
	39	+ 'controller' => 'HomeController'),
	40	+ (object) array(
	41	+ 'match' => '/about/',
	42	+ 'controller' => 'AboutController'),
	43	+ (object) array(
	44	+ 'match' => '/page/([0-9]+)/',
	45	+ 'controller' => 'HomeController'),
	46	+ (object) array(
	47	+ 'match' => '/([a-z]+)/',
	48	+ 'controller' => 'TagController'),
	49	+ (object) array(
	50	+ 'match' => '/([a-z]+)/page/([0-9]+)/',
	51	+ 'controller' => 'TagController'),
	52	+ (object) array(
	53	+ 'match' => '/([a-z]+)/([0-9]+)/',
	54	+ 'controller' => 'PostController'));
	55	+ }
56	56
57	57	}
58	58

		@@ -5,22 +5,22 @@
		block discarded – undo
5	5	class AJAXRouter extends Router
6	6	{
7	7
8		- protected function get_redirect_array()
9		- {
10		- return array(
11		- (object) array(
12		- 'pattern' => '@^/$@',
13		- 'replace' => 'https://home.jacobemerick.com/'));
14		- }
	8	+ protected function get_redirect_array()
	9	+ {
	10	+ return array(
	11	+ (object) array(
	12	+ 'pattern' => '@^/$@',
	13	+ 'replace' => 'https://home.jacobemerick.com/'));
	14	+ }
15	15
16		- protected function get_direct_array()
17		- {
18		- return array(
19		- (object) array(
20		- 'match' => '/get/portfolioImage.json',
21		- 'controller' => 'GetPortfolioImageController'),
	16	+ protected function get_direct_array()
	17	+ {
	18	+ return array(
	19	+ (object) array(
	20	+ 'match' => '/get/portfolioImage.json',
	21	+ 'controller' => 'GetPortfolioImageController'),
22	22	);
23		- }
	23	+ }
24	24
25	25	}
26	26

jacobemerick / web

Push — master ( 6d742b...a712f0 )

Status

Category

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch

Indentation +72 added lines, -72 removed lines patch added patch discarded remove patch

Indentation +91 added lines, -91 removed lines patch added patch discarded remove patch

Indentation +127 added lines, -127 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch