jacobemerick / web

controller/AJAXController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	protected function set_response($message, $type = 'internal')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'internal' :
 				$this->response['internal'] = $message;

Indentation +45 added lines, -45 removed lines

@@ -1,60 +1,60 @@
 <?php
 
 Loader::load('utility', array(
-	'Header',
-	'Request'));
+    'Header',
+    'Request'));
 
 abstract class AJAXController
 {
 
-	private static $RESPONSE_HEADER = 'sendJSON';
+    private static $RESPONSE_HEADER = 'sendJSON';
 
-	private $response = array();
+    private $response = array();
 
-	abstract protected function set_data();
+    abstract protected function set_data();
 
-	function __construct() {}
+    function __construct() {}
 
-	public function activate()
-	{
-		call_user_func(array('Header', self::$RESPONSE_HEADER));
+    public function activate()
+    {
+        call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
-		$this->set_data();
-		echo $this->response_as_json();
-	}
-
-	protected function set_response($message, $type = 'internal')
-	{
-		switch($type)
-		{
-			case 'internal' :
-				$this->response['internal'] = $message;
-			break;
-			case 'error' :
-				$this->response['error'] = $message;
-			default :
-				$this->response[$type] = $message;
-			break;
-		}
-	}
-
-	protected function fail_response($message)
-	{
-		$this->set_response($message, 'error');
-		return false;
-	}
-
-	protected function eject($message)
-	{
-		$this->fail_response($message);
-		echo $this->response_as_json();
-		exit();
-	}
-
-	private function response_as_json()
-	{
-		return json_encode($this->response);
-	}
+        $this->set_data();
+        echo $this->response_as_json();
+    }
+
+    protected function set_response($message, $type = 'internal')
+    {
+        switch($type)
+        {
+            case 'internal' :
+                $this->response['internal'] = $message;
+            break;
+            case 'error' :
+                $this->response['error'] = $message;
+            default :
+                $this->response[$type] = $message;
+            break;
+        }
+    }
+
+    protected function fail_response($message)
+    {
+        $this->set_response($message, 'error');
+        return false;
+    }
+
+    protected function eject($message)
+    {
+        $this->fail_response($message);
+        echo $this->response_as_json();
+        exit();
+    }
+
+    private function response_as_json()
+    {
+        return json_encode($this->response);
+    }
 
 }
 

Braces +15 added lines, -13 removed lines

@@ -4,8 +4,8 @@ 
 	'Header',
 	'Request'));
 
