Inspection of "Line endings are hard" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 67df75...25777a )

by Jacob

created 2015-12-22 13:15 UTC

Status

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 			(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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 			(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'),

Please login to merge, or discard this patch.

router/BlogRouter.class.inc.php 1 patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -57,8 +57,7 @@
 block discarded – undo
 			
 			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)

Please login to merge, or discard this patch.

router/Router.class.inc.php 2 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -96,9 +96,9 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 			}
 
 			$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 @@  discard block
 block discarded – undo
 			URLDecode::getExtension() != 'jpg' &&
 			URLDecode::getExtension() != 'png' &&
 			URLDecode::getExtension() != 'ico' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

Please login to merge, or discard this patch.

Braces +63 added lines, -42 removed lines patch added patch discarded remove patch

@@ -19,24 +19,33 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 		
 		$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 @@  discard block
 block discarded – undo
 	{
 		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 @@  discard block
 block discarded – undo
 
 	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();
 	}

Please login to merge, or discard this patch.

router/SitemapRouter.class.inc.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

collector/comment/CommentCollector.class.inc.php 2 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -114,9 +114,9 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-    public static function getRecentWaterfallComments($count = 5)
-    {
-        $query = "
+	public static function getRecentWaterfallComments($count = 5)
+	{
+		$query = "
             SELECT
                 `comment_meta`.`id`,
                 CONCAT('journal/', `log`.`alias`) AS `log_path`,
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
                 `comment_meta`.`date` DESC
             LIMIT {$count}";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getCommentsForURL($site, $path, $commenter = 0)
 	{

Please login to merge, or discard this patch.

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch

@@ -163,10 +163,11 @@
 block discarded – undo
 	{
 		$path = self::escape($path);
 		
-		if($commenter != 0)
-			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
-		else
-			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
+		if($commenter != 0) {
+					$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
+		} else {
+					$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
+		}
 		
 		$query = "
 			SELECT

Please login to merge, or discard this patch.

collector/waterfall/WaterfallCollector.class.inc.php 1 patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -43,9 +43,9 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-    public static function getMapList()
-    {
-        $query = "
+	public static function getMapList()
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias`,
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
             ORDER BY
                 `waterfall`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
 		return self::get_count($query);
 	}
 
-    public static function getNearbyList($waterfall)
-    {
-        $query = "
+	public static function getNearbyList($waterfall)
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias` AS `alias`,
@@ -114,14 +114,14 @@  discard block
 block discarded – undo
                 `waterfall`.`name`,
                 `watercourse`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
-    public static function getByOldAlias($alias)
-    {
-        $alias = self::escape($alias);
+	public static function getByOldAlias($alias)
+	{
+		$alias = self::escape($alias);
         
-        $query = "
+		$query = "
             SELECT
                 `waterfall`.`alias`,
                 `watercourse`.`alias` AS `watercourse_alias`
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
                 `waterfall`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 
 	public static function getByAlias($watercourse, $waterfall)
 	{

Please login to merge, or discard this patch.

collector/waterfall/LogCollector.class.inc.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -34,9 +34,9 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-    public static function getRecentList($total)
-    {
-        $query = "
+	public static function getRecentList($total)
+	{
+		$query = "
             SELECT
                 `log`.`title`,
                 `log`.`alias`,
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
                 `log`.`date` DESC
             LIMIT
                 {$total}";
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -178,11 +178,11 @@  discard block
 block discarded – undo
 		return self::run_row_query($query);
 	}
 
-    public static function getByDate($date)
-    {
-        $date = self::escape($date);
+	public static function getByDate($date)
+	{
+		$date = self::escape($date);
         
-        $query = "
+		$query = "
             SELECT
                 `log`.`alias`
             FROM
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
                 `log`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 	
 	public static function getById($log)
 	{

Please login to merge, or discard this patch.

collector/waterfall/WatercourseCollector.class.inc.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

controller/lifestream/PostController.class.inc.php 1 patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

@@ -20,15 +20,18 @@
 block discarded – undo
 		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;
 	}

Please login to merge, or discard this patch.

		@@ -96,9 +96,9 @@ discard block
		block discarded – undo
96	96	if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97	97	$redirect_uri .= '/';
98	98
99		- if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100		- $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101		- }
	99	+ if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
	100	+ $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
	101	+ }
102	102
103	103	if($redirect_uri == URLDecode::getURI())
104	104	return;
		@@ -129,8 +129,8 @@ discard block
		block discarded – undo
129	129	}
130	130
131	131	$image = new ImageOld($file);
132		- if(!$image->isValid()) {
133		- Loader::loadNew('controller', '/Error404Controller')->activate();
	132	+ if(!$image->isValid()) {
	133	+ Loader::loadNew('controller', '/Error404Controller')->activate();
134	134	exit();
135	135	}
136	136	}
		@@ -201,7 +201,7 @@ discard block
		block discarded – undo
201	201	URLDecode::getExtension() != 'jpg' &&
202	202	URLDecode::getExtension() != 'png' &&
203	203	URLDecode::getExtension() != 'ico' &&
204		- strstr(URLDecode::getURI(), '#') === false);
	204	+ strstr(URLDecode::getURI(), '#') === false);
205	205	}
206	206
207	207	}

		@@ -114,9 +114,9 @@ discard block
		block discarded – undo
114	114	return self::run_query($query);
115	115	}
116	116
117		- public static function getRecentWaterfallComments($count = 5)
118		- {
119		- $query = "
	117	+ public static function getRecentWaterfallComments($count = 5)
	118	+ {
	119	+ $query = "
120	120	SELECT
121	121	`comment_meta`.`id`,
122	122	CONCAT('journal/', `log`.`alias`) AS `log_path`,
		@@ -156,8 +156,8 @@ discard block
		block discarded – undo
156	156	`comment_meta`.`date` DESC
157	157	LIMIT {$count}";
158	158
159		- return self::run_query($query);
160		- }
	159	+ return self::run_query($query);
	160	+ }
161	161
162	162	public static function getCommentsForURL($site, $path, $commenter = 0)
163	163	{

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	Loader::load('collector', array(
4		- 'waterfall/LogCollector',
5		- 'waterfall/WaterfallCollector'));
	4	+ 'waterfall/LogCollector',
	5	+ 'waterfall/WaterfallCollector'));
6	6	Loader::load('router', 'Router');
7	7
8	8	class WaterfallRouter extends Router
		@@ -26,15 +26,15 @@ discard block
		block discarded – undo
26	26	(object) array(
27	27	'pattern' => '@^/falls/results(/?)$@',
28	28	'replace' => '/falls/'),
29		- (object) array(
30		- 'pattern' => '@^/log(/?)$@',
31		- 'replace' => '/journal/'),
32		- (object) array(
33		- 'pattern' => '@^/log/(\d+)(/?)$@',
34		- 'replace' => '/journal/$1'),
35		- (object) array(
36		- 'pattern' => '@^/map/([^/]+)(/?)$@',
37		- 'replace' => '/map/'),
	29	+ (object) array(
	30	+ 'pattern' => '@^/log(/?)$@',
	31	+ 'replace' => '/journal/'),
	32	+ (object) array(
	33	+ 'pattern' => '@^/log/(\d+)(/?)$@',
	34	+ 'replace' => '/journal/$1'),
	35	+ (object) array(
	36	+ 'pattern' => '@^/map/([^/]+)(/?)$@',
	37	+ 'replace' => '/map/'),
38	38	(object) array(
39	39	'pattern' => '@^/about/([a-z]*)(/?)$@',
40	40	'replace' => '/about/'),
		@@ -73,57 +73,57 @@ discard block
		block discarded – undo
73	73
74	74	protected function check_for_special_redirect($uri)
75	75	{
76		- if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
77		- $alias = $matches[1];
78		- $alias = str_replace("'", '', $alias);
79		- $alias .= '-falls';
80		- $result = WaterfallCollector::getByOldAlias($alias);
81		- if ($result !== null) {
82		- return "/{$result->watercourse_alias}/{$result->alias}/";
83		- } else {
84		- Loader::loadNew('controller', '/Error404Controller')->activate();
85		- }
86		- }
	76	+ if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
	77	+ $alias = $matches[1];
	78	+ $alias = str_replace("'", '', $alias);
	79	+ $alias .= '-falls';
	80	+ $result = WaterfallCollector::getByOldAlias($alias);
	81	+ if ($result !== null) {
	82	+ return "/{$result->watercourse_alias}/{$result->alias}/";
	83	+ } else {
	84	+ Loader::loadNew('controller', '/Error404Controller')->activate();
	85	+ }
	86	+ }
87	87
88		- if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
89		- $alias = $matches[1];
90		- $alias = explode('-', $alias);
91		- array_pop($alias);
92		- $alias = implode('-', $alias);
93		- $alias = str_replace("'", '', $alias);
94		- $alias .= '-falls';
95		- $result = WaterfallCollector::getByOldAlias($alias);
96		- if ($result !== null) {
97		- return "/{$result->watercourse_alias}/{$result->alias}/";
98		- } else {
99		- Loader::loadNew('controller', '/Error404Controller')->activate();
100		- }
101		- }
	88	+ if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
	89	+ $alias = $matches[1];
	90	+ $alias = explode('-', $alias);
	91	+ array_pop($alias);
	92	+ $alias = implode('-', $alias);
	93	+ $alias = str_replace("'", '', $alias);
	94	+ $alias .= '-falls';
	95	+ $result = WaterfallCollector::getByOldAlias($alias);
	96	+ if ($result !== null) {
	97	+ return "/{$result->watercourse_alias}/{$result->alias}/";
	98	+ } else {
	99	+ Loader::loadNew('controller', '/Error404Controller')->activate();
	100	+ }
	101	+ }
