jacobemerick / web

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

         }

     }

utility/Asset.class.inc.php

Doc Comments +15 added lines

@@ -79,6 +79,9 @@ 
 		return $final_files;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private static function process_simple_pieces($type, $file)

 	{

 		$piece_path = self::get_piece_path($type, $file);

@@ -101,6 +104,9 @@ 
 		return self::get_final_link($type, $file_name);

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private static function process_complex_pieces($type, $array)

 	{

 		if(in_array(404, $array))

@@ -152,6 +158,9 @@ 
 		return;

 	}

 

+	/**
+	 * @return string
+	 */
 	private static function get_piece_path($type, $file)

 	{

 		$path = Loader::getRoot() . "/{$type}/piece/{$file}*";

@@ -162,6 +171,9 @@ 
 		return;

 	}

 

+	/**
+	 * @param string $contents
+	 */
 	private static function make_final_file($type, $contents, $file_name, $exists = false)

 	{

 		if($exists)

@@ -213,6 +225,9 @@ 
 		return $path;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	public static function getLastModified($type, $file)

 	{

 		$final_path = self::get_final_path($type, $file);

Indentation +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			switch($piece)

 			{

 				case 'jquery-1.4.2' :

-                case 'jquery-1.10.2.min' :

+				case 'jquery-1.10.2.min' :

 				case 'jquery-ui-1.8.2' :

 				case 'ga' :

 					$simple_pieces[] = $piece;

@@ -118,9 +118,9 @@ 
 			foreach($array as $file)

 			{

 				$piece_path = self::get_piece_path($type, $file);

-                $contents .= "/*** {$file} ***/\n\n";

+				$contents .= "/*** {$file} ***/\n\n";

 				$contents .= file_get_contents($piece_path);

-                $contents .= "\n\n\n";

+				$contents .= "\n\n\n";

 			}

 			return self::make_final_file($type, $contents, $site);

 		}

Spacing +23 added lines, -23 removed lines

@@ -19,9 +19,9 @@ 
 	{

 		$simple_pieces = array();

 		$complex_pieces = array();

-		foreach($array as $piece)

+		foreach ($array as $piece)

 		{

-			switch($piece)

+			switch ($piece)

 			{

 				case 'global' :

 					$simple_pieces[] = $piece;

@@ -32,7 +32,7 @@ 
 			}

 		}

 		

-		foreach($simple_pieces as $piece)

+		foreach ($simple_pieces as $piece)

 		{

 			$final_files[] = self::process_simple_pieces('styles', $piece);

 		}

@@ -47,9 +47,9 @@ 
 		$complex_pieces = array();

 		$external_pieces = array();

 		

-		foreach($array as $piece)

+		foreach ($array as $piece)

 		{

-			switch($piece)

+			switch ($piece)

 			{

 				case 'jquery-1.4.2' :

                 case 'jquery-1.10.2.min' :

@@ -66,11 +66,11 @@ 
 			}

 		}

 		

-		foreach($external_pieces as $piece)

+		foreach ($external_pieces as $piece)

 		{

 			$final_files[] = $piece;

 		}

-		foreach($simple_pieces as $piece)

+		foreach ($simple_pieces as $piece)

 		{

 			$final_files[] = self::process_simple_pieces('scripts', $piece);

 		}

@@ -84,7 +84,7 @@ 
 		$piece_path = self::get_piece_path($type, $file);

 		$final_path = self::get_final_path($type, $file);

 		

-		if(!$final_path)

+		if (!$final_path)

 		{

 			$contents = file_get_contents($piece_path);

 			return self::make_final_file($type, $contents, $file);

@@ -92,7 +92,7 @@ 
 		

 		$file_name = substr($final_path, strpos($final_path, $file), strrpos($final_path, '.') - strpos($final_path, $file));

 		

-		if(filemtime($final_path) < filemtime($piece_path))

+		if (filemtime($final_path) < filemtime($piece_path))

 		{

 			$contents = file_get_contents($piece_path);

 			return self::make_final_file($type, $contents, $file_name, true);

@@ -103,19 +103,19 @@ 
 

 	private static function process_complex_pieces($type, $array)

 	{

-		if(in_array(404, $array))

+		if (in_array(404, $array))

 			$site = '404';

-		else if(in_array(503, $array))

+		else if (in_array(503, $array))

 			$site = '503';

 		else

 			$site = strtolower(URLDecode::getSite());

 		

 		$final_path = self::get_final_path($type, $site);

 		

-		if(!$final_path)

+		if (!$final_path)

 		{

 			$contents = '';

-			foreach($array as $file)

+			foreach ($array as $file)

 			{

 				$piece_path = self::get_piece_path($type, $file);

                 $contents .= "/*** {$file} ***/\n\n";

@@ -129,14 +129,14 @@ 
 		

 		$create_new = false;

 		$contents = '';

-		foreach($array as $file)

+		foreach ($array as $file)

 		{

 			$piece_path = self::get_piece_path($type, $file);

 			$contents .= file_get_contents($piece_path);

-			if(filemtime($final_path) < filemtime($piece_path))

+			if (filemtime($final_path) < filemtime($piece_path))

 				$create_new = true;

 		}

-		if($create_new)

+		if ($create_new)

 			return self::make_final_file($type, $contents, $file_name, true);

 		

 		return self::get_final_link($type, $file_name);

@@ -147,7 +147,7 @@ 
 		$path = Loader::getRoot() . "/{$type}/final/{$file}*";

 		

 		$files = glob($path); 

-		if(count($files) > 0)

+		if (count($files) > 0)

 			return $files[0];

 		return;

 	}

@@ -157,18 +157,18 @@ 
 		$path = Loader::getRoot() . "/{$type}/piece/{$file}*";

 		

 		$files = glob($path);

-		if(count($files) > 0)

+		if (count($files) > 0)

 			return $files[0];

 		return;

 	}

 

 	private static function make_final_file($type, $contents, $file_name, $exists = false)

 	{

-		if($exists)

+		if ($exists)

 		{

 			$old_file = self::get_final_path($type, $file_name);

 			$version = substr($old_file, strpos($old_file, $file_name));

-			if(strpos($version, '-v'))

+			if (strpos($version, '-v'))

 			{

 				$version = substr($version, strpos($version, '-v'));

 				$version = substr($version, 2, strpos($version, '.') - 2);

@@ -182,7 +182,7 @@ 
 		

 		$path = Loader::getRoot() . "/{$type}/final/{$file_name}";

 		

-		switch($type)

+		switch ($type)

 		{

 			case 'styles' :

 				$path .= '.css';

@@ -193,7 +193,7 @@ 
 		}

 		

 		file_put_contents($path, $contents);

-		if($exists)

+		if ($exists)

 			unlink($old_file);

 		Debugger::logMessage("New {$type} file created - {$file_name}.");

 		return self::get_final_link($type, $file_name);

@@ -201,7 +201,7 @@ 
 

 	private static function get_final_link($type, $file_name)

 	{

-		switch($type)

+		switch ($type)

 		{

 			case 'styles' :

 				$path = "/style/{$file_name}.css";

Braces +24 added lines, -18 removed lines

@@ -103,12 +103,13 @@ 
 

 	private static function process_complex_pieces($type, $array)

 	{

-		if(in_array(404, $array))

-			$site = '404';

-		else if(in_array(503, $array))

-			$site = '503';

-		else

-			$site = strtolower(URLDecode::getSite());

+		if(in_array(404, $array)) {

+					$site = '404';

+		} else if(in_array(503, $array)) {

+					$site = '503';

+		} else {

+					$site = strtolower(URLDecode::getSite());

+		}

 		

 		$final_path = self::get_final_path($type, $site);

 		

@@ -133,11 +134,13 @@ 
 		{

 			$piece_path = self::get_piece_path($type, $file);

 			$contents .= file_get_contents($piece_path);

-			if(filemtime($final_path) < filemtime($piece_path))

-				$create_new = true;

+			if(filemtime($final_path) < filemtime($piece_path)) {

+							$create_new = true;

+			}

+		}

+		if($create_new) {

+					return self::make_final_file($type, $contents, $file_name, true);

 		}

-		if($create_new)

-			return self::make_final_file($type, $contents, $file_name, true);

 		

 		return self::get_final_link($type, $file_name);

 	}

@@ -147,8 +150,9 @@ 
 		$path = Loader::getRoot() . "/{$type}/final/{$file}*";

 		

 		$files = glob($path); 

-		if(count($files) > 0)

-			return $files[0];

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

+					return $files[0];

+		}

 		return;

 	}

 

@@ -157,8 +161,9 @@ 
 		$path = Loader::getRoot() . "/{$type}/piece/{$file}*";

 		

 		$files = glob($path);

-		if(count($files) > 0)

-			return $files[0];

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

+					return $files[0];

+		}

 		return;

 	}

 

@@ -174,9 +179,9 @@ 
 				$version = substr($version, 2, strpos($version, '.') - 2);

 				$version++;

 				$file_name = substr($file_name, 0, strpos($file_name, '-v'));

+			} else {

+							$version = 2;

 			}

-			else

-				$version = 2;

 			$file_name .= "-v{$version}";

 		}

 		

@@ -193,8 +198,9 @@ 
 		}

 		

 		file_put_contents($path, $contents);

-		if($exists)

-			unlink($old_file);

+		if($exists) {

+					unlink($old_file);

+		}

 		Debugger::logMessage("New {$type} file created - {$file_name}.");

 		return self::get_final_link($type, $file_name);

 	}

utility/content/AutolinkTwitterURLContent.class.inc.php

Doc Comments +6 added lines

@@ -37,6 +37,9 @@ 
 		return;

 	}

 

+	/**
+	 * @param string[] $match
+	 */
 	private function get_display_url($match)

 	{

 		$display_url = $this->check_for_redirect($match[0]);

@@ -67,6 +70,9 @@ 
 		return $link;

 	}

 

+	/**
+	 * @return string
+	 */
 	private function check_for_redirect($url)

 	{

 		$headers = @get_headers($url);

Spacing +11 added lines, -11 removed lines

@@ -10,11 +10,11 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, 'http') === false)

+		if (stristr($this->content, 'http') === false)

 			return;

 		

 		$parameters = func_get_args();

-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

 		{

 			trigger_error('Unexpected parameters passed into AutolinkTwitterURL!');

 			return;

@@ -22,10 +22,10 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_link === false || $found_link === 0)

+		if ($found_link === false || $found_link === 0)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$parameters['href'] = $match[0];

 			$display_url = $this->get_display_url($match);

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

 		$display_url = $this->check_for_redirect($match[0]);

 		

-		if(strlen($display_url) > (self::$DISPLAY_URL_LENGTH - 2))

+		if (strlen($display_url) > (self::$DISPLAY_URL_LENGTH - 2))

 		{

 			$display_url = substr($display_url, 0, self::$DISPLAY_URL_LENGTH);

 			$display_url .= '...';

@@ -53,12 +53,12 @@ 
 	private function get_replacement_link($parameters, $display_url)

 	{

 		$link = '<a';

-		foreach($parameters as $attribute => $value)

+		foreach ($parameters as $attribute => $value)

 		{

 			$link .= ' ';

 			$link .= $attribute;

 			$link .= '=';

-			$link .= '"' . $value .'"';

+			$link .= '"' . $value . '"';

 		}

 		$link .= '>';

 		$link .= $display_url;

@@ -70,14 +70,14 @@ 
 	private function check_for_redirect($url)

 	{

 		$headers = @get_headers($url);

-		if($headers === false)

+		if ($headers === false)

 			$headers = $this->get_headers($url);

 		

-		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)

+		if (stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)

 		{

-			foreach($headers as $header)

+			foreach ($headers as $header)

 			{

-				if(substr($header, 0, 9) == 'Location:')

+				if (substr($header, 0, 9) == 'Location:')

 					break;

 			}

 			

Braces +12 added lines, -8 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, 'http') === false)

-			return;

+		if(stristr($this->content, 'http') === false) {

+					return;

+		}

 		

 		$parameters = func_get_args();

 		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

@@ -22,8 +23,9 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_link === false || $found_link === 0)

-			return;

+		if($found_link === false || $found_link === 0) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

@@ -70,15 +72,17 @@ 
 	private function check_for_redirect($url)

 	{

 		$headers = @get_headers($url);

-		if($headers === false)

-			$headers = $this->get_headers($url);

+		if($headers === false) {

+					$headers = $this->get_headers($url);

+		}

 		

 		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)

 		{

 			foreach($headers as $header)

 			{

-				if(substr($header, 0, 9) == 'Location:')

-					break;

+				if(substr($header, 0, 9) == 'Location:') {

+									break;

+				}

 			}

 			

 			$url = substr($header, 10);

utility/content/AutolinkTwitterUserContent.class.inc.php

Doc Comments +4 added lines

@@ -35,6 +35,10 @@
 		return;

 	}

 

+	/**
+	 * @param string $handle_link
+	 * @param string $handle_display
+	 */
 	private function get_replacement_link($handle_link, $handle_display)

 	{

 		return sprintf(self::$USER_LINK, $handle_link, $handle_display);

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, '@') === false)

+		if (stristr($this->content, '@') === false)

 			return;

 		

 		// yeah yeah, i'm currently ignoring the link, whatevs

 		$parameters = func_get_args();

-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

 		{

 			trigger_error('Unexpected parameters passed into AutolinkTwitterUser!');

 			return;

@@ -23,10 +23,10 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_user === false || $found_user === 0)

+		if ($found_user === false || $found_user === 0)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$replacement = $this->get_replacement_link($match[1], $match[0]);

 			$this->content = str_replace($match[0], $replacement, $this->content);

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, '@') === false)

