jacobemerick / web

collector/waterfall/LogCollector.class.inc.php

Doc Comments +6 added lines

@@ -34,6 +34,9 @@ 
 		return self::run_query($query);

 	}

 

+    /**
+     * @param integer $total
+     */
     public static function getRecentList($total)

     {

         $query = "

@@ -178,6 +181,9 @@ 
 		return self::run_row_query($query);

 	}

 

+    /**
+     * @param string $date
+     */
     public static function getByDate($date)

     {

         $date = self::escape($date);

Indentation +11 added lines, -11 removed lines

@@ -34,9 +34,9 @@ 
 		return self::run_query($query);

 	}

 

-    public static function getRecentList($total)

-    {

-        $query = "

+	public static function getRecentList($total)

+	{

+		$query = "

             SELECT

                 `log`.`title`,

                 `log`.`alias`,

@@ -59,8 +59,8 @@ 
                 `log`.`date` DESC

             LIMIT

                 {$total}";

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

 	public static function getListCount()

 	{

@@ -178,11 +178,11 @@ 
 		return self::run_row_query($query);

 	}

 

-    public static function getByDate($date)

-    {

-        $date = self::escape($date);

+	public static function getByDate($date)

+	{

+		$date = self::escape($date);

         

-        $query = "

+		$query = "

             SELECT

                 `log`.`alias`

             FROM

@@ -192,8 +192,8 @@ 
                 `log`.`is_public` = '1'

             LIMIT 1";

         

-        return self::run_row_query($query);

-    }

+		return self::run_row_query($query);

+	}

 	

 	public static function getById($log)

 	{

collector/waterfall/WaterfallCollector.class.inc.php

Doc Comments +3 added lines

@@ -117,6 +117,9 @@
         return self::run_query($query);

     }

 

+    /**
+     * @param string $alias
+     */
     public static function getByOldAlias($alias)

     {

         $alias = self::escape($alias);

Indentation +16 added lines, -16 removed lines

@@ -43,9 +43,9 @@ 
 		return self::run_query($query);

 	}

 

-    public static function getMapList()

-    {

-        $query = "

+	public static function getMapList()

+	{

+		$query = "

             SELECT

                 `waterfall`.`name`,

                 `waterfall`.`alias`,

@@ -71,8 +71,8 @@ 
             ORDER BY

                 `waterfall`.`name`";

         

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

 	public static function getListCount()

 	{

@@ -92,9 +92,9 @@ 
 		return self::get_count($query);

 	}

 

-    public static function getNearbyList($waterfall)

-    {

-        $query = "

+	public static function getNearbyList($waterfall)

+	{

+		$query = "

             SELECT

                 `waterfall`.`name`,

                 `waterfall`.`alias` AS `alias`,

@@ -114,14 +114,14 @@ 
                 `waterfall`.`name`,

                 `watercourse`.`name`";

         

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

-    public static function getByOldAlias($alias)

-    {

-        $alias = self::escape($alias);

+	public static function getByOldAlias($alias)

+	{

+		$alias = self::escape($alias);

         

-        $query = "

+		$query = "

             SELECT

                 `waterfall`.`alias`,

                 `watercourse`.`alias` AS `watercourse_alias`

@@ -134,8 +134,8 @@ 
                 `waterfall`.`is_public` = '1'

             LIMIT 1";

         

-        return self::run_row_query($query);

-    }

+		return self::run_row_query($query);

+	}

 

 	public static function getByAlias($watercourse, $waterfall)

 	{

controller/blog/DefaultPageController.class.inc.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $tag_array;

 	}

 

+	/**
+	 * @param boolean $trim
+	 */
 	final private function get_body_for_post($post, $trim)

 	{

 		$body = $post->body;

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		Loader::load('collector', 'blog/TagCollector');

 		

 		$tag_result = TagCollector::getTagsForPost($post->id);

-        $tag_array = array();

+		$tag_array = array();

 		foreach($tag_result as $tag)

 		{

 			$tag_object = new stdclass();

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::getRow($id);

 		

-		if($photo_result == null)

+		if ($photo_result == null)

 			return;

 		

 		$name = $photo_result->name;

@@ -87,7 +87,7 @@ 
 		

 		$tag_result = TagCollector::getTagsForPost($post->id);

         $tag_array = array();

-		foreach($tag_result as $tag)

+		foreach ($tag_result as $tag)

 		{

 			$tag_object = new stdclass();

 			$tag_object->name = $tag->tag;

@@ -101,7 +101,7 @@ 
 	{

 		$body = $post->body;

 		

-		if($trim)

+		if ($trim)

 			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

 		

 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');

@@ -126,9 +126,9 @@ 
 		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);

 		

 		$cloud_array = array();

-		foreach($tag_result as $tag)

+		foreach ($tag_result as $tag)

 		{

-			if($tag->tag_count < self::$MINIMUM_TAG_COUNT)

+			if ($tag->tag_count < self::$MINIMUM_TAG_COUNT)

 				continue;

 			

 			$tag_object = new stdclass();

@@ -145,9 +145,9 @@ 
 	{

 		$maximum = 1;

 		

-		foreach($tag_result as $tag)

+		foreach ($tag_result as $tag)

 		{

-			if($tag->tag_count > $maximum)

+			if ($tag->tag_count > $maximum)

 				$maximum = $tag->tag_count;

 		}

 		return $maximum;

@@ -158,7 +158,7 @@ 
 		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);

 		

 		$array = array();

-		foreach($comment_array as $comment)

+		foreach ($comment_array as $comment)

 		{

 			$body = $comment->body;

 			$body = strip_tags($body);

Braces +12 added lines, -8 removed lines

@@ -37,8 +37,9 @@ 
 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::getRow($id);

 		

-		if($photo_result == null)

-			return;

+		if($photo_result == null) {

+					return;

+		}

 		

 		$name = $photo_result->name;

 		$category = $photo_result->category;

@@ -101,8 +102,9 @@ 
 	{

 		$body = $post->body;

 		

-		if($trim)

-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		if($trim) {

+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		}

 		

 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');

 		$body = Content::instance('MarkupCode', $body)->activate();

@@ -128,8 +130,9 @@ 
 		$cloud_array = array();

 		foreach($tag_result as $tag)

 		{

-			if($tag->tag_count < self::$MINIMUM_TAG_COUNT)

-				continue;

+			if($tag->tag_count < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			

 			$tag_object = new stdclass();

 			$tag_object->name = $tag->tag;

@@ -147,8 +150,9 @@ 
 		

 		foreach($tag_result as $tag)

 		{

-			if($tag->tag_count > $maximum)

-				$maximum = $tag->tag_count;

+			if($tag->tag_count > $maximum) {

+							$maximum = $tag->tag_count;

+			}

 		}

 		return $maximum;

 	}

controller/PageController.class.inc.php

Doc Comments +28 added lines

@@ -204,6 +204,9 @@ 
 			exit;

 	}

 

+	/**
+	 * @param string $method
+	 */
 	protected function set_header_method($method)

 	{

 		$this->headers = $method;

@@ -214,6 +217,9 @@ 
 		$this->set_head('title', $value);

 	}

 

+	/**
+	 * @param string $value
+	 */
 	protected function set_author($value)

 	{

 		$this->set_head('author', $value);

@@ -229,26 +235,41 @@ 
 		$this->set_head('keywords', implode(', ', $array));

 	}

 	

+	/**
+	 * @param string $url
+	 */
 	protected function set_canonical($url)

 	{

 		$this->set_head('canonical', $url);

 	}

 

+	/**
+	 * @param string $set
+	 */
 	protected function set_head($set, $value)

 	{

 		$this->data_array['head'][$set] = $value;

 	}

 

+	/**
+	 * @param string $set
+	 */
 	protected function set_body($set, $value)

 	{

 		$this->data_array['body'][$set] = $value;

 	}

 

+	/**
+	 * @param string $file
+	 */
 	protected function add_css($file)

 	{

 		$this->css_array[] = $file;

 	}

 

+	/**
+	 * @param string $file
+	 */
 	protected function add_js($file)

 	{

 		$this->js_array[] = $file;

@@ -271,6 +292,9 @@ 
 		$this->set_head('js_link_array', $js_array);

 	}

 

+	/**
+	 * @param string $view
+	 */
 	protected function set_body_view($view)

 	{

 		$this->body_view_array[] = $view;

@@ -315,6 +339,10 @@ 
 	}

 

 	private $comment_errors;

+
+	/**
+	 * @param string $redirect_url
+	 */
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)

 	{

 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')

Indentation +8 added lines, -8 removed lines

@@ -125,9 +125,9 @@ 
 					if(strlen($row->title) > 0)

 						$post->title .= " I was hiking up around the {$row->title} area.";

 				}

-                else if ($row->type == 'walking') {

-                    $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";

-                }

+				else if ($row->type == 'walking') {

+					$post->title = "Walked {$row->distance} miles and felt {$row->felt}.";

+				}

 			break;

 			case 'hulu' :

 				$row = HuluCollector::getRow($raw_post->type_id);

@@ -194,11 +194,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

 		}

         

-        if (URLDecode::getSite() == 'waterfalls') {

-            Loader::load('view', '/WaterfallFoot');

-        } else {

-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));

-        }

+		if (URLDecode::getSite() == 'waterfalls') {

+			Loader::load('view', '/WaterfallFoot');

+		} else {

+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));

+		}

 		

 		if($view == '/404' || $view == '/503')

 			exit;

Spacing +31 added lines, -31 removed lines

@@ -40,7 +40,7 @@ 
 			'date' => date('Y')));

 		

 		Loader::loadInstance('utility', 'Database');

-		if(Database::isConnected() === false)

+		if (Database::isConnected() === false)

 			$this->unavailable();

 	}

 

@@ -65,9 +65,9 @@ 
 		$post_array = array();

 		$post_result = ActivityCollector::getRecent();

 		

-		foreach($post_result as $row)

+		foreach ($post_result as $row)

 		{

-			$post_array[] = $this->expand_post($row);;

+			$post_array[] = $this->expand_post($row); ;

 		}

 		

 		return $post_array;

@@ -86,7 +86,7 @@ 
 		

 		$post = new stdclass();

 		

-		switch($raw_post->type)

+		switch ($raw_post->type)

 		{

 			case 'blog' :

 				$row = BlogCollector::getRow($raw_post->type_id);

@@ -97,7 +97,7 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";

 				$post->comments = $row->comments;

 				

-				if($format == 'full')

+				if ($format == 'full')

 					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');

 			break;

 			case 'book' :

@@ -106,23 +106,23 @@ 
 				$post->type = 'book';

 				$post->title = "Just finished reading {$row->title} by {$row->author}.";

 				

-				if($format == 'full')

+				if ($format == 'full')

 					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";

 			break;

 			case 'distance' :

 				$row = DistanceCollector::getRow($raw_post->type_id);

 				

 				$post->type = 'distance';

-				if($row->type == 'running')

+				if ($row->type == 'running')

 				{

 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";

-					if(strlen($row->message) > 0)

+					if (strlen($row->message) > 0)

 						$post->title .= " Afterwards, I was all like '{$row->message}'.";

 				}

-				else if($row->type == 'hiking')

+				else if ($row->type == 'hiking')

 				{

 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";

-					if(strlen($row->title) > 0)

+					if (strlen($row->title) > 0)

 						$post->title .= " I was hiking up around the {$row->title} area.";

 				}

                 else if ($row->type == 'walking') {

@@ -140,7 +140,7 @@ 
 				

 				$post->type = 'twitter';

 				

-				if($format == 'full')

+				if ($format == 'full')

 					$post->title = $row->text_formatted_full;

 				else

 					$post->title = $row->text_formatted;

@@ -153,12 +153,12 @@ 
 				

 				$post->type = 'youtube';

 				

-				if($format == 'full')

+				if ($format == 'full')

 					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";

 				else

 					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";

 				

-				if($format == 'full')

+				if ($format == 'full')

 					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

 			break;

 		}

@@ -186,9 +186,9 @@ 
 		$headers = $this->headers;

 		Header::$headers();

 		Loader::load('view', '/Head', $this->data_array['head']);

-		foreach($this->body_view_array as $view)

+		foreach ($this->body_view_array as $view)

 		{

-			if(substr($view, 0, 1) == '/')

+			if (substr($view, 0, 1) == '/')

 				Loader::load('view', $view, $this->data_array['body']);

 			else

 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

@@ -200,7 +200,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));

         }

 		

-		if($view == '/404' || $view == '/503')

+		if ($view == '/404' || $view == '/503')

 			exit;

 	}

 

@@ -261,10 +261,10 @@ 
 		

 		$js_array = array();

 		

-		if(count($this->js_array) > 0)

+		if (count($this->js_array) > 0)

 			$js_array = array_merge($js_array, $this->js_array);

 		

-		if(count($js_array) > 0)

+		if (count($js_array) > 0)

 			$js_array = Asset::getJS($js_array);

 		

 		$this->set_head('css_link_array', $css_array);

@@ -278,26 +278,26 @@ 
 

 	protected function eject()

 	{

-		if(get_class($this) !== 'Error404Controller')

+		if (get_class($this) !== 'Error404Controller')

 			Loader::loadNew('controller', '/Error404Controller')->activate();

 	}

 

 	protected function unavailable()

 	{

-		if(get_class($this) !== 'Error503Controller')

+		if (get_class($this) !== 'Error503Controller')

 			Loader::loadNew('controller', '/Error503Controller')->activate();

 	}

 

 	protected function redirect($uri, $method = 301)

 	{

-		switch($method)

+		switch ($method)

 		{

 			case 301 :

-				if(get_class($this) !== 'Error301Controller')

+				if (get_class($this) !== 'Error301Controller')

 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

 				break;

 			case 303 :

-				if(get_class($this) !== 'Error303Controller')

+				if (get_class($this) !== 'Error303Controller')

 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

 				break;

 		}

@@ -317,7 +317,7 @@ 
 	private $comment_errors;

 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)

 	{

-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')

+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')

 		{

 			$parameters = array($site_id, $path, $redirect_url, $page_title);

 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();

@@ -335,7 +335,7 @@ 
 		$comment_array = array();

 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);

 		

-		foreach($comment_result as $comment)

+		foreach ($comment_result as $comment)

 		{

 			$comment_object = new stdclass();

 			$comment_object->id = $comment->id;

@@ -345,12 +345,12 @@ 
 			$comment_object->url = $comment->url;

 			$comment_object->trusted = $comment->trusted;

 			

-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)

+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)

 				$comment_object->errors = $this->comment_errors;

 			else

 				$comment_object->errors = array();

 			

-			if($comment->reply == 0)

+			if ($comment->reply == 0)

 			{

 				$comment_object->replies = array();

 				$comment_array[$comment->id] = $comment_object;

@@ -381,21 +381,21 @@ 
 		$commenter->website = '';

 		

 		$commenter_cookie = Cookie::instance('Commenter');

-		if(!$commenter_cookie->exists())

+		if (!$commenter_cookie->exists())

 			return $commenter;

 		

 		$commenter_cookie_value = $commenter_cookie->getValue();

 		$commenter_cookie_value = json_decode($commenter_cookie_value);

 		

-		if($commenter_cookie_value === NULL)

+		if ($commenter_cookie_value === NULL)

 			return $commenter;

 		

-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))

+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))

 			return $commenter;

 		

 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));

 		

-		if($commenter_object === NULL)

+		if ($commenter_object === NULL)

 			return $commenter;

 		

 		$commenter->id = $commenter_object->id;

Braces +75 added lines, -56 removed lines

@@ -40,8 +40,9 @@ 
 			'date' => date('Y')));

 		

 		Loader::loadInstance('utility', 'Database');

-		if(Database::isConnected() === false)

-			$this->unavailable();

+		if(Database::isConnected() === false) {

+					$this->unavailable();

+		}

 	}

 

 	protected function get_domain_container()

@@ -97,8 +98,9 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";

 				$post->comments = $row->comments;

 				

-				if($format == 'full')

-					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');

+				if($format == 'full') {

+									$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');

+				}

 			break;

 			case 'book' :

 				$row = BookCollector::getRow($raw_post->type_id);

@@ -106,8 +108,9 @@ 
 				$post->type = 'book';

 				$post->title = "Just finished reading {$row->title} by {$row->author}.";

 				

-				if($format == 'full')

-					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";

+				if($format == 'full') {

+									$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";

+				}

 			break;

 			case 'distance' :

 				$row = DistanceCollector::getRow($raw_post->type_id);

@@ -116,16 +119,16 @@ 
 				if($row->type == 'running')

 				{

 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";

-					if(strlen($row->message) > 0)

-						$post->title .= " Afterwards, I was all like '{$row->message}'.";

-				}