102	102
103		- if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
104		- $date = $matches[1];
105		- $date = explode('-', $date);
106		- $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
107		- $date = date('Y-m-d', $date);
108		- $result = LogCollector::getByDate($date);
109		- if ($result !== null) {
110		- return "/journal/{$result->alias}/";
111		- } else {
112		- Loader::loadNew('controller', '/Error404Controller')->activate();
113		- }
114		- }
	103	+ if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
	104	+ $date = $matches[1];
	105	+ $date = explode('-', $date);
	106	+ $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
	107	+ $date = date('Y-m-d', $date);
	108	+ $result = LogCollector::getByDate($date);
	109	+ if ($result !== null) {
	110	+ return "/journal/{$result->alias}/";
	111	+ } else {
	112	+ Loader::loadNew('controller', '/Error404Controller')->activate();
	113	+ }
	114	+ }
115	115
116		- if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
117		- $alias = $matches[1];
118		- $alias = str_replace("'", '', $alias);
119		- $alias .= '-falls';
120		- $result = WaterfallCollector::getByOldAlias($alias);
121		- if ($result !== null) {
122		- return "/map/#{$result->watercourse_alias}/{$result->alias}";
123		- } else {
124		- Loader::loadNew('controller', '/Error404Controller')->activate();
125		- }
126		- }
	116	+ if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
	117	+ $alias = $matches[1];
	118	+ $alias = str_replace("'", '', $alias);
	119	+ $alias .= '-falls';
	120	+ $result = WaterfallCollector::getByOldAlias($alias);
	121	+ if ($result !== null) {
	122	+ return "/map/#{$result->watercourse_alias}/{$result->alias}";
	123	+ } else {
	124	+ Loader::loadNew('controller', '/Error404Controller')->activate();
	125	+ }
	126	+ }
