jacobemerick / web

controller/PageController.class.inc.php

Indentation +27 added lines, -27 removed lines

@@ -58,9 +58,9 @@ 
 
 	protected function get_recent_activity()
 	{
-    global $container;
-    $activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
-    $post_result = $activityRepository->getPosts(5);
+	global $container;
+	$activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
+	$post_result = $activityRepository->getPosts(5);
 
 		$post_array = array();
 		foreach($post_result as $row)
@@ -75,13 +75,13 @@ 
 	{
 		Loader::load('utility', 'Content');
 
-    global $container;
-    $blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
-    $bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
-    $distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
-    $huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
-    $twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
-    $youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
+	global $container;
+	$blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
+	$bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
+	$distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
+	$huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
+	$twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
+	$youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
 
 		$post = new stdclass();
 		
@@ -124,9 +124,9 @@ 
 					if(strlen($row['title']) > 0)
 						$post->title .= " I was hiking up around the {$row['title']} area.";
 				}
-                else if ($row['type'] == 'walking') {
-                    $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
-                }
+				else if ($row['type'] == 'walking') {
+					$post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
+				}
 			break;
 			case 'hulu' :
 				$row = $huluRepository->getHuluById($raw_post['type_id']);
@@ -193,11 +193,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -255,15 +255,15 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      return "/css/{$stylesheet}.css";
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  return "/css/{$stylesheet}.css";
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 
 	protected static $WATERFALL_SITE_ID = 5;
 
-    protected $parent_navigation_item = '';
+	protected $parent_navigation_item = '';
 
 	protected function set_head_data()
 	{
@@ -19,45 +19,45 @@ 
 		$this->add_css('waterfalls');
 	}
 
-    protected function add_waterfall_js()
-    {
-        $this->add_js('jquery');
-        $this->add_js('imagelightbox');
-        $this->add_js('waterfalls');
-    }
+	protected function add_waterfall_js()
+	{
+		$this->add_js('jquery');
+		$this->add_js('imagelightbox');
+		$this->add_js('waterfalls');
+	}
 
 	protected function set_body_data($page_type = 'normal')
 	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
-        $this->set_body('main_navigation', array(
-                (object) array(
-                    'uri' => '/falls/',
-                    'anchor' => 'Falls',
-                    'is_active' => $this->parent_navigation_item === 'falls',
-                ),
-                (object) array(
-                    'uri' => '/map/',
-                    'anchor' => 'Map',
-                    'is_active' => $this->parent_navigation_item === 'map',
-                ),
-                (object) array(
-                    'uri' => '/journal/',
-                    'anchor' => 'Journal',
-                    'is_active' => $this->parent_navigation_item === 'journal',
-                ),
-                (object) array(
-                    'uri' => '/about/',
-                    'anchor' => 'About',
-                    'is_active' => $this->parent_navigation_item === 'about',
-                )
-        ));
-
-        if ($page_type == 'wide') {
-            $this->set_body_view('WidePage');
-        } else {
-            $this->set_body_view('Page');
-        }
-    }
+		$this->set_body('main_navigation', array(
+				(object) array(
+					'uri' => '/falls/',
+					'anchor' => 'Falls',
+					'is_active' => $this->parent_navigation_item === 'falls',
+				),
+				(object) array(
+					'uri' => '/map/',
+					'anchor' => 'Map',
+					'is_active' => $this->parent_navigation_item === 'map',
+				),
+				(object) array(
+					'uri' => '/journal/',
+					'anchor' => 'Journal',
+					'is_active' => $this->parent_navigation_item === 'journal',
+				),
+				(object) array(
+					'uri' => '/about/',
+					'anchor' => 'About',
+					'is_active' => $this->parent_navigation_item === 'about',
+				)
+		));
+
+		if ($page_type == 'wide') {
+			$this->set_body_view('WidePage');
+		} else {
+			$this->set_body_view('Page');
+		}
+	}
 
 }

utility/URLDecode.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 		
 		self::$array['host'] = $host;
 		
-    if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
-      $host == 'waterfallsofthekeweenaw.com'
-    ) {
+	if (
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
+	  $host == 'waterfallsofthekeweenaw.com'
+	) {
 			self::$array['site'] = 'waterfalls';
 		} else {
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));