Inspection of "Removes unused crons, collectors, and content util..." - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( cf0c7a...520b04 )

by Jacob

created 2015-12-27 03:00 UTC

Status

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

@@ -4,8 +4,8 @@
 block discarded – undo
 
 interface TagRepository
 {
-    public function findTagByTitle($title);
-    public function getAllTags();
-    public function getTagCloud();
-    public function getTagsForPost($post);
+	public function findTagByTitle($title);
+	public function getAllTags();
+	public function getTagCloud();
+	public function getTagsForPost($post);
 }

Please login to merge, or discard this patch.

src/Domain/Blog/Introduction/IntroductionRepositoryInterface.php 1 patch

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

@@ -4,5 +4,5 @@
 block discarded – undo
 
 interface IntroductionRepository
 {
-    public function findByType($type, $value = '');
+	public function findByType($type, $value = '');
 }

Please login to merge, or discard this patch.

src/Domain/Blog/Introduction/MysqlIntroductionRepository.php 1 patch

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

@@ -7,38 +7,38 @@
 block discarded – undo
 class MysqlIntroductionRepository implements IntroductionRepository
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param Aura\Sql\ConnectionLocator
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param Aura\Sql\ConnectionLocator
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param string $type
-     * @param string $value
-     *
-     * @return array|false
-     */
-    public function findByType($type, $value = '')
-    {
-        $query = "
+	/**
+	 * @param string $type
+	 * @param string $value
+	 *
+	 * @return array|false
+	 */
+	public function findByType($type, $value = '')
+	{
+		$query = "
             SELECT `title`, `content`, `image`
             FROM `jpemeric_blog`.`introduction`
             WHERE `type` = :type AND `value` = :value
             LIMIT 1";
-        $bindings = [
-            'type'  => $type,
-            'value' => $value,
-        ];
+		$bindings = [
+			'type'  => $type,
+			'value' => $value,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 }

Please login to merge, or discard this patch.

controller/home/HomeController.class.inc.php 2 patches

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

@@ -43,9 +43,9 @@
 block discarded – undo
 
 	private function get_recent_posts()
 	{
-    global $container;
-    $postRepository = new MysqlPostRepository($container['db_connection_locator']);
-    $recentPosts = $postRepository->getActivePosts(3);
+	global $container;
+	$postRepository = new MysqlPostRepository($container['db_connection_locator']);
+	$recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
 		foreach($recentPosts as $postResult)

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -48,7 +48,7 @@
 block discarded – undo
     $recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
+		foreach ($recentPosts as $postResult)
 		{
 			$post = new stdclass();
 			$post->title = $postResult['title'];

Please login to merge, or discard this patch.

router/WaterfallRouter.class.inc.php 1 patch

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 2 patches

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

@@ -45,11 +45,11 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 		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 .= '/';

Please login to merge, or discard this 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/PortfolioRouter.class.inc.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,12 +27,12 @@
 block discarded – undo
 
 	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();

Please login to merge, or discard this patch.

router/Router.class.inc.php 3 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.

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -19,26 +19,26 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 			}
 
 			$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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 
 	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')

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/map.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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	}

		@@ -19,26 +19,26 @@ discard block
		block discarded – undo
19	19
20	20	private static function get_router_name()
21	21	{
22		- if(Request::isAJAX())
	22	+ if (Request::isAJAX())
23	23	return 'AJAXRouter';
24		- if(URLDecode::getURI() == '/robots.txt')
	24	+ if (URLDecode::getURI() == '/robots.txt')
25	25	return 'RobotRouter';
26		- if(URLDecode::getURI() == '/sitemap.xml')
	26	+ if (URLDecode::getURI() == '/sitemap.xml')
27	27	return 'SitemapRouter';
28		- if(URLDecode::getURI() == '/rss/')
	28	+ if (URLDecode::getURI() == '/rss/')
29	29	return 'RSSRouter';
30		- if(URLDecode::getExtension() == 'css')
	30	+ if (URLDecode::getExtension() == 'css')
31	31	return 'StyleRouter';
32		- if(URLDecode::getExtension() == 'js')
	32	+ if (URLDecode::getExtension() == 'js')
33	33	return 'ScriptRouter';
34		- if(URLDecode::getExtension() == 'ico')
	34	+ if (URLDecode::getExtension() == 'ico')
35	35	return 'ImageRouter';
36		- if(URLDecode::getExtension() == 'jpg')
	36	+ if (URLDecode::getExtension() == 'jpg')
37	37	return 'ImageRouter';
38		- if(URLDecode::getExtension() == 'png')
	38	+ if (URLDecode::getExtension() == 'png')
39	39	return 'ImageRouter';
40	40
41		- switch(URLDecode::getSite())
	41	+ switch (URLDecode::getSite())
42	42	{
43	43	case 'ajax' :
44	44	return 'AjaxRouter';
		@@ -86,37 +86,37 @@ discard block
		block discarded – undo
86	86
87	87	final protected function check_for_redirect($redirect_uri)
88	88	{
89		- foreach($this->get_redirect_array() as $check)
	89	+ foreach ($this->get_redirect_array() as $check)
90	90	{
91	91	$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
92	92	}
93	93
94	94	$redirect_uri = $this->check_for_special_redirect($redirect_uri);
95	95
96		- if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
	96	+ if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97	97	$redirect_uri .= '/';
98	98
99	99	if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100	100	$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101	101	}
102	102
103		- if($redirect_uri == URLDecode::getURI())
	103	+ if ($redirect_uri == URLDecode::getURI())
104	104	return;
105	105
106	106	$controller_check = $redirect_uri;
107		- if(substr($redirect_uri, 0, 4) == 'http')
	107	+ if (substr($redirect_uri, 0, 4) == 'http')
108	108	$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
109	109
110	110	$controller = $this->get_controller($controller_check);
111		- if($controller == '/Error404Controller')
	111	+ if ($controller == '/Error404Controller')
112	112	{
113	113	Loader::loadNew('controller', '/Error404Controller')
114	114	->activate();
115	115	exit;
116	116	}
117	117
118		- if($this->get_primary_folder() == 'images') {
119		- $file = $controller_check;//URLDecode::getURI();
	118	+ if ($this->get_primary_folder() == 'images') {
	119	+ $file = $controller_check; //URLDecode::getURI();
120	120
121	121	if (
122	122	URLDecode::getSite() == 'images' \|\|
		@@ -129,13 +129,13 @@ discard block
		block discarded – undo
129	129	}
130	130
131	131	$image = new ImageOld($file);
132		- if(!$image->isValid()) {
	132	+ if (!$image->isValid()) {
133	133	Loader::loadNew('controller', '/Error404Controller')->activate();
134	134	exit();
135	135	}
136	136	}
137	137
138		- if(substr($redirect_uri, 0, 4) != 'http')
	138	+ if (substr($redirect_uri, 0, 4) != 'http')
139	139	{
140	140	$redirect_uri = substr($redirect_uri, 1);
141	141	$redirect_uri = URLDecode::getBase() . $redirect_uri;
		@@ -152,12 +152,12 @@ discard block
		block discarded – undo
152	152
153	153	final private function get_controller($uri)
154	154	{
155		- foreach($this->get_direct_array() as $check)
	155	+ foreach ($this->get_direct_array() as $check)
156	156	{
157		- if($uri == $check->match)
	157	+ if ($uri == $check->match)
158	158	return "{$this->get_primary_folder()}/{$check->controller}";
159	159
160		- if(preg_match("@^{$check->match}$@", $uri))
	160	+ if (preg_match("@^{$check->match}$@", $uri))
161	161	return "{$this->get_primary_folder()}/{$check->controller}";
162	162	}
163	163
		@@ -166,19 +166,19 @@ discard block
		block discarded – undo
166	166
167	167	final private function get_primary_folder()
168	168	{
169		- if(Request::isAjax())
	169	+ if (Request::isAjax())
170	170	return 'ajax';
171		- if(URLDecode::getURI() == '/robots.txt')
	171	+ if (URLDecode::getURI() == '/robots.txt')
172	172	return 'robot';
173		- if(URLDecode::getURI() == '/sitemap.xml')
	173	+ if (URLDecode::getURI() == '/sitemap.xml')
174	174	return 'sitemap';
175		- if(URLDecode::getURI() == '/rss/')
	175	+ if (URLDecode::getURI() == '/rss/')
176	176	return 'rss';
177		- if(URLDecode::getExtension() == 'css')
	177	+ if (URLDecode::getExtension() == 'css')
178	178	return 'styles';
179		- if(URLDecode::getExtension() == 'js')
	179	+ if (URLDecode::getExtension() == 'js')
180	180	return 'scripts';
181		- if(
	181	+ if (
182	182	URLDecode::getExtension() == 'jpg' \|\|
183	183	URLDecode::getExtension() == 'ico' \|\|
184	184	URLDecode::getExtension() == 'png')

		@@ -4,8 +4,8 @@
		block discarded – undo
4	4
5	5	interface TagRepository
6	6	{
7		- public function findTagByTitle($title);
8		- public function getAllTags();
9		- public function getTagCloud();
10		- public function getTagsForPost($post);
	7	+ public function findTagByTitle($title);
	8	+ public function getAllTags();
	9	+ public function getTagCloud();
	10	+ public function getTagsForPost($post);
11	11	}

		@@ -4,5 +4,5 @@
		block discarded – undo
4	4
5	5	interface IntroductionRepository
6	6	{
7		- public function findByType($type, $value = '');
	7	+ public function findByType($type, $value = '');
8	8	}

		@@ -7,38 +7,38 @@
		block discarded – undo
7	7	class MysqlIntroductionRepository implements IntroductionRepository
8	8	{
9	9
10		- /** @var Aura\Sql\ConnectionLocator */
11		- protected $connections;
	10	+ /** @var Aura\Sql\ConnectionLocator */
	11	+ protected $connections;
12	12
13		- /**
14		- * @param Aura\Sql\ConnectionLocator
15		- */
16		- public function __construct(ConnectionLocator $connections)
17		- {
18		- $this->connections = $connections;
19		- }
	13	+ /**
	14	+ * @param Aura\Sql\ConnectionLocator
	15	+ */
	16	+ public function __construct(ConnectionLocator $connections)
	17	+ {
	18	+ $this->connections = $connections;
	19	+ }
20	20
21		- /**
22		- * @param string $type
23		- * @param string $value
24		- *
25		- * @return array\|false
26		- */
27		- public function findByType($type, $value = '')
28		- {
29		- $query = "
	21	+ /**
	22	+ * @param string $type
	23	+ * @param string $value
	24	+ *
	25	+ * @return array\|false
	26	+ */
	27	+ public function findByType($type, $value = '')
	28	+ {
	29	+ $query = "
30	30	SELECT `title`, `content`, `image`
31	31	FROM `jpemeric_blog`.`introduction`
32	32	WHERE `type` = :type AND `value` = :value
33	33	LIMIT 1";
34		- $bindings = [
35		- 'type' => $type,
36		- 'value' => $value,
37		- ];
	34	+ $bindings = [
	35	+ 'type' => $type,
	36	+ 'value' => $value,
	37	+ ];
38	38
39		- return $this
40		- ->connections
41		- ->getRead()
42		- ->fetchOne($query, $bindings);
43		- }
	39	+ return $this
	40	+ ->connections
	41	+ ->getRead()
	42	+ ->fetchOne($query, $bindings);
	43	+ }
44	44	}

		@@ -43,9 +43,9 @@
		block discarded – undo
43	43
44	44	private function get_recent_posts()
45	45	{
46		- global $container;
47		- $postRepository = new MysqlPostRepository($container['db_connection_locator']);
48		- $recentPosts = $postRepository->getActivePosts(3);
	46	+ global $container;
	47	+ $postRepository = new MysqlPostRepository($container['db_connection_locator']);
	48	+ $recentPosts = $postRepository->getActivePosts(3);
49	49
50	50	$recent_post_array = array();
51	51	foreach($recentPosts as $postResult)

		@@ -48,7 +48,7 @@
		block discarded – undo
48	48	$recentPosts = $postRepository->getActivePosts(3);
49	49
50	50	$recent_post_array = array();
51		- foreach($recentPosts as $postResult)
	51	+ foreach ($recentPosts as $postResult)
52	52	{
53	53	$post = new stdclass();
54	54	$post->title = $postResult['title'];

		@@ -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'),

		@@ -45,11 +45,11 @@ discard block
		block discarded – undo
45	45
46	46	protected function check_for_special_redirect($uri)
47	47	{
48		- if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
	48	+ if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
49	49	{
50	50	Loader::load('collector', 'blog/PostCollector');
51	51	$post = PostCollector::getPostByURI($matches[2]);
52		- if(!$post)
	52	+ if (!$post)
53	53	{
54	54	Loader::loadNew('controller', '/Error404Controller')
55	55	->activate();
		@@ -61,21 +61,21 @@ discard block
		block discarded – undo
61	61	else
62	62	{
63	63	$post_uri = URLDecode::getPiece(1);
64		- if($post_uri !== null)
	64	+ if ($post_uri !== null)
65	65	{
66	66	Loader::load('collector', 'blog/PostCollector');
67	67	$post = PostCollector::getPostByURI($post_uri);
68	68
69		- if($post != false)
	69	+ if ($post != false)
70	70	{
71	71	Loader::load('utility', 'Content');
72	72	$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
73	73	}
74	74	}
75	75	}
76		- if($uri == '/search/')
	76	+ if ($uri == '/search/')
77	77	{
78		- if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
	78	+ if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
79	79	{
80	80	$uri .= Request::getGet('search');
81	81	$uri .= '/';

		@@ -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)

		@@ -27,12 +27,12 @@
		block discarded – undo
27	27
28	28	protected function check_for_special_redirect($uri)
29	29	{
30		- if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
	30	+ if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
31	31	{
32	32	Loader::load('collector', 'portfolio/PortfolioCollector');
33	33	$piece = PortfolioCollector::getPieceByURI($matches[1]);
34	34
35		- if($piece === null)
	35	+ if ($piece === null)
36	36	{
37	37	Loader::loadNew('controller', '/Error404Controller')
38	38	->activate();

		@@ -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	}

		@@ -26,6 +26,6 @@
		block discarded – undo
26	26	)
27	27	);
28	28
29		-Router::route($redirect,$direct);
	29	+Router::route($redirect, $direct);
30	30
31	31	?>
32	32	\ No newline at end of file

jacobemerick / web

Push — master ( cf0c7a...520b04 )

Status

Category

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

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

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

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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

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

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch