jacobemerick / web

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

@@ -19,26 +19,26 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/robots.txt')
+		if (URLDecode::getURI() == '/robots.txt')
 			return 'RobotRouter';
-		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() == 'css')
+		if (URLDecode::getExtension() == 'css')
 			return 'StyleRouter';
-		if(URLDecode::getExtension() == 'js')
+		if (URLDecode::getExtension() == 'js')
 			return 'ScriptRouter';
-		if(URLDecode::getExtension() == 'ico')
+		if (URLDecode::getExtension() == 'ico')
 			return 'ImageRouter';
-		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';
@@ -86,37 +86,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' ||
@@ -129,13 +129,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;
@@ -152,12 +152,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}";
 		}
 		
@@ -166,19 +166,19 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
-		if(URLDecode::getURI() == '/robots.txt')
+		if (URLDecode::getURI() == '/robots.txt')
 			return 'robot';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'rss';
-		if(URLDecode::getExtension() == 'css')
+		if (URLDecode::getExtension() == 'css')
 			return 'styles';
-		if(URLDecode::getExtension() == 'js')
+		if (URLDecode::getExtension() == 'js')
 			return 'scripts';
-		if(
+		if (
 			URLDecode::getExtension() == 'jpg' ||
 			URLDecode::getExtension() == 'ico' ||
 			URLDecode::getExtension() == 'png')

Braces +63 added lines, -42 removed lines

@@ -19,24 +19,33 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/robots.txt')
-			return 'RobotRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
-			return 'RSSRouter';
-		if(URLDecode::getExtension() == 'css')
-			return 'StyleRouter';
-		if(URLDecode::getExtension() == 'js')
-			return 'ScriptRouter';
-		if(URLDecode::getExtension() == 'ico')
-			return 'ImageRouter';
-		if(URLDecode::getExtension() == 'jpg')
-			return 'ImageRouter';
-		if(URLDecode::getExtension() == 'png')
-			return 'ImageRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'RobotRouter';

+		}

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

+					return 'SitemapRouter';

+		}

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

+					return 'RSSRouter';

+		}

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

+					return 'StyleRouter';

+		}

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

+					return 'ScriptRouter';

+		}

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

+					return 'ImageRouter';

+		}

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

+					return 'ImageRouter';

+		}

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

+					return 'ImageRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -93,19 +102,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')
@@ -154,11 +166,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';
@@ -166,23 +180,30 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
-		if(URLDecode::getURI() == '/robots.txt')
-			return 'robot';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
-			return 'rss';
-		if(URLDecode::getExtension() == 'css')
-			return 'styles';
-		if(URLDecode::getExtension() == 'js')
-			return 'scripts';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'robot';

+		}

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

+					return 'sitemap';

+		}

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

+					return 'rss';

+		}

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

+					return 'styles';

+		}

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

+					return 'scripts';

+		}

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

+					return 'images';

+		}

 		
 		return URLDecode::getSite();
 	}

router/map.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 	)
 );
 
-Router::route($redirect,$direct);
+Router::route($redirect, $direct);
 
 ?>
\ No newline at end of file

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/PostController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
+		if (!$id || !is_numeric($id))
 			$this->eject();
 		
 		$post = ActivityCollector::getPost($id);
-		if(!$post)
+		if (!$post)
 			$this->eject();
 		
-		if(URLDecode::getPiece(1) != $post->type)
+		if (URLDecode::getPiece(1) != $post->type)
 			$this->eject();
 		
 		$this->post = $post;
@@ -59,7 +59,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->post->type)
+		switch ($this->post->type)
 		{
 			case 'blog' :
 				return 'Jacob blogged';
@@ -84,7 +84,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->post->type)
+		switch ($this->post->type)
 		{
 			case 'blog' :
 				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';

Braces +9 added lines, -6 removed lines

@@ -20,15 +20,18 @@
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		
 		$post = ActivityCollector::getPost($id);
-		if(!$post)
-			$this->eject();
+		if(!$post) {

+					$this->eject();

+		}

 		
-		if(URLDecode::getPiece(1) != $post->type)
-			$this->eject();
+		if(URLDecode::getPiece(1) != $post->type) {

+					$this->eject();

+		}

 		
 		$this->post = $post;
 	}