jacobemerick / web

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 +25 added lines, -19 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/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);
 	}

utility/content/MarkupCodeContent.class.inc.php

Doc Comments +6 added lines

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

 	}

 

+	/**
+	 * @param string $content
+	 */
 	private function wrap_in_list($content)

 	{

 		$content_array = explode("\n", $content);

@@ -44,6 +47,9 @@ 
 		return $content;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function highlight_code($content, $type)

 	{

 		switch($type)

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@ 
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
+		if (count($matches[1]) == 0)
 			return;
 		
-		foreach($matches[3] as $key => $match)
+		foreach ($matches[3] as $key => $match)
 		{
 			$replacement = $match;
 			$replacement = $this->wrap_in_list($replacement);
@@ -29,7 +29,7 @@ 
 	{
 		$content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
+		foreach ($content_array as $key => $row)
 		{
 			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
 			$new_row .= '<p>';
@@ -46,7 +46,7 @@ 
 
 	private function highlight_code($content, $type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			default :
 				return $content;

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

 		
 		foreach($matches[3] as $key => $match)
 		{

utility/content/SmartTrimContent.class.inc.php

Doc Comments +3 added lines

@@ -62,6 +62,9 @@
 		$this->is_trimmed = true;

 	}

 

+	/**
+	 * @param string $content
+	 */
 	private function trim_html_string($content, $length)

 	{

 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		
 		if($length < strlen($this->content))
 			$this->trim_string($length);
-        else
-            $etc = '';
+		else
+			$etc = '';
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}

Spacing +13 added lines, -13 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			if ($max_length <= $match[1])
 				break;
 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}

Braces +28 added lines, -22 removed lines

@@ -33,17 +33,19 @@ 
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
@@ -54,8 +56,9 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {

+					$content = substr($content, 0, $last_left_bracket_position);

+		}

 		$content = trim($content);
 		
 		$this->content = $content;
@@ -76,14 +79,16 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {

+					$content = substr($content, 0, -7);

+		}

 		
 		return $content;
 	}
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,13 +133,14 @@ 
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}

utility/Cookie.class.inc.php

Doc Comments +17 added lines

@@ -14,9 +14,20 @@ 
 		$this->class_new = $class_name;

 	}

 

+	/**
+	 * @return string
+	 */
 	abstract protected function getName();

 	abstract protected function getDuration();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getDomain();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getPath();

 

 	public function setValue($value)

@@ -28,6 +39,9 @@ 
 		return $this;

 	}

 

+	/**
+	 * @return string|null
+	 */
 	public function getValue()

 	{

 		if(!$this->is_loaded)

@@ -118,6 +132,9 @@ 
 		return $set_cookie;

 	}

 

+	/**
+	 * @param string $class_name
+	 */
 	public static function instance($class_name)

 	{

 		return Loader::loadNew('utility', "cookie/{$class_name}Cookie", (array) $class_name);

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		
 		$this->value = $value;
@@ -30,7 +30,7 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->value;
 	}
@@ -42,7 +42,7 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->exists;
 	}
@@ -50,10 +50,10 @@ 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
+		if (isset($_COOKIE[$name]))
 			$value = $_COOKIE[$name];
 		
-		if(isset($value))
+		if (isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
@@ -66,13 +66,13 @@ 
 
 	public final function save()
 	{
-		if(!$this->check_values())
+		if (!$this->check_values())
 		{
 			Debugger::error('Attempt to create a cookie without all of the values being set!');
 			return false;
 		}
 		
-		if(!$this->set_cookie())
+		if (!$this->set_cookie())
 		{
 			Debugger::log('There was a problem saving the cookie.');
 			return false;
@@ -84,23 +84,23 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
+		if (empty($name) || strlen($name) < 1)
 			return false;
 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
+		if (!isset($value) || strlen($value) < 1)
 			return false;
 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
+		if (!isset($expiration) || !is_int($expiration))
 			return false;
 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
+		if (!isset($domain) || strlen($domain) < 1)
 			return false;
 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
+		if (!isset($path) || strlen($path) < 1)
 			return false;
 		
 		return true;

Braces +30 added lines, -21 removed lines

@@ -21,8 +21,9 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		
 		$this->value = $value;
 		return $this;
@@ -30,8 +31,9 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->value;
 	}
 
@@ -42,24 +44,26 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->exists;
 	}
 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
-			$value = $_COOKIE[$name];
+		if(isset($_COOKIE[$name])) {

+					$value = $_COOKIE[$name];

+		}

 		
 		if(isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
-		}
-		else
-			$this->exists = false;
+		} else {

+					$this->exists = false;

+		}

 		
 		$this->is_loaded = true;
 	}
@@ -84,24 +88,29 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
-			return false;
+		if(empty($name) || strlen($name) < 1) {

+					return false;

+		}

 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
-			return false;
+		if(!isset($value) || strlen($value) < 1) {

+					return false;

+		}

 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
-			return false;
+		if(!isset($expiration) || !is_int($expiration)) {

+					return false;

+		}

 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
-			return false;
+		if(!isset($domain) || strlen($domain) < 1) {

+					return false;

+		}

 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
-			return false;
+		if(!isset($path) || strlen($path) < 1) {

+					return false;

+		}

 		
 		return true;
 	}

utility/cron/ChangelogCron.class.inc.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 		Database::execute($query);

 	}

 

+	/**
+	 * @return string
+	 */
 	private function get_changeset_to_check()

 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

Spacing +5 added lines, -5 removed lines

@@ -16,16 +16,16 @@ 
 	public function activate()
 	{
 		$loop_count = 0;
-		for($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)
+		for ($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)
 		{
 			$changeset_to_check = $this->get_changeset_to_check();
 			$data = $this->get_changeset_page_data($changeset_to_check);
 			
-			if(!isset($data))
+			if (!isset($data))
 				break;
 			
 			$this->save_changeset_data($data);
-			if($loop_count > 20)
+			if ($loop_count > 20)
 				exit;
 		}
 		
@@ -53,7 +53,7 @@ 
 	{
 		$changeset = ChangelogCollector::getMostRecentChange();
 		
-		if($changeset === null)
+		if ($changeset === null)
 			return 1;
 		
 		$number = $changeset->number;
@@ -66,7 +66,7 @@ 
 		$changeset_page = $this->get_changeset_page($page);
 		
 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);
-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)
+		if (stristr($match[1], 'Error: Invalid Changeset Number') !== false)
 			return;
 		
 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);

Braces +12 added lines, -8 removed lines

@@ -21,12 +21,14 @@ 
 			$changeset_to_check = $this->get_changeset_to_check();
 			$data = $this->get_changeset_page_data($changeset_to_check);
 			
-			if(!isset($data))
-				break;
+			if(!isset($data)) {

+							break;

+			}

 			
 			$this->save_changeset_data($data);
-			if($loop_count > 20)
-				exit;
+			if($loop_count > 20) {

+							exit;

+			}

 		}
 		
 		return true;
@@ -53,8 +55,9 @@ 
 	{
 		$changeset = ChangelogCollector::getMostRecentChange();
 		
-		if($changeset === null)
-			return 1;
+		if($changeset === null) {

+					return 1;

+		}

 		
 		$number = $changeset->number;
 		$number++;
@@ -66,8 +69,9 @@ 
 		$changeset_page = $this->get_changeset_page($page);
 		
 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);
-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)
-			return;
+		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false) {

+					return;

+		}

 		
 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);
 		$number = $match[1];