jacobemerick / web

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/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

module/form/CommentSubmitModule.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -172,24 +172,24 @@
 			}

 		}

         

-        $site = URLDecode::getSite();

+		$site = URLDecode::getSite();

         

-        if ($site == 'blog') {

-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

-        } else if ($site == 'waterfalls') {

-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

-        }

+		if ($site == 'blog') {

+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

+		} else if ($site == 'waterfalls') {

+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

+		}

         

 		foreach($email_recipient_array as $email_recipient)

 		{

 			$mail = new Mail();

 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);

             

-            if ($site == 'blog') {

-                $mail->setSubject("New Comment on Jacob Emerick's Blog");

-            } else if ($site == 'waterfalls') {

-                $mail->setSubject("New Comment on Waterfalls of the Keweenaw");

-            }

+			if ($site == 'blog') {

+				$mail->setSubject("New Comment on Jacob Emerick's Blog");

+			} else if ($site == 'waterfalls') {

+				$mail->setSubject("New Comment on Waterfalls of the Keweenaw");

+			}

             

 			$mail->setMessage($message);

 			$mail->send();

router/Router.class.inc.php

Indentation +6 added lines, -6 removed lines

@@ -96,9 +96,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;

@@ -129,8 +129,8 @@ 
 			}

 

 			$image = new ImageOld($file);

-        	        if(!$image->isValid()) {

-                	        Loader::loadNew('controller', '/Error404Controller')->activate();

+					if(!$image->isValid()) {

+							Loader::loadNew('controller', '/Error404Controller')->activate();

 				exit();

 			}

 		}

@@ -201,7 +201,7 @@ 
 			URLDecode::getExtension() != 'jpg' &&

 			URLDecode::getExtension() != 'png' &&

 			URLDecode::getExtension() != 'ico' &&

-            strstr(URLDecode::getURI(), '#') === false);

+			strstr(URLDecode::getURI(), '#') === false);

 	}

 

 }

router/SitemapRouter.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
 	protected function get_direct_array()

 	{

 		$site = URLDecode::getSite();

-        if ($site == 'waterfalls') {

-            $site = 'waterfall';

-        }

+		if ($site == 'waterfalls') {

+			$site = 'waterfall';

+		}

 		$site = ucwords($site);

 		

 		return array(

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'),

src/domain/blog/MysqlPostRepository.php

Indentation +17 added lines, -17 removed lines

@@ -7,27 +7,27 @@
 class MysqlPostRepository implements PostRepository
 {
 
-    protected $connections;
+	protected $connections;
 
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    // todo make this smarter - it should parse by category as well
-    public function findByUri($uri)
-    {
-        $query = "
+	// todo make this smarter - it should parse by category as well
+	public function findByUri($uri)
+	{
+		$query = "
             SELECT `id`, `title`, `path`, `date`, `body`, `category`
             FROM `jpemeric_blog`.`post`
             WHERE `path` = :uri AND `display` = '1'
             LIMIT 1";
-        $bindings = [
-            'uri' => $uri,
-        ];
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		$bindings = [
+			'uri' => $uri,
+		];
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 }

src/domain/blog/PostRepository.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface PostRepository
 {
-    public function findByUri($uri);
+	public function findByUri($uri);
 }

utility/Asset.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			switch($piece)

 			{

 				case 'jquery-1.4.2' :

-                case 'jquery-1.10.2.min' :

+				case 'jquery-1.10.2.min' :

 				case 'jquery-ui-1.8.2' :

 				case 'ga' :

 					$simple_pieces[] = $piece;

@@ -118,9 +118,9 @@ 
 			foreach($array as $file)

 			{

 				$piece_path = self::get_piece_path($type, $file);

-                $contents .= "/*** {$file} ***/\n\n";

+				$contents .= "/*** {$file} ***/\n\n";

 				$contents .= file_get_contents($piece_path);

-                $contents .= "\n\n\n";

+				$contents .= "\n\n\n";

 			}

 			return self::make_final_file($type, $contents, $site);

 		}