jacobemerick / web

router/Router.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -66,36 +66,36 @@ 
 
 	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(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;
@@ -112,12 +112,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}";
 		}
 		
@@ -126,7 +126,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

Braces +21 added lines, -14 removed lines

@@ -18,8 +18,9 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -73,19 +74,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')
@@ -114,11 +118,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';
@@ -126,8 +132,9 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

 		
 		return URLDecode::getSite();
 	}

script/cron/generate-sitemaps.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
  * @param string $domain
  * @return boolean
  */
-$buildSitemap = function (array $entries, $domain, $folder) {
+$buildSitemap = function(array $entries, $domain, $folder) {
     $urlSet = new Urlset();
     foreach ($entries as $path => $entry) {
         $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
@@ -52,13 +52,13 @@ 
 /*********************************************
  * blog.jacobemerick.com
  *********************************************/
-$reduceToMostRecentBlogPost = function ($recentPost, $post) {
+$reduceToMostRecentBlogPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -93,7 +93,7 @@ 
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+    $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) {
         return $post['category'] == $blogCategory;
     });
     $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
@@ -206,13 +206,13 @@ 
 /*********************************************
  * lifestream.jacobemerick.com
  *********************************************/
-$reduceToMostRecentStreamPost = function ($recentPost, $post) {
+$reduceToMostRecentStreamPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $streamPostsPerPage = 15;
@@ -249,7 +249,7 @@ 
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypePosts = array_filter($streamPosts, function ($post) use ($streamType) {
+    $streamTypePosts = array_filter($streamPosts, function($post) use ($streamType) {
         return $post['type'] == $streamType;
     });
     $mostRecentStreamTypePost = array_reduce($streamTypePosts, $reduceToMostRecentStreamPost);
@@ -379,13 +379,13 @@ 
 /*********************************************
  * waterfall.jacobemerick.com
  *********************************************/
-$reduceToMostRecentJournalLog = function ($recentLog, $log) {
+$reduceToMostRecentJournalLog = function($recentLog, $log) {
     if (is_null($recentLog)) {
         return $log;
     }
     $logDate = new DateTime($log['publish_date']);
     $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+    return ($logDate > $recentLogDate) ? log : $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);

src/Domain/Portfolio/Piece/PieceRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface PieceRepositoryInterface
 {
-    public function getPieces($limit = null, $offset= 0);
+    public function getPieces($limit = null, $offset = 0);
 }

src/Domain/Waterfall/Log/LogRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface LogRepositoryInterface
 {
-    public function getActiveLogs($limit = null, $offset= 0);
+    public function getActiveLogs($limit = null, $offset = 0);
 }

src/Domain/Waterfall/Waterfall/WaterfallRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface WaterfallRepositoryInterface
 {
-    public function getWaterfalls($limit = null, $offset= 0);
+    public function getWaterfalls($limit = null, $offset = 0);
 }