jacobemerick / web

controller/home/AboutController.class.inc.php

Indentation +22 added lines, -22 removed lines

@@ -5,32 +5,32 @@
 final class AboutController extends DefaultPageController
 {
 
-	private static $TITLE = 'About | Jacob Emerick';
-	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
+    private static $TITLE = 'About | Jacob Emerick';
+    private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'about',
-		'bio',
-		'web developer',
-		'hiker');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'about',
+        'bio',
+        'web developer',
+        'hiker');
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body_view('About');
+    protected function set_body_data()
+    {
+        $this->set_body_view('About');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }
\ No newline at end of file

Braces +4 added lines, -6 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'home/DefaultPageController');
 
-final class AboutController extends DefaultPageController
-{
+final class AboutController extends DefaultPageController

+{

 
 	private static $TITLE = 'About | Jacob Emerick';
 	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
@@ -17,8 +17,7 @@ 
 		'web developer',
 		'hiker');
 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -26,8 +25,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body_view('About');
 		
 		parent::set_body_data();

controller/site/TermsController.class.inc.php

Indentation +13 added lines, -13 removed lines

@@ -5,22 +5,22 @@
 final class TermsController extends DefaultPageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_title("Terms of Use for Jacob Emerick's Sites");
-		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
-		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
+    protected function set_head_data()
+    {
+        $this->set_title("Terms of Use for Jacob Emerick's Sites");
+        $this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
+        $this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('top_data', array('title' => 'Terms of Use'));
+    protected function set_body_data()
+    {
+        $this->set_body('top_data', array('title' => 'Terms of Use'));
 		
-		$this->set_body('body_view', 'Terms');
+        $this->set_body('body_view', 'Terms');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }

Braces +4 added lines, -6 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class TermsController extends DefaultPageController
-{
+final class TermsController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Terms of Use for Jacob Emerick's Sites");
 		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
 		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
@@ -14,8 +13,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('top_data', array('title' => 'Terms of Use'));
 		
 		$this->set_body('body_view', 'Terms');

controller/site/HomeController.class.inc.php

Indentation +12 added lines, -12 removed lines

@@ -5,20 +5,20 @@
 final class HomeController extends DefaultPageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_title("Jacob Emerick's Site Information | General and Technical Information");
-		$this->set_description("Meta information about Jacob Emerick's websites and content. Introduces the man behind the code, discusses the reasons behind the sites, and goes into some technical background of the custom framework.");
-		$this->set_keywords(array('site', 'technical', 'support', 'help', 'information', 'Jacob Emerick'));
+    protected function set_head_data()
+    {
+        $this->set_title("Jacob Emerick's Site Information | General and Technical Information");
+        $this->set_description("Meta information about Jacob Emerick's websites and content. Introduces the man behind the code, discusses the reasons behind the sites, and goes into some technical background of the custom framework.");
+        $this->set_keywords(array('site', 'technical', 'support', 'help', 'information', 'Jacob Emerick'));
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('body_view', 'Home');
+    protected function set_body_data()
+    {
+        $this->set_body('body_view', 'Home');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }
\ No newline at end of file

Braces +4 added lines, -6 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Jacob Emerick's Site Information | General and Technical Information");
 		$this->set_description("Meta information about Jacob Emerick's websites and content. Introduces the man behind the code, discusses the reasons behind the sites, and goes into some technical background of the custom framework.");
 		$this->set_keywords(array('site', 'technical', 'support', 'help', 'information', 'Jacob Emerick'));
@@ -14,8 +13,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('body_view', 'Home');
 		
 		parent::set_body_data();

controller/Error303Controller.class.inc.php

Indentation +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
 class Error303Controller extends PageController
 {
 
-	public function __construct($uri)
-	{
-		Header::redirect($uri, 303);
-		exit;
-	}
+    public function __construct($uri)
+    {
+        Header::redirect($uri, 303);
+        exit;
+    }
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+    protected function set_head_data() {}
+    protected function set_body_data() {}
 
 }

Braces +3 added lines, -4 removed lines

@@ -2,11 +2,10 @@
 
 Loader::load('controller', '/PageController');
 
-class Error303Controller extends PageController
-{
+class Error303Controller extends PageController

+{

 
-	public function __construct($uri)
-	{
+	public function __construct($uri) {

 		Header::redirect($uri, 303);
 		exit;
 	}

controller/Error404Controller.class.inc.php

Indentation +30 added lines, -30 removed lines

@@ -5,58 +5,58 @@
 class Error404Controller extends PageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_header_method('send404');
-		$this->add_css('normalize');
-		$this->add_css('404');
+    protected function set_head_data()
+    {
+        $this->set_header_method('send404');
+        $this->add_css('normalize');
+        $this->add_css('404');
 		
-		$this->set_title("Jacob Emerick's 404 Page");
-		$this->set_head('description', 'Global 404 page for sites under jacobemerick.com. Page not found!');
-		$this->set_head('keywords', '');
-	}
+        $this->set_title("Jacob Emerick's 404 Page");
+        $this->set_head('description', 'Global 404 page for sites under jacobemerick.com. Page not found!');
+        $this->set_head('keywords', '');
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('site_list', $this->get_sites());
+    protected function set_body_data()
+    {
+        $this->set_body('site_list', $this->get_sites());
 		
-		$this->set_body_view('/404');
-	}
+        $this->set_body_view('/404');
+    }
 
-	private function get_sites()
-	{
+    private function get_sites()
+    {
     return [
-      [
+        [
         'url' => 'https://home.jacobemerick.com/',
         'title' => "Jacob Emerick's Home",
         'name' => 'Home'
-      ],
-      [
+        ],
+        [
         'url' => 'https://blog.jacobemerick.com/',
         'title' => "Jacob Emerick's Blog",
         'name' => 'Blog'
-      ],
-      [
+        ],
+        [
         'url' => 'https://lifestream.jacobemerick.com/',
         'title' => "Jacob Emerick's Lifestream",
         'name' => 'Lifestream'
-      ],
-      [
+        ],
+        [
         'url' => 'https://map.jacobemerick.com/',
         'title' => "Jacob Emerick's Hiking Map",
         'name' => 'Map'
-      ],
-      [
+        ],
+        [
         'url' => 'https://portfolio.jacobemerick.com/',
         'title' => "Jacob Emerick's Portfolio",
         'name' => 'Portfolio',
-      ],
-      [
+        ],
+        [
         'url' => 'https://www.waterfallsofthekeweenaw.com/',
         'title' => 'Waterfalls of the Keweenaw',
         'name' => 'Waterfalls'
-      ]
-  ];
-	}
+        ]
+    ];
+    }
 
 }

Braces +5 added lines, -8 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', '/PageController');
 
-class Error404Controller extends PageController
-{
+class Error404Controller extends PageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_header_method('send404');
 		$this->add_css('normalize');
 		$this->add_css('404');
@@ -16,15 +15,13 @@ 
 		$this->set_head('keywords', '');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('site_list', $this->get_sites());
 		
 		$this->set_body_view('/404');
 	}
 
-	private function get_sites()
-	{
+	private function get_sites() {

     return [
       [
         'url' => 'https://home.jacobemerick.com/',

utility/content/URLSafeContent.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@
 class URLSafeContent extends Content
 {
 
-	protected function execute()
-	{
-		$this->content = strtolower(str_replace(' ', '-', $this->content));
-	}
+    protected function execute()
+    {
+        $this->content = strtolower(str_replace(' ', '-', $this->content));
+    }
 
 }
\ No newline at end of file

Braces +3 added lines, -4 removed lines

@@ -2,11 +2,10 @@
 
 Loader::load('utility', 'Content');
 
-class URLSafeContent extends Content
-{
+class URLSafeContent extends Content

+{

 
-	protected function execute()
-	{
+	protected function execute() {

 		$this->content = strtolower(str_replace(' ', '-', $this->content));
 	}
 

utility/Content.class.inc.php

Indentation +35 added lines, -35 removed lines

@@ -3,43 +3,43 @@
 abstract class Content
 {
 
-	protected $original_content;
-	protected $content;
-
-	function __construct($content)
-	{
-		$this->original_content = $content;
-		$this->content = $content;
-	}
-
-	public function getOriginal()
-	{
-		return $this->original_content;
-	}
-
-	abstract protected function execute();
-
-	public function activate()
-	{
-		$args = func_get_args();
-		call_user_func_array(array($this, 'execute'), $args);
+    protected $original_content;
+    protected $content;
+
+    function __construct($content)
+    {
+        $this->original_content = $content;
+        $this->content = $content;
+    }
+
+    public function getOriginal()
+    {
+        return $this->original_content;
+    }
+
+    abstract protected function execute();
+
+    public function activate()
+    {
+        $args = func_get_args();
+        call_user_func_array(array($this, 'execute'), $args);
 		
-		return $this->content;
-	}
+        return $this->content;
+    }
 
-	public function check()
-	{
-		$args = func_get_args();
-		$return = call_user_func_array(array($this, 'execute'), $args);
+    public function check()
+    {
+        $args = func_get_args();
+        $return = call_user_func_array(array($this, 'execute'), $args);
 		
-		return $return;
-	}
-
-	public static function instance($class, $content)
-	{
-		$class_name = "{$class}Content";
-		Loader::load('utility', "content/{$class_name}");
-		return new $class_name($content);
-	}
+        return $return;
+    }
+
+    public static function instance($class, $content)
+    {
+        $class_name = "{$class}Content";
+        Loader::load('utility', "content/{$class_name}");
+        return new $class_name($content);
+    }
 
 }

Braces +7 added lines, -12 removed lines

@@ -1,42 +1,37 @@
 <?php
 
-abstract class Content
-{
+abstract class Content

+{

 
 	protected $original_content;
 	protected $content;
 
-	function __construct($content)
-	{
+	function __construct($content) {

 		$this->original_content = $content;
 		$this->content = $content;
 	}
 
-	public function getOriginal()
-	{
+	public function getOriginal() {

 		return $this->original_content;
 	}
 
 	abstract protected function execute();
 
-	public function activate()
-	{
+	public function activate() {

 		$args = func_get_args();
 		call_user_func_array(array($this, 'execute'), $args);
 		
 		return $this->content;
 	}
 
-	public function check()
-	{
+	public function check() {

 		$args = func_get_args();
 		$return = call_user_func_array(array($this, 'execute'), $args);
 		
 		return $return;
 	}
 
-	public static function instance($class, $content)
-	{
+	public static function instance($class, $content) {

 		$class_name = "{$class}Content";
 		Loader::load('utility', "content/{$class_name}");
 		return new $class_name($content);

router/WaterfallRouter.class.inc.php

Indentation +127 added lines, -127 removed lines

@@ -8,24 +8,24 @@ 
 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 @@ 
             (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 @@ 
             }
         }
         
-		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'));
+    }
 
 }

Braces +5 added lines, -8 removed lines

@@ -5,11 +5,10 @@ 
     'waterfall/WaterfallCollector'));
 Loader::load('router', 'Router');
 
-class WaterfallRouter extends Router
-{
+class WaterfallRouter extends Router

+{

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

 		return array(
 			(object) array(
 				'pattern' => '@/index.(html|htm|php)$@',
@@ -71,8 +70,7 @@ 
 		);
 	}
 
-	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);
@@ -128,8 +126,7 @@ 
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array() {

 		return array(
 			(object) array(
 				'match' => '/',

router/HomeRouter.class.inc.php

Indentation +20 added lines, -20 removed lines

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

Braces +4 added lines, -6 removed lines

@@ -2,19 +2,17 @@
 
 Loader::load('router', 'Router');
 
-final class HomeRouter extends Router
-{
+final class HomeRouter extends Router

+{

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

 		return array(
 			(object) array(
 				'pattern' => '@/index.(html|htm|php)$@',
 				'replace' => ''));
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array() {

 		return array(
 			(object) array(
 				'match' => '/',