jacobemerick / web

controller/waterfalls/HomeController.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,84 +1,84 @@
 <?

 

 Loader::load('collector', array(

-    'comment/CommentCollector',

-    'image/PhotoCollector',

-    'waterfall/LogCollector',

+	'comment/CommentCollector',

+	'image/PhotoCollector',

+	'waterfall/LogCollector',

 ));

 Loader::load('controller', 'waterfalls/DefaultPageController');

 

 final class HomeController extends DefaultPageController

 {

 

-    private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';

-    private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';

-    private static $KEYWORD_ARRAY = array(

-        'waterfalls',

-        'keweenaw',

-        'upper peninsula',

-        'jacob emerick',

-    );

+	private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';

+	private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';

+	private static $KEYWORD_ARRAY = array(

+		'waterfalls',

+		'keweenaw',

+		'upper peninsula',

+		'jacob emerick',

+	);

 

-    private static $BANNER_IMAGE = 2661;

+	private static $BANNER_IMAGE = 2661;

 

-    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 = 'wide')

-    {

-        parent::set_body_data($page_type);

+	protected function set_body_data($page_type = 'wide')

+	{

+		parent::set_body_data($page_type);

         

-        $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);

-        $photo_obj = (object) array(

-            'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",

-            'description'  => $photo->description,

-        );

-        $this->set_body('photo', $photo_obj);

+		$photo = PhotoCollector::getRow(self::$BANNER_IMAGE);

+		$photo_obj = (object) array(

+			'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",

+			'description'  => $photo->description,

+		);

+		$this->set_body('photo', $photo_obj);

         

-        $recent_log_container;

-        $recent_logs = LogCollector::getRecentList(4);

-        foreach ($recent_logs as $log) {

-            $recent_log_container[] = (object) array(

-                'photo'  => (object) array(

-                    'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",

-                    'description'  => $log->photo_description,

-                ),

-                'title'  => $log->title,

-                'link'   => "/journal/{$log->alias}/",

-                'date'   => date('F j, Y', strtotime($log->publish_date)),

-            );

-        }

-        $this->set_body('logs', $recent_log_container);

+		$recent_log_container;

+		$recent_logs = LogCollector::getRecentList(4);

+		foreach ($recent_logs as $log) {

+			$recent_log_container[] = (object) array(

+				'photo'  => (object) array(

+					'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",

+					'description'  => $log->photo_description,

+				),

+				'title'  => $log->title,

+				'link'   => "/journal/{$log->alias}/",

+				'date'   => date('F j, Y', strtotime($log->publish_date)),

+			);

+		}

+		$this->set_body('logs', $recent_log_container);

         

-        $recent_comments = CommentCollector::getRecentWaterfallComments();

+		$recent_comments = CommentCollector::getRecentWaterfallComments();

         

-        $recent_comment_container = array();

-        foreach($recent_comments as $comment) {

-            $body = $comment->body;

-            $body = strip_tags($body);

+		$recent_comment_container = array();

+		foreach($recent_comments as $comment) {

+			$body = $comment->body;

+			$body = strip_tags($body);

             

-            $comment_obj = new stdclass();

-            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);

-            $comment_obj->commenter = $comment->name;

-            if (!empty($comment->log_path)) {

-                $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";

-                $comment_obj->location = $comment->log_title;

-            } else {

-                $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";

-                $comment_obj->location = $comment->waterfall_title;

-            }

+			$comment_obj = new stdclass();

+			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);

+			$comment_obj->commenter = $comment->name;

+			if (!empty($comment->log_path)) {

+				$comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";

+				$comment_obj->location = $comment->log_title;

+			} else {

+				$comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";

+				$comment_obj->location = $comment->waterfall_title;

+			}

             

-            $recent_comment_container[] = $comment_obj;

-        }

-        $this->set_body('comments', $recent_comment_container);

+			$recent_comment_container[] = $comment_obj;

+		}

+		$this->set_body('comments', $recent_comment_container);

         

-        $this->set_body('view', 'Home');

-    }

+		$this->set_body('view', 'Home');

