jacobemerick / web

controller/portfolio/PieceController.class.inc.php

Indentation +6 added lines, -6 removed lines

@@ -40,9 +40,9 @@ 
 		
 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
 
-    $image_path = "portfolio/{$portfolio_image_result[0]->name}";
-    $image_path = Loader::getImagePath('image', $image_path);
-    $image_size = getimagesize($image_path);
+	$image_path = "portfolio/{$portfolio_image_result[0]->name}";
+	$image_path = Loader::getImagePath('image', $image_path);
+	$image_size = getimagesize($image_path);
 
 		$main_image = new stdclass();
 		$main_image->id = $portfolio_image_result[0]->id;
@@ -57,9 +57,9 @@ 
 			$thumb_array = explode('.', $thumb);
 			$thumb = "{$thumb_array[0]}_clip.{$thumb_array[1]}";
 
-      $image_path = "portfolio/{$thumb}";
-      $image_path = Loader::getImagePath('image', $image_path);
-      $image_size = getimagesize($image_path);
+	  $image_path = "portfolio/{$thumb}";
+	  $image_path = Loader::getImagePath('image', $image_path);
+	  $image_size = getimagesize($image_path);
 
 			$image_obj = new stdclass();
 			$image_obj->id = $portfolio_image->id;

controller/ajax/GetPortfolioImageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 		
 		$portfolio_result = PortfolioCollector::getImageById($id);
 
-    $image_path = "portfolio/{$portfolio_result->name}";
-    $image_path = Loader::getImagePath('image', $image_path);
-    $image_size = getimagesize($image_path);
+	$image_path = "portfolio/{$portfolio_result->name}";
+	$image_path = Loader::getImagePath('image', $image_path);
+	$image_size = getimagesize($image_path);
 
 		$main_image = new stdclass();
 		$main_image->id = $portfolio_result->id;

router/Router.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -80,9 +80,9 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
@@ -147,7 +147,7 @@ 
 			URLDecode::getExtension() != 'json' &&
 			URLDecode::getExtension() != 'jpg' &&
 			URLDecode::getExtension() != 'png' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

Spacing +16 added lines, -16 removed lines

@@ -18,14 +18,14 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'RSSRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -70,36 +70,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;
@@ -116,12 +116,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}";
 		}
 		
@@ -130,11 +130,11 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'rss';
 		
 		return URLDecode::getSite();

Braces +33 added lines, -22 removed lines

@@ -18,12 +18,15 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
-			return 'RSSRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

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

+					return 'SitemapRouter';

+		}

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

+					return 'RSSRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -77,19 +80,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')
@@ -118,11 +124,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';
@@ -130,12 +138,15 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
-			return 'rss';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

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

+					return 'sitemap';

+		}

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

+					return 'rss';

+		}

 		
 		return URLDecode::getSite();
 	}