127	127
128	128	return $uri;
129	129	}
		@@ -164,9 +164,9 @@ discard block
		block discarded – undo
164	164	(object) array(
165	165	'match' => '/map/',
166	166	'controller' => 'MapController'),
167		- (object) array(
168		- 'match' => '/map/#[a-z-/]+',
169		- 'controller' => 'MapController'),
	167	+ (object) array(
	168	+ 'match' => '/map/#[a-z-/]+',
	169	+ 'controller' => 'MapController'),
170	170	(object) array(
171	171	'match' => '/journal/',
172	172	'controller' => 'LogListController'),

		@@ -57,8 +57,7 @@
		block discarded – undo
57	57
58	58	Loader::load('utility', 'Content');
59	59	$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
60		- }
61		- else
	60	+ } else
62	61	{
63	62	$post_uri = URLDecode::getPiece(1);
64	63	if($post_uri !== null)

		@@ -19,24 +19,33 @@ discard block
		block discarded – undo
19	19
20	20	private static function get_router_name()
21	21	{
22		- if(Request::isAJAX())
23		- return 'AJAXRouter';
24		- if(URLDecode::getURI() == '/robots.txt')
25		- return 'RobotRouter';
26		- if(URLDecode::getURI() == '/sitemap.xml')
27		- return 'SitemapRouter';
28		- if(URLDecode::getURI() == '/rss/')
29		- return 'RSSRouter';
30		- if(URLDecode::getExtension() == 'css')
31		- return 'StyleRouter';
32		- if(URLDecode::getExtension() == 'js')
33		- return 'ScriptRouter';
34		- if(URLDecode::getExtension() == 'ico')
35		- return 'ImageRouter';
36		- if(URLDecode::getExtension() == 'jpg')
37		- return 'ImageRouter';
38		- if(URLDecode::getExtension() == 'png')
39		- return 'ImageRouter';
	22	+ if(Request::isAJAX()) {
	23	+ return 'AJAXRouter';
	24	+ }
	25	+ if(URLDecode::getURI() == '/robots.txt') {
	26	+ return 'RobotRouter';
	27	+ }
	28	+ if(URLDecode::getURI() == '/sitemap.xml') {
	29	+ return 'SitemapRouter';
	30	+ }
	31	+ if(URLDecode::getURI() == '/rss/') {
	32	+ return 'RSSRouter';
	33	+ }
	34	+ if(URLDecode::getExtension() == 'css') {
	35	+ return 'StyleRouter';
	36	+ }
	37	+ if(URLDecode::getExtension() == 'js') {
	38	+ return 'ScriptRouter';
	39	+ }
	40	+ if(URLDecode::getExtension() == 'ico') {
	41	+ return 'ImageRouter';
	42	+ }
	43	+ if(URLDecode::getExtension() == 'jpg') {
	44	+ return 'ImageRouter';
	45	+ }
	46	+ if(URLDecode::getExtension() == 'png') {
	47	+ return 'ImageRouter';
	48	+ }
40	49
41	50	switch(URLDecode::getSite())
42	51	{
		@@ -93,19 +102,22 @@ discard block
		block discarded – undo
93	102
94	103	$redirect_uri = $this->check_for_special_redirect($redirect_uri);
95	104
96		- if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97		- $redirect_uri .= '/';
	105	+ if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
	106	+ $redirect_uri .= '/';
	107	+ }
98	108
99	109	if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100	110	$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101	111	}
102	112
103		- if($redirect_uri == URLDecode::getURI())
104		- return;
	113	+ if($redirect_uri == URLDecode::getURI()) {
	114	+ return;
	115	+ }
105	116
106	117	$controller_check = $redirect_uri;
107		- if(substr($redirect_uri, 0, 4) == 'http')
108		- $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
	118	+ if(substr($redirect_uri, 0, 4) == 'http') {
	119	+ $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
	120	+ }
109	121
110	122	$controller = $this->get_controller($controller_check);
111	123	if($controller == '/Error404Controller')
		@@ -154,11 +166,13 @@ discard block
		block discarded – undo
154	166	{
155	167	foreach($this->get_direct_array() as $check)
156	168	{
157		- if($uri == $check->match)
158		- return "{$this->get_primary_folder()}/{$check->controller}";
	169	+ if($uri == $check->match) {
	170	+ return "{$this->get_primary_folder()}/{$check->controller}";
	171	+ }
159	172
160		- if(preg_match("@^{$check->match}$@", $uri))
161		- return "{$this->get_primary_folder()}/{$check->controller}";
	173	+ if(preg_match("@^{$check->match}$@", $uri)) {
	174	+ return "{$this->get_primary_folder()}/{$check->controller}";
	175	+ }
162	176	}
163	177
164	178	return '/Error404Controller';
		@@ -166,23 +180,30 @@ discard block
		block discarded – undo
166	180
167	181	final private function get_primary_folder()
168	182	{
169		- if(Request::isAjax())
170		- return 'ajax';
171		- if(URLDecode::getURI() == '/robots.txt')
172		- return 'robot';
173		- if(URLDecode::getURI() == '/sitemap.xml')
174		- return 'sitemap';
175		- if(URLDecode::getURI() == '/rss/')
176		- return 'rss';
177		- if(URLDecode::getExtension() == 'css')
178		- return 'styles';
179		- if(URLDecode::getExtension() == 'js')
180		- return 'scripts';
	183	+ if(Request::isAjax()) {
	184	+ return 'ajax';
	185	+ }
	186	+ if(URLDecode::getURI() == '/robots.txt') {
	187	+ return 'robot';
	188	+ }
	189	+ if(URLDecode::getURI() == '/sitemap.xml') {
	190	+ return 'sitemap';
	191	+ }
	192	+ if(URLDecode::getURI() == '/rss/') {
	193	+ return 'rss';
	194	+ }
	195	+ if(URLDecode::getExtension() == 'css') {
	196	+ return 'styles';
	197	+ }
	198	+ if(URLDecode::getExtension() == 'js') {
	199	+ return 'scripts';
	200	+ }
181	201	if(
182	202	URLDecode::getExtension() == 'jpg' \|\|
183	203	URLDecode::getExtension() == 'ico' \|\|
184		- URLDecode::getExtension() == 'png')
185		- return 'images';
	204	+ URLDecode::getExtension() == 'png') {
	205	+ return 'images';
	206	+ }
186	207
187	208	return URLDecode::getSite();
188	209	}

		@@ -16,9 +16,9 @@
		block discarded – undo
16	16	protected function get_direct_array()
17	17	{
18	18	$site = URLDecode::getSite();
19		- if ($site == 'waterfalls') {
20		- $site = 'waterfall';
21		- }
	19	+ if ($site == 'waterfalls') {
	20	+ $site = 'waterfall';
	21	+ }
22	22	$site = ucwords($site);
23	23
24	24	return array(

		@@ -163,10 +163,11 @@
		block discarded – undo
163	163	{
164	164	$path = self::escape($path);
165	165
166		- if($commenter != 0)
167		- $trusted_commenter_clause = "(`commenter`.`trusted` = '1' \|\| `commenter`.`id` = '{$commenter}')";
168		- else
169		- $trusted_commenter_clause = "`commenter`.`trusted` = '1'";
	166	+ if($commenter != 0) {
	167	+ $trusted_commenter_clause = "(`commenter`.`trusted` = '1' \|\| `commenter`.`id` = '{$commenter}')";
	168	+ } else {
	169	+ $trusted_commenter_clause = "`commenter`.`trusted` = '1'";
	170	+ }
170	171
171	172	$query = "
172	173	SELECT

		@@ -43,9 +43,9 @@ discard block
		block discarded – undo
43	43	return self::run_query($query);
44	44	}
45	45
46		- public static function getMapList()
47		- {
48		- $query = "
	46	+ public static function getMapList()
	47	+ {
	48	+ $query = "
49	49	SELECT
50	50	`waterfall`.`name`,
51	51	`waterfall`.`alias`,
		@@ -71,8 +71,8 @@ discard block
		block discarded – undo
71	71	ORDER BY
72	72	`waterfall`.`name`";
73	73
74		- return self::run_query($query);
75		- }
	74	+ return self::run_query($query);
	75	+ }
76	76
77	77	public static function getListCount()
78	78	{
		@@ -92,9 +92,9 @@ discard block
		block discarded – undo
92	92	return self::get_count($query);
93	93	}
94	94
95		- public static function getNearbyList($waterfall)
96		- {
97		- $query = "
	95	+ public static function getNearbyList($waterfall)
	96	+ {
	97	+ $query = "
98	98	SELECT
99	99	`waterfall`.`name`,
100	100	`waterfall`.`alias` AS `alias`,
		@@ -114,14 +114,14 @@ discard block
		block discarded – undo
114	114	`waterfall`.`name`,
115	115	`watercourse`.`name`";
116	116
117		- return self::run_query($query);
118		- }
	117	+ return self::run_query($query);
	118	+ }
119	119
120		- public static function getByOldAlias($alias)
121		- {
122		- $alias = self::escape($alias);
	120	+ public static function getByOldAlias($alias)
	121	+ {
	122	+ $alias = self::escape($alias);
123	123
124		- $query = "
	124	+ $query = "
125	125	SELECT
126	126	`waterfall`.`alias`,
127	127	`watercourse`.`alias` AS `watercourse_alias`
		@@ -134,8 +134,8 @@ discard block
		block discarded – undo
134	134	`waterfall`.`is_public` = '1'
135	135	LIMIT 1";
136	136
137		- return self::run_row_query($query);
138		- }
	137	+ return self::run_row_query($query);
	138	+ }
139	139
140	140	public static function getByAlias($watercourse, $waterfall)
141	141	{

		@@ -34,9 +34,9 @@ discard block
		block discarded – undo
34	34	return self::run_query($query);
35	35	}
36	36
37		- public static function getRecentList($total)
38		- {
39		- $query = "
	37	+ public static function getRecentList($total)
	38	+ {
	39	+ $query = "
40	40	SELECT
41	41	`log`.`title`,
42	42	`log`.`alias`,
		@@ -59,8 +59,8 @@ discard block
		block discarded – undo
59	59	`log`.`date` DESC
60	60	LIMIT
61	61	{$total}";
62		- return self::run_query($query);
63		- }
	62	+ return self::run_query($query);
	63	+ }
64	64
65	65	public static function getListCount()
66	66	{
		@@ -178,11 +178,11 @@ discard block
		block discarded – undo
178	178	return self::run_row_query($query);
179	179	}
180	180
181		- public static function getByDate($date)
182		- {
183		- $date = self::escape($date);
	181	+ public static function getByDate($date)
	182	+ {
	183	+ $date = self::escape($date);
184	184
185		- $query = "
	185	+ $query = "
186	186	SELECT
187	187	`log`.`alias`
188	188	FROM
		@@ -192,8 +192,8 @@ discard block
		block discarded – undo
192	192	`log`.`is_public` = '1'
193	193	LIMIT 1";
194	194
195		- return self::run_row_query($query);
196		- }
	195	+ return self::run_row_query($query);
	196	+ }
197	197
198	198	public static function getById($log)
199	199	{

		@@ -153,9 +153,9 @@
		block discarded – undo
153	153	return self::run_query($query);
154	154	}
155	155
156		- public static function getParentWatercourse($watercourse)
157		- {
158		- }
	156	+ public static function getParentWatercourse($watercourse)
	157	+ {
	158	+ }
159	159
160	160	public static function getLogCountForWatercourse($watercourse)
161	161	{

		@@ -20,15 +20,18 @@
		block discarded – undo
20	20	parent::__construct();
21	21
22	22	$id = URLDecode::getPiece(2);
23		- if(!$id \|\| !is_numeric($id))
24		- $this->eject();
	23	+ if(!$id \|\| !is_numeric($id)) {
	24	+ $this->eject();
	25	+ }
25	26
26	27	$post = ActivityCollector::getPost($id);
27		- if(!$post)
28		- $this->eject();
	28	+ if(!$post) {
	29	+ $this->eject();
	30	+ }
29	31
30		- if(URLDecode::getPiece(1) != $post->type)
31		- $this->eject();
	32	+ if(URLDecode::getPiece(1) != $post->type) {
	33	+ $this->eject();
	34	+ }
32	35
33	36	$this->post = $post;
34	37	}

jacobemerick / web

Push — master ( 67df75...25777a )

Status

Category

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +63 added lines, -42 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch