jacobemerick / web

router/WaterfallRouter.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
 Loader::load('collector', array(
-    'waterfall/LogCollector',
-    'waterfall/WaterfallCollector'));
+	'waterfall/LogCollector',
+	'waterfall/WaterfallCollector'));
 Loader::load('router', 'Router');
 
 class WaterfallRouter extends Router
@@ -26,15 +26,15 @@ 
 			(object) array(
 				'pattern' => '@^/falls/results(/?)$@',
 				'replace' => '/falls/'),
-            (object) array(
-                'pattern' => '@^/log(/?)$@',
-                'replace' => '/journal/'),
-            (object) array(
-                'pattern' => '@^/log/(\d+)(/?)$@',
-                'replace' => '/journal/$1'),
-            (object) array(
-                'pattern' => '@^/map/([^/]+)(/?)$@',
-                'replace' => '/map/'),
+			(object) array(
+				'pattern' => '@^/log(/?)$@',
+				'replace' => '/journal/'),
+			(object) array(
+				'pattern' => '@^/log/(\d+)(/?)$@',
+				'replace' => '/journal/$1'),
+			(object) array(
+				'pattern' => '@^/map/([^/]+)(/?)$@',
+				'replace' => '/map/'),
 			(object) array(
 				'pattern' => '@^/about/([a-z]*)(/?)$@',
 				'replace' => '/about/'),
@@ -73,57 +73,57 @@ 
 
 	protected function check_for_special_redirect($uri)
 	{
-        if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/{$result->watercourse_alias}/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/{$result->watercourse_alias}/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = explode('-', $alias);
-            array_pop($alias);
-            $alias = implode('-', $alias);
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/{$result->watercourse_alias}/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = explode('-', $alias);
+			array_pop($alias);
+			$alias = implode('-', $alias);
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/{$result->watercourse_alias}/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
-            $date = $matches[1];
-            $date = explode('-', $date);
-            $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
-            $date = date('Y-m-d', $date);
-            $result = LogCollector::getByDate($date);
-            if ($result !== null) {
-                return "/journal/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
+			$date = $matches[1];
+			$date = explode('-', $date);
+			$date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
+			$date = date('Y-m-d', $date);
+			$result = LogCollector::getByDate($date);
+			if ($result !== null) {
+				return "/journal/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/map/#{$result->watercourse_alias}/{$result->alias}";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/map/#{$result->watercourse_alias}/{$result->alias}";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
 		return $uri;
 	}
@@ -164,9 +164,9 @@ 
 			(object) array(
 				'match' => '/map/',
 				'controller' => 'MapController'),
-            (object) array(
-                'match' => '/map/#[a-z-/]+',
-                'controller' => 'MapController'),
+			(object) array(
+				'match' => '/map/#[a-z-/]+',
+				'controller' => 'MapController'),
 			(object) array(
 				'match' => '/journal/',
 				'controller' => 'LogListController'),

router/BlogRouter.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
 			Loader::load('collector', 'blog/PostCollector');
 			$post = PostCollector::getPostByURI($matches[2]);
-			if(!$post)
+			if (!$post)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();
@@ -61,21 +61,21 @@ 
 		else
 		{
 			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
+			if ($post_uri !== null)
 			{
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($post_uri);
 				
-				if($post != false)
+				if ($post != false)
 				{
 					Loader::load('utility', 'Content');
 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
 				}
 			}
 		}
-		if($uri == '/search/')
+		if ($uri == '/search/')
 		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
 			{
 				$uri .= Request::getGet('search');
 				$uri .= '/';

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 			
 			Loader::load('utility', 'Content');
 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
-		}
-		else
+		} else
 		{
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
 			Loader::load('collector', 'portfolio/PortfolioCollector');
 			$piece = PortfolioCollector::getPieceByURI($matches[1]);
 			
-			if($piece === null)
+			if ($piece === null)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();

router/Router.class.inc.php

Indentation +6 added lines, -6 removed lines

@@ -96,9 +96,9 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
@@ -129,8 +129,8 @@ 
 			}
 
 			$image = new ImageOld($file);
-        	        if(!$image->isValid()) {
-                	        Loader::loadNew('controller', '/Error404Controller')->activate();
+					if(!$image->isValid()) {
+							Loader::loadNew('controller', '/Error404Controller')->activate();
 				exit();
 			}
 		}
@@ -201,7 +201,7 @@ 
 			URLDecode::getExtension() != 'jpg' &&
 			URLDecode::getExtension() != 'png' &&
 			URLDecode::getExtension() != 'ico' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

Spacing +22 added lines, -22 removed lines

@@ -19,18 +19,18 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'RSSRouter';
-		if(URLDecode::getExtension() == 'jpg')
+		if (URLDecode::getExtension() == 'jpg')
 			return 'ImageRouter';
-		if(URLDecode::getExtension() == 'png')
+		if (URLDecode::getExtension() == 'png')
 			return 'ImageRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -78,37 +78,37 @@ 
 
 	final protected function check_for_redirect($redirect_uri)
 	{
-		foreach($this->get_redirect_array() as $check)
+		foreach ($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
 		}
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
+		if ($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http')
+		if (substr($redirect_uri, 0, 4) == 'http')
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			Loader::loadNew('controller', '/Error404Controller')
 				->activate();
 			exit;
 		}
 
-		if($this->get_primary_folder() == 'images') {
-			$file = $controller_check;//URLDecode::getURI();
+		if ($this->get_primary_folder() == 'images') {
+			$file = $controller_check; //URLDecode::getURI();
 
 			if (
 				URLDecode::getSite() == 'images' ||
@@ -121,13 +121,13 @@ 
 			}
 
 			$image = new ImageOld($file);
-        	        if(!$image->isValid()) {
+        	        if (!$image->isValid()) {
                 	        Loader::loadNew('controller', '/Error404Controller')->activate();
 				exit();
 			}
 		}
 		
-		if(substr($redirect_uri, 0, 4) != 'http')
+		if (substr($redirect_uri, 0, 4) != 'http')
 		{
 			$redirect_uri = substr($redirect_uri, 1);
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -144,12 +144,12 @@ 
 
 	final private function get_controller($uri)
 	{
-		foreach($this->get_direct_array() as $check)
+		foreach ($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
+			if ($uri == $check->match)
 				return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
+			if (preg_match("@^{$check->match}$@", $uri))
 				return "{$this->get_primary_folder()}/{$check->controller}";
 		}
 		
@@ -158,13 +158,13 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'rss';
-		if(
+		if (
 			URLDecode::getExtension() == 'jpg' ||
 			URLDecode::getExtension() == 'png')
 			return 'images';

Braces +42 added lines, -28 removed lines

@@ -19,16 +19,21 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
-			return 'RSSRouter';
-		if(URLDecode::getExtension() == 'jpg')
-			return 'ImageRouter';
-		if(URLDecode::getExtension() == 'png')
-			return 'ImageRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'SitemapRouter';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'RSSRouter';

+		}

+		if(URLDecode::getExtension() == 'jpg') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'png') {

+					return 'ImageRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -85,19 +90,22 @@ 
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http')
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
+		if(substr($redirect_uri, 0, 4) == 'http') {

+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		}

 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -146,11 +154,13 @@ 
 	{
 		foreach($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}
 		
 		return '/Error404Controller';
@@ -158,16 +168,20 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
-			return 'rss';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'sitemap';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'rss';

+		}

 		if(
 			URLDecode::getExtension() == 'jpg' ||
-			URLDecode::getExtension() == 'png')
-			return 'images';
+			URLDecode::getExtension() == 'png') {

+					return 'images';

+		}

 		
 		return URLDecode::getSite();
 	}

router/SitemapRouter.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
 	protected function get_direct_array()
 	{
 		$site = URLDecode::getSite();
-        if ($site == 'waterfalls') {
-            $site = 'waterfall';
-        }
+		if ($site == 'waterfalls') {
+			$site = 'waterfall';
+		}
 		$site = ucwords($site);
 		
 		return array(

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -153,9 +153,9 @@
 		return self::run_query($query);
 	}
 
-    public static function getParentWatercourse($watercourse)
-    {
-    }
+	public static function getParentWatercourse($watercourse)
+	{
+	}
 
 	public static function getLogCountForWatercourse($watercourse)
 	{

controller/AJAXController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	protected function set_response($message, $type = 'internal')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'internal' :
 				$this->response['internal'] = $message;

controller/rss/BlogPostRSSController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	{
 		$post_result = PostCollector::getMainList(250);
 		
-		foreach($post_result as $post)
+		foreach ($post_result as $post)
 		{
 			$this->addItem(
 				$post->title,

controller/lifestream/TagController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Jacob has a Blog';
@@ -71,7 +71,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Yeah, Jacob has a blog. Check out his posting activity.';
@@ -97,7 +97,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -117,16 +117,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream') . $this->tag . '/';
 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
@@ -134,7 +134,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = ActivityCollector::getCountForTag($this->tag);
 		return $this->total_post_count;
 	}

Braces +15 added lines, -10 removed lines

@@ -97,8 +97,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -117,25 +118,29 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Loader::getRootUrl('lifestream') . $this->tag . '/';

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->postRepository->getPostsByTypeCount($this->tag);
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->postRepository->getPostsByTypeCount($this->tag);

+		}

 		return $this->total_post_count;
 	}