jacobemerick / web

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

 		}

controller/sitemap/LifestreamSitemapController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@ 
 {

 

 	private static $HOME_PAGE_RANK			= .9;

-	private static $TAG_PAGE_RANK			= .3;

-	private static $PAGINATED_PAGE_RANK		= .1;

+	private static $TAG_PAGE_RANK = .3;

+	private static $PAGINATED_PAGE_RANK = .1;

 	private static $POST_PAGE_RANK			= .5;

-	private static $ABOUT_PAGE_RANK			= .7;

+	private static $ABOUT_PAGE_RANK = .7;

 

 	private static $HOME_PAGE_CHANGEFREQ		= 'hourly';

 	private static $TAG_PAGE_CHANGEFREQ			= 'daily';

-	private static $PAGINATED_PAGE_CHANGEFREQ	= 'daily';

+	private static $PAGINATED_PAGE_CHANGEFREQ = 'daily';

 	private static $POST_PAGE_CHANGEFREQ		= 'weekly';

-	private static $ABOUT_PAGE_CHANGEFREQ		= 'monthly';

+	private static $ABOUT_PAGE_CHANGEFREQ = 'monthly';

 

 	private static $POSTS_PER_PAGE = 15;

 

@@ -42,12 +42,12 @@ 
 		$posts = ActivityCollector::getAll();

 		

 		$tag_post_holder = array();

-		foreach($posts as $post)

+		foreach ($posts as $post)

 		{

 			$tag_post_holder[$post->type][] = $post;

 		}

 		

-		foreach($tag_post_holder as $tag => $posts)

+		foreach ($tag_post_holder as $tag => $posts)

 		{

 			$url = "{$tag}/";

 			$this->add_paginated_pages($posts, $url, self::$TAG_PAGE_CHANGEFREQ, self::$TAG_PAGE_RANK);

@@ -58,7 +58,7 @@ 
 	{

 		$posts = ActivityCollector::getAll();

 		

-		foreach($posts as $post)

+		foreach ($posts as $post)

 		{

 			$this->addURL("{$post->type}/{$post->id}/", date('Y-m-d', strtotime('last Monday')), self::$POST_PAGE_CHANGEFREQ, self::$POST_PAGE_RANK);

 		}

@@ -66,7 +66,7 @@ 
 

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

 	{

-		switch($changefreq)

+		switch ($changefreq)

 		{

 			case 'hourly' :

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

@@ -83,7 +83,7 @@ 
 		}

 		

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

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

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

 		{

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

 		}

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

controller/sitemap/WaterfallSitemapController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 

     private function add_paginated_pages($count, $items_per_page, $base_url, $type)

     {

-        switch($type) {

+        switch ($type) {

             case 'waterfall':

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

                 $changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;

@@ -148,7 +148,7 @@ 
                 break;

         }

 

-        for($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {

+        for ($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {

             $this->addURL("{$base_url}/{$i}/", $lastmod, $changefreq, $rank);

         }

     }

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

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

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

controller/waterfalls/DefaultListController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();

 		

 		$items = $this->get_items();

-		if(count($items) < 1)

+		if (count($items) < 1)

 			$this->eject();

 	}

 

 	final protected function get_page_number()

 	{

 		$page = $this->get_page_number_piece();

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

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

 			return $page;

 		return 1;

 	}

@@ -41,7 +41,7 @@ 
 

 	final private function get_introduction()

 	{

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

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

 			return $this->get_initial_introduction();

 		

 		return $this->get_subsequent_introduction();

@@ -53,7 +53,7 @@ 
 	private $items;

 	protected function get_items()

 	{

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

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

 		{

 			$total = $this->get_item_count_per_page();

 			$offset = ($this->page - 1) * $this->get_item_count_per_page();

@@ -68,7 +68,7 @@ 
 	private $item_count;

 	final private function get_item_count()

 	{

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

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

 			$this->item_count = $this->get_item_count_result();

 		return $this->item_count;

 	}

@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());

 		$this->set_head('previous_link', $this->get_list_prev_link());

 		

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

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

 			$meta_array = $this->get_initial_meta();

 		else

 			$meta_array = $this->get_subsequent_meta();

@@ -119,16 +119,16 @@ 
 

 	final private function get_list_prev_link()

 	{

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

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

 			return;

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

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

 			return $this->get_list_link_root();

 		return $this->get_list_link_root() . ($this->page - 1) . '/';

 	}

 

 	final private function get_list_next_link()

 	{

-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())

+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())

 			return;

 		return $this->get_list_link_root() . ($this->page + 1) . '/';

 	}

@@ -139,27 +139,27 @@ 
 	{

 		$link_array = array();

 		

-		if($this->get_item_count_per_page() >= $this->get_item_count())

+		if ($this->get_item_count_per_page() >= $this->get_item_count())

 			return $link_array;

 		

 		$link = new stdclass();

 		$link->anchor = '&laquo; previous';

-		if($this->get_list_prev_link() !== null)

+		if ($this->get_list_prev_link() !== null)

 			$link->uri = $this->get_list_prev_link();

 		else

 			$link->class = 'inactive';

 		$link_array[] = $link;

 		

-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)

+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)

 		{

 			$link = new stdclass();

 			$link->anchor = $i;

 			

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

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

 				$link->class = 'current';

 			else

 			{

-				if($i == 1)

+				if ($i == 1)

 					$link->uri = $this->get_list_link_root();

 				else

 					$link->uri = $this->get_list_link_root() . $i . '/';

@@ -170,7 +170,7 @@ 
 		

 		$link = new stdclass();

 		$link->anchor = 'next &raquo;';

-		if($this->get_list_next_link() !== null)

+		if ($this->get_list_next_link() !== null)

 			$link->uri = $this->get_list_next_link();

 		else

 			$link->class = 'inactive';

@@ -192,7 +192,7 @@ 
 

 	final protected function get_image_element($category, $path, $description, $size = 'small')

 	{

-		switch($size)

+		switch ($size)

 		{

 			case 'medium' :

 				$height = 375;

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();

 		$companion_list = array();

 		

-		foreach($companion_result as $companion_row)

+		foreach ($companion_result as $companion_row)

 		{

 			$companion = new stdclass();

 			$companion->name = $companion_row->name;

@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();

 		$period_list = array();

 		

-		foreach($period_result as $period_row)

+		foreach ($period_result as $period_row)

 		{

 			$period = new stdclass();

 			$period->name = $period_row->name;