jacobemerick / web

utility/Debugger.class.inc.php

Indentation +25 added lines, -25 removed lines

@@ -18,8 +18,8 @@ 
 	private function __construct()
 	{
 		$this->console = new Console();
-    $this->profiler = new PhpQuickProfiler();
-    $this->profiler->setConsole($this->console);
+	$this->profiler = new PhpQuickProfiler();
+	$this->profiler->setConsole($this->console);
 	}
 
 	public static function instance()
@@ -82,29 +82,29 @@ 
 
 	public static function display()
 	{
-    if ($_COOKIE['debugger'] == 'display' && self::instance()->display) {
-      $pdo = '';
-      global $container;
-      if (!empty($container) && !empty($container['db_connection_locator'])) {
-        $pdo = $container['db_connection_locator']->getRead();
-      }
-      if (!empty($pdo)) {
-        $profiles = $pdo->getProfiler()->getProfiles();
-        $profiles = array_filter($profiles, function ($profile) {
-            return $profile['function'] == 'perform';
-        });
-        $profiles = array_map(function ($profile) {
-            return array(
-                'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-                'parameters' => $profile['bind_values'],
-                'time' => $profile['duration']
-            );
-        }, $profiles);
-        self::instance()->profiler->setProfiledQueries($profiles);
-      }
-      self::instance()->profiler->setDisplay(new Particletree\Pqp\Display());
-      self::instance()->profiler->display($pdo);
-    }
+	if ($_COOKIE['debugger'] == 'display' && self::instance()->display) {
+	  $pdo = '';
+	  global $container;
+	  if (!empty($container) && !empty($container['db_connection_locator'])) {
+		$pdo = $container['db_connection_locator']->getRead();
+	  }
+	  if (!empty($pdo)) {
+		$profiles = $pdo->getProfiler()->getProfiles();
+		$profiles = array_filter($profiles, function ($profile) {
+			return $profile['function'] == 'perform';
+		});
+		$profiles = array_map(function ($profile) {
+			return array(
+				'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+				'parameters' => $profile['bind_values'],
+				'time' => $profile['duration']
+			);
+		}, $profiles);
+		self::instance()->profiler->setProfiledQueries($profiles);
+	  }
+	  self::instance()->profiler->setDisplay(new Particletree\Pqp\Display());
+	  self::instance()->profiler->display($pdo);
+	}
 	}
 
 }

