jacobemerick / web

controller/blog/HomeController.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -32,12 +32,12 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_title(self::$TITLE_MAIN);
 		else
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_description(self::$DESCRIPTION_MAIN);
 		else
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
@@ -47,7 +47,7 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
 			Loader::load('collector', 'blog/IntroductionCollector');
 			$introduction_result = IntroductionCollector::getRow('home');
@@ -67,7 +67,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -87,16 +87,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 '/';
 		return '/' . ($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 '/' . ($this->page + 1) . '/';
 	}
@@ -104,7 +104,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::getMainPostCount();
 		return $this->total_post_count;
 	}

Braces +25 added lines, -18 removed lines

@@ -32,15 +32,17 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
-			$this->set_title(self::$TITLE_MAIN);
-		else
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_title(self::$TITLE_MAIN);

+		} else {

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

+		}

 		
-		if($this->page == 1)
-			$this->set_description(self::$DESCRIPTION_MAIN);
-		else
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_description(self::$DESCRIPTION_MAIN);

+		} else {

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

+		}

 		
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 	}
@@ -67,8 +69,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -87,25 +90,29 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return '/';
+		if($this->page == 1) {

+					return;

+		}

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

+					return '/';

+		}

 		return '/' . ($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 '/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = PostCollector::getMainPostCount();
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = PostCollector::getMainPostCount();

+		}

 		return $this->total_post_count;
 	}
 

controller/blog/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,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->format_post($post, true);
 		}
-		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

@@ -60,8 +60,9 @@
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		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/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/site/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 				'value' => Request::getPost());
 		}
 		
-        global $config;
+		global $config;
 		$mail = new Mail();
 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');
 		$mail->setSubject('Site Contact');

Spacing +5 added lines, -5 removed lines

@@ -29,17 +29,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,

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

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

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		Loader::load('collector', 'SiteCollector');
 		$site_result = SiteCollector::getSitesForMenu();
 		
-		foreach($site_result as $site)
+		foreach ($site_result as $site)
 		{
 			$site_array[] = array(
 				'url' => $site->url,

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/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;
 		}