jacobemerick / web

controller/blog/SearchController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	{

 		$query = URLDecode::getPiece(2);

 		$query = urldecode($query);

-        $query = str_replace('-', ' ', $query);

+		$query = str_replace('-', ' ', $query);

 		

 		$this->query = $query;

 		

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
 	{

 		parent::set_head_data();

 		

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

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

 		{

 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));

 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));

@@ -63,10 +63,10 @@ 
 

 	protected function get_introduction()

 	{

-		if($this->total_pages > 1)

+		if ($this->total_pages > 1)

 			return array(

 				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");

-		else if($this->total_pages == 1)

+		else if ($this->total_pages == 1)

 			return array(

 				'title' => "Posts from search '{$this->query}'.");

 		else

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

 	{

 		$page = URLDecode::getPiece(3);

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

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

 			return $page;

 		return 1;

 	}

@@ -85,7 +85,7 @@ 
 	private $search_result;

 	private function get_search_result()

 	{

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

+		if (!isset($this->search_result))

 		{

 			$posts = PostCollector::getMainList(self::$MAXIMUM_SEARCH_POSTS);

 			

@@ -113,16 +113,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

 			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();

 	}

 

 	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 Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();

 	}

@@ -130,7 +130,7 @@ 
 	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 = count($this->get_search_result());

 		return $this->total_post_count;

 	}

Braces +23 added lines, -18 removed lines

@@ -49,8 +49,7 @@ 
 		{

 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));

 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));

-		}

-		else

+		} else

 		{

 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));

 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));

@@ -63,22 +62,24 @@ 
 

 	protected function get_introduction()

 	{

-		if($this->total_pages > 1)

-			return array(

+		if($this->total_pages > 1) {

+					return array(

 				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");

-		else if($this->total_pages == 1)

-			return array(

+		} else if($this->total_pages == 1) {

+					return array(

 				'title' => "Posts from search '{$this->query}'.");

-		else

-			return array(

+		} else {

+					return array(

 				'title' => "Sorry, '{$this->query}' didn't return any posts.");

+		}

 	}

 

 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(3);

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

-			return $page;

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

+					return $page;

+		}

 		return 1;

 	}

 

@@ -113,25 +114,29 @@ 
 

 	protected function get_list_next_link()

 	{

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

-			return;

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

-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();

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

+					return;

+		}

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

+					return Content::instance('URLSafe', "/search/{$this->query}/")->activate();

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();

 	}

 

 	protected function get_list_prev_link()

 	{

-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

-			return;

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = count($this->get_search_result());

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

+					$this->total_post_count = count($this->get_search_result());

+		}

 		return $this->total_post_count;

 	}

 

controller/blog/TagController.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 		$tag = str_replace('-', ' ', $tag);

 		

 		$tag_result = TagCollector::getSingleTag($tag);

-		if($tag_result === false)

+		if ($tag_result === false)

 			$this->eject();

 		

 		$this->tag = $tag_result;

@@ -40,7 +40,7 @@ 
 	{

 		parent::set_head_data();

 		

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

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

 		{

 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag->tag)));

 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag->tag)));

@@ -60,12 +60,12 @@ 
 	{

 		$tag = ucwords($this->tag->tag);

 		

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

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

 		{

 			Loader::load('collector', 'blog/IntroductionCollector');

 			$introduction_result = IntroductionCollector::getRow('tag', $this->tag->tag);

 			

-			if($introduction_result !== null)

+			if ($introduction_result !== null)

 			{

 				$introduction = array();

 				$introduction['title'] = $introduction_result->title;

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

 	{

 		$page = URLDecode::getPiece(3);

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

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

 			return $page;

 		return 1;

 	}

@@ -106,16 +106,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

 			return Content::instance('URLSafe', "/tag/{$this->tag->tag}/")->activate();

 		return Content::instance('URLSafe', "/tag/{$this->tag->tag}/" . ($this->page - 1) . '/')->activate();

 	}

 

 	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 Content::instance('URLSafe', "/tag/{$this->tag->tag}/" . ($this->page + 1) . '/')->activate();

 	}

@@ -123,7 +123,7 @@ 
 	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 = PostCollector::getPostCountForTag($this->tag->id);

 		return $this->total_post_count;

 	}

Braces +19 added lines, -14 removed lines

@@ -28,8 +28,9 @@ 
 		$tag = str_replace('-', ' ', $tag);

 		

 		$tag_result = TagCollector::getSingleTag($tag);

-		if($tag_result === false)

-			$this->eject();

+		if($tag_result === false) {

+					$this->eject();

+		}

 		

 		$this->tag = $tag_result;

 		

@@ -44,8 +45,7 @@ 
 		{

 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag->tag)));

 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag->tag)));

-		}

-		else