-				else if($row->type == 'hiking')

+					if(strlen($row->message) > 0) {

+											$post->title .= " Afterwards, I was all like '{$row->message}'.";

+					}

+				} else if($row->type == 'hiking')

 				{

 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";

-					if(strlen($row->title) > 0)

-						$post->title .= " I was hiking up around the {$row->title} area.";

-				}

-                else if ($row->type == 'walking') {

+					if(strlen($row->title) > 0) {

+											$post->title .= " I was hiking up around the {$row->title} area.";

+					}

+				} else if ($row->type == 'walking') {

                     $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";

                 }

 			break;

@@ -140,10 +143,11 @@ 
 				

 				$post->type = 'twitter';

 				

-				if($format == 'full')

-					$post->title = $row->text_formatted_full;

-				else

-					$post->title = $row->text_formatted;

+				if($format == 'full') {

+									$post->title = $row->text_formatted_full;

+				} else {

+									$post->title = $row->text_formatted;

+				}

 				

 				$post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0;

 				$post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0;

@@ -153,13 +157,15 @@ 
 				

 				$post->type = 'youtube';

 				

-				if($format == 'full')

-					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";

-				else

-					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";

+				if($format == 'full') {

+									$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";

+				} else {

+									$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";

+				}

 				

-				if($format == 'full')

-					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

+				if($format == 'full') {

+									$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

+				}

 			break;

 		}

 		

@@ -188,10 +194,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);

 		foreach($this->body_view_array as $view)

 		{

-			if(substr($view, 0, 1) == '/')

-				Loader::load('view', $view, $this->data_array['body']);

-			else

-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			if(substr($view, 0, 1) == '/') {

+							Loader::load('view', $view, $this->data_array['body']);

+			} else {

+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			}

 		}

         

         if (URLDecode::getSite() == 'waterfalls') {

@@ -200,8 +207,9 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));

         }

 		

-		if($view == '/404' || $view == '/503')

-			exit;

+		if($view == '/404' || $view == '/503') {

+					exit;

+		}

 	}

 

 	protected function set_header_method($method)

@@ -261,11 +269,13 @@ 
 		

 		$js_array = array();

 		

-		if(count($this->js_array) > 0)

-			$js_array = array_merge($js_array, $this->js_array);

+		if(count($this->js_array) > 0) {

+					$js_array = array_merge($js_array, $this->js_array);

+		}

 		

-		if(count($js_array) > 0)

-			$js_array = Asset::getJS($js_array);

+		if(count($js_array) > 0) {

+					$js_array = Asset::getJS($js_array);

+		}

 		

 		$this->set_head('css_link_array', $css_array);

 		$this->set_head('js_link_array', $js_array);

@@ -278,14 +288,16 @@ 
 

 	protected function eject()

 	{

-		if(get_class($this) !== 'Error404Controller')

-			Loader::loadNew('controller', '/Error404Controller')->activate();

+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}

 

 	protected function unavailable()

 	{

-		if(get_class($this) !== 'Error503Controller')

-			Loader::loadNew('controller', '/Error503Controller')->activate();

+		if(get_class($this) !== 'Error503Controller') {

+					Loader::loadNew('controller', '/Error503Controller')->activate();

+		}

 	}

 

 	protected function redirect($uri, $method = 301)

@@ -293,12 +305,14 @@ 
 		switch($method)

 		{

 			case 301 :

-				if(get_class($this) !== 'Error301Controller')

-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				if(get_class($this) !== 'Error301Controller') {

+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				}

 				break;

 			case 303 :

-				if(get_class($this) !== 'Error303Controller')

-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				if(get_class($this) !== 'Error303Controller') {

+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				}

 				break;

 		}

 	}

@@ -345,18 +359,19 @@ 
 			$comment_object->url = $comment->url;

 			$comment_object->trusted = $comment->trusted;

 			

-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)

-				$comment_object->errors = $this->comment_errors;

-			else

-				$comment_object->errors = array();

+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {

+							$comment_object->errors = $this->comment_errors;

+			} else {

+							$comment_object->errors = array();

+			}

 			

 			if($comment->reply == 0)

 			{

 				$comment_object->replies = array();

 				$comment_array[$comment->id] = $comment_object;

+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

 			}

-			else

-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

 		}

 		

 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);

@@ -381,22 +396,26 @@ 
 		$commenter->website = '';

 		

 		$commenter_cookie = Cookie::instance('Commenter');

-		if(!$commenter_cookie->exists())

-			return $commenter;

+		if(!$commenter_cookie->exists()) {

+					return $commenter;

+		}

 		

 		$commenter_cookie_value = $commenter_cookie->getValue();

 		$commenter_cookie_value = json_decode($commenter_cookie_value);

 		

-		if($commenter_cookie_value === NULL)

-			return $commenter;

+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		

-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))

-			return $commenter;

+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {

+					return $commenter;

+		}

 		

 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));

 		

-		if($commenter_object === NULL)

-			return $commenter;

+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		

 		$commenter->id = $commenter_object->id;

 		$commenter->name = $commenter_object->name;

controller/RobotController.class.inc.php

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
 		$this->entries[] = $entry;

 	}

 

+	/**
+	 * @param string $url
+	 */
 	protected function disallow_for_all_robots($url = null)

 	{

 		$entry = new stdclass();

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

+		if ($url)

 			$entry->allow = $url;

 		else

 		{

@@ -42,7 +42,7 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

+		if ($url)

 			$entry->disallow = $url;

 		else

 			$entry->disallow = self::$ALL_URL;

@@ -55,18 +55,18 @@ 
 		$this->set_data();

 		Header::sendRobot();

 		

-		foreach($this->entries as $key => $entry)

+		foreach ($this->entries as $key => $entry)

 		{

-			if($key == 0)

+			if ($key == 0)

 				echo "User-agent: {$entry->agent}\n";

-			if(isset($entry->disallow) && $entry->disallow != '')

+			if (isset($entry->disallow) && $entry->disallow != '')

 				echo "Disallow: {$entry->disallow}\n";

-			if(isset($entry->allow))

+			if (isset($entry->allow))

 				echo "Allow: {$entry->allow}\n";

 			//echo "\n";

 		}

 		

-		if($this->show_sitemap)

+		if ($this->show_sitemap)

 		{

 			echo "\n";

 			$sitemap = URLDecode::getBase() . 'sitemap.xml';

Braces +17 added lines, -13 removed lines

@@ -27,9 +27,9 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

-			$entry->allow = $url;

-		else

+		if($url) {

+					$entry->allow = $url;

+		} else

 		{

 			$entry->disallow = '';

 			$entry->allow = self::$ALL_URL;

@@ -42,10 +42,11 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

-			$entry->disallow = $url;

-		else

-			$entry->disallow = self::$ALL_URL;

+		if($url) {

+					$entry->disallow = $url;

+		} else {

+					$entry->disallow = self::$ALL_URL;

+		}

 		

 		$this->entries[] = $entry;

 	}

@@ -57,12 +58,15 @@ 
 		

 		foreach($this->entries as $key => $entry)

 		{

-			if($key == 0)

-				echo "User-agent: {$entry->agent}\n";

-			if(isset($entry->disallow) && $entry->disallow != '')

-				echo "Disallow: {$entry->disallow}\n";

-			if(isset($entry->allow))

-				echo "Allow: {$entry->allow}\n";

+			if($key == 0) {

+							echo "User-agent: {$entry->agent}\n";

+			}

+			if(isset($entry->disallow) && $entry->disallow != '') {

+							echo "Disallow: {$entry->disallow}\n";

+			}

+			if(isset($entry->allow)) {

+							echo "Allow: {$entry->allow}\n";

+			}

 			//echo "\n";

 		}

 		

controller/RSSController.class.inc.php

Doc Comments +12 added lines

@@ -18,6 +18,9 @@ 
 		Debugger::hide();

 	}

 

+	/**
+	 * @param string $title
+	 */
 	final protected function setTitle($title)

 	{

 		$this->xml->channel->addChild('title', $title);

@@ -30,11 +33,17 @@ 
 		$this->xml->channel->addChild('link', $url);

 	}

 

+	/**
+	 * @param string $description
+	 */
 	final protected function setDescription($description)

 	{

 		$this->xml->channel->addChild('description', $description);

 	}

 

+	/**
+	 * @param string $url
+	 */
 	final protected function setAtom($url)

 	{

 		$atom = $this->xml->channel->addChild('link', '', 'http://www.w3.org/2005/Atom');

@@ -76,6 +85,9 @@ 
 		$this->xml->channel->addChild('ttl', $ttl);

 	}

 

+	/**
+	 * @param string $pubDate
+	 */
 	final protected function addItem($title, $link, $description, $category, $pubDate)

 	{

 		$item = $this->xml->channel->addChild('item');

Indentation +4 added lines, -4 removed lines

@@ -57,10 +57,10 @@
 

 	final protected function setWebMaster($webmaster = '')

 	{

-        if ($webmaster == '') {

-            global $config;

-            $webmaster = "{$config->admin_email} (Jacob Emerick)";

-        }

+		if ($webmaster == '') {

+			global $config;

+			$webmaster = "{$config->admin_email} (Jacob Emerick)";

+		}

 		$this->xml->channel->addChild('webMaster', $webmaster);

 	}

 

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 

 	final protected function setLink($url = null)

 	{

-		if(!isset($url))

+		if (!isset($url))

 			$url = URLDecode::getBase();

 		$this->xml->channel->addChild('link', $url);

 	}

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

 	final protected function setCopyright($copyright = null)

 	{

-		if(!isset($copyright))

+		if (!isset($copyright))

 			$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

 		$this->xml->channel->addChild('copyright', $copyright);

 	}

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

 	final protected function setPubDate($date = null)

 	{

-		if(!isset($date))

+		if (!isset($date))

 			$date = date('r');

 		$this->xml->channel->addChild('pubDate', $date);

 	}

Braces +9 added lines, -6 removed lines

@@ -25,8 +25,9 @@ 
 

 	final protected function setLink($url = null)

 	{

-		if(!isset($url))

-			$url = URLDecode::getBase();

+		if(!isset($url)) {

+					$url = URLDecode::getBase();

+		}

 		$this->xml->channel->addChild('link', $url);

 	}

 

@@ -50,8 +51,9 @@ 
 

 	final protected function setCopyright($copyright = null)

 	{

-		if(!isset($copyright))

-			$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

+		if(!isset($copyright)) {

+					$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

+		}

 		$this->xml->channel->addChild('copyright', $copyright);

 	}

 

@@ -66,8 +68,9 @@ 
 

 	final protected function setPubDate($date = null)

 	{

-		if(!isset($date))

-			$date = date('r');

+		if(!isset($date)) {

+					$date = date('r');

+		}

 		$this->xml->channel->addChild('pubDate', $date);

 	}

 

controller/sitemap/BlogSitemapController.class.inc.php

Doc Comments +3 added lines

@@ -83,6 +83,9 @@
 		}

 	}

 

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

 	{

 		switch($changefreq)

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

Doc Comments +3 added lines

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

 	}

 

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

 	{

 		switch($changefreq)

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

Doc Comments +4 added lines

@@ -133,6 +133,10 @@
         $this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);

     }

 

+    /**
+     * @param integer $items_per_page
+     * @param string $type
+     */
     private function add_paginated_pages($count, $items_per_page, $base_url, $type)

     {

         switch($type) {

Indentation +144 added lines, -144 removed lines

@@ -1,13 +1,13 @@ 
 <?

 

 Loader::load('collector', array(

-    'waterfall/CompanionCollector',

-    'waterfall/CountyCollector',

-    'waterfall/LogCollector',

-    'waterfall/LogTagCollector',

-    'waterfall/PeriodCollector',

-    'waterfall/WatercourseCollector',

-    'waterfall/WaterfallCollector',

+	'waterfall/CompanionCollector',

+	'waterfall/CountyCollector',

+	'waterfall/LogCollector',

+	'waterfall/LogTagCollector',

+	'waterfall/PeriodCollector',

+	'waterfall/WatercourseCollector',

+	'waterfall/WaterfallCollector',

 ));

 Loader::load('controller', '/SitemapController');

 Loader::load('utility', 'Content');

@@ -15,143 +15,143 @@ 
 final class WaterfallSitemapController extends SitemapController

 {

 

-    private static $HOME_PAGE_RANK                      = .9;

-

-    private static $WATERFALL_LISTING_RANK              = .3;

-    private static $WATERFALL_COUNTY_LISTING_RANK       = .6;

-    private static $WATERFALL_WATERCOURSE_LISTING_RANK  = .6;

-    private static $WATERFALL_LISTING_SUBPAGES_RANK     = .1;

-    private static $WATERFALL_PAGE_RANK                 = .8;

-

-    private static $MAP_PAGE_RANK                       = .6;

-

-    private static $LOG_LISTING_RANK                    = .3;

-    private static $LOG_COMPANION_LISTING_RANK          = .3;

-    private static $LOG_PERIOD_LISTING_RANK             = .3;

-    private static $LOG_LISTING_SUBPAGES_RANK           = .1;

-    private static $LOG_PAGE_RANK                       = .7;

-

-    private static $ABOUT_PAGE_RANK                     = .6;

-

-

-    private static $HOME_PAGE_CHANGEFREQ                      = 'daily';

-

-    private static $WATERFALL_LISTING_CHANGEFREQ              = 'monthly';

-    private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ       = 'monthly';

-    private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ  = 'monthly';

-    private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ     = 'monthly';

-    private static $WATERFALL_PAGE_CHANGEFREQ                 = 'weekly';

-

-    private static $MAP_PAGE_CHANGEFREQ                       = 'monthly';

-

-    private static $LOG_LISTING_CHANGEFREQ                    = 'weekly';

-    private static $LOG_COMPANION_LISTING_CHANGEFREQ          = 'monthly';

-    private static $LOG_PERIOD_LISTING_CHANGEFREQ             = 'monthly';

-    private static $LOG_LISTING_SUBPAGES_CHANGEFREQ           = 'monthly';

-    private static $LOG_PAGE_CHANGEFREQ                       = 'weekly';

-

-    private static $ABOUT_PAGE_CHANGEFREQ                     = 'yearly';

-

-

-    private static $WATERFALLS_PER_LISTING              = 24;

-    private static $WATERFALLS_PER_COUNTY_LISTING       = 12;

-    private static $WATERFALLS_PER_WATERCOURSE_LISTING  = 12;

-

-    private static $LOGS_PER_LISTING                    = 10;

-    private static $LOGS_PER_COMPANION_LISTING          = 10;

-    private static $LOGS_PER_PERIOD_LISTING             = 10;

-

-    protected function set_data()

-    {

-        $this->add_home_pages();

-        $this->add_waterfall_pages();

-        $this->add_map_pages();

-        $this->add_log_pages();

-        $this->add_about_pages();

-    }

-

-    private function add_home_pages()

-    {

-        $this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);

-    }

-

-    private function add_waterfall_pages()

-    {

-        $this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);

-        $count = WaterfallCollector::getListCount();

-        $this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');

-

-        $county_list = CountyCollector::getCountyList();

-        foreach ($county_list as $county) {

-            $this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);

-            $this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');

-        }

-

-        $watercourse_list = WatercourseCollector::getWatercourseList();

-        foreach ($watercourse_list as $watercourse) {

-            $this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);

-            $this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');

-        }

-

-        $waterfall_list = WaterfallCollector::getList(500);

-        foreach ($waterfall_list as $waterfall) {

-            $this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);

-        }

-    }

-

-    private function add_map_pages()

-    {

-        $this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);

-    }

-

-    private function add_log_pages()

-    {

-        $this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);

-        $count = LogCollector::getListCount();

-        $this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');

-

-        $companion_list = CompanionCollector::getCompanionList();

-        foreach ($companion_list as $companion) {

-            $this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);

-            $this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');

-        }

-

-        $period_list = PeriodCollector::getPeriodList();

-        foreach ($period_list as $period) {

-            $this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);

-            $this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');

-        }

-

-        $log_list = LogCollector::getList(500);

-        foreach ($log_list as $log) {

-            $this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);

