jacobemerick / web

controller/site/DefaultPageController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 		$active_page = $this->get_active_page();

 		

 		$menu = array();

-		foreach(self::$MENU as $item)

+		foreach (self::$MENU as $item)

 		{

 			$menu[] = (object) array(

 				'name' => $item['name'],

@@ -56,13 +56,13 @@ 
 	{

 		$current_uri = URLDecode::getPiece(1);

 		

-		if(!isset($current_uri))

+		if (!isset($current_uri))

 			return 'About';

 		

 		$menu = self::$MENU;

-		foreach($menu as $link)

+		foreach ($menu as $link)

 		{

-			if($link['uri'] == $current_uri)

+			if ($link['uri'] == $current_uri)

 				return $link['name'];

 		}

 		

Braces +6 added lines, -4 removed lines

@@ -56,14 +56,16 @@
 	{

 		$current_uri = URLDecode::getPiece(1);

 		

-		if(!isset($current_uri))

-			return 'About';

+		if(!isset($current_uri)) {

+					return 'About';

+		}

 		

 		$menu = self::$MENU;

 		foreach($menu as $link)

 		{

-			if($link['uri'] == $current_uri)

-				return $link['name'];

+			if($link['uri'] == $current_uri) {

+							return $link['name'];

+			}

 		}

 		

 		return 'About';

controller/sitemap/PortfolioSitemapController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 		

 		$pieces = PortfolioCollector::getAllPieces();

 		

-		foreach($pieces as $piece)

+		foreach ($pieces as $piece)

 		{

-			if($piece->category == 1)

+			if ($piece->category == 1)

 				$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

 			else

 				$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 		

 		foreach($pieces as $piece)

 		{

-			if($piece->category == 1)

-				$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

-			else

-				$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			if($piece->category == 1) {

+							$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			} else {

+							$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			}

 		}

 	}

 

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

Spacing +1 added lines, -1 removed lines

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

 		$this->companion = CompanionCollector::getByAlias($alias);

 		

-		if(!$this->companion)

+		if (!$this->companion)

 			$this->eject();

 		

 		parent::__construct();

Braces +3 added lines, -2 removed lines

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

 		$this->companion = CompanionCollector::getByAlias($alias);

 		

-		if(!$this->companion)

-			$this->eject();

+		if(!$this->companion) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 				'values' => $values);

 		}

 		

-        global $config;

+		global $config;

 		$mail = Loader::loadNew('utility', 'Mail');

 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');

 		$mail->setSubject('Waterfall Site Contact');

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

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

Indentation +4 added lines, -4 removed lines

@@ -95,9 +95,9 @@ 
 	abstract protected function get_initial_meta();

 	abstract protected function get_subsequent_meta();

 

-    final protected function set_body_data($page_type = 'normal')

-    {

-        parent::set_body_data($page_type);

+	final protected function set_body_data($page_type = 'normal')

+	{

+		parent::set_body_data($page_type);

 		

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

 		$this->set_body('data', $this->get_list_body_data());

@@ -107,7 +107,7 @@ 
 	{

 		$body_data_array = array();

 		

-        $body_data_array['introduction'] = $this->get_introduction();

+		$body_data_array['introduction'] = $this->get_introduction();

 		$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());

 		$body_data_array['navigation'] = array(

 				'description' => $this->get_list_description(),

Spacing +16 added lines, -16 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,16 +119,16 @@ 
 

 	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) . '/';

 	}

 

 	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) . '/';

 	}

@@ -139,27 +139,27 @@ 
 	{

 		$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 . '/';

@@ -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;

Braces +47 added lines, -35 removed lines

@@ -20,15 +20,17 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();

 		

 		$items = $this->get_items();

-		if(count($items) < 1)

-			$this->eject();

+		if(count($items) < 1) {

+					$this->eject();

+		}

 	}

 

 	final protected function get_page_number()

 	{

 		$page = $this->get_page_number_piece();

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

-			return $page;

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

+					return $page;

+		}

 		return 1;

 	}

 

@@ -41,8 +43,9 @@ 
 

 	final private function get_introduction()

 	{

-		if($this->page == 1)

-			return $this->get_initial_introduction();

+		if($this->page == 1) {

+					return $this->get_initial_introduction();

+		}

 		

 		return $this->get_subsequent_introduction();

 	}

@@ -68,8 +71,9 @@ 
 	private $item_count;

 	final private function get_item_count()

 	{

-		if(!isset($this->item_count))

-			$this->item_count = $this->get_item_count_result();

+		if(!isset($this->item_count)) {

+					$this->item_count = $this->get_item_count_result();

+		}

 		return $this->item_count;

 	}

 

@@ -82,10 +86,11 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());

 		$this->set_head('previous_link', $this->get_list_prev_link());

 		

-		if($this->page == 1)

-			$meta_array = $this->get_initial_meta();