-			return;

+		if(stristr($this->content, '@') === false) {

+					return;

+		}

 		

 		// yeah yeah, i'm currently ignoring the link, whatevs

 		$parameters = func_get_args();

@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_user === false || $found_user === 0)

-			return;

+		if($found_user === false || $found_user === 0) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

utility/content/CleanCommentContent.class.inc.php

Doc Comments +14 added lines

@@ -36,6 +36,10 @@ 
 		$this->replace_element_patterns();

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

@@ -54,11 +58,17 @@ 
 		}

 	}

 

+	/**
+	 * @param string|null $text
+	 */
 	private function create_placeholder($text)

 	{

 		return md5($text . rand());

 	}

 

+	/**
+	 * @param string|null $text
+	 */
 	private function create_full_match_pattern($text)

 	{

 		$pattern = '';

@@ -75,6 +85,10 @@ 
 		$this->content = strip_tags($this->content);

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

Spacing +5 added lines, -5 removed lines

@@ -40,10 +40,10 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

+		if ($match_count < 1)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$full_match = array_shift($match);

 			$placeholder = $this->create_placeholder($full_match);

@@ -79,10 +79,10 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

+		if ($match_count < 1)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$full_match = array_shift($match);

 			$full_match_pattern = $this->create_full_match_pattern($full_match);

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

 	private function replace_element_patterns()

 	{

-		foreach($this->replacement_array as $key => $replace)

+		foreach ($this->replacement_array as $key => $replace)

 		{

 			$this->content = str_replace($key, $replace, $this->content);

 		}

Braces +6 added lines, -4 removed lines

@@ -40,8 +40,9 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

-			return;

+		if($match_count < 1) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

@@ -79,8 +80,9 @@ 
 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

 		

-		if($match_count < 1)

-			return;

+		if($match_count < 1) {

+					return;

+		}

 		

 		foreach($matches as $match)

 		{

utility/content/FetchFirstPhotoContent.class.inc.php

Doc Comments +5 added lines

@@ -24,6 +24,11 @@
 		return Loader::getImagePath('photo', $path);

 	}

 

+	/**
+	 * @param string $string
+	 * @param boolean $is_absolute
+	 * @param string $size
+	 */
 	private function get_thumb($string, $is_absolute, $size)

 	{

 		list($category, $file_name) = explode('/', $string);

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 

 	protected function execute($is_absolute = false, $size = 'thumb')

 	{

-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)

+		if (preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)

 			$this->content = $this->get_thumb($match[1], $is_absolute, $size);

 		else

 			$this->content = self::$DEFAULT_RETURN;

@@ -34,7 +34,7 @@ 
 		

 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::fetchRow($category, $photo);

-		if($photo_result == false)

+		if ($photo_result == false)

 			return '';

 		

 		$height = $file_size[1];

@@ -42,7 +42,7 @@ 
 		$description = $photo_result->description;

 		

 		$domain = '/';

-		if($is_absolute)

+		if ($is_absolute)

 			$domain = Loader::getRootUrl();

 		

 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

Braces +11 added lines, -8 removed lines

@@ -11,10 +11,11 @@ 
 

 	protected function execute($is_absolute = false, $size = 'thumb')

 	{

-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)

-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);

-		else

-			$this->content = self::$DEFAULT_RETURN;

+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {

+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);

+		} else {

+					$this->content = self::$DEFAULT_RETURN;

+		}

 		return;

 	}

 

@@ -34,16 +35,18 @@ 
 		

 		Loader::load('collector', 'image/PhotoCollector');

 		$photo_result = PhotoCollector::fetchRow($category, $photo);

-		if($photo_result == false)

-			return '';

+		if($photo_result == false) {

+					return '';

+		}

 		

 		$height = $file_size[1];

 		$width = $file_size[0];

 		$description = $photo_result->description;

 		

 		$domain = '/';

-		if($is_absolute)

-			$domain = Loader::getRootUrl();

+		if($is_absolute) {

+					$domain = Loader::getRootUrl();

+		}

 		

 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

 	}