-        }

-    }

-

-    private function add_about_pages()

-    {

-        $this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);

-    }

-

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

-    {

-        switch($type) {

-            case 'waterfall':

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

-                $changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;

-                $rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;

-                break;

-            case 'log':

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

-                $changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;

-                $rank = self::$LOG_LISTING_SUBPAGES_RANK;

-                break;

-        }

-

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

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

-        }

-    }

+	private static $HOME_PAGE_RANK                      = .9;

+

+	private static $WATERFALL_LISTING_RANK              = .3;

+	private static $WATERFALL_COUNTY_LISTING_RANK       = .6;

+	private static $WATERFALL_WATERCOURSE_LISTING_RANK  = .6;

+	private static $WATERFALL_LISTING_SUBPAGES_RANK     = .1;

+	private static $WATERFALL_PAGE_RANK                 = .8;

+

+	private static $MAP_PAGE_RANK                       = .6;

+

+	private static $LOG_LISTING_RANK                    = .3;

+	private static $LOG_COMPANION_LISTING_RANK          = .3;

+	private static $LOG_PERIOD_LISTING_RANK             = .3;

+	private static $LOG_LISTING_SUBPAGES_RANK           = .1;

+	private static $LOG_PAGE_RANK                       = .7;

+

+	private static $ABOUT_PAGE_RANK                     = .6;

+

+

+	private static $HOME_PAGE_CHANGEFREQ                      = 'daily';

+

+	private static $WATERFALL_LISTING_CHANGEFREQ              = 'monthly';

+	private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ       = 'monthly';

+	private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ  = 'monthly';

+	private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ     = 'monthly';

+	private static $WATERFALL_PAGE_CHANGEFREQ                 = 'weekly';

+

+	private static $MAP_PAGE_CHANGEFREQ                       = 'monthly';

+

+	private static $LOG_LISTING_CHANGEFREQ                    = 'weekly';

+	private static $LOG_COMPANION_LISTING_CHANGEFREQ          = 'monthly';

+	private static $LOG_PERIOD_LISTING_CHANGEFREQ             = 'monthly';

+	private static $LOG_LISTING_SUBPAGES_CHANGEFREQ           = 'monthly';

+	private static $LOG_PAGE_CHANGEFREQ                       = 'weekly';

+

+	private static $ABOUT_PAGE_CHANGEFREQ                     = 'yearly';

+

+

+	private static $WATERFALLS_PER_LISTING              = 24;

+	private static $WATERFALLS_PER_COUNTY_LISTING       = 12;

+	private static $WATERFALLS_PER_WATERCOURSE_LISTING  = 12;

+

+	private static $LOGS_PER_LISTING                    = 10;

+	private static $LOGS_PER_COMPANION_LISTING          = 10;

+	private static $LOGS_PER_PERIOD_LISTING             = 10;

+

+	protected function set_data()

+	{

+		$this->add_home_pages();

+		$this->add_waterfall_pages();

+		$this->add_map_pages();

+		$this->add_log_pages();

+		$this->add_about_pages();

+	}

+

+	private function add_home_pages()

+	{

+		$this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);

+	}

+

+	private function add_waterfall_pages()

+	{

+		$this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);

+		$count = WaterfallCollector::getListCount();

+		$this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');

+

+		$county_list = CountyCollector::getCountyList();

+		foreach ($county_list as $county) {

+			$this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);

+			$this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');

+		}

+

+		$watercourse_list = WatercourseCollector::getWatercourseList();

+		foreach ($watercourse_list as $watercourse) {

+			$this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);

+			$this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');

+		}

+

+		$waterfall_list = WaterfallCollector::getList(500);

+		foreach ($waterfall_list as $waterfall) {

+			$this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);

+		}

+	}

+

+	private function add_map_pages()

+	{

+		$this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);

+	}

+

+	private function add_log_pages()

+	{

+		$this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);

+		$count = LogCollector::getListCount();

+		$this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');

+

+		$companion_list = CompanionCollector::getCompanionList();

+		foreach ($companion_list as $companion) {

+			$this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);

+			$this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');

+		}

+

+		$period_list = PeriodCollector::getPeriodList();

+		foreach ($period_list as $period) {

+			$this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);

+			$this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');

+		}

+

+		$log_list = LogCollector::getList(500);

+		foreach ($log_list as $log) {

+			$this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);

+		}

+	}

+

+	private function add_about_pages()

+	{

+		$this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);

+	}

+

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

+	{

+		switch($type) {

+			case 'waterfall':

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

+				$changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;

+				$rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;

+				break;

+			case 'log':

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

+				$changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;

+				$rank = self::$LOG_LISTING_SUBPAGES_RANK;

+				break;

+		}

+

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

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

+		}

+	}

 

 }

 

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

         }

     }