+	}

 

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $recent_comments = CommentCollector::getRecentWaterfallComments();

         

         $recent_comment_container = array();

-        foreach($recent_comments as $comment) {

+        foreach ($recent_comments as $comment) {

             $body = $comment->body;

             $body = strip_tags($body);

             

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

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
         $log_path = URLDecode::getPiece(2);

         

         $this->log = LogCollector::getByAlias($log_path);

-        if(!$this->log)

+        if (!$this->log)

             $this->eject();

 

         $this->parent_navigation_item = 'journal';

@@ -48,7 +48,7 @@ 
         

         $keyword_array = array();

         $tag_result = LogCollector::getTagListForLog($this->log->id);

-        foreach($tag_result as $tag)

+        foreach ($tag_result as $tag)

         {

             $keyword_array[] = $tag->name;

         }

@@ -124,7 +124,7 @@ 
             'next' => array());

         

         $previous_log = LogCollector::getPreviousLog($this->log->id);

-        if($previous_log != false)

+        if ($previous_log != false)

         {

             $series['previous'] = (object) array(

                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',

@@ -133,7 +133,7 @@ 
         }

         

         $next_log = LogCollector::getNextLog($this->log->id);

-        if($next_log != false)

+        if ($next_log != false)

         {

             $series['next'] = (object) array(

                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',

@@ -150,7 +150,7 @@ 
         

         $sidebar['companion_list'] = array();

         $companions = LogCollector::getCompanionListForLog($this->log->id);

-        foreach($companions as $companion)

+        foreach ($companions as $companion)

         {

             $sidebar['companion_list'][] = (object) array(

                 'title' => $companion->name,

@@ -159,7 +159,7 @@ 
         

         $sidebar['tag_list'] = array();

         $tags = LogCollector::getTagListForLog($this->log->id);

-        foreach($tags as $tag)

+        foreach ($tags as $tag)

         {

             $sidebar['tag_list'][] = (object) array(

                 'title' => $tag->name,

@@ -168,7 +168,7 @@ 
         

         $sidebar['waterfall_list'] = array();

         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);

-        foreach($waterfalls as $waterfall)

+        foreach ($waterfalls as $waterfall)

         {

             $sidebar['waterfall_list'][] = (object) array(

                 'title' => $waterfall->name,

@@ -182,17 +182,17 @@ 
     {

         $album = array();

         

-        if($this->log->album == 0)

+        if ($this->log->album == 0)

             return $album;

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);

-        foreach($photo_list as $photo)

+        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)

+            if ($photo->height < $photo->width)

                 list($height, $width) = array(75, 100);

             else

                 list($height, $width) = array(100, 75);

Braces +11 added lines, -8 removed lines

@@ -25,8 +25,9 @@ 
         $log_path = URLDecode::getPiece(2);

         

         $this->log = LogCollector::getByAlias($log_path);

-        if(!$this->log)

-            $this->eject();

+        if(!$this->log) {

+                    $this->eject();

+        }

 

         $this->parent_navigation_item = 'journal';

         

@@ -182,8 +183,9 @@ 
     {

         $album = array();

         

-        if($this->log->album == 0)

-            return $album;

+        if($this->log->album == 0) {

+                    return $album;

+        }

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);

         foreach($photo_list as $photo)

@@ -192,10 +194,11 @@ 
             $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}");

controller/waterfalls/LogTagListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		$alias = URLDecode::getPiece(3);

 		$this->tag = LogTagCollector::getTag($alias);

 		

-		if(!$this->tag)

+		if (!$this->tag)

 			$this->eject();

 		

 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);

 		$this->tag = LogTagCollector::getTag($alias);

 		

-		if(!$this->tag)

-			$this->eject();

+		if(!$this->tag) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

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/PeriodListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

+		if (!$this->period)

 			$this->eject();

 		

 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

-			$this->eject();

+		if(!$this->period) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

-			return $page;

+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;

 	}

 

controller/waterfalls/WatercourseListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

+		if (!$this->watercourse)

 			$this->eject();

 	

 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

-			$this->eject();

+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	

 		parent::__construct();

 	}

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

Spacing +4 added lines, -4 removed lines

@@ -112,17 +112,17 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

+        if ($this->waterfall->album == 0)

             return $album;

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

-        foreach($photo_list as $photo)

+        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)

+            if ($photo->height < $photo->width)

                 list($height, $width) = array(75, 100);

             else

                 list($height, $width) = array(100, 75);

@@ -154,7 +154,7 @@ 
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');

 		$sidebar_data['drop_count'] = $waterfall->drop_count;

 		

-        $sidebar_data['county'] = (object) array (

+        $sidebar_data['county'] = (object) array(

             'name' => $waterfall->county,

             'alias' => $waterfall->county_alias,

             'title' => $waterfall->county_title,

Braces +8 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

-            return $album;

+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

         foreach($photo_list as $photo)

@@ -122,10 +123,11 @@ 
             $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,

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();

Spacing +19 added lines, -19 removed lines

@@ -26,15 +26,15 @@ 
 

 	public function activate()

 	{

-		if(!Request::hasPost())

+		if (!Request::hasPost())

 			return false;

-		if(!Request::getPost('submit') == 'Submit Comment')

+		if (!Request::getPost('submit') == 'Submit Comment')

 			return false;

 		

 		$errors = $this->fetch_errors();

-		if(count($errors) > 0)

+		if (count($errors) > 0)

 			return $errors;

-		if(Request::getPost('catch') !== '')

+		if (Request::getPost('catch') !== '')

 			return false;

 		

 		$page_id = $this->save_comment_page();

@@ -50,17 +50,17 @@ 
 	private function fetch_errors()

 	{

 		$errors = array();

-		if(!Validate::checkRequest('post', 'name', 'name'))

+		if (!Validate::checkRequest('post', 'name', 'name'))

 			$errors['name'] = 'You must include a valid name';

-		if(!Validate::checkRequest('post', 'email', 'email'))

+		if (!Validate::checkRequest('post', 'email', 'email'))

 			$errors['email'] = 'You must include a valid email';

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

 			$errors['website'] = 'Please enter a valid website';

-		if(!Validate::checkRequest('post', 'comment', 'string'))

+		if (!Validate::checkRequest('post', 'comment', 'string'))

 			$errors['comment'] = 'You must enter a comment';

-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')

+		if (Request::getPost('notify') && Request::getPost('notify') != 'check')

 			$errors['notify'] = 'You entered an invalid notify request';

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

 			$errors['reply'] = 'You entered an invalid reply request';

 		

 		return $errors;

@@ -69,7 +69,7 @@ 
 	private function save_comment_page()

 	{

 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);

-		if($page_result !== null)

+		if ($page_result !== null)

 			return $page_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";

@@ -85,7 +85,7 @@ 
 			'name' => Request::getPost('name'),

 			'email' => Request::getPost('email'));

 		

-		if(Request::getPost('website') != '')

+		if (Request::getPost('website') != '')

 			$cookie_value['website'] = Request::getPost('website');

 		

 		$cookie_value = json_encode($cookie_value);

@@ -95,7 +95,7 @@ 
 			->save();

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result !== null)

+		if ($commenter_result !== null)

 			return $commenter_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";

@@ -112,7 +112,7 @@ 
 	private function save_comment()

 	{

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result !== null)

+		if ($comment_result !== null)

 			return $comment_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";

@@ -133,7 +133,7 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";

 		

 		$reply = Database::escape(Request::getPost('type'));

-		if($reply == 'new')

+		if ($reply == 'new')

 			$reply = 0;

 		// else check to make sure value is legit

 		

@@ -157,13 +157,13 @@ 
 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

 		

-		if($commenter_result->trusted == 1)

+		if ($commenter_result->trusted == 1)

 		{

 			$notification_result = CommentCollector::getNotificationForPage($page);

 			

-			foreach($notification_result as $notification_row)

+			foreach ($notification_result as $notification_row)

 			{

-				if($notification_row->email == Request::getPost('email'))

+				if ($notification_row->email == Request::getPost('email'))

 					continue;

 				

 				$email_recipient_array[$notification_row->email] = array(

@@ -180,7 +180,7 @@ 
             $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)

+		foreach ($email_recipient_array as $email_recipient)

 		{

 			$mail = new Mail();

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

Braces +48 added lines, -32 removed lines

@@ -26,16 +26,20 @@ 
 

 	public function activate()

 	{

-		if(!Request::hasPost())

-			return false;

-		if(!Request::getPost('submit') == 'Submit Comment')

-			return false;

+		if(!Request::hasPost()) {

+					return false;

+		}

+		if(!Request::getPost('submit') == 'Submit Comment') {

+					return false;

+		}

 		

 		$errors = $this->fetch_errors();

-		if(count($errors) > 0)

-			return $errors;

-		if(Request::getPost('catch') !== '')

-			return false;

+		if(count($errors) > 0) {

+					return $errors;

+		}

+		if(Request::getPost('catch') !== '') {

+					return false;

+		}

 		

 		$page_id = $this->save_comment_page();

 		$commenter_id = $this->save_commenter();

@@ -50,18 +54,24 @@ 
 	private function fetch_errors()

 	{

 		$errors = array();

-		if(!Validate::checkRequest('post', 'name', 'name'))

-			$errors['name'] = 'You must include a valid name';

-		if(!Validate::checkRequest('post', 'email', 'email'))

-			$errors['email'] = 'You must include a valid email';

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

-			$errors['website'] = 'Please enter a valid website';

-		if(!Validate::checkRequest('post', 'comment', 'string'))

-			$errors['comment'] = 'You must enter a comment';

-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')

-			$errors['notify'] = 'You entered an invalid notify request';

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

-			$errors['reply'] = 'You entered an invalid reply request';

+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					$errors['name'] = 'You must include a valid name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					$errors['email'] = 'You must include a valid email';

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					$errors['website'] = 'Please enter a valid website';

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					$errors['comment'] = 'You must enter a comment';

+		}

+		if(Request::getPost('notify') && Request::getPost('notify') != 'check') {

+					$errors['notify'] = 'You entered an invalid notify request';

+		}

+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {

+					$errors['reply'] = 'You entered an invalid reply request';

+		}

 		

 		return $errors;

 	}

@@ -69,8 +79,9 @@ 
 	private function save_comment_page()

 	{

 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);

-		if($page_result !== null)

-			return $page_result->id;

+		if($page_result !== null) {

+					return $page_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";

 		$query = sprintf($query, $this->site, $this->path);

@@ -85,8 +96,9 @@ 
 			'name' => Request::getPost('name'),

 			'email' => Request::getPost('email'));

 		

-		if(Request::getPost('website') != '')

-			$cookie_value['website'] = Request::getPost('website');

+		if(Request::getPost('website') != '') {

+					$cookie_value['website'] = Request::getPost('website');

+		}

 		

 		$cookie_value = json_encode($cookie_value);

 		

@@ -95,8 +107,9 @@ 
 			->save();

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result !== null)

-			return $commenter_result->id;

+		if($commenter_result !== null) {

+					return $commenter_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";

 		

@@ -112,8 +125,9 @@ 
 	private function save_comment()

 	{

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result !== null)

-			return $comment_result->id;

+		if($comment_result !== null) {

+					return $comment_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";

 		

@@ -133,8 +147,9 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";

 		

 		$reply = Database::escape(Request::getPost('type'));

-		if($reply == 'new')

-			$reply = 0;

+		if($reply == 'new') {

+					$reply = 0;

+		}

 		// else check to make sure value is legit

 		

 		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;

@@ -163,8 +178,9 @@ 
 			

 			foreach($notification_result as $notification_row)

 			{

-				if($notification_row->email == Request::getPost('email'))

-					continue;

+				if($notification_row->email == Request::getPost('email')) {

+									continue;

+				}

 				

 				$email_recipient_array[$notification_row->email] = array(

 					'email' => $notification_row->email,