jacobemerick / web

controller/lifestream/HomeController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,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;
 	}
@@ -58,24 +58,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream');
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = $this->activityRepository->getActivitiesCount();
 		return $this->total_post_count;
 	}

controller/site/ContactController.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,17 +28,17 @@ 
 
 	private function get_form_results()
 	{
-		if(!Request::hasPost())
+		if (!Request::hasPost())
 			return array();
 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_message['message'] = 'Please enter a message.';
 		
-		if(!empty($error_message))
+		if (!empty($error_message))
 		{
 			return array(
 				'error_message' => $error_message,
@@ -50,14 +50,14 @@ 
       ->addTo($container['config']->admin_email)
       ->setSubject('Site Contact')
       ->setPlainMessage(
-        'Name: ' . Request::getPost('name') . "\n" .
-        'Email: ' . Request::getPost('email') . "\n" .
-        'Message: ' . Request::getPost('message')
+        'Name: '.Request::getPost('name')."\n".
+        'Email: '.Request::getPost('email')."\n".
+        'Message: '.Request::getPost('message')
       )
       ->send();
 
 		return array(
-			'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");
+			'success_message' => "Thank you for your message, ".Request::getPost('name')."! I'll get back to you as soon as possible.");
 	}
 
 }

controller/waterfalls/DefaultListController.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
+		if (count($items) < 1)
 			$this->eject();
 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -41,7 +41,7 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return $this->get_initial_introduction();
 		
 		return $this->get_subsequent_introduction();
@@ -53,7 +53,7 @@ 
 	private $items;
 	protected function get_items()
 	{
-		if(!isset($this->items))
+		if (!isset($this->items))
 		{
 			$total = $this->get_item_count_per_page();
 			$offset = ($this->page - 1) * $this->get_item_count_per_page();
@@ -68,7 +68,7 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
+		if (!isset($this->item_count))
 			$this->item_count = $this->get_item_count_result();
 		return $this->item_count;
 	}
@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$meta_array = $this->get_initial_meta();
 		else
 			$meta_array = $this->get_subsequent_meta();
@@ -119,18 +119,18 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return $this->get_list_link_root();
-		return $this->get_list_link_root() . ($this->page - 1) . '/';
+		return $this->get_list_link_root().($this->page - 1).'/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
 			return;
-		return $this->get_list_link_root() . ($this->page + 1) . '/';
+		return $this->get_list_link_root().($this->page + 1).'/';
 	}
 
 	abstract protected function get_list_link_root();
@@ -139,30 +139,30 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
+		if ($this->get_item_count_per_page() >= $this->get_item_count())
 			return $link_array;
 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
+		if ($this->get_list_prev_link() !== null)
 			$link->uri = $this->get_list_prev_link();
 		else
 			$link->class = 'inactive';
 		$link_array[] = $link;
 		
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
 		{
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
+			if ($i == $this->page)
 				$link->class = 'current';
 			else
 			{
-				if($i == 1)
+				if ($i == 1)
 					$link->uri = $this->get_list_link_root();
 				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+					$link->uri = $this->get_list_link_root().$i.'/';
 			}
 			
 			$link_array[] = $link;
@@ -170,7 +170,7 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
+		if ($this->get_list_next_link() !== null)
 			$link->uri = $this->get_list_next_link();
 		else
 			$link->class = 'inactive';
@@ -192,7 +192,7 @@ 
 
 	final protected function get_image_element($category, $path, $description, $size = 'small')
 	{
-		switch($size)
+		switch ($size)
 		{
 			case 'medium' :
 				$height = 375;

controller/waterfalls/LogController.class.inc.php

Spacing +16 added lines, -16 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';
@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+            Loader::getRootUrl('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/',
             $this->log->title);
         
         $this->add_waterfall_js();
@@ -43,12 +43,12 @@ 
     {
         parent::set_head_data();
         
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+        $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)
+        foreach ($tag_result as $tag)
         {
             $keyword_array[] = $tag->name;
         }
@@ -77,7 +77,7 @@ 
         
         $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['url'] = Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/';
 
         $formatted_log['body'] = $this->get_formatted_log_body();
         
@@ -88,7 +88,7 @@ 
     {
         return array(
             'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+            '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,
@@ -120,19 +120,19 @@ 
             '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 . '/',
+                '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)
+        if ($next_log != false)
         {
             $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$next_log->alias.'/',
                 'title' => $next_log->title,
                 'date' => $next_log->date);
         }
@@ -146,7 +146,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,
@@ -155,7 +155,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,
@@ -164,7 +164,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,
@@ -178,17 +178,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);

controller/waterfalls/WaterfallController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
         $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}/",
+            Loader::getRootUrl('waterfalls')."{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
             $this->waterfall->name);
         
         $this->add_waterfall_js();
@@ -43,7 +43,7 @@ 
     {
         parent::set_head_data();
 
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
+        $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);
     }
@@ -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);
@@ -147,14 +147,14 @@ 
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
+		$sidebar_data['rating_display'] = ($waterfall->rating / 2).'/5';
         $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 (
+        $sidebar_data['county'] = (object) array(
             'name' => $waterfall->county,
             'alias' => $waterfall->county_alias,
             'title' => $waterfall->county_title,

controller/waterfalls/CountyListController.class.inc.php

Spacing +3 added lines, -3 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();
@@ -38,7 +38,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "{$this->county->name} Waterfalls | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->county->description;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -49,7 +49,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->county->name);
 		$meta_array['keywords'] = $this->get_keyword_array();
 		

controller/waterfalls/ContactController.class.inc.php

Spacing +7 added lines, -7 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',
@@ -63,8 +63,8 @@ 
       ->addTo($container['config']->admin_email)
       ->setSubject('Waterfall Site Contact')
       ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
+        "Name: {$values->name}\n".
+        "Email: {$values->email}\n".
         "Message: {$values->message}"
       )
       ->send();

controller/waterfalls/LogTagListController.class.inc.php

Spacing +3 added lines, -3 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();
@@ -37,7 +37,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "{$this->tag->name} | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "{$this->tag->name} | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->tag->name;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -48,7 +48,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->tag->name);
 		$meta_array['keywords'] = $this->get_keyword_array();
 		

controller/waterfalls/PeriodListController.class.inc.php

Spacing +3 added lines, -3 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();
@@ -36,7 +36,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "Hiking Stories - {$this->period->name} | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "Hiking Stories - {$this->period->name} | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->period->description;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -47,7 +47,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->period->name);
 		$meta_array['keywords'] = $this->get_keyword_array();