jacobemerick / web

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;

 		}

controller/portfolio/PieceController.class.inc.php

Spacing +3 added lines, -3 removed lines

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

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

 		

-		if($portfolio_result === null)

+		if ($portfolio_result === null)

 			$this->eject();

 		

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

@@ -51,7 +51,7 @@ 
 		$main_image->width = $dimensions[0];

 		$main_image->height = $dimensions[1];

 		

-		foreach($portfolio_image_result as $portfolio_image)

+		foreach ($portfolio_image_result as $portfolio_image)

 		{

 			$thumb = $portfolio_image->name;

 			$thumb_array = explode('.', $thumb);

@@ -72,7 +72,7 @@ 
 		

 		$portfolio_tag_result = PortfolioCollector::getTagsForPiece($portfolio_result->id);

 		

-		foreach($portfolio_tag_result as $portfolio_tag)

+		foreach ($portfolio_tag_result as $portfolio_tag)

 		{

 			$tag_array[] = $portfolio_tag->name;

 		}

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

Indentation +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@
 class WaterfallsRobotController extends RobotController

 {

 

-    protected function set_data()

-    {

-        $this->disallow_for_all_robots('/search/');

-    }

+	protected function set_data()

+	{

+		$this->disallow_for_all_robots('/search/');

+	}

 

 }

controller/rss/BlogPostRSSController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	{

 		$post_result = PostCollector::getMainList(250);

 		

-		foreach($post_result as $post)

+		foreach ($post_result as $post)

 		{

 			$this->addItem(

 				$post->title,

controller/site/ChangelogController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		Loader::load('collector', 'data/ChangelogCollector');

 		$changelog_result = ChangelogCollector::getLast20Changes();

 		

-		foreach($changelog_result as $change)

+		foreach ($changelog_result as $change)

 		{

 			$changelog[] = (object) array(

 				'date' => (object) array(