jacobemerick / web

controller/waterfalls/DefaultListController.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -95,9 +95,9 @@ 
 	abstract protected function get_initial_meta();
 	abstract protected function get_subsequent_meta();
 
-    final protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
+	final protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
 		
 		$this->set_body('view', $this->get_list_view());
 		$this->set_body('data', $this->get_list_body_data());
@@ -107,7 +107,7 @@ 
 	{
 		$body_data_array = array();
 		
-        $body_data_array['introduction'] = $this->get_introduction();
+		$body_data_array['introduction'] = $this->get_introduction();
 		$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());
 		$body_data_array['navigation'] = array(
 				'description' => $this->get_list_description(),

controller/waterfalls/MapController.class.inc.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 final class MapController extends DefaultPageController
 {
 
-    private static $TITLE = 'Map of Upper Peninsula Waterfalls';
-    private static $DESCRIPTION = '';
-    private static $KEYWORD_ARRAY = array();
+	private static $TITLE = 'Map of Upper Peninsula Waterfalls';
+	private static $DESCRIPTION = '';
+	private static $KEYWORD_ARRAY = array();
 
-    private static $HIDE_ON_INITIAL_LOAD_LIST = array(
-        'Lower Tahquamenon Falls',
-        'Rainbow Falls',
-        'Sandstone Falls',
-        'Upper Tahquamenon Falls',
-    );
+	private static $HIDE_ON_INITIAL_LOAD_LIST = array(
+		'Lower Tahquamenon Falls',
+		'Rainbow Falls',
+		'Sandstone Falls',
+		'Upper Tahquamenon Falls',
+	);
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
-        $this->add_waterfall_js();
-    }
+		$this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
+		$this->add_waterfall_js();
+	}
 
-    protected function set_head_data()
-    {
-        parent::set_head_data();
+	protected function set_head_data()
+	{
+		parent::set_head_data();
         
-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
-        $this->set_description(self::$DESCRIPTION);
-        $this->set_keywords(self::$KEYWORD_ARRAY);
-    }
+		$this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
+		$this->set_description(self::$DESCRIPTION);
+		$this->set_keywords(self::$KEYWORD_ARRAY);
+	}
 
-    protected function set_body_data($page_type = 'wide')
-    {
-        parent::set_body_data($page_type);
+	protected function set_body_data($page_type = 'wide')
+	{
+		parent::set_body_data($page_type);
         
-        $this->set_head('full_page_map', true);
-        $this->set_body('waterfall_list', $this->fetch_waterfall_list());
-        $this->set_body('view', 'Map');
-    }
+		$this->set_head('full_page_map', true);
+		$this->set_body('waterfall_list', $this->fetch_waterfall_list());
+		$this->set_body('view', 'Map');
+	}
 
-    private function fetch_waterfall_list()
-    {
-        $list = WaterfallCollector::getMapList();
-        array_walk($list, array($this, 'parse_waterfall'));
-        return $list;
-    }
+	private function fetch_waterfall_list()
+	{
+		$list = WaterfallCollector::getMapList();
+		array_walk($list, array($this, 'parse_waterfall'));
+		return $list;
+	}
 
-    private function parse_waterfall(&$waterfall)
-    {
-        $waterfall = (object) array(
-            'name'  => $waterfall->name,
-            'latitude' => $waterfall->latitude,
-            'longitude' => $waterfall->longitude,
-            'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
-            'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
-            'image_alt' => $waterfall->photo_description,
-            'watercourse' => $waterfall->watercourse,
-            'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
-        );
-    }
+	private function parse_waterfall(&$waterfall)
+	{
+		$waterfall = (object) array(
+			'name'  => $waterfall->name,
+			'latitude' => $waterfall->latitude,
+			'longitude' => $waterfall->longitude,
+			'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
+			'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
+			'image_alt' => $waterfall->photo_description,
+			'watercourse' => $waterfall->watercourse,
+			'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
+		);
+	}
 
 }

controller/blog/SearchController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	{
 		$query = URLDecode::getPiece(2);
 		$query = urldecode($query);
-        $query = str_replace('-', ' ', $query);
+		$query = str_replace('-', ' ', $query);
 		
 		$this->query = $query;
 		

utility/Database.class.inc.php

Indentation +17 added lines, -17 removed lines

@@ -16,17 +16,17 @@ 
 
 	private function __construct($write_params, $read_params)
 	{
-        $this->write_connection = $this->connect(
-            $write_params->host,
-            $write_params->user,
-            $write_params->password
-        );
-
-        $this->read_connection = $this->connect(
-            $read_params->host,
-            $read_params->user,
-            $read_params->password
-        );
+		$this->write_connection = $this->connect(
+			$write_params->host,
+			$write_params->user,
+			$write_params->password
+		);
+
+		$this->read_connection = $this->connect(
+			$read_params->host,
+			$read_params->user,
+			$read_params->password
+		);
 
 		return $this;
 	}
@@ -45,12 +45,12 @@ 
 	public static function instance()
 	{
 		if(!isset(self::$instance)) {
-            global $config;
-            self::$instance = new Database(
-                $config->database->master,
-                $config->database->slave
-            );
-        }
+			global $config;
+			self::$instance = new Database(
+				$config->database->master,
+				$config->database->slave
+			);
+		}
 
 		return self::$instance;
 	}

utility/cookie/CommenterCookie.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
 
 	protected function getDomain()
 	{
-        $site = URLDecode::getSite();
-        if ($site == 'waterfalls' && Loader::isLive()) {
-            return 'waterfallsofthekeweenaw.com';
-        }
+		$site = URLDecode::getSite();
+		if ($site == 'waterfalls' && Loader::isLive()) {
+			return 'waterfallsofthekeweenaw.com';
+		}
 		return self::$COOKIE_DOMAIN;
 	}
 