+		} else

 		{

 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag->tag), $this->page, $this->total_pages));

 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag->tag)));

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

 	{

 		$page = URLDecode::getPiece(3);

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

-			return $page;

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

+					return $page;

+		}

 		return 1;

 	}

 

@@ -106,25 +107,29 @@ 
 

 	protected function get_list_next_link()

 	{

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

-			return;

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

-			return Content::instance('URLSafe', "/tag/{$this->tag->tag}/")->activate();

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

+					return;

+		}

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

+					return Content::instance('URLSafe', "/tag/{$this->tag->tag}/")->activate();

+		}

 		return Content::instance('URLSafe', "/tag/{$this->tag->tag}/" . ($this->page - 1) . '/')->activate();

 	}

 

 	protected function get_list_prev_link()

 	{

-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

-			return;

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/tag/{$this->tag->tag}/" . ($this->page + 1) . '/')->activate();

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = PostCollector::getPostCountForTag($this->tag->id);

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

+					$this->total_post_count = PostCollector::getPostCountForTag($this->tag->id);

+		}

 		return $this->total_post_count;

 	}

 

controller/images/HomeController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -16,13 +16,13 @@ 
 	{

 		$file = URLDecode::getURI();

 		

-		if(

+		if (

 			URLDecode::getSite() == 'images' ||

 			URLDecode::getExtension() == 'ico')

 			$file = "/css/{$file}";

-		else if(URLDecode::getSite() == 'portfolio')

+		else if (URLDecode::getSite() == 'portfolio')

 			$file = "/portfolio/{$file}";

-		else if(substr($file, 0, 7) == '/photo/')

+		else if (substr($file, 0, 7) == '/photo/')

 			$file = '/photo/processed/' . substr($file, 7);

 		

 		$this->use_old_image_logic($file);

@@ -32,7 +32,7 @@ 
 

 	private function send_headers($extension, $last_modified)

 	{

-		switch($extension)

+		switch ($extension)

 		{

 			case 'gif' :

 				Header::sendGIF($last_modified);

@@ -52,11 +52,11 @@ 
 	private function use_old_image_logic($file)

 	{

 		$image = new ImageOld($file);

-		if(!$image->isValid()) {

+		if (!$image->isValid()) {

 			$this->eject();

 		}

 		

-		switch($image->getExtension())

+		switch ($image->getExtension())

 		{

 			case 'gif' :

 				Header::sendGIF($image->getLastModified());

@@ -78,7 +78,7 @@ 
 

 	protected function eject()

 	{

-		if(get_class($this) !== 'Error404Controller')

+		if (get_class($this) !== 'Error404Controller')

 			Loader::loadNew('controller', '/Error404Controller')->activate();

 	}

 

Braces +10 added lines, -8 removed lines

@@ -18,12 +18,13 @@ 
 		

 		if(

 			URLDecode::getSite() == 'images' ||

-			URLDecode::getExtension() == 'ico')

-			$file = "/css/{$file}";

-		else if(URLDecode::getSite() == 'portfolio')

-			$file = "/portfolio/{$file}";

-		else if(substr($file, 0, 7) == '/photo/')

-			$file = '/photo/processed/' . substr($file, 7);

+			URLDecode::getExtension() == 'ico') {

+					$file = "/css/{$file}";

+		} else if(URLDecode::getSite() == 'portfolio') {

+					$file = "/portfolio/{$file}";

+		} else if(substr($file, 0, 7) == '/photo/') {

+					$file = '/photo/processed/' . substr($file, 7);

+		}

 		

 		$this->use_old_image_logic($file);

 		

@@ -78,8 +79,9 @@ 
 

 	protected function eject()

 	{

-		if(get_class($this) !== 'Error404Controller')

-			Loader::loadNew('controller', '/Error404Controller')->activate();

+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}

 

 }

controller/lifestream/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
 	final private function get_list_posts()

 	{

 		$post_array = array();

-		foreach($this->get_list_results() as $post)

+		foreach ($this->get_list_results() as $post)

 		{

 			$post_array[] = $this->expand_post($post, 'full');

 		}

-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

 			$this->eject();

 		return $post_array;

 	}

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 		{

 			$post_array[] = $this->expand_post($post, 'full');

 		}

-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

-			$this->eject();

+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;

 	}

 

controller/lifestream/HomeController.class.inc.php

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

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

 	}

 

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

 	}

@@ -75,7 +75,7 @@ 
 	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 = ActivityCollector::getCount();

 		return $this->total_post_count;

 	}

Braces +15 added lines, -10 removed lines

@@ -38,8 +38,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;

 	}

 

@@ -58,25 +59,29 @@ 
 

 	protected function get_list_next_link()

 	{

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

-			return;

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

-			return Loader::getRootUrl('lifestream');

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

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream');

+		}

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

-			return;

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = ActivityCollector::getCount();

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

+					$this->total_post_count = ActivityCollector::getCount();

+		}

 		return $this->total_post_count;

 	}

 

