jacobemerick / web

controller/waterfalls/CountyListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		$path = URLDecode::getPiece(1);
 		$this->county = CountyCollector::getByAlias($path);
 		
-		if(!$this->county)
+		if (!$this->county)
 			$this->eject();
 		
 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 		$path = URLDecode::getPiece(1);
 		$this->county = CountyCollector::getByAlias($path);
 		
-		if(!$this->county)
-			$this->eject();
+		if(!$this->county) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/waterfalls/LogController.class.inc.php

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}");

Indentation +196 added lines, -196 removed lines

@@ -1,210 +1,210 @@
 <?
 
 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 = 'https://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)
-    {
-        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;
+	private static $AUTHOR = 'Jacob Emerick';
+	private static $AUTHOR_URL = 'https://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)
+	{
+		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);
             
-            $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;
+	}
 
 }

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

Indentation +20 added lines, -20 removed lines

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

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		
-		foreach($companion_result as $companion_row)
+		foreach ($companion_result as $companion_row)
 		{
 			$companion = new stdclass();
 			$companion->name = $companion_row->name;
@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();
 		$period_list = array();
 		
-		foreach($period_result as $period_row)
+		foreach ($period_result as $period_row)
 		{
 			$period = new stdclass();
 			$period->name = $period_row->name;

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

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		
-		foreach($county_result as $county_row)
+		foreach ($county_result as $county_row)
 		{
 			$county = new stdclass();
 			$county->name = $county_row->name;
@@ -54,7 +54,7 @@ 
 		$watercourse_result = WatercourseCollector::getWatercourseList();
 		$watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
+		foreach ($watercourse_result as $watercourse_row)
 		{
 			$watercourse = new stdclass();
 			$watercourse->name = $watercourse_row->name;

controller/waterfalls/ContactController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

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

+					$error_result['email'] = 'please enter a valid email';

+		}

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

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

Indentation +10 added lines, -10 removed lines

@@ -58,16 +58,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Waterfall Site Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Waterfall Site Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();
 
 		return (object) array('display' => 'success');
 	}