jacobemerick / web

controller/portfolio/DefaultPageController.class.inc.php

Braces +10 added lines, -8 removed lines

@@ -39,10 +39,11 @@ 
 				'name' => 'Contact',

 				'link' => Loader::getRootURL() . 'contact/'));

 		

-		if(!URLDecode::getPiece(1))

-			$active_page = 'About';

-		else

-			$active_page = ucfirst(URLDecode::getPiece(1));

+		if(!URLDecode::getPiece(1)) {

+					$active_page = 'About';

+		} else {

+					$active_page = ucfirst(URLDecode::getPiece(1));

+		}

 		

 		foreach($menu as $menu_item)

 		{

@@ -63,10 +64,11 @@ 
 		{

 			$piece_obj = new stdclass();

 			$piece_obj->title = $piece->title;

-			if("{$piece->category}" == 1)

-				$piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";

-			else

-				$piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";

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

+							$piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";

+			} else {

+							$piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";

+			}

 			$piece_obj->image = "/{$piece->image}";

 			$piece_array[] = $piece_obj;

 		}

controller/portfolio/PieceController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 		Loader::load('collector', 'portfolio/PortfolioCollector');

 		$portfolio_result = PortfolioCollector::getPieceByURI($this->title_url);

 		

-		if($portfolio_result === null)

-			$this->eject();

+		if($portfolio_result === null) {

+					$this->eject();

+		}

 		

 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);

 		$image = new ImageOld("portfolio/{$portfolio_image_result[0]->name}");

controller/site/ContactController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -29,15 +29,19 @@
 

 	private function get_form_results()

 	{

-		if(!Request::hasPost())

-			return array();

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

+					return array();

+		}

 		

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

-			$error_message['name'] = 'Please enter a value for your name.';

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

-			$error_message['email'] = 'Please enter a valid email address.';

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

-			$error_message['message'] = 'Please enter a message.';

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

+					$error_message['name'] = 'Please enter a value for your name.';

+		}

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

+					$error_message['email'] = 'Please enter a valid email address.';

+		}

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

+					$error_message['message'] = 'Please enter a message.';

+		}

 		

 		if(!empty($error_message))

 		{

controller/site/DefaultPageController.class.inc.php

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

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

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

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

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

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;