controller/lifestream/PostController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
 		parent::__construct();

 		

 		$id = URLDecode::getPiece(2);

-		if(!$id || !is_numeric($id))

+		if (!$id || !is_numeric($id))

 			$this->eject();

 		

 		$post = ActivityCollector::getPost($id);

-		if(!$post)

+		if (!$post)

 			$this->eject();

 		

-		if(URLDecode::getPiece(1) != $post->type)

+		if (URLDecode::getPiece(1) != $post->type)

 			$this->eject();

 		

 		$this->post = $post;

@@ -59,7 +59,7 @@ 
 

 	private function get_title()

 	{

-		switch($this->post->type)

+		switch ($this->post->type)

 		{

 			case 'blog' :

 				return 'Jacob blogged';

@@ -84,7 +84,7 @@ 
 

 	private function get_description()

 	{

-		switch($this->post->type)

+		switch ($this->post->type)

 		{

 			case 'blog' :

 				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';

Braces +9 added lines, -6 removed lines

@@ -20,15 +20,18 @@
 		parent::__construct();

 		

 		$id = URLDecode::getPiece(2);

-		if(!$id || !is_numeric($id))

-			$this->eject();

+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		

 		$post = ActivityCollector::getPost($id);

-		if(!$post)

-			$this->eject();

+		if(!$post) {

+					$this->eject();

+		}

 		

-		if(URLDecode::getPiece(1) != $post->type)

-			$this->eject();

+		if(URLDecode::getPiece(1) != $post->type) {

+					$this->eject();

+		}

 		

 		$this->post = $post;

 	}

controller/lifestream/TagController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
 

 	private function get_title()

 	{

-		switch($this->tag)

+		switch ($this->tag)

 		{

 			case 'blog' :

 				return 'Jacob has a Blog';

@@ -71,7 +71,7 @@ 
 

 	private function get_description()

 	{

-		switch($this->tag)

+		switch ($this->tag)

 		{

 			case 'blog' :

 				return 'Yeah, Jacob has a blog. Check out his posting activity.';

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

 	{

 		$page = URLDecode::getPiece(3);

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

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

 			return $page;

 		return 1;

 	}

@@ -117,16 +117,16 @@ 
 

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

 		return Loader::getRootUrl('lifestream') . $this->tag . '/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') . $this->tag . '/page/' . ($this->page + 1) . '/';

 	}

@@ -134,7 +134,7 @@ 
 	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 = ActivityCollector::getCountForTag($this->tag);

 		return $this->total_post_count;

 	}

Braces +15 added lines, -10 removed lines

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

 	{

 		$page = URLDecode::getPiece(3);

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

-			return $page;

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

+					return $page;

+		}

 		return 1;

 	}

 

@@ -117,25 +118,29 @@ 
 

 	protected function get_list_next_link()

 	{

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

-			return;

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

-			return Loader::getRootUrl('lifestream') . $this->tag . '/';

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

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream') . $this->tag . '/';

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';

 	}

 

 	protected function get_list_prev_link()

 	{

-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

-			return;

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = ActivityCollector::getCountForTag($this->tag);

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

+					$this->total_post_count = ActivityCollector::getCountForTag($this->tag);

+		}

 		return $this->total_post_count;

 	}

 

controller/portfolio/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		

 		else

 		{

-            global $config;

+			global $config;

 			$mail = new Mail();

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

 			$mail->setSubject('Portfolio Contact');

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 

 	private function process_form_data()

 	{

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

@@ -58,7 +58,7 @@ 
 			$mail->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.");

 		}

 	}

 

Braces +13 added lines, -11 removed lines

@@ -28,24 +28,26 @@
 

 	private function process_form_data()

 	{

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

 		{

 			return array(

 				'error_message' => $error_message,

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

-		}

-		

-		else

+		} else

 		{

             global $config;

 			$mail = new Mail();

controller/portfolio/DefaultPageController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -39,12 +39,12 @@ 
 				'name' => 'Contact',

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

 		

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

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

 			$active_page = 'About';

 		else

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

 		

-		foreach($menu as $menu_item)

+		foreach ($menu as $menu_item)

 		{

 			$menu_item = (object) $menu_item;

 			$menu_item->active = ($menu_item->name == $active_page);

@@ -59,11 +59,11 @@ 
 		Loader::load('collector', 'portfolio/PortfolioCollector');

 		$portfolio_result = PortfolioCollector::getPiecesForCategory($category_id);

 		

-		foreach($portfolio_result as $piece)

+		foreach ($portfolio_result as $piece)

 		{

 			$piece_obj = new stdclass();

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

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

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

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

 			else

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

@@ -71,7 +71,7 @@ 
 			$piece_array[] = $piece_obj;

 		}

 		

-		switch($category_id)

+		switch ($category_id)

 		{

 			case 1 :

 				$title = "Sites I've worked on";

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;

 		}