-		else

-			$meta_array = $this->get_subsequent_meta();

+		if($this->page == 1) {

+					$meta_array = $this->get_initial_meta();

+		} else {

+					$meta_array = $this->get_subsequent_meta();

+		}

 		

 		$this->set_title($meta_array['title']);

 		$this->set_description($meta_array['description']);

@@ -119,17 +124,20 @@ 
 

 	final private function get_list_prev_link()

 	{

-		if($this->page == 1)

-			return;

-		if($this->page == 2)

-			return $this->get_list_link_root();

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return $this->get_list_link_root();

+		}

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

-			return;

+		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) {

+					return;

+		}

 		return $this->get_list_link_root() . ($this->page + 1) . '/';

 	}

 

@@ -139,15 +147,17 @@ 
 	{

 		$link_array = array();

 		

-		if($this->get_item_count_per_page() >= $this->get_item_count())

-			return $link_array;

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

-			$link->uri = $this->get_list_prev_link();

-		else

-			$link->class = 'inactive';

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

@@ -155,14 +165,15 @@ 
 			$link = new stdclass();

 			$link->anchor = $i;

 			

-			if($i == $this->page)

-				$link->class = 'current';

-			else

+			if($i == $this->page) {

+							$link->class = 'current';

+			} else

 			{

-				if($i == 1)

-					$link->uri = $this->get_list_link_root();

-				else

-					$link->uri = $this->get_list_link_root() . $i . '/';

+				if($i == 1) {

+									$link->uri = $this->get_list_link_root();

+				} else {

+									$link->uri = $this->get_list_link_root() . $i . '/';

+				}

 			}

 			

 			$link_array[] = $link;

@@ -170,10 +181,11 @@ 
 		

 		$link = new stdclass();

 		$link->anchor = 'next &raquo;';

-		if($this->get_list_next_link() !== null)

-			$link->uri = $this->get_list_next_link();

-		else

-			$link->class = 'inactive';

+		if($this->get_list_next_link() !== null) {

+					$link->uri = $this->get_list_next_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;

 		

 		return $link_array;

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

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 

 	protected static $WATERFALL_SITE_ID = 5;

 

-    protected $parent_navigation_item = '';

+	protected $parent_navigation_item = '';

 

 	protected function set_head_data()

 	{

@@ -19,46 +19,46 @@ 
 		$this->add_css('waterfall');

 	}

 

-    protected function add_waterfall_js()

-    {

-        $this->add_js('jquery-1.10.2.min');

-        $this->add_js('imagelightbox.min');

-        $this->add_js('waterfall-overlay');

-        $this->add_js('waterfall-map');

-    }

+	protected function add_waterfall_js()

+	{

+		$this->add_js('jquery-1.10.2.min');

+		$this->add_js('imagelightbox.min');

+		$this->add_js('waterfall-overlay');

+		$this->add_js('waterfall-map');

+	}

 

 	protected function set_body_data($page_type = 'normal')

 	{

 		$this->set_body('activity_array', $this->get_recent_activity());

 

-        $this->set_body('main_navigation', array(

-                (object) array(

-                    'uri' => '/falls/',

-                    'anchor' => 'Falls',

-                    'is_active' => $this->parent_navigation_item === 'falls',

-                ),

-                (object) array(

-                    'uri' => '/map/',

-                    'anchor' => 'Map',

-                    'is_active' => $this->parent_navigation_item === 'map',

-                ),

-                (object) array(

-                    'uri' => '/journal/',

-                    'anchor' => 'Journal',

-                    'is_active' => $this->parent_navigation_item === 'journal',

-                ),

-                (object) array(

-                    'uri' => '/about/',

-                    'anchor' => 'About',

-                    'is_active' => $this->parent_navigation_item === 'about',

-                )

-        ));

+		$this->set_body('main_navigation', array(

+				(object) array(

+					'uri' => '/falls/',

+					'anchor' => 'Falls',

+					'is_active' => $this->parent_navigation_item === 'falls',

+				),

+				(object) array(

+					'uri' => '/map/',

+					'anchor' => 'Map',

+					'is_active' => $this->parent_navigation_item === 'map',

+				),

+				(object) array(

+					'uri' => '/journal/',

+					'anchor' => 'Journal',

+					'is_active' => $this->parent_navigation_item === 'journal',

+				),

+				(object) array(

+					'uri' => '/about/',

+					'anchor' => 'About',

+					'is_active' => $this->parent_navigation_item === 'about',

+				)

+		));

 

-        if ($page_type == 'wide') {

-            $this->set_body_view('WidePage');

-        } else {

-            $this->set_body_view('Page');

-        }

-    }

+		if ($page_type == 'wide') {

+			$this->set_body_view('WidePage');

+		} else {

+			$this->set_body_view('Page');

+		}

+	}

 

 }