router/WaterfallRouter.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,8 +1,8 @@ 
 <?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 @@ 
 			(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 @@ 
 
 	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 @@ 
 			(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'),

collector/comment/CommentCollector.class.inc.php

Indentation +5 added lines, -5 removed lines

@@ -114,9 +114,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getRecentWaterfallComments($count = 5)
-    {
-        $query = "
+	public static function getRecentWaterfallComments($count = 5)
+	{
+		$query = "
             SELECT
                 `comment_meta`.`id`,
                 CONCAT('journal/', `log`.`alias`) AS `log_path`,
@@ -156,8 +156,8 @@ 
                 `comment_meta`.`date` DESC
             LIMIT {$count}";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getCommentsForURL($site, $path, $commenter = 0)
 	{

collector/waterfall/WaterfallCollector.class.inc.php

Indentation +16 added lines, -16 removed lines

@@ -43,9 +43,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getMapList()
-    {
-        $query = "
+	public static function getMapList()
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias`,
@@ -71,8 +71,8 @@ 
             ORDER BY
                 `waterfall`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -92,9 +92,9 @@ 
 		return self::get_count($query);
 	}
 
-    public static function getNearbyList($waterfall)
-    {
-        $query = "
+	public static function getNearbyList($waterfall)
+	{
+		$query = "
             SELECT
                 `waterfall`.`name`,
                 `waterfall`.`alias` AS `alias`,
@@ -114,14 +114,14 @@ 
                 `waterfall`.`name`,
                 `watercourse`.`name`";
         
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
-    public static function getByOldAlias($alias)
-    {
-        $alias = self::escape($alias);
+	public static function getByOldAlias($alias)
+	{
+		$alias = self::escape($alias);
         
-        $query = "
+		$query = "
             SELECT
                 `waterfall`.`alias`,
                 `watercourse`.`alias` AS `watercourse_alias`
@@ -134,8 +134,8 @@ 
                 `waterfall`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 
 	public static function getByAlias($watercourse, $waterfall)
 	{

collector/waterfall/LogCollector.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -34,9 +34,9 @@ 
 		return self::run_query($query);
 	}
 
-    public static function getRecentList($total)
-    {
-        $query = "
+	public static function getRecentList($total)
+	{
+		$query = "
             SELECT
                 `log`.`title`,
                 `log`.`alias`,
@@ -59,8 +59,8 @@ 
                 `log`.`date` DESC
             LIMIT
                 {$total}";
-        return self::run_query($query);
-    }
+		return self::run_query($query);
+	}
 
 	public static function getListCount()
 	{
@@ -178,11 +178,11 @@ 
 		return self::run_row_query($query);
 	}
 
-    public static function getByDate($date)
-    {
-        $date = self::escape($date);
+	public static function getByDate($date)
+	{
+		$date = self::escape($date);
         
-        $query = "
+		$query = "
             SELECT
                 `log`.`alias`
             FROM
@@ -192,8 +192,8 @@ 
                 `log`.`is_public` = '1'
             LIMIT 1";
         
-        return self::run_row_query($query);
-    }
+		return self::run_row_query($query);
+	}
 	
 	public static function getById($log)
 	{

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -153,9 +153,9 @@
 		return self::run_query($query);
 	}
 
-    public static function getParentWatercourse($watercourse)
-    {
-    }
+	public static function getParentWatercourse($watercourse)
+	{
+	}
 
 	public static function getLogCountForWatercourse($watercourse)
 	{

controller/waterfalls/WaterfallController.class.inc.php

Indentation +193 added lines, -193 removed lines

@@ -1,231 +1,231 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/WatercourseCollector',
-    'waterfall/WaterfallCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/WatercourseCollector',
+	'waterfall/WaterfallCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class WaterfallController extends DefaultPageController
 {
 
-    private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
-
-    private $waterfall;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $path_watercourse = URLDecode::getPiece(1);
-        $path_fall = URLDecode::getPiece(2);
-
-        $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
-        if (!$this->waterfall) {
-              $this->eject();
-        }
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
-            $this->waterfall->name);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->waterfall->description);
-        $this->set_keywords((array) $this->waterfall->name);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-
-        $body_data = $this->format_waterfall_data($this->waterfall);
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
-
-        $this->set_body('data', $body_data);
-
-        $this->set_body('view', 'Fall');
-    }
-
-    private function format_waterfall_data($waterfall)
-    {
-        $waterfall_data = array();
-        $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
-        $waterfall_data['name'] = $waterfall->name;
-        $waterfall_data['watercourse'] = $waterfall->watercourse;
-        $waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
-        $waterfall_data['tagline'] = $waterfall->introduction;
-        $waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
-        $waterfall_data['album'] = $this->get_album();
-        $waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
-        $waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
-        $waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
-
-        return $waterfall_data;
-    }
-
-    private function get_waterfall_introduction($waterfall)
-    {
-        return array(
-            'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
-            'name' => $waterfall->name,
-            'watercourse' => $waterfall->watercourse,
-            'tagline' => $waterfall->introduction,
-        );
-    }
-
-    private function get_main_watercourse($alias)
-    {
-        $watercourse = WatercourseCollector::getByAlias($alias);
-        if ($watercourse->parent != 0) {
-            $watercourse = WatercourseCollector::getById($watercourse->parent);
-        }
-        
-        return (object) array(
-            'name' => $watercourse->name,
-            'title' => $watercourse->name,
-            'alias' => $watercourse->alias,
-        );
-    }
-
-    private function format_waterfall_content($content)
-    {
-        $content = Content::instance('FixInternalLink', $content)->activate();
-        
-        return $content;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->waterfall->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
+
+	private $waterfall;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$path_watercourse = URLDecode::getPiece(1);
+		$path_fall = URLDecode::getPiece(2);
+
+		$this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
+		if (!$this->waterfall) {
+			  $this->eject();
+		}
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			"{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
+			Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
+			$this->waterfall->name);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+
+		$this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->waterfall->description);
+		$this->set_keywords((array) $this->waterfall->name);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+
+		$body_data = $this->format_waterfall_data($this->waterfall);
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
+
+		$this->set_body('data', $body_data);
+
+		$this->set_body('view', 'Fall');
+	}
+
+	private function format_waterfall_data($waterfall)
+	{
+		$waterfall_data = array();
+		$waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
+		$waterfall_data['name'] = $waterfall->name;
+		$waterfall_data['watercourse'] = $waterfall->watercourse;
+		$waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
+		$waterfall_data['tagline'] = $waterfall->introduction;
+		$waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
+		$waterfall_data['album'] = $this->get_album();
+		$waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
+		$waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
+		$waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
+
+		return $waterfall_data;
+	}
+
+	private function get_waterfall_introduction($waterfall)
+	{
+		return array(
+			'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
+			'name' => $waterfall->name,
+			'watercourse' => $waterfall->watercourse,
+			'tagline' => $waterfall->introduction,
+		);
+	}
+
+	private function get_main_watercourse($alias)
+	{
+		$watercourse = WatercourseCollector::getByAlias($alias);
+		if ($watercourse->parent != 0) {
+			$watercourse = WatercourseCollector::getById($watercourse->parent);
+		}
+        
+		return (object) array(
+			'name' => $watercourse->name,
+			'title' => $watercourse->name,
+			'alias' => $watercourse->alias,
+		);
+	}
+
+	private function format_waterfall_content($content)
+	{
+		$content = Content::instance('FixInternalLink', $content)->activate();
+        
+		return $content;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->waterfall->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 	private function get_sidebar($waterfall)
 	{
 		$sidebar_data = array();
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
-        $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
+		$sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
 		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
-        $sidebar_data['rating'] = $waterfall->rating;
+		$sidebar_data['rating'] = $waterfall->rating;
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
 		
-        $sidebar_data['county'] = (object) array (
-            'name' => $waterfall->county,
-            'alias' => $waterfall->county_alias,
-            'title' => $waterfall->county_title,
-        );
+		$sidebar_data['county'] = (object) array (
+			'name' => $waterfall->county,
+			'alias' => $waterfall->county_alias,
+			'title' => $waterfall->county_title,
+		);
         
 		$sidebar_data['nearest_town'] = $waterfall->nearest_town;
 		$sidebar_data['latitude'] = round($waterfall->latitude, 5);
 		$sidebar_data['longitude'] = round($waterfall->longitude, 5);
 		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
         
-        $sidebar_data['map'] = $this->get_map_piece($waterfall);
+		$sidebar_data['map'] = $this->get_map_piece($waterfall);
         
-        $sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
+		$sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
         
-        $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
+		$sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
 		
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
-        $list = array();
-        $log_result = LogCollector::getLogListForWaterfall($waterfall);
-        foreach ($log_result as $log_row) {
-            $list[] = (object) array(
-                'date' => date('F j, Y', strtotime($log_row->date)),
-                'title' => $log_row->title,
-                'url' => "/journal/{$log_row->alias}/",
-            );
-        }
-        
-        return $list;
-    }
-
-    private function get_map_piece($waterfall)
-    {
-        $map_holder = array();
-        
-        $url = 'http://maps.googleapis.com/maps/api/staticmap';
-        $url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&zoom=8";
-        $url .= "&maptype=terrain";
-        $url .= "&size=230x200";
-        $url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&sensor=false";
-        $url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
-        
-        $image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
-        $map_holder['image'] = $image;
-        
-        $map_holder['uri'] = '/map/';
-        $map_holder['title'] = "View {$waterfall->name} on a larger map";
-        
-        return (object) $map_holder;
-    }
-
-    private function get_nearby_list($waterfall)
-    {
-        $nearby_list = array();
-        
-        $result = WaterfallCollector::getNearbyList($waterfall);
-        foreach ($result as $row) {
-            $nearby_list[] = (object) array(
-                'url' => "/{$row->watercourse_alias}/{$row->alias}/",
-                'anchor' => $row->name,
-                'title' => "{$row->name} of {$row->watercourse}",
-                'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
-            );
-        }
-        
-        return $nearby_list;
-    }
+	private function get_journal_list($waterfall)
+	{
+		$list = array();
+		$log_result = LogCollector::getLogListForWaterfall($waterfall);
+		foreach ($log_result as $log_row) {
+			$list[] = (object) array(
+				'date' => date('F j, Y', strtotime($log_row->date)),
+				'title' => $log_row->title,
+				'url' => "/journal/{$log_row->alias}/",
+			);
+		}
+        
+		return $list;
+	}
+
+	private function get_map_piece($waterfall)
+	{
+		$map_holder = array();
+        
+		$url = 'http://maps.googleapis.com/maps/api/staticmap';
+		$url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&zoom=8";
+		$url .= "&maptype=terrain";
+		$url .= "&size=230x200";
+		$url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&sensor=false";
+		$url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
+        
+		$image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
+		$map_holder['image'] = $image;
+        
+		$map_holder['uri'] = '/map/';
+		$map_holder['title'] = "View {$waterfall->name} on a larger map";
+        
+		return (object) $map_holder;
+	}
+
+	private function get_nearby_list($waterfall)
+	{
+		$nearby_list = array();
+        
+		$result = WaterfallCollector::getNearbyList($waterfall);
+		foreach ($result as $row) {
+			$nearby_list[] = (object) array(
+				'url' => "/{$row->watercourse_alias}/{$row->alias}/",
+				'anchor' => $row->name,
+				'title' => "{$row->name} of {$row->watercourse}",
+				'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
+			);
+		}
+        
+		return $nearby_list;
+	}
 
 }
\ No newline at end of file

controller/waterfalls/LogController.class.inc.php

Indentation +202 added lines, -202 removed lines

@@ -1,218 +1,218 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class LogController extends DefaultPageController
 {
 
-    private static $AUTHOR = 'Jacob Emerick';
-    private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
-    private static $JOURNAL_DIRECTORY = 'journal';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
-
-    private $log;
+	private static $AUTHOR = 'Jacob Emerick';
+	private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
+	private static $JOURNAL_DIRECTORY = 'journal';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
+
+	private $log;
 
-    public function __construct()
-    {
-        parent::__construct();
-        
-        $log_path = URLDecode::getPiece(2);
-        
-        $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
-
-        $this->parent_navigation_item = 'journal';
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
-            $this->log->title);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-        
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->log->introduction);
-        
-        $keyword_array = array();
-        $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
-        {
-            $keyword_array[] = $tag->name;
-        }
-        
-        $this->set_keywords($keyword_array);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-        
-        $this->set_body('view', 'Log');
-
-        $body_data = $this->get_formatted_log();
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
-        $body_data['sidebar'] = $this->get_sidebar();
-        $body_data['series'] = $this->get_series();
-        $body_data['album'] = $this->get_album();
-        
-        $this->set_body('data', $body_data);
-    }
-
-    private function get_formatted_log()
-    {
-        $formatted_log = array();
-        
-        $formatted_log['introduction'] = $this->get_log_introduction($this->log);
-        $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
-
-        $formatted_log['body'] = $this->get_formatted_log_body();
-        
-        return $formatted_log;
-    }
-
-    private function get_log_introduction($log)
-    {
-        if ($log->image_description == '') {
-            Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");
-        }
-        
-        return array(
-            'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
-            'date' => $this->get_parsed_date($log->date),
-            'publish_date' => $this->get_parsed_date($log->publish_date),
-            'introduction' => $log->introduction,
-            'image' => sprintf(
-                self::$MEDIUM_IMAGE_NODE,
-                $log->image_category,
-                $log->image_name,
-                $log->image_description),
-            'author' => self::$AUTHOR,
-            'author_url' => self::$AUTHOR_URL,
-        );
-    }
-
-    // @todo - link things up
-    private function get_formatted_log_body()
-    {
-        $body = $this->log->body;
-        
-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
-        $body = Content::instance('FixInternalLink', $body)->activate();
-        
-        return $body;
-    }
-
-    private function get_series()
-    {
-        $series = array(
-            'previous' => array(),
-            'next' => array());
-        
-        $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
-        {
-            $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
-                'title' => $previous_log->title,
-                'date' => $previous_log->date);
-        }
-        
-        $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
-        {
-            $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
-                'title' => $next_log->title,
-                'date' => $next_log->date);
-        }
-        
-        return $series;
-    }
-
-    private function get_sidebar()
-    {
-        $sidebar = array();
-        
-        $sidebar['companion_list'] = array();
-        $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
-        {
-            $sidebar['companion_list'][] = (object) array(
-                'title' => $companion->name,
-                'path' => "/companion/{$companion->alias}/");
-        }
-        
-        $sidebar['tag_list'] = array();
-        $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
-        {
-            $sidebar['tag_list'][] = (object) array(
-                'title' => $tag->name,
-                'path' => "/journal/tag/{$tag->alias}/");
-        }
-        
-        $sidebar['waterfall_list'] = array();
-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
-        {
-            $sidebar['waterfall_list'][] = (object) array(
-                'title' => $waterfall->name,
-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
-        }
-        
-        return $sidebar;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->log->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	public function __construct()
+	{
+		parent::__construct();
+        
+		$log_path = URLDecode::getPiece(2);
+        
+		$this->log = LogCollector::getByAlias($log_path);
+		if(!$this->log)
+			$this->eject();
+
+		$this->parent_navigation_item = 'journal';
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			$this->log->alias,
+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+			$this->log->title);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+        
+		$this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->log->introduction);
+        
+		$keyword_array = array();
+		$tag_result = LogCollector::getTagListForLog($this->log->id);
+		foreach($tag_result as $tag)
+		{
+			$keyword_array[] = $tag->name;
+		}
+        
+		$this->set_keywords($keyword_array);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+        
+		$this->set_body('view', 'Log');
+
+		$body_data = $this->get_formatted_log();
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
+		$body_data['sidebar'] = $this->get_sidebar();
+		$body_data['series'] = $this->get_series();
+		$body_data['album'] = $this->get_album();
+        
+		$this->set_body('data', $body_data);
+	}
+
+	private function get_formatted_log()
+	{
+		$formatted_log = array();
+        
+		$formatted_log['introduction'] = $this->get_log_introduction($this->log);
+		$formatted_log['title'] = $this->log->title;
+		$formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+
+		$formatted_log['body'] = $this->get_formatted_log_body();
+        
+		return $formatted_log;
+	}
+
+	private function get_log_introduction($log)
+	{
+		if ($log->image_description == '') {
+			Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");
+		}
+        
+		return array(
+			'title' => $log->title,
+			'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+			'date' => $this->get_parsed_date($log->date),
+			'publish_date' => $this->get_parsed_date($log->publish_date),
+			'introduction' => $log->introduction,
+			'image' => sprintf(
+				self::$MEDIUM_IMAGE_NODE,
+				$log->image_category,
+				$log->image_name,
+				$log->image_description),
+			'author' => self::$AUTHOR,
+			'author_url' => self::$AUTHOR_URL,
+		);
+	}
+
+	// @todo - link things up
+	private function get_formatted_log_body()
+	{
+		$body = $this->log->body;
+        
+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+		$body = Content::instance('FixInternalLink', $body)->activate();
+        
+		return $body;
+	}
+
+	private function get_series()
+	{
+		$series = array(
+			'previous' => array(),
+			'next' => array());
+        
+		$previous_log = LogCollector::getPreviousLog($this->log->id);
+		if($previous_log != false)
+		{
+			$series['previous'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+				'title' => $previous_log->title,
+				'date' => $previous_log->date);
+		}
+        
+		$next_log = LogCollector::getNextLog($this->log->id);
+		if($next_log != false)
+		{
+			$series['next'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+				'title' => $next_log->title,
+				'date' => $next_log->date);
+		}
+        
+		return $series;
+	}
+
+	private function get_sidebar()
+	{
+		$sidebar = array();
+        
+		$sidebar['companion_list'] = array();
+		$companions = LogCollector::getCompanionListForLog($this->log->id);
+		foreach($companions as $companion)
+		{
+			$sidebar['companion_list'][] = (object) array(
+				'title' => $companion->name,
+				'path' => "/companion/{$companion->alias}/");
+		}
+        
+		$sidebar['tag_list'] = array();
+		$tags = LogCollector::getTagListForLog($this->log->id);
+		foreach($tags as $tag)
+		{
+			$sidebar['tag_list'][] = (object) array(
+				'title' => $tag->name,
+				'path' => "/journal/tag/{$tag->alias}/");
+		}
+        
+		$sidebar['waterfall_list'] = array();
+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
+		foreach($waterfalls as $waterfall)
+		{
+			$sidebar['waterfall_list'][] = (object) array(
+				'title' => $waterfall->name,
+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
+		}
+        
+		return $sidebar;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->log->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            if ($photo->description == '') {
-                Debugger::logMessage("No description for {$photo->category}/{$photo->name}");
-            }
+			if ($photo->description == '') {
+				Debugger::logMessage("No description for {$photo->category}/{$photo->name}");
+			}
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 }
\ No newline at end of file

controller/waterfalls/AboutController.class.inc.php

Indentation +20 added lines, -20 removed lines

@@ -5,29 +5,29 @@
 final class AboutController extends DefaultPageController
 {
 
-    private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';
-    private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
-    private static $KEYWORD_ARRAY = array(
-        'about',
-        'waterfalls',
-        'birthday trip',
-        'Jacob Emerick',
-    );
+	private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';
+	private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
+	private static $KEYWORD_ARRAY = array(
+		'about',
+		'waterfalls',
+		'birthday trip',
+		'Jacob Emerick',
+	);
 
-    protected function set_head_data()
-    {
-        parent::set_head_data();
+	protected function set_head_data()
+	{
+		parent::set_head_data();
         
-        $this->set_title(self::$TITLE);
-        $this->set_description(self::$DESCRIPTION);
-        $this->set_keywords(self::$KEYWORD_ARRAY);
-    }
+		$this->set_title(self::$TITLE);
+		$this->set_description(self::$DESCRIPTION);
+		$this->set_keywords(self::$KEYWORD_ARRAY);
+	}
 
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
         
-        $this->set_body('view', 'About');
-    }
+		$this->set_body('view', 'About');
+	}
 
 }