jacobemerick /
web
@@ -5,50 +5,50 @@ |
||
| 5 | 5 | final class FixPhotoContent extends Content |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@'; |
|
| 9 | - private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>'; |
|
| 10 | - private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>'; |
|
| 8 | + private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@'; |
|
| 9 | + private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>'; |
|
| 10 | + private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>'; |
|
| 11 | 11 | |
| 12 | - protected function execute($is_absolute = false, $size = 'medium') |
|
| 13 | - { |
|
| 14 | - preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches); |
|
| 15 | - foreach($matches[1] as $key => $match) |
|
| 16 | - { |
|
| 17 | - $photo_content = $this->get_photo_content($match, $size, $is_absolute); |
|
| 18 | - $this->content = str_replace($matches[0][$key], $photo_content, $this->content); |
|
| 19 | - } |
|
| 20 | - return; |
|
| 21 | - } |
|
| 12 | + protected function execute($is_absolute = false, $size = 'medium') |
|
| 13 | + { |
|
| 14 | + preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches); |
|
| 15 | + foreach($matches[1] as $key => $match) |
|
| 16 | + { |
|
| 17 | + $photo_content = $this->get_photo_content($match, $size, $is_absolute); |
|
| 18 | + $this->content = str_replace($matches[0][$key], $photo_content, $this->content); |
|
| 19 | + } |
|
| 20 | + return; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - private function get_file_path($category, $photo, $size, $extension) |
|
| 24 | - { |
|
| 25 | - $path = "{$category}/{$photo}-size-{$size}.{$extension}"; |
|
| 26 | - return Loader::getImagePath('photo', $path); |
|
| 27 | - } |
|
| 23 | + private function get_file_path($category, $photo, $size, $extension) |
|
| 24 | + { |
|
| 25 | + $path = "{$category}/{$photo}-size-{$size}.{$extension}"; |
|
| 26 | + return Loader::getImagePath('photo', $path); |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - private function get_photo_content($string, $size, $is_absolute) |
|
| 30 | - { |
|
| 31 | - list($category, $file_name) = explode('/', $string); |
|
| 32 | - list($photo, $extension) = explode('.', $file_name); |
|
| 29 | + private function get_photo_content($string, $size, $is_absolute) |
|
| 30 | + { |
|
| 31 | + list($category, $file_name) = explode('/', $string); |
|
| 32 | + list($photo, $extension) = explode('.', $file_name); |
|
| 33 | 33 | |
| 34 | - $file_path = $this->get_file_path($category, $photo, $size, $extension); |
|
| 34 | + $file_path = $this->get_file_path($category, $photo, $size, $extension); |
|
| 35 | 35 | |
| 36 | - $file_size = getimagesize($file_path); |
|
| 36 | + $file_size = getimagesize($file_path); |
|
| 37 | 37 | |
| 38 | - Loader::load('collector', 'image/PhotoCollector'); |
|
| 39 | - $photo_result = PhotoCollector::fetchRow($category, $photo); |
|
| 40 | - if($photo_result == false) |
|
| 41 | - return ''; |
|
| 38 | + Loader::load('collector', 'image/PhotoCollector'); |
|
| 39 | + $photo_result = PhotoCollector::fetchRow($category, $photo); |
|
| 40 | + if($photo_result == false) |
|
| 41 | + return ''; |
|
| 42 | 42 | |
| 43 | - $height = $file_size[1]; |
|
| 44 | - $width = $file_size[0]; |
|
| 45 | - $description = $photo_result->description; |
|
| 43 | + $height = $file_size[1]; |
|
| 44 | + $width = $file_size[0]; |
|
| 45 | + $description = $photo_result->description; |
|
| 46 | 46 | |
| 47 | - $domain = '/'; |
|
| 48 | - if($is_absolute) |
|
| 49 | - $domain = Loader::getRootUrl('blog'); |
|
| 47 | + $domain = '/'; |
|
| 48 | + if($is_absolute) |
|
| 49 | + $domain = Loader::getRootUrl('blog'); |
|
| 50 | 50 | |
| 51 | - return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description); |
|
| 52 | - } |
|
| 51 | + return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | 54 | } |
@@ -3,43 +3,43 @@ |
||
| 3 | 3 | abstract class Content |
| 4 | 4 | { |
| 5 | 5 | |
| 6 | - protected $original_content; |
|
| 7 | - protected $content; |
|
| 8 | - |
|
| 9 | - function __construct($content) |
|
| 10 | - { |
|
| 11 | - $this->original_content = $content; |
|
| 12 | - $this->content = $content; |
|
| 13 | - } |
|
| 14 | - |
|
| 15 | - public function getOriginal() |
|
| 16 | - { |
|
| 17 | - return $this->original_content; |
|
| 18 | - } |
|
| 19 | - |
|
| 20 | - abstract protected function execute(); |
|
| 21 | - |
|
| 22 | - public function activate() |
|
| 23 | - { |
|
| 24 | - $args = func_get_args(); |
|
| 25 | - call_user_func_array(array($this, 'execute'), $args); |
|
| 6 | + protected $original_content; |
|
| 7 | + protected $content; |
|
| 8 | + |
|
| 9 | + function __construct($content) |
|
| 10 | + { |
|
| 11 | + $this->original_content = $content; |
|
| 12 | + $this->content = $content; |
|
| 13 | + } |
|
| 14 | + |
|
| 15 | + public function getOriginal() |
|
| 16 | + { |
|
| 17 | + return $this->original_content; |
|
| 18 | + } |
|
| 19 | + |
|
| 20 | + abstract protected function execute(); |
|
| 21 | + |
|
| 22 | + public function activate() |
|
| 23 | + { |
|
| 24 | + $args = func_get_args(); |
|
| 25 | + call_user_func_array(array($this, 'execute'), $args); |
|
| 26 | 26 | |
| 27 | - return $this->content; |
|
| 28 | - } |
|
| 27 | + return $this->content; |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - public function check() |
|
| 31 | - { |
|
| 32 | - $args = func_get_args(); |
|
| 33 | - $return = call_user_func_array(array($this, 'execute'), $args); |
|
| 30 | + public function check() |
|
| 31 | + { |
|
| 32 | + $args = func_get_args(); |
|
| 33 | + $return = call_user_func_array(array($this, 'execute'), $args); |
|
| 34 | 34 | |
| 35 | - return $return; |
|
| 36 | - } |
|
| 37 | - |
|
| 38 | - public static function instance($class, $content) |
|
| 39 | - { |
|
| 40 | - $class_name = "{$class}Content"; |
|
| 41 | - Loader::load('utility', "content/{$class_name}"); |
|
| 42 | - return new $class_name($content); |
|
| 43 | - } |
|
| 35 | + return $return; |
|
| 36 | + } |
|
| 37 | + |
|
| 38 | + public static function instance($class, $content) |
|
| 39 | + { |
|
| 40 | + $class_name = "{$class}Content"; |
|
| 41 | + Loader::load('utility', "content/{$class_name}"); |
|
| 42 | + return new $class_name($content); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | 45 | } |
@@ -3,78 +3,78 @@ |
||
| 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 | |
@@ -5,110 +5,110 @@ |
||
| 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 | |
@@ -5,54 +5,54 @@ |
||
| 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 @@ |
||
| 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 | |
@@ -8,24 +8,24 @@ discard block |
||
| 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,47 +35,47 @@ discard block |
||
| 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 | - (object) array( |
|
| 72 | - 'pattern' => '@^/baltimore-river/peanut-butter-falls/?@', |
|
| 73 | - 'replace' => '/baltimore-river/konteko-falls/'), |
|
| 74 | - ); |
|
| 75 | - } |
|
| 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 | + (object) array( |
|
| 72 | + 'pattern' => '@^/baltimore-river/peanut-butter-falls/?@', |
|
| 73 | + 'replace' => '/baltimore-river/konteko-falls/'), |
|
| 74 | + ); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - protected function check_for_special_redirect($uri) |
|
| 78 | - { |
|
| 77 | + protected function check_for_special_redirect($uri) |
|
| 78 | + { |
|
| 79 | 79 | if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) { |
| 80 | 80 | $alias = $matches[1]; |
| 81 | 81 | $alias = str_replace("'", '', $alias); |
@@ -128,78 +128,78 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - return $uri; |
|
| 132 | - } |
|
| 131 | + return $uri; |
|
| 132 | + } |
|
| 133 | 133 | |
| 134 | - protected function get_direct_array() |
|
| 135 | - { |
|
| 136 | - return array( |
|
| 137 | - (object) array( |
|
| 138 | - 'match' => '/', |
|
| 139 | - 'controller' => 'HomeController'), |
|
| 140 | - (object) array( |
|
| 141 | - 'match' => '/falls/', |
|
| 142 | - 'controller' => 'WaterfallListController'), |
|
| 143 | - (object) array( |
|
| 144 | - 'match' => '/falls/([0-9]+)/', |
|
| 145 | - 'controller' => 'WaterfallListController'), |
|
| 146 | - (object) array( |
|
| 147 | - 'match' => '/([a-z]+)-county/', |
|
| 148 | - 'controller' => 'CountyListController'), |
|
| 149 | - (object) array( |
|
| 150 | - 'match' => '/([a-z]+)-county/([0-9]+)/', |
|
| 151 | - 'controller' => 'CountyListController'), |
|
| 152 | - (object) array( |
|
| 153 | - 'match' => '/([a-z0-9-]+)-(creek|river)/', |
|
| 154 | - 'controller' => 'WatercourseListController'), |
|
| 155 | - (object) array( |
|
| 156 | - 'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/', |
|
| 157 | - 'controller' => 'WatercourseListController'), |
|
| 158 | - (object) array( |
|
| 159 | - 'match' => '/category/([a-z]+)/', |
|
| 160 | - 'controller' => 'CategoryListController'), |
|
| 161 | - (object) array( |
|
| 162 | - 'match' => '/category/([a-z]+)/([0-9]+)/', |
|
| 163 | - 'controller' => 'CategoryListController'), |
|
| 164 | - (object) array( |
|
| 165 | - 'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/', |
|
| 166 | - 'controller' => 'WaterfallController'), |
|
| 167 | - (object) array( |
|
| 168 | - 'match' => '/map/', |
|
| 169 | - 'controller' => 'MapController'), |
|
| 134 | + protected function get_direct_array() |
|
| 135 | + { |
|
| 136 | + return array( |
|
| 137 | + (object) array( |
|
| 138 | + 'match' => '/', |
|
| 139 | + 'controller' => 'HomeController'), |
|
| 140 | + (object) array( |
|
| 141 | + 'match' => '/falls/', |
|
| 142 | + 'controller' => 'WaterfallListController'), |
|
| 143 | + (object) array( |
|
| 144 | + 'match' => '/falls/([0-9]+)/', |
|
| 145 | + 'controller' => 'WaterfallListController'), |
|
| 146 | + (object) array( |
|
| 147 | + 'match' => '/([a-z]+)-county/', |
|
| 148 | + 'controller' => 'CountyListController'), |
|
| 149 | + (object) array( |
|
| 150 | + 'match' => '/([a-z]+)-county/([0-9]+)/', |
|
| 151 | + 'controller' => 'CountyListController'), |
|
| 152 | + (object) array( |
|
| 153 | + 'match' => '/([a-z0-9-]+)-(creek|river)/', |
|
| 154 | + 'controller' => 'WatercourseListController'), |
|
| 155 | + (object) array( |
|
| 156 | + 'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/', |
|
| 157 | + 'controller' => 'WatercourseListController'), |
|
| 158 | + (object) array( |
|
| 159 | + 'match' => '/category/([a-z]+)/', |
|
| 160 | + 'controller' => 'CategoryListController'), |
|
| 161 | + (object) array( |
|
| 162 | + 'match' => '/category/([a-z]+)/([0-9]+)/', |
|
| 163 | + 'controller' => 'CategoryListController'), |
|
| 164 | + (object) array( |
|
| 165 | + 'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/', |
|
| 166 | + 'controller' => 'WaterfallController'), |
|
| 167 | + (object) array( |
|
| 168 | + 'match' => '/map/', |
|
| 169 | + 'controller' => 'MapController'), |
|
| 170 | 170 | (object) array( |
| 171 | 171 | 'match' => '/map/#[a-z-/]+', |
| 172 | 172 | 'controller' => 'MapController'), |
| 173 | - (object) array( |
|
| 174 | - 'match' => '/journal/', |
|
| 175 | - 'controller' => 'LogListController'), |
|
| 176 | - (object) array( |
|
| 177 | - 'match' => '/journal/([0-9]+)/', |
|
| 178 | - 'controller' => 'LogListController'), |
|
| 179 | - (object) array( |
|
| 180 | - 'match' => '/journal/[a-z-]+/', |
|
| 181 | - 'controller' => 'LogController'), |
|
| 182 | - (object) array( |
|
| 183 | - 'match' => '/companion/([a-z-]+)/', |
|
| 184 | - 'controller' => 'CompanionListController'), |
|
| 185 | - (object) array( |
|
| 186 | - 'match' => '/companion/([a-z-]+)/([0-9]+)/', |
|
| 187 | - 'controller' => 'CompanionListController'), |
|
| 188 | - (object) array( |
|
| 189 | - 'match' => '/period/([a-z-]+)/', |
|
| 190 | - 'controller' => 'PeriodListController'), |
|
| 191 | - (object) array( |
|
| 192 | - 'match' => '/period/([a-z-]+)/([0-9]+)/', |
|
| 193 | - 'controller' => 'PeriodListController'), |
|
| 194 | - (object) array( |
|
| 195 | - 'match' => '/journal/tag/([a-z-]+)/', |
|
| 196 | - 'controller' => 'LogTagListController'), |
|
| 197 | - (object) array( |
|
| 198 | - 'match' => '/journal/tag/([a-z-]+)/([0-9]+)/', |
|
| 199 | - 'controller' => 'LogTagListController'), |
|
| 200 | - (object) array( |
|
| 201 | - 'match' => '/about/', |
|
| 202 | - 'controller' => 'AboutController')); |
|
| 203 | - } |
|
| 173 | + (object) array( |
|
| 174 | + 'match' => '/journal/', |
|
| 175 | + 'controller' => 'LogListController'), |
|
| 176 | + (object) array( |
|
| 177 | + 'match' => '/journal/([0-9]+)/', |
|
| 178 | + 'controller' => 'LogListController'), |
|
| 179 | + (object) array( |
|
| 180 | + 'match' => '/journal/[a-z-]+/', |
|
| 181 | + 'controller' => 'LogController'), |
|
| 182 | + (object) array( |
|
| 183 | + 'match' => '/companion/([a-z-]+)/', |
|
| 184 | + 'controller' => 'CompanionListController'), |
|
| 185 | + (object) array( |
|
| 186 | + 'match' => '/companion/([a-z-]+)/([0-9]+)/', |
|
| 187 | + 'controller' => 'CompanionListController'), |
|
| 188 | + (object) array( |
|
| 189 | + 'match' => '/period/([a-z-]+)/', |
|
| 190 | + 'controller' => 'PeriodListController'), |
|
| 191 | + (object) array( |
|
| 192 | + 'match' => '/period/([a-z-]+)/([0-9]+)/', |
|
| 193 | + 'controller' => 'PeriodListController'), |
|
| 194 | + (object) array( |
|
| 195 | + 'match' => '/journal/tag/([a-z-]+)/', |
|
| 196 | + 'controller' => 'LogTagListController'), |
|
| 197 | + (object) array( |
|
| 198 | + 'match' => '/journal/tag/([a-z-]+)/([0-9]+)/', |
|
| 199 | + 'controller' => 'LogTagListController'), |
|
| 200 | + (object) array( |
|
| 201 | + 'match' => '/about/', |
|
| 202 | + 'controller' => 'AboutController')); |
|
| 203 | + } |
|
| 204 | 204 | |
| 205 | 205 | } |