-abstract class AJAXController
-{
+abstract class AJAXController

+{

 
 	private static $RESPONSE_HEADER = 'sendJSON';
 
@@ -13,18 +13,20 @@ 
 
 	abstract protected function set_data();
 
-	function __construct() {}
+	function __construct()

+	{

+}
 
-	public function activate()
-	{
+	public function activate()

+	{

 		call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
 		$this->set_data();
 		echo $this->response_as_json();
 	}
 
-	protected function set_response($message, $type = 'internal')
-	{
+	protected function set_response($message, $type = 'internal')

+	{

 		switch($type)
 		{
 			case 'internal' :
@@ -38,21 +40,21 @@ 
 		}
 	}
 
-	protected function fail_response($message)
-	{
+	protected function fail_response($message)

+	{

 		$this->set_response($message, 'error');
 		return false;
 	}
 
-	protected function eject($message)
-	{
+	protected function eject($message)

+	{

 		$this->fail_response($message);
 		echo $this->response_as_json();
 		exit();
 	}
 
-	private function response_as_json()
-	{
+	private function response_as_json()

+	{

 		return json_encode($this->response);
 	}
 

controller/lifestream/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
 	final private function get_list_posts()
 	{
 		$post_array = array();
-		foreach($this->get_list_results() as $post)
+		foreach ($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->expand_post($post, 'full');
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
 			$this->eject();
 		return $post_array;
 	}

Indentation +48 added lines, -48 removed lines

@@ -5,63 +5,63 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	protected static $POSTS_PER_PAGE = 15;
+    protected static $POSTS_PER_PAGE = 15;
 
-	protected $page;
-	protected $offset;
+    protected $page;
+    protected $offset;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 
-		$this->page = $this->get_page_number();
-		$this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
-	}
+        $this->page = $this->get_page_number();
+        $this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
+    }
 
-	abstract protected function get_page_number();
-	abstract protected function get_list_results();
-	abstract protected function get_list_description();
-	abstract protected function get_list_next_link();
-	abstract protected function get_list_prev_link();
-	abstract protected function get_total_post_count();
+    abstract protected function get_page_number();
+    abstract protected function get_list_results();
+    abstract protected function get_list_description();
+    abstract protected function get_list_next_link();
+    abstract protected function get_list_prev_link();
+    abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_head('next_link', $this->get_list_next_link());
-		$this->set_head('previous_link', $this->get_list_prev_link());
-	}
+        $this->set_head('next_link', $this->get_list_next_link());
+        $this->set_head('previous_link', $this->get_list_prev_link());
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('view', 'Listing');
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', 'Listing');
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		return array(
-			'posts' => $this->get_list_posts(),
-			'type' => 'list',
-			'pagination' => array(
-				'description' => $this->get_list_description(),
-				'next' => $this->get_list_next_link(),
-				'prev' => $this->get_list_prev_link()));
-	}
+    final private function get_list_body_data()
+    {
+        return array(
+            'posts' => $this->get_list_posts(),
+            'type' => 'list',
+            'pagination' => array(
+                'description' => $this->get_list_description(),
+                'next' => $this->get_list_next_link(),
+                'prev' => $this->get_list_prev_link()));
+    }
 
-	final private function get_list_posts()
-	{
-		$post_array = array();
-		foreach($this->get_list_results() as $post)
-		{
-			$post_array[] = $this->expand_post($post, 'full');
-		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
-		return $post_array;
-	}
+    final private function get_list_posts()
+    {
+        $post_array = array();
+        foreach($this->get_list_results() as $post)
+        {
+            $post_array[] = $this->expand_post($post, 'full');
+        }
+        if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+            $this->eject();
+        return $post_array;
+    }
 
 }

Braces +15 added lines, -14 removed lines

@@ -2,16 +2,16 @@ 
 
 Loader::load('controller', 'lifestream/DefaultPageController');
 
-abstract class DefaultListController extends DefaultPageController
-{
+abstract class DefaultListController extends DefaultPageController

+{

 
 	protected static $POSTS_PER_PAGE = 15;
 
 	protected $page;
 	protected $offset;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 
 		$this->page = $this->get_page_number();
@@ -25,24 +25,24 @@ 
 	abstract protected function get_list_prev_link();
 	abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('view', 'Listing');
 		$this->set_body('data', $this->get_list_body_data());
 	}
 
-	final private function get_list_body_data()
-	{
+	final private function get_list_body_data()

+	{

 		return array(
 			'posts' => $this->get_list_posts(),
 			'type' => 'list',
@@ -52,15 +52,16 @@ 
 				'prev' => $this->get_list_prev_link()));
 	}
 
-	final private function get_list_posts()
-	{
+	final private function get_list_posts()

+	{

 		$post_array = array();
 		foreach($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->expand_post($post, 'full');
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;
 	}
 

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		
-		foreach($companion_result as $companion_row)
+		foreach ($companion_result as $companion_row)
 		{
 			$companion = new stdclass();
 			$companion->name = $companion_row->name;
@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();
 		$period_list = array();
 		
-		foreach($period_result as $period_row)
+		foreach ($period_result as $period_row)
 		{
 			$period = new stdclass();
 			$period->name = $period_row->name;

Braces +10 added lines, -10 removed lines

@@ -7,23 +7,23 @@ 
 	'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultLogListController extends DefaultListController
-{
+abstract class DefaultLogListController extends DefaultListController

+{

 
 	private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()

+	{

 		return 'LogListing';
 	}
 
-	final protected function get_item_count_per_page()
-	{
+	final protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)

+	{

 		$item_array = array();
 		
 		$item_array['title'] = $item->title;
@@ -37,8 +37,8 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()

+	{

 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		

Indentation +50 added lines, -50 removed lines

@@ -1,72 +1,72 @@
 <?
 
 Loader::load('collector', array(
-	'waterfall/CompanionCollector',
-	'waterfall/LogCollector',
-	'waterfall/PeriodCollector'));
+    'waterfall/CompanionCollector',
+    'waterfall/LogCollector',
+    'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultLogListController extends DefaultListController
 {
 
-	private static $ITEM_COUNT_PER_PAGE = 10;
+    private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
-		return 'LogListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'LogListing';
+    }
 
-	final protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    final protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['title'] = $item->title;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
-		$item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
-		$item_array['introduction'] = $item->introduction;
-		$item_array['path'] = "/journal/{$item->alias}/";
-		$item_array['comment_count'] = 0; // todo - this
-		$item_array['date'] = $this->get_parsed_date($item->date);
+        $item_array['title'] = $item->title;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
+        $item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
+        $item_array['introduction'] = $item->introduction;
+        $item_array['path'] = "/journal/{$item->alias}/";
+        $item_array['comment_count'] = 0; // todo - this
+        $item_array['date'] = $this->get_parsed_date($item->date);
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$companion_result = CompanionCollector::getCompanionList();
-		$companion_list = array();
+    final protected function get_sidebar()
+    {
+        $companion_result = CompanionCollector::getCompanionList();
+        $companion_list = array();
 		
-		foreach($companion_result as $companion_row)
-		{
-			$companion = new stdclass();
-			$companion->name = $companion_row->name;
-			$companion->uri = "/companion/{$companion_row->alias}/";
-			$companion->count = $companion_row->count;
+        foreach($companion_result as $companion_row)
+        {
+            $companion = new stdclass();
+            $companion->name = $companion_row->name;
+            $companion->uri = "/companion/{$companion_row->alias}/";
+            $companion->count = $companion_row->count;
 			
-			$companion_list[] = $companion;
-		}
+            $companion_list[] = $companion;
+        }
 		
-		$period_result = PeriodCollector::getPeriodList();
-		$period_list = array();
+        $period_result = PeriodCollector::getPeriodList();
+        $period_list = array();
 		
-		foreach($period_result as $period_row)
-		{
-			$period = new stdclass();
-			$period->name = $period_row->name;
-			$period->uri = "/period/{$period_row->alias}/";
-			$period->count = $period_row->count;
+        foreach($period_result as $period_row)
+        {
+            $period = new stdclass();
+            $period->name = $period_row->name;
+            $period->uri = "/period/{$period_row->alias}/";
+            $period->count = $period_row->count;
 			
-			$period_list[] = $period;
-		}
+            $period_list[] = $period;
+        }
 		
-		return array(
-			'companion_list' => $companion_list,
-			'period_list' => $period_list);
-	}
+        return array(
+            'companion_list' => $companion_list,
+            'period_list' => $period_list);
+    }
 
 }

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}

Indentation +46 added lines, -46 removed lines

@@ -5,62 +5,62 @@
 final class SearchListController extends DefaultListController
 {
 
-	private static $TITLE = 'Search Listing';
-	private static $DESCRIPTION = '';
+    private static $TITLE = 'Search Listing';
+    private static $DESCRIPTION = '';
 
-	private static $KEYWORD_ARRAY = array();
+    private static $KEYWORD_ARRAY = array();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
-	}
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
+    }
 
-	protected function get_introduction()
-	{
-		return;
-	}
+    protected function get_introduction()
+    {
+        return;
+    }
 
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(2);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
 
-	protected function get_items()
-	{
-		return array();
-	}
+    protected function get_items()
+    {
+        return array();
+    }
 
-	protected function get_list_description()
-	{
-		return 'yay cloud';
-	}
+    protected function get_list_description()
+    {
+        return 'yay cloud';
+    }
 
-	protected function get_list_next_link()
-	{
-		return '/';
-	}
+    protected function get_list_next_link()
+    {
+        return '/';
+    }
 
-	protected function get_list_prev_link()
-	{
-		return '/';
-	}
+    protected function get_list_prev_link()
+    {
+        return '/';
+    }
 
-	private $total_post_count;
-	protected function get_item_count()
-	{
-		return 20;
-	}
+    private $total_post_count;
+    protected function get_item_count()
+    {
+        return 20;
+    }
 
-	protected function get_item_count_per_page()
-	{
-		return 20;
-	}
+    protected function get_item_count_per_page()
+    {
+        return 20;
+    }
 
 }
\ No newline at end of file

Braces +23 added lines, -22 removed lines

@@ -2,16 +2,16 @@ 
 
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-final class SearchListController extends DefaultListController
-{
+final class SearchListController extends DefaultListController

+{

 
 	private static $TITLE = 'Search Listing';
 	private static $DESCRIPTION = '';
 
 	private static $KEYWORD_ARRAY = array();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_title(self::$TITLE);
@@ -19,47 +19,48 @@ 
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		return;
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
-	protected function get_items()
-	{
+	protected function get_items()

+	{

 		return array();
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		return 'yay cloud';
 	}
 
-	protected function get_list_next_link()
-	{
+	protected function get_list_next_link()

+	{

 		return '/';
 	}
 
-	protected function get_list_prev_link()
-	{
+	protected function get_list_prev_link()

+	{

 		return '/';
 	}
 
 	private $total_post_count;
-	protected function get_item_count()
-	{
+	protected function get_item_count()

+	{

 		return 20;
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()

+	{

 		return 20;
 	}
 

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		
-		foreach($county_result as $county_row)
+		foreach ($county_result as $county_row)
 		{
 			$county = new stdclass();
 			$county->name = $county_row->name;
@@ -54,7 +54,7 @@ 
 		$watercourse_result = WatercourseCollector::getWatercourseList();
 		$watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
+		foreach ($watercourse_result as $watercourse_row)
 		{
 			$watercourse = new stdclass();
 			$watercourse->name = $watercourse_row->name;

Braces +10 added lines, -10 removed lines

@@ -7,23 +7,23 @@ 
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultWaterfallListController extends DefaultListController
-{
+abstract class DefaultWaterfallListController extends DefaultListController

+{

 
 	protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()

+	{

 		return 'FallListing';
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)

+	{

 		$item_array = array();
 		
 		$item_array['name'] = $item->name;
@@ -36,8 +36,8 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()

+	{

 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		

Indentation +49 added lines, -49 removed lines

@@ -1,71 +1,71 @@
 <?
 
 Loader::load('collector', array(
-	'waterfall/CountyCollector',
-	'waterfall/WatercourseCollector',
-	'waterfall/WaterfallCollector'));
+    'waterfall/CountyCollector',
+    'waterfall/WatercourseCollector',
+    'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultWaterfallListController extends DefaultListController
 {
 
-	protected static $ITEM_COUNT_PER_PAGE = 24;
+    protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
-		return 'FallListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'FallListing';
+    }
 
-	protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['name'] = $item->name;
-		$item_array['watercourse'] = $item->watercourse;
-		$item_array['county'] = $item->county;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
-		$item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
-		$item_array['comment_count'] = 0; // todo this
+        $item_array['name'] = $item->name;
+        $item_array['watercourse'] = $item->watercourse;
+        $item_array['county'] = $item->county;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
+        $item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
+        $item_array['comment_count'] = 0; // todo this
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$county_result = CountyCollector::getCountyList();
-		$county_list = array();
+    final protected function get_sidebar()
+    {
+        $county_result = CountyCollector::getCountyList();
+        $county_list = array();
 		
-		foreach($county_result as $county_row)
-		{
-			$county = new stdclass();
-			$county->name = $county_row->name;
-			$county->uri = "/{$county_row->alias}/";
-			$county->count = $county_row->count;
+        foreach($county_result as $county_row)
+        {
+            $county = new stdclass();
+            $county->name = $county_row->name;
+            $county->uri = "/{$county_row->alias}/";
+            $county->count = $county_row->count;
 			
-			$county_list[] = $county;
-		}
+            $county_list[] = $county;
+        }
 		
-		$watercourse_result = WatercourseCollector::getWatercourseList();
-		$watercourse_list = array();
+        $watercourse_result = WatercourseCollector::getWatercourseList();
+        $watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
-		{
-			$watercourse = new stdclass();
-			$watercourse->name = $watercourse_row->name;
-			$watercourse->uri = "/{$watercourse_row->alias}/";
-			$watercourse->count = $watercourse_row->count;
+        foreach($watercourse_result as $watercourse_row)
+        {
+            $watercourse = new stdclass();
+            $watercourse->name = $watercourse_row->name;
+            $watercourse->uri = "/{$watercourse_row->alias}/";
+            $watercourse->count = $watercourse_row->count;
 			
-			$watercourse_list[] = $watercourse;
-		}
+            $watercourse_list[] = $watercourse;
+        }
 		
-		return array(
-			'county_list' => $county_list,
-			'watercourse_list' => $watercourse_list);
-	}
+        return array(
+            'county_list' => $county_list,
+            'watercourse_list' => $watercourse_list);
+    }
 
 }

controller/blog/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,11 @@
 	final private function get_list_posts()
 	{
 		$post_array = array();
-		foreach($this->get_list_results() as $post)
+		foreach ($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
 			$this->eject();
 		return $post_array;
 	}

Indentation +49 added lines, -49 removed lines

@@ -5,64 +5,64 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	protected static $POSTS_PER_PAGE = 10;
+    protected static $POSTS_PER_PAGE = 10;
 
-	protected $page;
-	protected $offset;
+    protected $page;
+    protected $offset;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$this->page = $this->get_page_number();
-		$this->total_pages = ceil($this->get_total_post_count() / self::$POSTS_PER_PAGE);
-		$this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
-	}
+        $this->page = $this->get_page_number();
+        $this->total_pages = ceil($this->get_total_post_count() / self::$POSTS_PER_PAGE);
+        $this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
+    }
 
-	abstract protected function get_page_number();
-	abstract protected function get_list_results();
-	abstract protected function get_list_description();
-	abstract protected function get_list_next_link();
-	abstract protected function get_list_prev_link();
-	abstract protected function get_total_post_count();
+    abstract protected function get_page_number();
+    abstract protected function get_list_results();
+    abstract protected function get_list_description();
+    abstract protected function get_list_next_link();
+    abstract protected function get_list_prev_link();
+    abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_head('next_link', $this->get_list_next_link());
-		$this->set_head('previous_link', $this->get_list_prev_link());
-	}
+        $this->set_head('next_link', $this->get_list_next_link());
+        $this->set_head('previous_link', $this->get_list_prev_link());
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('view', 'Listing');
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', 'Listing');
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		return array(
-			'posts' => $this->get_list_posts(),
-			'show_top_navigation' => ($this->page !== 1),
-			'navigation' => array(
-				'description' => $this->get_list_description(),
-				'next' => $this->get_list_next_link(),
-				'prev' => $this->get_list_prev_link()));
-	}
+    final private function get_list_body_data()
+    {
+        return array(
+            'posts' => $this->get_list_posts(),
+            'show_top_navigation' => ($this->page !== 1),
+            'navigation' => array(
+                'description' => $this->get_list_description(),
+                'next' => $this->get_list_next_link(),
+                'prev' => $this->get_list_prev_link()));
+    }
 
-	final private function get_list_posts()
-	{
-		$post_array = array();
-		foreach($this->get_list_results() as $post)
-		{
-			$post_array[] = $this->format_post($post, true);
-		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
-		return $post_array;
-	}
+    final private function get_list_posts()
+    {
+        $post_array = array();
+        foreach($this->get_list_results() as $post)
+        {
+            $post_array[] = $this->format_post($post, true);
+        }
+        if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+            $this->eject();
+        return $post_array;
+    }
 
 }
\ No newline at end of file

Braces +15 added lines, -14 removed lines

@@ -2,16 +2,16 @@ 
 
 Loader::load('controller', 'blog/DefaultPageController');
 
-abstract class DefaultListController extends DefaultPageController
-{
+abstract class DefaultListController extends DefaultPageController

+{

 
 	protected static $POSTS_PER_PAGE = 10;
 
 	protected $page;
 	protected $offset;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$this->page = $this->get_page_number();
@@ -26,24 +26,24 @@ 
 	abstract protected function get_list_prev_link();
 	abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('view', 'Listing');
 		$this->set_body('data', $this->get_list_body_data());
 	}
 
-	final private function get_list_body_data()
-	{
+	final private function get_list_body_data()

+	{

 		return array(
 			'posts' => $this->get_list_posts(),
 			'show_top_navigation' => ($this->page !== 1),
@@ -53,15 +53,16 @@ 
 				'prev' => $this->get_list_prev_link()));
 	}
 
-	final private function get_list_posts()
-	{
+	final private function get_list_posts()

+	{

 		$post_array = array();
 		foreach($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;
 	}
 

controller/site/DefaultPageController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 		$active_page = $this->get_active_page();
 		
 		$menu = array();
-		foreach(self::$MENU as $item)
+		foreach (self::$MENU as $item)
 		{
 			$menu[] = (object) array(
 				'name' => $item['name'],
@@ -56,13 +56,13 @@ 
 	{
 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
+		if (!isset($current_uri))
 			return 'About';
 		
 		$menu = self::$MENU;
-		foreach($menu as $link)
+		foreach ($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
+			if ($link['uri'] == $current_uri)
 				return $link['name'];
 		}
 		

Indentation +52 added lines, -52 removed lines

@@ -5,68 +5,68 @@
 abstract class DefaultPageController extends PageController
 {
 
-	private static $MENU = array(
-		array(
-			'name' => 'About',
-			'uri' => ''),
-		array(
-			'name' => 'Terms',
-			'uri' => 'terms'),
-		array(
-			'name' => 'Change Log',
-			'uri' => 'change-log'),
-		array(
-			'name' => 'Contact',
-			'uri' => 'contact'));
+    private static $MENU = array(
+        array(
+            'name' => 'About',
+            'uri' => ''),
+        array(
+            'name' => 'Terms',
+            'uri' => 'terms'),
+        array(
+            'name' => 'Change Log',
+            'uri' => 'change-log'),
+        array(
+            'name' => 'Contact',
+            'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
-		$this->add_css('reset');
-		$this->add_css('site');
-	}
+    protected function set_head_data()
+    {
+        $this->add_css('reset');
+        $this->add_css('site');
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('top_data', array());
-		$this->set_body('body_data', array());
+    protected function set_body_data()
+    {
+        $this->set_body('top_data', array());
+        $this->set_body('body_data', array());
 		
-		$this->set_body('left_side_data', array('menu' => $this->get_menu()));
+        $this->set_body('left_side_data', array('menu' => $this->get_menu()));
 		
-		$this->set_body('activity_array', $this->get_recent_activity());
-		$this->set_body_view('Page');
-	}
+        $this->set_body('activity_array', $this->get_recent_activity());
+        $this->set_body_view('Page');
+    }
 
-	private function get_menu()
-	{
-		$active_page = $this->get_active_page();
+    private function get_menu()
+    {
+        $active_page = $this->get_active_page();
 		
-		$menu = array();
-		foreach(self::$MENU as $item)
-		{
-			$menu[] = (object) array(
-				'name' => $item['name'],
-				'uri' => (strlen($item['uri']) > 0) ? "/{$item['uri']}/" : '/',
-				'is_active' => ($item['name'] == $active_page));
-		}
+        $menu = array();
+        foreach(self::$MENU as $item)
+        {
+            $menu[] = (object) array(
+                'name' => $item['name'],
+                'uri' => (strlen($item['uri']) > 0) ? "/{$item['uri']}/" : '/',
+                'is_active' => ($item['name'] == $active_page));
+        }
 		
-		return $menu;
-	}
+        return $menu;
+    }
 
-	private function get_active_page()
-	{
-		$current_uri = URLDecode::getPiece(1);
+    private function get_active_page()
+    {
+        $current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+        if(!isset($current_uri))
+            return 'About';
 		
-		$menu = self::$MENU;
-		foreach($menu as $link)
-		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
-		}
+        $menu = self::$MENU;
+        foreach($menu as $link)
+        {
+            if($link['uri'] == $current_uri)
+                return $link['name'];
+        }
 		
-		return 'About';
-	}
+        return 'About';
+    }
 
 }

Braces +16 added lines, -14 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $MENU = array(
 		array(
@@ -19,14 +19,14 @@ 
 			'name' => 'Contact',
 			'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('reset');
 		$this->add_css('site');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('top_data', array());
 		$this->set_body('body_data', array());
 		
@@ -36,8 +36,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	private function get_menu()
-	{
+	private function get_menu()

+	{

 		$active_page = $this->get_active_page();
 		
 		$menu = array();
@@ -52,18 +52,20 @@ 
 		return $menu;
 	}
 
-	private function get_active_page()
-	{
+	private function get_active_page()

+	{

 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+		if(!isset($current_uri)) {

+					return 'About';

+		}

 		
 		$menu = self::$MENU;
 		foreach($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
+			if($link['uri'] == $current_uri) {

+							return $link['name'];

+			}

 		}
 		
 		return 'About';

utility/content/MarkupCodeContent.class.inc.php

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;

Indentation +40 added lines, -40 removed lines

@@ -5,53 +5,53 @@
 final class MarkupCodeContent extends Content
 {
 
-	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
+    private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
-		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+    protected function execute($title = '')
+    {
+        preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
+        if(count($matches[1]) == 0)
+            return;
 		
-		foreach($matches[3] as $key => $match)
-		{
-			$replacement = $match;
-			$replacement = $this->wrap_in_list($replacement);
-			$replacement = $this->highlight_code($replacement, $matches[2][$key]);
+        foreach($matches[3] as $key => $match)
+        {
+            $replacement = $match;
+            $replacement = $this->wrap_in_list($replacement);
+            $replacement = $this->highlight_code($replacement, $matches[2][$key]);
 			
-			$this->content = str_replace($match, $replacement, $this->content);
-		}
+            $this->content = str_replace($match, $replacement, $this->content);
+        }
 		
-		return;
-	}
+        return;
+    }
 
-	private function wrap_in_list($content)
-	{
-		$content_array = explode("\n", $content);
+    private function wrap_in_list($content)
+    {
+        $content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
-		{
-			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
-			$new_row .= '<p>';
-			$new_row .= $row;
-			$new_row .= '</p>';
-			$new_row .= '</li>';
-			$content_array[$key] = $new_row;
-		}
+        foreach($content_array as $key => $row)
+        {
+            $new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
+            $new_row .= '<p>';
+            $new_row .= $row;
+            $new_row .= '</p>';
+            $new_row .= '</li>';
+            $content_array[$key] = $new_row;
+        }
 		
-		$content = implode($content_array);
-		$content = "<ol>{$content}</ol>";
-		return $content;
-	}
+        $content = implode($content_array);
+        $content = "<ol>{$content}</ol>";
+        return $content;
+    }
 
-	private function highlight_code($content, $type)
-	{
-		switch($type)
-		{
-			default :
-				return $content;
-			break;
-		}
-	}
+    private function highlight_code($content, $type)
+    {
+        switch($type)
+        {
+            default :
+                return $content;
+            break;
+        }
+    }
 
 }
\ No newline at end of file

Braces +11 added lines, -10 removed lines

@@ -2,16 +2,17 @@ 
 
 Loader::load('utility', 'Content');
 
-final class MarkupCodeContent extends Content
-{
+final class MarkupCodeContent extends Content

+{

 
 	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
+	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)
 		{
@@ -25,8 +26,8 @@ 
 		return;
 	}
 
-	private function wrap_in_list($content)
-	{
+	private function wrap_in_list($content)

+	{

 		$content_array = explode("\n", $content);
 		
 		foreach($content_array as $key => $row)
@@ -44,8 +45,8 @@ 
 		return $content;
 	}
 
-	private function highlight_code($content, $type)
-	{
+	private function highlight_code($content, $type)

+	{

 		switch($type)
 		{
 			default :

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)

utility/content/ElapsedTimeContent.class.inc.php

Spacing +28 added lines, -28 removed lines

@@ -10,61 +10,61 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
+		if ($current_time <= $previous_time)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
+		else if (($current_time - $previous_time) < 30)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60)
 			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
+		else if (($current_time - $previous_time) < 4 * 60)
 			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
+		else if (($current_time - $previous_time) < 7 * 60)
 			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
+		else if (($current_time - $previous_time) < 12 * 60)
 			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
+		else if (($current_time - $previous_time) < 17 * 60)
 			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
+		else if (($current_time - $previous_time) < 22 * 60)
 			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
+		else if (($current_time - $previous_time) < 37 * 60)
 			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
+		else if (($current_time - $previous_time) < 52 * 60)
 			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60 * 60)
 			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 2.5 * 60 * 60)
 			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 3.5 * 60 * 60)
 			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 4.5 * 60 * 60)
 			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
 			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
 			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
 			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
 			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
 			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
+		else if (($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
 			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
+		else if (($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
 			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
+		else if (($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
 			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
 			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
 			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
 			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
+		else if (($current_time - $previous_time) < 1.25 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
 			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
 			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
 			$this->content = 'several months ago';
 		else
 			$this->content = 'long ago';

Indentation +63 added lines, -63 removed lines

@@ -5,69 +5,69 @@
 final class ElapsedTimeContent extends Content
 {
 
-	protected function execute()
-	{
-		$previous_time = strtotime($this->content);
-		$current_time = time();
+    protected function execute()
+    {
+        $previous_time = strtotime($this->content);
+        $current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
-	}
+        if($current_time <= $previous_time)
+            $this->content = 'few seconds ago';
+        else if(($current_time - $previous_time) < 30)
+            $this->content = 'few seconds ago';
+        else if(($current_time - $previous_time) < 1.5 * 60)
+            $this->content = 'a minute ago';
+        else if(($current_time - $previous_time) < 4 * 60)
+            $this->content = 'few minutes ago';
+        else if(($current_time - $previous_time) < 7 * 60)
+            $this->content = 'five minutes ago';
+        else if(($current_time - $previous_time) < 12 * 60)
+            $this->content = 'ten minutes ago';
+        else if(($current_time - $previous_time) < 17 * 60)
+            $this->content = 'fifteen minutes ago';
+        else if(($current_time - $previous_time) < 22 * 60)
+            $this->content = 'twenty minutes ago';
+        else if(($current_time - $previous_time) < 37 * 60)
+            $this->content = 'half hour ago';
+        else if(($current_time - $previous_time) < 52 * 60)
+            $this->content = 'forty-five minutes ago';
+        else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+            $this->content = 'an hour ago';
+        else if(($current_time - $previous_time) < 2.5 * 60 * 60)
+            $this->content = 'two hours ago';
+        else if(($current_time - $previous_time) < 3.5 * 60 * 60)
+            $this->content = 'three hours ago';
+        else if(($current_time - $previous_time) < 4.5 * 60 * 60)
+            $this->content = 'few hours ago';
+        else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
+            $this->content = 'this afternoon';
+        else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
+            $this->content = 'this morning';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
+            $this->content = 'yesterday evening';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
+            $this->content = 'yesterday afternoon';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
+            $this->content = 'yesterday morning';
+        else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
+            $this->content = 'two days ago';
+        else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
+            $this->content = 'three days ago';
+        else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
+            $this->content = 'earlier this week';
+        else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
+            $this->content = 'late last week';
+        else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
+            $this->content = 'early last week';
+        else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
+            $this->content = 'few weeks ago';
+        else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
+            $this->content = 'earlier this month';
+        else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
+            $this->content = 'last month';
+        else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
+            $this->content = 'several months ago';
+        else
+            $this->content = 'long ago';
+    }
 
 }
\ No newline at end of file

Braces +63 added lines, -62 removed lines

@@ -2,72 +2,73 @@
 
 Loader::load('utility', 'Content');
 
-final class ElapsedTimeContent extends Content
-{
+final class ElapsedTimeContent extends Content

+{

 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
+		if($current_time <= $previous_time) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 30) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60) {

+					$this->content = 'a minute ago';

+		} else if(($current_time - $previous_time) < 4 * 60) {

+					$this->content = 'few minutes ago';

+		} else if(($current_time - $previous_time) < 7 * 60) {

+					$this->content = 'five minutes ago';

+		} else if(($current_time - $previous_time) < 12 * 60) {

+					$this->content = 'ten minutes ago';

+		} else if(($current_time - $previous_time) < 17 * 60) {

+					$this->content = 'fifteen minutes ago';

+		} else if(($current_time - $previous_time) < 22 * 60) {

+					$this->content = 'twenty minutes ago';

+		} else if(($current_time - $previous_time) < 37 * 60) {

+					$this->content = 'half hour ago';

+		} else if(($current_time - $previous_time) < 52 * 60) {

+					$this->content = 'forty-five minutes ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60 * 60) {

+					$this->content = 'an hour ago';

+		} else if(($current_time - $previous_time) < 2.5 * 60 * 60) {

+					$this->content = 'two hours ago';

+		} else if(($current_time - $previous_time) < 3.5 * 60 * 60) {

+					$this->content = 'three hours ago';

+		} else if(($current_time - $previous_time) < 4.5 * 60 * 60) {

+					$this->content = 'few hours ago';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm') {

+					$this->content = 'this afternoon';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am') {

+					$this->content = 'this morning';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17) {

+					$this->content = 'yesterday evening';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm') {

+					$this->content = 'yesterday afternoon';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am') {

+					$this->content = 'yesterday morning';

+		} else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2) {

+					$this->content = 'two days ago';

+		} else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3) {

+					$this->content = 'three days ago';

+		} else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time)) {

+					$this->content = 'earlier this week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3) {

+					$this->content = 'late last week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1) {

+					$this->content = 'early last week';

+		} else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60) {

+					$this->content = 'few weeks ago';

+		} else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time)) {

+					$this->content = 'earlier this month';

+		} else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1) {

+					$this->content = 'last month';

+		} else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60) {

+					$this->content = 'several months ago';

+		} else {

+					$this->content = 'long ago';

+		}

 	}
 
 }
\ No newline at end of file