jacobemerick / web

router/AJAXRouter.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,19 +2,19 @@
 
 Loader::load('router', 'Router');
 
-class AJAXRouter extends Router
-{
+class AJAXRouter extends Router

+{

 
-	protected function get_redirect_array()
-	{
+	protected function get_redirect_array()

+	{

 		return array(
 			(object) array(
 				'pattern' => '@^/$@',
 				'replace' => 'https://home.jacobemerick.com/'));
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()

+	{

 		return array(
 			(object) array(
 				'match' => '/get/portfolioImage.json',

router/WaterfallRouter.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -5,11 +5,11 @@ 
     'waterfall/WaterfallCollector'));
 Loader::load('router', 'Router');
 
-class WaterfallRouter extends Router
-{
+class WaterfallRouter extends Router

+{

 
-	protected function get_redirect_array()
-	{
+	protected function get_redirect_array()

+	{

 		return array(
 			(object) array(
 				'pattern' => '@/index.(html|htm|php)$@',
@@ -71,8 +71,8 @@ 
 		);
 	}
 
-	protected function check_for_special_redirect($uri)
-	{
+	protected function check_for_special_redirect($uri)

+	{

         if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
             $alias = $matches[1];
             $alias = str_replace("'", '', $alias);
@@ -128,8 +128,8 @@ 
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()

+	{

 		return array(
 			(object) array(
 				'match' => '/',

controller/Error503Controller.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', '/PageController');
 
-class Error503Controller extends PageController
-{
+class Error503Controller extends PageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_header_method('send503');
 		$this->add_css('normalize');
 		$this->add_css('503');
@@ -16,8 +16,8 @@ 
 		$this->set_keywords(array());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('/503');
 	}
 

controller/site/ChangelogController.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -4,11 +4,11 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class ChangelogController extends DefaultPageController
-{
+final class ChangelogController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Changelog for Jacob Emerick's Sites");
 		$this->set_description("Listing of the last changes done on the framework behind Jacob Emerick's websites. Yeah, he's down with that version control.");
 		$this->set_keywords(array('changelog', 'version control', 'code', 'comments', 'Jacob Emerick'));
@@ -16,8 +16,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Change Log'));
@@ -26,8 +26,8 @@ 
 		$this->set_body('body_view', 'Changelog');
 	}
 
-	private function get_changelog()
-	{
+	private function get_changelog()

+	{

     global $container;
     $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']);
     $changelog_result = $changelogRepository->getChanges(40);

controller/site/DefaultPageController.class.inc.php

Braces +16 added lines, -14 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $MENU = array(
 		array(
@@ -19,14 +19,14 @@ 
 			'name' => 'Contact',
 			'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('reset');
 		$this->add_css('site');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('top_data', array());
 		$this->set_body('body_data', array());
 		
@@ -36,8 +36,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	private function get_menu()
-	{
+	private function get_menu()

+	{

 		$active_page = $this->get_active_page();
 		
 		$menu = array();
@@ -52,18 +52,20 @@ 
 		return $menu;
 	}
 
-	private function get_active_page()
-	{
+	private function get_active_page()

+	{

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

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Jacob Emerick's Site Information | General and Technical Information");
 		$this->set_description("Meta information about Jacob Emerick's websites and content. Introduces the man behind the code, discusses the reasons behind the sites, and goes into some technical background of the custom framework.");
 		$this->set_keywords(array('site', 'technical', 'support', 'help', 'information', 'Jacob Emerick'));
@@ -14,8 +14,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('body_view', 'Home');
 		
 		parent::set_body_data();

controller/site/TermsController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class TermsController extends DefaultPageController
-{
+final class TermsController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Terms of Use for Jacob Emerick's Sites");
 		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
 		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
@@ -14,8 +14,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('top_data', array('title' => 'Terms of Use'));
 		
 		$this->set_body('body_view', 'Terms');

controller/site/ContactController.class.inc.php

Braces +20 added lines, -16 removed lines

@@ -4,11 +4,11 @@ 
 Loader::load('utility', array(
 	'Validate'));
 
-final class ContactController extends DefaultPageController
-{
+final class ContactController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Contact Form for Jacob Emerick's Sites");
 		$this->set_description("Want to reach out to Jacob Emerick with questions or concerns? Well, then here's a handy contact form for you that will connect you with the man himself.");
 		$this->set_keywords(array('contact', 'webmaster', 'support', 'help', 'Jacob Emerick'));
@@ -16,8 +16,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Contact Me'));
@@ -26,17 +26,21 @@ 
 		$this->set_body('body_view', 'Contact');
 	}
 
-	private function get_form_results()
-	{
-		if(!Request::hasPost())
-			return array();
+	private function get_form_results()

+	{

+		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/blog/CategoryController.class.inc.php

Braces +35 added lines, -34 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'blog/DefaultListController');
 
-final class CategoryController extends DefaultListController
-{
+final class CategoryController extends DefaultListController

+{

 
 	private static $TITLE_MAIN_HIKING = "Hiking | Posts on Upper Peninsula Exploring on Jacob Emerick's Blog";
 	private static $DESCRIPTION_MAIN_HIKING = "Posts on Jacob Emerick's Blog about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls in the Keweenaw.";
@@ -53,8 +53,8 @@ 
 
 	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts in the %s category.';
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$url = URLDecode::getPiece(1);
 		$this->category = (object) array(
 			'display' => ucwords(str_replace('-', ' ', $url)),
@@ -63,8 +63,8 @@ 
 		parent::__construct();
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		switch($this->category->display)
@@ -74,8 +74,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
@@ -87,8 +86,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
@@ -100,8 +98,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
@@ -111,8 +108,8 @@ 
 		}
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		if($this->page == 1)
 		{
         global $container;
@@ -131,48 +128,52 @@ 
 			'title' => "Posts about {$this->category->display}, page {$this->page} of {$this->total_pages}.");
 	}
 
-	protected function get_page_number()
-	{
+	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;
 	}
 
-	protected function get_list_results()
-	{
+	protected function get_list_results()

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePostsByCategory($this->category->link, self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->category->display);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
+	protected function get_list_next_link()

+	{

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

+					return;

+		}

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

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

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

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

+					return;

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
+	protected function get_total_post_count()

+	{

 		if(!isset($this->total_post_count)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);