utility/Loader.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -179,16 +179,16 @@
 		return self::instance()->is_live;
 	}
 
-    public static function getRootURL($site = '')
-    {
-        if (strlen($site) > 0) {
-            if ($site == 'waterfalls' && self::instance()->is_live) {
-                return 'http://www.waterfallsofthekeweenaw.com/';
-            } else {
-                return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
-            }
-        }
-        return '/';
-    }
+	public static function getRootURL($site = '')
+	{
+		if (strlen($site) > 0) {
+			if ($site == 'waterfalls' && self::instance()->is_live) {
+				return 'http://www.waterfallsofthekeweenaw.com/';
+			} else {
+				return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+			}
+		}
+		return '/';
+	}
 
 }

utility/content/FixInternalLinkContent.class.inc.php

Indentation +26 added lines, -26 removed lines

@@ -72,38 +72,38 @@
 				
 				break;
 			case 'falls' :
-                $pieces = explode('/', $uri);
-                if (count($pieces) == 1) {
-                    Loader::load('collector', 'waterfall/WatercourseCollector');
-                    list ($watercourse_alias) = $pieces;
-                    $watercourse = WatercourseCollector::getByAlias($watercourse_alias);
+				$pieces = explode('/', $uri);
+				if (count($pieces) == 1) {
+					Loader::load('collector', 'waterfall/WatercourseCollector');
+					list ($watercourse_alias) = $pieces;
+					$watercourse = WatercourseCollector::getByAlias($watercourse_alias);
                     
-                    if ($watercourse == null) {
-                        return;
-                    }
+					if ($watercourse == null) {
+						return;
+					}
                     
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
-                    $link .= "{$watercourse->alias}/";
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
+					$link .= "{$watercourse->alias}/";
                     
-                    if ($anchor == '') {
-                        $anchor = $watercourse->name;
-                    }
-                } else if (count($pieces) == 2) {
-                    Loader::load('collector', 'waterfall/WaterfallCollector');
-                    list ($watercourse_alias, $waterfall_alias) = $pieces;
-                    $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
+					if ($anchor == '') {
+						$anchor = $watercourse->name;
+					}
+				} else if (count($pieces) == 2) {
+					Loader::load('collector', 'waterfall/WaterfallCollector');
+					list ($watercourse_alias, $waterfall_alias) = $pieces;
+					$waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
                     
-                    if ($waterfall == null) {
-                        return;
-                    }
+					if ($waterfall == null) {
+						return;
+					}
                     
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
-                    $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
+					$link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
                     
-                    if ($anchor == '') {
-                        $anchor = $waterfall->name;
-                    }
-                }
+					if ($anchor == '') {
+						$anchor = $waterfall->name;
+					}
+				}
 				break;
 			default :
 				break;

utility/content/ImperialUnitContent.class.inc.php

Indentation +46 added lines, -46 removed lines

@@ -5,56 +5,56 @@
 final class ImperialUnitContent extends Content
 {
 
-    protected function execute($type = '')
-    {
-        $number = floatval($this->content);
-        $number *= 39.37; // convert to inches
+	protected function execute($type = '')
+	{
+		$number = floatval($this->content);
+		$number *= 39.37; // convert to inches
         
-        if ($type == '') {
-            if ($number > (12 * 3 * 1760 * 5)) {
-                $type = 'full miles';
-            } else if ($number > (12 * 3 * 1760 * .5)) {
-                $type = 'tenth miles';
-            } else if ($number > (12 * 3 * 150)) {
-                $type = 'yards';
-            } else if ($number > (12 * 10)) {
-                $type = 'feet';
-            } else {
-                $type = 'inches';
-            }
-        }
+		if ($type == '') {
+			if ($number > (12 * 3 * 1760 * 5)) {
+				$type = 'full miles';
+			} else if ($number > (12 * 3 * 1760 * .5)) {
+				$type = 'tenth miles';
+			} else if ($number > (12 * 3 * 150)) {
+				$type = 'yards';
+			} else if ($number > (12 * 10)) {
+				$type = 'feet';
+			} else {
+				$type = 'inches';
+			}
+		}
         
-        switch ($type) {
-            case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
-                break;
-            case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
-                break;
-            case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
-                break;
-            case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
-                break;
-            case 'inches' :
-                $feet = floor($number / 12);
+		switch ($type) {
+			case 'full miles' :
+				$this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+				break;
+			case 'tenth miles' :
+				$this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+				break;
+			case 'yards' :
+				$this->content = number_format(round($number / (12 * 3))) . ' yards';
+				break;
+			case 'feet' :
+				$this->content = number_format(round($number / 12)) . "'";
+				break;
+			case 'inches' :
+				$feet = floor($number / 12);
                 
-                $inches = $number - $feet * 12;
-                $inches = round($inches);
+				$inches = $number - $feet * 12;
+				$inches = round($inches);
                 
-                if ($inches == 12) {
-                    $feet++;
-                    $inches = 0;
-                }
+				if ($inches == 12) {
+					$feet++;
+					$inches = 0;
+				}
                 
-                $this->content = '';
-                $this->content .= number_format($feet) . "'";
-                if (isset($inches) && $inches > 0) {
-                    $this->content .= " {$inches}\"";
-                }
-                break;
-        }
-    }
+				$this->content = '';
+				$this->content .= number_format($feet) . "'";
+				if (isset($inches) && $inches > 0) {
+					$this->content .= " {$inches}\"";
+				}
+				break;
+		}
+	}
 
 }
\ No newline at end of file

utility/content/SmartTrimContent.class.inc.php

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		
 		if($length < strlen($this->content))
 			$this->trim_string($length);
-        else
-            $etc = '';
+		else
+			$etc = '';
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}