jacobemerick / web

collector/Collector.class.inc.php

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 abstract class Collector
 {
 
-	protected static function run_query($query)
-	{
-		return Database::select($query);
-	}
-
-	protected static function run_row_query($query)
-	{
-		return Database::selectRow($query);
-	}
-
-	protected static function get_count($query)
-	{
-		return Database::selectRow($query)->count;
-	}
-
-	protected static function check_exists($query)
-	{
-		return Database::selectRow($query) !== null;
-	}
-
-	protected static function escape($string)
-	{
-		return Database::escape($string);
-	}
+    protected static function run_query($query)
+    {
+        return Database::select($query);
+    }
+
+    protected static function run_row_query($query)
+    {
+        return Database::selectRow($query);
+    }
+
+    protected static function get_count($query)
+    {
+        return Database::selectRow($query)->count;
+    }
+
+    protected static function check_exists($query)
+    {
+        return Database::selectRow($query) !== null;
+    }
+
+    protected static function escape($string)
+    {
+        return Database::escape($string);
+    }
 
 }

Braces +12 added lines, -12 removed lines

@@ -2,31 +2,31 @@
 
 Loader::loadInstance('utility', 'Database');
 
-abstract class Collector
-{
+abstract class Collector

+{

 
-	protected static function run_query($query)
-	{
+	protected static function run_query($query)

+	{

 		return Database::select($query);
 	}
 
-	protected static function run_row_query($query)
-	{
+	protected static function run_row_query($query)

+	{

 		return Database::selectRow($query);
 	}
 
-	protected static function get_count($query)
-	{
+	protected static function get_count($query)

+	{

 		return Database::selectRow($query)->count;
 	}
 
-	protected static function check_exists($query)
-	{
+	protected static function check_exists($query)

+	{

 		return Database::selectRow($query) !== null;
 	}
 
-	protected static function escape($string)
-	{
+	protected static function escape($string)

+	{

 		return Database::escape($string);
 	}
 

controller/Error301Controller.class.inc.php

Indentation +7 added lines, -7 removed lines

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

Braces +10 added lines, -6 removed lines

@@ -2,16 +2,20 @@
 
 Loader::load('controller', '/PageController');
 
-class Error301Controller extends PageController
-{
+class Error301Controller extends PageController

+{

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

+	{

 		Header::redirect($uri);
 		exit;
 	}
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function 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 +10 added lines, -6 removed lines

@@ -2,16 +2,20 @@
 
 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;
 	}
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function set_body_data()

+	{

+}
 
 }

utility/content/FetchFirstPhotoContent.class.inc.php

Indentation +37 added lines, -37 removed lines

@@ -5,47 +5,47 @@
 final class FetchFirstPhotoContent extends Content
 {
 
-	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
-	private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
-	private static $DEFAULT_RETURN = '';
-
-	protected function execute($is_absolute = false, $size = 'thumb')
-	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
-		else
-			$this->content = self::$DEFAULT_RETURN;
-		return;
-	}
-
-	private function get_file_path($category, $photo, $size, $extension)
-	{
-		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
-		return Loader::getImagePath('photo', $path);
-	}
-
-	private function get_thumb($string, $is_absolute, $size)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
+    private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
+    private static $DEFAULT_RETURN = '';
+
+    protected function execute($is_absolute = false, $size = 'thumb')
+    {
+        if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
+            $this->content = $this->get_thumb($match[1], $is_absolute, $size);
+        else
+            $this->content = self::$DEFAULT_RETURN;
+        return;
+    }
+
+    private function get_file_path($category, $photo, $size, $extension)
+    {
+        $path = "{$category}/{$photo}-size-{$size}.{$extension}";
+        return Loader::getImagePath('photo', $path);
+    }
+
+    private function get_thumb($string, $is_absolute, $size)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
-		$file_size = getimagesize($file_path);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
 		
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootURL(URLDecode::getSite());
 
-		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
-	}
+        return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
+    }
 
 }

Braces +19 added lines, -16 removed lines

@@ -2,30 +2,31 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FetchFirstPhotoContent extends Content
-{
+final class FetchFirstPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
 	private static $DEFAULT_RETURN = '';
 
-	protected function execute($is_absolute = false, $size = 'thumb')
-	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
-		else
-			$this->content = self::$DEFAULT_RETURN;
+	protected function execute($is_absolute = false, $size = 'thumb')

+	{

+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {

+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);

+		} else {

+					$this->content = self::$DEFAULT_RETURN;

+		}

 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_thumb($string, $is_absolute, $size)
-	{
+	private function get_thumb($string, $is_absolute, $size)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -34,16 +35,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+		if($is_absolute) {

+					$domain = Loader::getRootURL(URLDecode::getSite());

+		}

 
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
 	}

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 
 	protected function execute($is_absolute = false, $size = 'thumb')
 	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
+		if (preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
 			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
 		else
 			$this->content = self::$DEFAULT_RETURN;
@@ -34,7 +34,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -42,7 +42,7 @@ 
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
+		if ($is_absolute)
 			$domain = Loader::getRootURL(URLDecode::getSite());
 
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

utility/content/FixPhotoContent.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -5,50 +5,50 @@
 final class FixPhotoContent extends Content
 {
 
-	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
-	private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
-	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>';
+    private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
+    private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
+    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>';
 
-	protected function execute($is_absolute = false, $size = 'medium')
-	{
-		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
-		{
-			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
-			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
-		}
-		return;
-	}
+    protected function execute($is_absolute = false, $size = 'medium')
+    {
+        preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
+        foreach($matches[1] as $key => $match)
+        {
+            $photo_content = $this->get_photo_content($match, $size, $is_absolute);
+            $this->content = str_replace($matches[0][$key], $photo_content, $this->content);
+        }
+        return;
+    }
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
-		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
-		return Loader::getImagePath('photo', $path);
-	}
+    private function get_file_path($category, $photo, $size, $extension)
+    {
+        $path = "{$category}/{$photo}-size-{$size}.{$extension}";
+        return Loader::getImagePath('photo', $path);
+    }
 
-	private function get_photo_content($string, $size, $is_absolute)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    private function get_photo_content($string, $size, $is_absolute)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
 		
-		$file_size = getimagesize($file_path);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
         
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootUrl('blog');
 		
-		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
-	}
+        return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
+    }
 
 }

Braces +14 added lines, -12 removed lines

@@ -2,15 +2,15 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FixPhotoContent extends Content
-{
+final class FixPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
 	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>';
 
-	protected function execute($is_absolute = false, $size = 'medium')
-	{
+	protected function execute($is_absolute = false, $size = 'medium')

+	{

 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
@@ -20,14 +20,14 @@ 
 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_photo_content($string, $size, $is_absolute)
-	{
+	private function get_photo_content($string, $size, $is_absolute)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -37,16 +37,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
         
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+		if($is_absolute) {

+					$domain = Loader::getRootUrl('blog');

+		}

 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
 	}

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	protected function execute($is_absolute = false, $size = 'medium')
 	{
 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
 			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
 			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
@@ -37,7 +37,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -45,7 +45,7 @@ 
 		$description = $photo_result->description;
         
 		$domain = '/';
-		if($is_absolute)
+		if ($is_absolute)
 			$domain = Loader::getRootUrl('blog');
 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);

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 +12 added lines, -12 removed lines

@@ -1,42 +1,42 @@
 <?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/LifestreamRouter.class.inc.php

Indentation +47 added lines, -47 removed lines

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

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('router', 'Router');
 
-class LifestreamRouter extends Router
-{
+class LifestreamRouter extends Router

+{

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

+	{

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

+	{

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

router/AJAXRouter.class.inc.php

Indentation +14 added lines, -14 removed lines

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

Braces +6 added lines, -6 removed lines

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

+{

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

+	{

 		return array(
 			(object) array(
 				'pattern' => '@^/$@',
 				'replace' => 'https://home.jacobemerick.com/'));
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()

+	{

 		return array(
 			(object) array(
 				'match' => '/get/portfolioImage.json',

router/WaterfallRouter.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -5,11 +5,11 @@ 
     '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 +71,8 @@ 
 		);
 	}
 
-	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 +128,8 @@ 
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()

+	{

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

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,47 +35,47 @@ 
             (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' => '@^/baltimore-river/peanut-butter-falls/?@',
-				'replace' => '/baltimore-river/konteko-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/'),
+            (object) array(
+                'pattern' => '@^/baltimore-river/peanut-butter-falls/?@',
+                'replace' => '/baltimore-river/konteko-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);
@@ -128,78 +128,78 @@ 
             }
         }
         
-		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' => '/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'));
+    }
 
 }