jacobemerick / web

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

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

 		{

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 

 	public function __construct()

 	{

-        global $config;

+		global $config;

 		$this->headers['From'] = self::$FROM;

 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";

 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

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

Spacing +13 added lines, -13 removed lines

@@ -9,19 +9,19 @@ 
 final class BlogSitemapController extends SitemapController

 {

 

-	private static $HOME_PAGE_RANK			= .9;

-	private static $CATEGORY_PAGE_RANK		= .3;

-	private static $TAG_PAGE_RANK			= .2;

-	private static $PAGINATED_PAGE_RANK		= .1;

-	private static $POST_PAGE_RANK			= .8;

+	private static $HOME_PAGE_RANK = .9;

+	private static $CATEGORY_PAGE_RANK = .3;

+	private static $TAG_PAGE_RANK = .2;

+	private static $PAGINATED_PAGE_RANK = .1;

+	private static $POST_PAGE_RANK = .8;

 

 	private static $HOME_PAGE_CHANGEFREQ		= 'daily';

-	private static $CATEGORY_PAGE_CHANGEFREQ	= 'weekly';

+	private static $CATEGORY_PAGE_CHANGEFREQ = 'weekly';

 	private static $TAG_PAGE_CHANGEFREQ			= 'monthly';

-	private static $PAGINATED_PAGE_CHANGEFREQ	= 'monthly';

+	private static $PAGINATED_PAGE_CHANGEFREQ = 'monthly';

 	private static $POST_PAGE_CHANGEFREQ		= 'weekly';

 

-	private static $POSTS_PER_PAGE		= 10;

+	private static $POSTS_PER_PAGE = 10;

 

 	private static $CATEGORY_ARRAY = array(

 		'hiking',

@@ -50,7 +50,7 @@ 
 	{

 		$categories = self::$CATEGORY_ARRAY;

 		

-		foreach($categories as $category)

+		foreach ($categories as $category)

 		{

 			$post_count = PostCollector::getPostCountForCategory($category);

 			

@@ -63,7 +63,7 @@ 
 	{

 		$tags = TagCollector::getAllTags();

 		

-		foreach($tags as $tag)

+		foreach ($tags as $tag)

 		{

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

 			

@@ -76,7 +76,7 @@ 
 	{

 		$posts = PostCollector::getMainList(500);

 		

-		foreach($posts as $post)

+		foreach ($posts as $post)

 		{

 			$base_url = "{$post->category}/{$post->path}/";

 			$this->addURL($base_url, date('Y-m-d', strtotime('last Monday')), self::$POST_PAGE_CHANGEFREQ, self::$POST_PAGE_RANK);

@@ -85,7 +85,7 @@ 
 

 	private function add_paginated_pages($post_count, $base_url, $changefreq, $rank)

 	{

-		switch($changefreq)

+		switch ($changefreq)

 		{

 			case 'daily' :

 				$lastmod = date('Y-m-d');

@@ -99,7 +99,7 @@ 
 		}

 		

 		$this->addURL($base_url, $lastmod, $changefreq, $rank);

-		for($i = 2; (($i - 1) * self::$POSTS_PER_PAGE) < $post_count; $i++)

+		for ($i = 2; (($i - 1) * self::$POSTS_PER_PAGE) < $post_count; $i++)

 		{

 			$this->addURL("{$base_url}{$i}/", date('Y-m-01'), self::$PAGINATED_PAGE_CHANGEFREQ, self::$PAGINATED_PAGE_RANK);

 		}

Doc Comments +3 added lines

@@ -64,6 +64,9 @@
 		}

 	}

 

+	/**
+	 * @param string $changefreq
+	 */
 	private function add_paginated_pages($posts, $base_url, $changefreq, $rank)

 	{

 		switch($changefreq)

controller/sitemap/PortfolioSitemapController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 		

 		$pieces = PortfolioCollector::getAllPieces();

 		

-		foreach($pieces as $piece)

+		foreach ($pieces as $piece)

 		{

-			if($piece->category == 1)

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

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

Indentation +20 added lines, -20 removed lines

@@ -5,29 +5,29 @@
 final class AboutController extends DefaultPageController

 {

 

-    private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';

-    private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';

-    private static $KEYWORD_ARRAY = array(

-        'about',

-        'waterfalls',

-        'birthday trip',

-        'Jacob Emerick',

-    );

+	private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';

+	private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';

+	private static $KEYWORD_ARRAY = array(

+		'about',

+		'waterfalls',

+		'birthday trip',

+		'Jacob Emerick',

+	);

 

-    protected function set_head_data()

-    {

-        parent::set_head_data();

+	protected function set_head_data()

+	{

+		parent::set_head_data();

         

-        $this->set_title(self::$TITLE);

-        $this->set_description(self::$DESCRIPTION);

-        $this->set_keywords(self::$KEYWORD_ARRAY);

-    }

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

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

+		$this->set_keywords(self::$KEYWORD_ARRAY);

+	}

 

-    protected function set_body_data($page_type = 'normal')

-    {

-        parent::set_body_data($page_type);

+	protected function set_body_data($page_type = 'normal')

+	{

+		parent::set_body_data($page_type);

         

-        $this->set_body('view', 'About');

-    }

+		$this->set_body('view', 'About');

+	}

 

 }

controller/waterfalls/CompanionListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		$alias = URLDecode::getPiece(2);

 		$this->companion = CompanionCollector::getByAlias($alias);

 		

-		if(!$this->companion)

+		if (!$this->companion)

 			$this->eject();

 		

 		parent::__construct();

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

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 

 	private function process_form()

 	{

-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')

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

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

 			$error_result['name'] = 'please enter your name';

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

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

 			$error_result['email'] = 'please enter a valid email';

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

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

 			$error_result['message'] = 'please write a message';

 		

 		$values = (object) array(

@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),

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

 		

-		if(count($error_result) > 0)

+		if (count($error_result) > 0)

 		{

 			return (object) array(

 				'display' => 'error',

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

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 

 	public function __construct()

 	{

-        global $config;

+		global $config;

 		$this->headers['From'] = self::$FROM;

 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";

 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

controller/waterfalls/CountyListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		$path = URLDecode::getPiece(1);

 		$this->county = CountyCollector::getByAlias($path);

 		

-		if(!$this->county)

+		if (!$this->county)

 			$this->eject();

 		

 		parent::__construct();

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

 	}