jacobemerick / web

utility/content/ImperialUnitContent.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -26,16 +26,16 @@ 
         
         switch ($type) {
             case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+                $this->content = number_format(round($number / (12 * 3 * 1760))).' miles';
                 break;
             case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+                $this->content = round($number / (12 * 3 * 1760), 1).' miles';
                 break;
             case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
+                $this->content = number_format(round($number / (12 * 3))).' yards';
                 break;
             case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
+                $this->content = number_format(round($number / 12))."'";
                 break;
             case 'inches' :
                 $feet = floor($number / 12);
@@ -49,7 +49,7 @@ 
                 }
                 
                 $this->content = '';
-                $this->content .= number_format($feet) . "'";
+                $this->content .= number_format($feet)."'";
                 if (isset($inches) && $inches > 0) {
                     $this->content .= " {$inches}\"";
                 }

Braces +4 added lines, -4 removed lines

@@ -2,11 +2,11 @@
 
 Loader::load('utility', 'Content');
 
-final class ImperialUnitContent extends Content
-{
+final class ImperialUnitContent extends Content

+{

 
-    protected function execute($type = '')
-    {
+    protected function execute($type = '')

+    {

         $number = floatval($this->content);
         $number *= 39.37; // convert to inches
         

utility/Database.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
+		if (isset($has_connection_error))
 			$this->has_connection_error = true;
 		
 		return $mysqli;
@@ -44,7 +44,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance)) {
+		if (!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -63,23 +63,23 @@ 
 	public static function select($query)
 	{
 		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
+		if ($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
+			while ($row = $result->fetch_object())
 				$array[] = $row;
 			$result->close();
 			return $array;
 		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+		trigger_error('Could not preform query - '.$query.' - '.self::instance()->read_connection->error);
 		return false;
 	}
 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
+		if (is_array($result))
 			return array_pop($result);
 		return false;
 	}
@@ -87,19 +87,19 @@ 
 	public static function execute($query)
 	{
 		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
+		if (self::instance()->write_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			return true;
 		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+		trigger_error('Could not preform query - '.$query.'-'.self::instance()->write_connection->error);
 		return false;
 	}
 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
+		if ($id == 0)
 			return false;
 		return $id;
 	}
@@ -119,7 +119,7 @@ 
 	private function gather_query_data()
 	{
 		$query_data = array();
-		foreach($this->query_log as $query)
+		foreach ($this->query_log as $query)
 		{
 			$query = self::explain($query);
 			$query_data[] = $query;
@@ -129,9 +129,9 @@ 
 
 	public static function explain($query)
 	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+		$sql = 'EXPLAIN '.$query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
+		if ($result = self::instance()->read_connection->query($sql))
 		{
 			$row = $result->fetch_assoc();
 			$query['explain'] = $row;

Indentation +122 added lines, -122 removed lines

@@ -3,19 +3,19 @@ 
 final class Database
 {
 
-	private $read_connection;
-	private $write_connection;
-	private $query_log = array();
-	private $query_total = array(
-		'count' => 0,
-		'time' => 0);
+    private $read_connection;
+    private $write_connection;
+    private $query_log = array();
+    private $query_total = array(
+        'count' => 0,
+        'time' => 0);
 
-	private $has_connection_error = false;
+    private $has_connection_error = false;
 
-	private static $instance;
+    private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+    private function __construct($write_params, $read_params)
+    {
         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -28,23 +28,23 @@ 
             $read_params->password
         );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	private function connect($host, $username, $password)
-	{
-		$mysqli = new mysqli($host, $username, $password);
+    private function connect($host, $username, $password)
+    {
+        $mysqli = new mysqli($host, $username, $password);
 		
-		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+        $has_connection_error = $mysqli->connect_error;
+        if(isset($has_connection_error))
+            $this->has_connection_error = true;
 		
-		return $mysqli;
-	}
+        return $mysqli;
+    }
 
-	public static function instance()
-	{
-		if(!isset(self::$instance)) {
+    public static function instance()
+    {
+        if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -52,107 +52,107 @@ 
             );
         }
 
-		return self::$instance;
-	}
-
-	public static function escape($string)
-	{
-		return self::instance()->read_connection->real_escape_string($string);
-	}
-
-	public static function select($query)
-	{
-		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
-			$result->close();
-			return $array;
-		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
-		return false;
-	}
-
-	public static function selectRow($query)
-	{
-		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
-		return false;
-	}
-
-	public static function execute($query)
-	{
-		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			return true;
-		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
-		return false;
-	}
-
-	public static function lastInsertID()
-	{
-		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
-		return $id;
-	}
-
-	private function log_query($query, $start)
-	{
-		$time = (microtime(true) - $start) * 1000;
-		$query = array(
-			'sql' => $query,
-			'time' => $time);
-		array_push($this->query_log, $query);
+        return self::$instance;
+    }
+
+    public static function escape($string)
+    {
+        return self::instance()->read_connection->real_escape_string($string);
+    }
+
+    public static function select($query)
+    {
+        $start = microtime(true);
+        if($result = self::instance()->read_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            $array = array();
+            while($row = $result->fetch_object())
+                $array[] = $row;
+            $result->close();
+            return $array;
+        }
+        trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+        return false;
+    }
+
+    public static function selectRow($query)
+    {
+        $result = self::select($query);
+        if(is_array($result))
+            return array_pop($result);
+        return false;
+    }
+
+    public static function execute($query)
+    {
+        $start = microtime(true);
+        if(self::instance()->write_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            return true;
+        }
+        trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+        return false;
+    }
+
+    public static function lastInsertID()
+    {
+        $id = self::instance()->write_connection->insert_id;
+        if($id == 0)
+            return false;
+        return $id;
+    }
+
+    private function log_query($query, $start)
+    {
+        $time = (microtime(true) - $start) * 1000;
+        $query = array(
+            'sql' => $query,
+            'time' => $time);
+        array_push($this->query_log, $query);
 		
-		$this->query_total['count']++;
-		$this->query_total['time'] += $time;
-	}
-
-	private function gather_query_data()
-	{
-		$query_data = array();
-		foreach($this->query_log as $query)
-		{
-			$query = self::explain($query);
-			$query_data[] = $query;
-		}
-		return $query_data;
-	}
-
-	public static function explain($query)
-	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+        $this->query_total['count']++;
+        $this->query_total['time'] += $time;
+    }
+
+    private function gather_query_data()
+    {
+        $query_data = array();
+        foreach($this->query_log as $query)
+        {
+            $query = self::explain($query);
+            $query_data[] = $query;
+        }
+        return $query_data;
+    }
+
+    public static function explain($query)
+    {
+        $sql = 'EXPLAIN ' . $query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
-		{
-			$row = $result->fetch_assoc();
-			$query['explain'] = $row;
-		}
+        if($result = self::instance()->read_connection->query($sql))
+        {
+            $row = $result->fetch_assoc();
+            $query['explain'] = $row;
+        }
 		
-		return $query;
-	}
-
-	public static function getQueryLog()
-	{
-		return self::instance()->gather_query_data();
-	}
-
-	public static function getQueryTotals()
-	{
-		return self::instance()->query_total;
-	}
-
-	public static function isConnected()
-	{
-		return !self::instance()->has_connection_error;
-	}
+        return $query;
+    }
+
+    public static function getQueryLog()
+    {
+        return self::instance()->gather_query_data();
+    }
+
+    public static function getQueryTotals()
+    {
+        return self::instance()->query_total;
+    }
+
+    public static function isConnected()
+    {
+        return !self::instance()->has_connection_error;
+    }
 
 }

Braces +42 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Database
-{
+final class Database

+{

 
 	private $read_connection;
 	private $write_connection;
@@ -14,8 +14,8 @@ 
 
 	private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+	private function __construct($write_params, $read_params)

+	{

         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -31,19 +31,20 @@ 
 		return $this;
 	}
 
-	private function connect($host, $username, $password)
-	{
+	private function connect($host, $username, $password)

+	{

 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
@@ -55,20 +56,21 @@ 
 		return self::$instance;
 	}
 
-	public static function escape($string)
-	{
+	public static function escape($string)

+	{

 		return self::instance()->read_connection->real_escape_string($string);
 	}
 
-	public static function select($query)
-	{
+	public static function select($query)

+	{

 		$start = microtime(true);
 		if($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -76,16 +78,17 @@ 
 		return false;
 	}
 
-	public static function selectRow($query)
-	{
+	public static function selectRow($query)

+	{

 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
-	public static function execute($query)
-	{
+	public static function execute($query)

+	{

 		$start = microtime(true);
 		if(self::instance()->write_connection->query($query))
 		{
@@ -96,16 +99,17 @@ 
 		return false;
 	}
 
-	public static function lastInsertID()
-	{
+	public static function lastInsertID()

+	{

 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 
-	private function log_query($query, $start)
-	{
+	private function log_query($query, $start)

+	{

 		$time = (microtime(true) - $start) * 1000;
 		$query = array(
 			'sql' => $query,
@@ -116,8 +120,8 @@ 
 		$this->query_total['time'] += $time;
 	}
 
-	private function gather_query_data()
-	{
+	private function gather_query_data()

+	{

 		$query_data = array();
 		foreach($this->query_log as $query)
 		{
@@ -127,8 +131,8 @@ 
 		return $query_data;
 	}
 
-	public static function explain($query)
-	{
+	public static function explain($query)

+	{

 		$sql = 'EXPLAIN ' . $query['sql'];
 		
 		if($result = self::instance()->read_connection->query($sql))
@@ -140,18 +144,18 @@ 
 		return $query;
 	}
 
-	public static function getQueryLog()
-	{
+	public static function getQueryLog()

+	{

 		return self::instance()->gather_query_data();
 	}
 
-	public static function getQueryTotals()
-	{
+	public static function getQueryTotals()

+	{

 		return self::instance()->query_total;
 	}
 
-	public static function isConnected()
-	{
+	public static function isConnected()

+	{

 		return !self::instance()->has_connection_error;
 	}
 

controller/lifestream/TagController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Jacob has a Blog';
@@ -74,7 +74,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Yeah, Jacob has a blog. Check out his posting activity.';
@@ -103,7 +103,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -123,24 +123,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
+		if ($this->page == 2)
+			return Loader::getRootUrl('lifestream').$this->tag.'/';
+		return Loader::getRootUrl('lifestream').$this->tag.'/page/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
+		return Loader::getRootUrl('lifestream').$this->tag.'/page/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
 		return $this->total_post_count;
 	}

Indentation +126 added lines, -126 removed lines

@@ -5,144 +5,144 @@
 final class TagController extends DefaultListController
 {
 
-	private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
-	private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
+    private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
+    private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
 
-	private static $KEYWORD_ARRAY = array(
-		'lifestream',
-		'activity stream',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'lifestream',
+        'activity stream',
+        'Jacob Emerick');
 
-	private static $LIST_DESCRIPTION = 'viewing %d - %d of %d %s activities';
+    private static $LIST_DESCRIPTION = 'viewing %d - %d of %d %s activities';
 
-	private $tag;
+    private $tag;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$this->tag = URLDecode::getPiece(1);
-	}
+        $this->tag = URLDecode::getPiece(1);
+    }
 
-	protected function set_head_data()
-	{
-		$this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
-		$this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
+    protected function set_head_data()
+    {
+        $this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
+        $this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->tag);
-		$this->set_keywords($keyword_array);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->tag);
+        $this->set_keywords($keyword_array);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', $this->get_title());
-		$this->set_body('description', $this->get_description());
+    protected function set_body_data()
+    {
+        $this->set_body('title', $this->get_title());
+        $this->set_body('description', $this->get_description());
 		
-		parent::set_body_data();
-	}
-
-	private function get_title()
-	{
-		switch($this->tag)
-		{
-			case 'blog' :
-				return 'Jacob has a Blog';
-			break;
-			case 'book' :
-				return 'Jacob reads Books';
-			break;
-			case 'distance' :
-				return 'Run, Jacob, and Hike';
-			break;
-      case 'github' :
+        parent::set_body_data();
+    }
+
+    private function get_title()
+    {
+        switch($this->tag)
+        {
+            case 'blog' :
+                return 'Jacob has a Blog';
+            break;
+            case 'book' :
+                return 'Jacob reads Books';
+            break;
+            case 'distance' :
+                return 'Run, Jacob, and Hike';
+            break;
+        case 'github' :
         return 'Jacob, Code Monkey';
-      break;
-			case 'hulu' :
-				return 'Jacob watches Hulu';
-			break;
-			case 'twitter' :
-				return 'Jacob likes to Tweet';
-			break;
-			case 'youtube' :
-				return 'Videos Jacob Likes';
-			break;
-		}
-	}
-
-	private function get_description()
-	{
-		switch($this->tag)
-		{
-			case 'blog' :
-				return 'Yeah, Jacob has a blog. Check out his posting activity.';
-			break;
-			case 'book' :
-				return "Outside of building websites, hiking, and <em>being awesome</em>, Jacob reads books. Check out what he's been reading.";
-			break;
-			case 'distance' :
-				return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
-			break;
-      case 'github' :
+        break;
+            case 'hulu' :
+                return 'Jacob watches Hulu';
+            break;
+            case 'twitter' :
+                return 'Jacob likes to Tweet';
+            break;
+            case 'youtube' :
+                return 'Videos Jacob Likes';
+            break;
+        }
+    }
+
+    private function get_description()
+    {
+        switch($this->tag)
+        {
+            case 'blog' :
+                return 'Yeah, Jacob has a blog. Check out his posting activity.';
+            break;
+            case 'book' :
+                return "Outside of building websites, hiking, and <em>being awesome</em>, Jacob reads books. Check out what he's been reading.";
+            break;
+            case 'distance' :
+                return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
+            break;
+        case 'github' :
         return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
-      break;
-			case 'hulu' :
-				return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
-			break;
-			case 'twitter' :
-				return 'All the cool kids are on Twitter. The cool kids and Jacob. Check his tweets, yo.';
-			break;
-			case 'youtube' :
-				return 'Jacob watches videos on YouTube. Some videos he likes more than others.';
-			break;
-		}
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
-		return $this->activityRepository->getActivitiesByType($this->tag, self::$POSTS_PER_PAGE, $this->offset);
-	}
-
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+        break;
+            case 'hulu' :
+                return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
+            break;
+            case 'twitter' :
+                return 'All the cool kids are on Twitter. The cool kids and Jacob. Check his tweets, yo.';
+            break;
+            case 'youtube' :
+                return 'Jacob watches videos on YouTube. Some videos he likes more than others.';
+            break;
+        }
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    protected function get_list_results()
+    {
+        return $this->activityRepository->getActivitiesByType($this->tag, self::$POSTS_PER_PAGE, $this->offset);
+    }
+
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Loader::getRootUrl('lifestream') . $this->tag . '/';
+        return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
+        return $this->total_post_count;
+    }
 
 }

Braces +39 added lines, -34 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultListController');
 
-final class TagController extends DefaultListController
-{
+final class TagController extends DefaultListController

+{

 
 	private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
@@ -17,15 +17,15 @@ 
 
 	private $tag;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$this->tag = URLDecode::getPiece(1);
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
 		$this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
 		
@@ -36,16 +36,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', $this->get_title());
 		$this->set_body('description', $this->get_description());
 		
 		parent::set_body_data();
 	}
 
-	private function get_title()
-	{
+	private function get_title()

+	{

 		switch($this->tag)
 		{
 			case 'blog' :
@@ -72,8 +72,8 @@ 
 		}
 	}
 
-	private function get_description()
-	{
+	private function get_description()

+	{

 		switch($this->tag)
 		{
 			case 'blog' :
@@ -100,48 +100,53 @@ 
 		}
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

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

+					return $page;

+		}

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

+	{

 		return $this->activityRepository->getActivitiesByType($this->tag, self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
+	protected function get_list_next_link()

+	{

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

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream') . $this->tag . '/';

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);

+		}

 		return $this->total_post_count;
 	}
 

controller/lifestream/HomeController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,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;
 	}
@@ -58,24 +58,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream');
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = $this->activityRepository->getActivitiesCount();
 		return $this->total_post_count;
 	}

Indentation +60 added lines, -60 removed lines

@@ -5,79 +5,79 @@
 final class HomeController extends DefaultListController
 {
 
-	private static $TITLE = "Jacob Emerick's Lifestream";
-	private static $DESCRIPTION = 'Lifestream for Jacob Emerick, a combination of his latest twitter, youtube, running, reading, and blogging activity.';
+    private static $TITLE = "Jacob Emerick's Lifestream";
+    private static $DESCRIPTION = 'Lifestream for Jacob Emerick, a combination of his latest twitter, youtube, running, reading, and blogging activity.';
 
-	private static $KEYWORD_ARRAY = array(
-		'lifestream',
-		'activity stream',
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'twitter');
+    private static $KEYWORD_ARRAY = array(
+        'lifestream',
+        'activity stream',
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'twitter');
 
-	private static $LIST_DESCRIPTION = 'viewing %d - %d of %d total activities';
+    private static $LIST_DESCRIPTION = 'viewing %d - %d of %d total activities';
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', "What's Jacob Up To?");
-		$this->set_body('description', "A combination of Jacob Emerick's tweets, runs, reads, blogs, and YouTubes all in <em>one awesome lifestream</em>.");
+    protected function set_body_data()
+    {
+        $this->set_body('title', "What's Jacob Up To?");
+        $this->set_body('description', "A combination of Jacob Emerick's tweets, runs, reads, blogs, and YouTubes all in <em>one awesome lifestream</em>.");
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	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_list_results()
-	{
+    protected function get_list_results()
+    {
     return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
-	}
+    }
 
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
+    }
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream');
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
-	}
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Loader::getRootUrl('lifestream');
+        return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
+    }
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
-	}
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
+    }
 
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesCount();
-		return $this->total_post_count;
-	}
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = $this->activityRepository->getActivitiesCount();
+        return $this->total_post_count;
+    }
 
 }

Braces +33 added lines, -28 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultListController');
 
-final class HomeController extends DefaultListController
-{
+final class HomeController extends DefaultListController

+{

 
 	private static $TITLE = "Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = 'Lifestream for Jacob Emerick, a combination of his latest twitter, youtube, running, reading, and blogging activity.';
@@ -18,8 +18,8 @@ 
 
 	private static $LIST_DESCRIPTION = 'viewing %d - %d of %d total activities';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -27,56 +27,61 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', "What's Jacob Up To?");
 		$this->set_body('description', "A combination of Jacob Emerick's tweets, runs, reads, blogs, and YouTubes all in <em>one awesome lifestream</em>.");
 		
 		parent::set_body_data();
 	}
 
-	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_list_results()
-	{
+	protected function get_list_results()

+	{

     return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream');
+	protected function get_list_next_link()

+	{

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

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream');

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesCount();
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesCount();

+		}

 		return $this->total_post_count;
 	}
 

controller/site/ContactController.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,17 +28,17 @@ 
 
 	private function get_form_results()
 	{
-		if(!Request::hasPost())
+		if (!Request::hasPost())
 			return array();
 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_message['message'] = 'Please enter a message.';
 		
-		if(!empty($error_message))
+		if (!empty($error_message))
 		{
 			return array(
 				'error_message' => $error_message,
@@ -50,14 +50,14 @@ 
       ->addTo($container['config']->admin_email)
       ->setSubject('Site Contact')
       ->setPlainMessage(
-        'Name: ' . Request::getPost('name') . "\n" .
-        'Email: ' . Request::getPost('email') . "\n" .
-        'Message: ' . Request::getPost('message')
+        'Name: '.Request::getPost('name')."\n".
+        'Email: '.Request::getPost('email')."\n".
+        'Message: '.Request::getPost('message')
       )
       ->send();
 
 		return array(
-			'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");
+			'success_message' => "Thank you for your message, ".Request::getPost('name')."! I'll get back to you as soon as possible.");
 	}
 
 }

Indentation +40 added lines, -40 removed lines

@@ -2,62 +2,62 @@
 
 Loader::load('controller', 'site/DefaultPageController');
 Loader::load('utility', array(
-	'Validate'));
+    'Validate'));
 
 final class ContactController extends DefaultPageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_title("Contact Form for Jacob Emerick's Sites");
-		$this->set_description("Want to reach out to Jacob Emerick with questions or concerns? Well, then here's a handy contact form for you that will connect you with the man himself.");
-		$this->set_keywords(array('contact', 'webmaster', 'support', 'help', 'Jacob Emerick'));
+    protected function set_head_data()
+    {
+        $this->set_title("Contact Form for Jacob Emerick's Sites");
+        $this->set_description("Want to reach out to Jacob Emerick with questions or concerns? Well, then here's a handy contact form for you that will connect you with the man himself.");
+        $this->set_keywords(array('contact', 'webmaster', 'support', 'help', 'Jacob Emerick'));
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('top_data', array('title' => 'Contact Me'));
+        $this->set_body('top_data', array('title' => 'Contact Me'));
 		
-		$this->set_body('body_data', $this->get_form_results());
-		$this->set_body('body_view', 'Contact');
-	}
-
-	private function get_form_results()
-	{
-		if(!Request::hasPost())
-			return array();
+        $this->set_body('body_data', $this->get_form_results());
+        $this->set_body('body_view', 'Contact');
+    }
+
+    private function get_form_results()
+    {
+        if(!Request::hasPost())
+            return array();
 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_message['message'] = 'Please enter a message.';
+        if(!Validate::checkRequest('post', 'name', 'string'))
+            $error_message['name'] = 'Please enter a value for your name.';
+        if(!Validate::checkRequest('post', 'email', 'string'))
+            $error_message['email'] = 'Please enter a valid email address.';
+        if(!Validate::checkRequest('post', 'message', 'string'))
+            $error_message['message'] = 'Please enter a message.';
 		
-		if(!empty($error_message))
-		{
-			return array(
-				'error_message' => $error_message,
-				'value' => Request::getPost());
-		}
+        if(!empty($error_message))
+        {
+            return array(
+                'error_message' => $error_message,
+                'value' => Request::getPost());
+        }
 
     global $container;
     $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Site Contact')
-      ->setPlainMessage(
+        ->addTo($container['config']->admin_email)
+        ->setSubject('Site Contact')
+        ->setPlainMessage(
         'Name: ' . Request::getPost('name') . "\n" .
         'Email: ' . Request::getPost('email') . "\n" .
         'Message: ' . Request::getPost('message')
-      )
-      ->send();
+        )
+        ->send();
 
-		return array(
-			'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");
-	}
+        return array(
+            'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");
+    }
 
 }

Braces +20 added lines, -16 removed lines

@@ -4,11 +4,11 @@ 
 Loader::load('utility', array(
 	'Validate'));
 
-final class ContactController extends DefaultPageController
-{
+final class ContactController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Contact Form for Jacob Emerick's Sites");
 		$this->set_description("Want to reach out to Jacob Emerick with questions or concerns? Well, then here's a handy contact form for you that will connect you with the man himself.");
 		$this->set_keywords(array('contact', 'webmaster', 'support', 'help', 'Jacob Emerick'));
@@ -16,8 +16,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Contact Me'));
@@ -26,17 +26,21 @@ 
 		$this->set_body('body_view', 'Contact');
 	}
 
-	private function get_form_results()
-	{
-		if(!Request::hasPost())
-			return array();
+	private function get_form_results()

+	{

+		if(!Request::hasPost()) {

+					return array();

+		}

 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_message['message'] = 'Please enter a message.';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_message['name'] = 'Please enter a value for your name.';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_message['email'] = 'Please enter a valid email address.';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_message['message'] = 'Please enter a message.';

+		}

 		
 		if(!empty($error_message))
 		{

controller/waterfalls/MapController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         parent::set_head_data();
         
-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
+        $this->set_title(self::$TITLE.' | '.self::$WEBSITE_TITLE);
         $this->set_description(self::$DESCRIPTION);
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }

Braces +12 added lines, -12 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', 'waterfalls/DefaultPageController');
 Loader::load('collector', 'waterfall/WaterfallCollector');
 
-final class MapController extends DefaultPageController
-{
+final class MapController extends DefaultPageController

+{

 
     private static $TITLE = 'Map of Upper Peninsula Waterfalls';
     private static $DESCRIPTION = '';
@@ -17,16 +17,16 @@ 
         'Upper Tahquamenon Falls',
     );
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
@@ -34,8 +34,8 @@ 
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'wide')
-    {
+    protected function set_body_data($page_type = 'wide')

+    {

         parent::set_body_data($page_type);
         
         $this->set_head('full_page_map', true);
@@ -43,15 +43,15 @@ 
         $this->set_body('view', 'Map');
     }
 
-    private function fetch_waterfall_list()
-    {
+    private function fetch_waterfall_list()

+    {

         $list = WaterfallCollector::getMapList();
         array_walk($list, array($this, 'parse_waterfall'));
         return $list;
     }
 
-    private function parse_waterfall(&$waterfall)
-    {
+    private function parse_waterfall(&$waterfall)

+    {

         $waterfall = (object) array(
             'name'  => $waterfall->name,
             'latitude' => $waterfall->latitude,

controller/waterfalls/DefaultListController.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
+		if (count($items) < 1)
 			$this->eject();
 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -41,7 +41,7 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return $this->get_initial_introduction();
 		
 		return $this->get_subsequent_introduction();
@@ -53,7 +53,7 @@ 
 	private $items;
 	protected function get_items()
 	{
-		if(!isset($this->items))
+		if (!isset($this->items))
 		{
 			$total = $this->get_item_count_per_page();
 			$offset = ($this->page - 1) * $this->get_item_count_per_page();
@@ -68,7 +68,7 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
+		if (!isset($this->item_count))
 			$this->item_count = $this->get_item_count_result();
 		return $this->item_count;
 	}
@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$meta_array = $this->get_initial_meta();
 		else
 			$meta_array = $this->get_subsequent_meta();
@@ -119,18 +119,18 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return $this->get_list_link_root();
-		return $this->get_list_link_root() . ($this->page - 1) . '/';
+		return $this->get_list_link_root().($this->page - 1).'/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
 			return;
-		return $this->get_list_link_root() . ($this->page + 1) . '/';
+		return $this->get_list_link_root().($this->page + 1).'/';
 	}
 
 	abstract protected function get_list_link_root();
@@ -139,30 +139,30 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
+		if ($this->get_item_count_per_page() >= $this->get_item_count())
 			return $link_array;
 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
+		if ($this->get_list_prev_link() !== null)
 			$link->uri = $this->get_list_prev_link();
 		else
 			$link->class = 'inactive';
 		$link_array[] = $link;
 		
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
 		{
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
+			if ($i == $this->page)
 				$link->class = 'current';
 			else
 			{
-				if($i == 1)
+				if ($i == 1)
 					$link->uri = $this->get_list_link_root();
 				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+					$link->uri = $this->get_list_link_root().$i.'/';
 			}
 			
 			$link_array[] = $link;
@@ -170,7 +170,7 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
+		if ($this->get_list_next_link() !== null)
 			$link->uri = $this->get_list_next_link();
 		else
 			$link->class = 'inactive';
@@ -192,7 +192,7 @@ 
 
 	final protected function get_image_element($category, $path, $description, $size = 'small')
 	{
-		switch($size)
+		switch ($size)
 		{
 			case 'medium' :
 				$height = 375;

Indentation +182 added lines, -182 removed lines

@@ -5,206 +5,206 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	private static $IMAGE_ELEMENT_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" alt="%s" height="%s" width="%s" />';
-
-	protected $page;
-	protected $page_count;
-	protected $offset;
-
-	public function __construct()
-	{
-		parent::__construct();
-		
-		$this->page = $this->get_page_number();
-		$this->page_count = ceil($this->get_item_count() / $this->get_item_count_per_page());
-		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
-		
-		$items = $this->get_items();
-		if(count($items) < 1)
-			$this->eject();
-	}
-
-	final protected function get_page_number()
-	{
-		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	abstract protected function get_page_number_piece();
-
-	abstract protected function get_item_count_per_page();
-	abstract protected function format_item($item);
-	abstract protected function get_sidebar();
-	abstract protected function get_list_view();
-
-	final private function get_introduction()
-	{
-		if($this->page == 1)
-			return $this->get_initial_introduction();
-		
-		return $this->get_subsequent_introduction();
-	}
-
-	abstract protected function get_initial_introduction();
-	abstract protected function get_subsequent_introduction();
-
-	private $items;
-	protected function get_items()
-	{
-		if(!isset($this->items))
-		{
-			$total = $this->get_item_count_per_page();
-			$offset = ($this->page - 1) * $this->get_item_count_per_page();
+    private static $IMAGE_ELEMENT_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" alt="%s" height="%s" width="%s" />';
+
+    protected $page;
+    protected $page_count;
+    protected $offset;
+
+    public function __construct()
+    {
+        parent::__construct();
+		
+        $this->page = $this->get_page_number();
+        $this->page_count = ceil($this->get_item_count() / $this->get_item_count_per_page());
+        $this->offset = ($this->page - 1) * $this->get_item_count_per_page();
+		
+        $items = $this->get_items();
+        if(count($items) < 1)
+            $this->eject();
+    }
+
+    final protected function get_page_number()
+    {
+        $page = $this->get_page_number_piece();
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    abstract protected function get_page_number_piece();
+
+    abstract protected function get_item_count_per_page();
+    abstract protected function format_item($item);
+    abstract protected function get_sidebar();
+    abstract protected function get_list_view();
+
+    final private function get_introduction()
+    {
+        if($this->page == 1)
+            return $this->get_initial_introduction();
+		
+        return $this->get_subsequent_introduction();
+    }
+
+    abstract protected function get_initial_introduction();
+    abstract protected function get_subsequent_introduction();
+
+    private $items;
+    protected function get_items()
+    {
+        if(!isset($this->items))
+        {
+            $total = $this->get_item_count_per_page();
+            $offset = ($this->page - 1) * $this->get_item_count_per_page();
 			
-			$this->items = $this->get_item_result($total, $offset);
-		}
-		return $this->items;
-	}
+            $this->items = $this->get_item_result($total, $offset);
+        }
+        return $this->items;
+    }
 
-	abstract protected function get_item_result($total, $offset);
+    abstract protected function get_item_result($total, $offset);
 
-	private $item_count;
-	final private function get_item_count()
-	{
-		if(!isset($this->item_count))
-			$this->item_count = $this->get_item_count_result();
-		return $this->item_count;
-	}
+    private $item_count;
+    final private function get_item_count()
+    {
+        if(!isset($this->item_count))
+            $this->item_count = $this->get_item_count_result();
+        return $this->item_count;
+    }
 
-	abstract protected function get_item_count_result();
+    abstract protected function get_item_count_result();
 
-	final protected function set_head_data()
-	{
-		parent::set_head_data();
+    final 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());
 		
-		if($this->page == 1)
-			$meta_array = $this->get_initial_meta();
-		else
-			$meta_array = $this->get_subsequent_meta();
+        if($this->page == 1)
+            $meta_array = $this->get_initial_meta();
+        else
+            $meta_array = $this->get_subsequent_meta();
 		
-		$this->set_title($meta_array['title']);
-		$this->set_description($meta_array['description']);
-		$this->set_keywords($meta_array['keywords']);
-	}
+        $this->set_title($meta_array['title']);
+        $this->set_description($meta_array['description']);
+        $this->set_keywords($meta_array['keywords']);
+    }
 
-	abstract protected function get_initial_meta();
-	abstract protected function get_subsequent_meta();
+    abstract protected function get_initial_meta();
+    abstract protected function get_subsequent_meta();
 
     final protected function set_body_data($page_type = 'normal')
     {
         parent::set_body_data($page_type);
 		
-		$this->set_body('view', $this->get_list_view());
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', $this->get_list_view());
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		$body_data_array = array();
+    final private function get_list_body_data()
+    {
+        $body_data_array = array();
 		
         $body_data_array['introduction'] = $this->get_introduction();
-		$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());
-		$body_data_array['navigation'] = array(
-				'description' => $this->get_list_description(),
-				'list' => $this->get_list_link_array());
-		$body_data_array['sidebar'] = $this->get_sidebar();
-		
-		return $body_data_array;
-	}
-
-	final private function get_list_prev_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return $this->get_list_link_root();
-		return $this->get_list_link_root() . ($this->page - 1) . '/';
-	}
-
-	final private function get_list_next_link()
-	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
-			return;
-		return $this->get_list_link_root() . ($this->page + 1) . '/';
-	}
-
-	abstract protected function get_list_link_root();
-
-	final private function get_list_link_array()
-	{
-		$link_array = array();
-		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
-			return $link_array;
-		
-		$link = new stdclass();
-		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
-			$link->uri = $this->get_list_prev_link();
-		else
-			$link->class = 'inactive';
-		$link_array[] = $link;
-		
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
-		{
-			$link = new stdclass();
-			$link->anchor = $i;
+        $body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());
+        $body_data_array['navigation'] = array(
+                'description' => $this->get_list_description(),
+                'list' => $this->get_list_link_array());
+        $body_data_array['sidebar'] = $this->get_sidebar();
+		
+        return $body_data_array;
+    }
+
+    final private function get_list_prev_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return $this->get_list_link_root();
+        return $this->get_list_link_root() . ($this->page - 1) . '/';
+    }
+
+    final private function get_list_next_link()
+    {
+        if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
+            return;
+        return $this->get_list_link_root() . ($this->page + 1) . '/';
+    }
+
+    abstract protected function get_list_link_root();
+
+    final private function get_list_link_array()
+    {
+        $link_array = array();
+		
+        if($this->get_item_count_per_page() >= $this->get_item_count())
+            return $link_array;
+		
+        $link = new stdclass();
+        $link->anchor = '&laquo; previous';
+        if($this->get_list_prev_link() !== null)
+            $link->uri = $this->get_list_prev_link();
+        else
+            $link->class = 'inactive';
+        $link_array[] = $link;
+		
+        for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
+        {
+            $link = new stdclass();
+            $link->anchor = $i;
 			
-			if($i == $this->page)
-				$link->class = 'current';
-			else
-			{
-				if($i == 1)
-					$link->uri = $this->get_list_link_root();
-				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
-			}
+            if($i == $this->page)
+                $link->class = 'current';
+            else
+            {
+                if($i == 1)
+                    $link->uri = $this->get_list_link_root();
+                else
+                    $link->uri = $this->get_list_link_root() . $i . '/';
+            }
 			
-			$link_array[] = $link;
-		}
-		
-		$link = new stdclass();
-		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
-			$link->uri = $this->get_list_next_link();
-		else
-			$link->class = 'inactive';
-		$link_array[] = $link;
-		
-		return $link_array;
-	}
-
-	final private function get_list_description()
-	{
-		$start = ($this->page - 1) * $this->get_item_count_per_page() + 1;
-		$end = min($this->page * $this->get_item_count_per_page(), $this->get_item_count());
-		$total = $this->get_item_count();
-		
-		return sprintf($this->get_list_description_pattern(), $start, $end, $total);
-	}
-
-	abstract protected function get_list_description_pattern();
-
-	final protected function get_image_element($category, $path, $description, $size = 'small')
-	{
-		switch($size)
-		{
-			case 'medium' :
-				$height = 375;
-				$width = 500;
-			break;
-			case 'small' :
-				$height = 180;
-				$width = 240;
-			break;
-		}
-		
-		return sprintf(self::$IMAGE_ELEMENT_PATTERN, $category, $path, $size, $description, $height, $width);
-	}
+            $link_array[] = $link;
+        }
+		
+        $link = new stdclass();
+        $link->anchor = 'next &raquo;';
+        if($this->get_list_next_link() !== null)
+            $link->uri = $this->get_list_next_link();
+        else
+            $link->class = 'inactive';
+        $link_array[] = $link;
+		
+        return $link_array;
+    }
+
+    final private function get_list_description()
+    {
+        $start = ($this->page - 1) * $this->get_item_count_per_page() + 1;
+        $end = min($this->page * $this->get_item_count_per_page(), $this->get_item_count());
+        $total = $this->get_item_count();
+		
+        return sprintf($this->get_list_description_pattern(), $start, $end, $total);
+    }
+
+    abstract protected function get_list_description_pattern();
+
+    final protected function get_image_element($category, $path, $description, $size = 'small')
+    {
+        switch($size)
+        {
+            case 'medium' :
+                $height = 375;
+                $width = 500;
+            break;
+            case 'small' :
+                $height = 180;
+                $width = 240;
+            break;
+        }
+		
+        return sprintf(self::$IMAGE_ELEMENT_PATTERN, $category, $path, $size, $description, $height, $width);
+    }
 
 }
\ No newline at end of file

Braces +75 added lines, -63 removed lines

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

+{

 
 	private static $IMAGE_ELEMENT_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" alt="%s" height="%s" width="%s" />';
 
@@ -11,8 +11,8 @@ 
 	protected $page_count;
 	protected $offset;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$this->page = $this->get_page_number();
@@ -20,15 +20,17 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
-			$this->eject();
+		if(count($items) < 1) {

+					$this->eject();

+		}

 	}
 
-	final protected function get_page_number()
-	{
+	final protected function get_page_number()

+	{

 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -39,10 +41,11 @@ 
 	abstract protected function get_sidebar();
 	abstract protected function get_list_view();
 
-	final private function get_introduction()
-	{
-		if($this->page == 1)
-			return $this->get_initial_introduction();
+	final private function get_introduction()

+	{

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

+					return $this->get_initial_introduction();

+		}

 		
 		return $this->get_subsequent_introduction();
 	}
@@ -51,8 +54,8 @@ 
 	abstract protected function get_subsequent_introduction();
 
 	private $items;
-	protected function get_items()
-	{
+	protected function get_items()

+	{

 		if(!isset($this->items))
 		{
 			$total = $this->get_item_count_per_page();
@@ -66,26 +69,28 @@ 
 	abstract protected function get_item_result($total, $offset);
 
 	private $item_count;
-	final private function get_item_count()
-	{
-		if(!isset($this->item_count))
-			$this->item_count = $this->get_item_count_result();
+	final private function get_item_count()

+	{

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

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

+		}

 		return $this->item_count;
 	}
 
 	abstract protected function get_item_count_result();
 
-	final protected function set_head_data()
-	{
+	final 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());
 		
-		if($this->page == 1)
-			$meta_array = $this->get_initial_meta();
-		else
-			$meta_array = $this->get_subsequent_meta();
+		if($this->page == 1) {

+					$meta_array = $this->get_initial_meta();

+		} else {

+					$meta_array = $this->get_subsequent_meta();

+		}

 		
 		$this->set_title($meta_array['title']);
 		$this->set_description($meta_array['description']);
@@ -95,16 +100,16 @@ 
 	abstract protected function get_initial_meta();
 	abstract protected function get_subsequent_meta();
 
-    final protected function set_body_data($page_type = 'normal')
-    {
+    final protected function set_body_data($page_type = 'normal')

+    {

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

+	{

 		$body_data_array = array();
 		
         $body_data_array['introduction'] = $this->get_introduction();
@@ -117,37 +122,42 @@ 
 		return $body_data_array;
 	}
 
-	final private function get_list_prev_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return $this->get_list_link_root();
+	final private function get_list_prev_link()

+	{

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

+					return;

+		}

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

+					return $this->get_list_link_root();

+		}

 		return $this->get_list_link_root() . ($this->page - 1) . '/';
 	}
 
-	final private function get_list_next_link()
-	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
-			return;
+	final private function get_list_next_link()

+	{

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

+					return;

+		}

 		return $this->get_list_link_root() . ($this->page + 1) . '/';
 	}
 
 	abstract protected function get_list_link_root();
 
-	final private function get_list_link_array()
-	{
+	final private function get_list_link_array()

+	{

 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
-			return $link_array;
+		if($this->get_item_count_per_page() >= $this->get_item_count()) {

+					return $link_array;

+		}

 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
-			$link->uri = $this->get_list_prev_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_prev_link() !== null) {

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

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
@@ -155,14 +165,15 @@ 
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
-				$link->class = 'current';
-			else
+			if($i == $this->page) {

+							$link->class = 'current';

+			} else
 			{
-				if($i == 1)
-					$link->uri = $this->get_list_link_root();
-				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+				if($i == 1) {

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

+				} else {

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

+				}

 			}
 			
 			$link_array[] = $link;
@@ -170,17 +181,18 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
-			$link->uri = $this->get_list_next_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_next_link() !== null) {

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

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		return $link_array;
 	}
 
-	final private function get_list_description()
-	{
+	final private function get_list_description()

+	{

 		$start = ($this->page - 1) * $this->get_item_count_per_page() + 1;
 		$end = min($this->page * $this->get_item_count_per_page(), $this->get_item_count());
 		$total = $this->get_item_count();
@@ -190,8 +202,8 @@ 
 
 	abstract protected function get_list_description_pattern();
 
-	final protected function get_image_element($category, $path, $description, $size = 'small')
-	{
+	final protected function get_image_element($category, $path, $description, $size = 'small')

+	{

 		switch($size)
 		{
 			case 'medium' :

controller/waterfalls/LogController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
+        if (!$this->log)
             $this->eject();
 
         $this->parent_navigation_item = 'journal';
@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+            Loader::getRootUrl('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/',
             $this->log->title);
         
         $this->add_waterfall_js();
@@ -43,12 +43,12 @@ 
     {
         parent::set_head_data();
         
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+        $this->set_title("{$this->log->title} | ".self::$WEBSITE_TITLE);
         $this->set_description($this->log->introduction);
         
         $keyword_array = array();
         $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
+        foreach ($tag_result as $tag)
         {
             $keyword_array[] = $tag->name;
         }
@@ -77,7 +77,7 @@ 
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
         $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+        $formatted_log['url'] = Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/';
 
         $formatted_log['body'] = $this->get_formatted_log_body();
         
@@ -88,7 +88,7 @@ 
     {
         return array(
             'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+            'url' => Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$log->alias.'/',
             'date' => $this->get_parsed_date($log->date),
             'publish_date' => $this->get_parsed_date($log->publish_date),
             'introduction' => $log->introduction,
@@ -120,19 +120,19 @@ 
             'next' => array());
         
         $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
+        if ($previous_log != false)
         {
             $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$previous_log->alias.'/',
                 'title' => $previous_log->title,
                 'date' => $previous_log->date);
         }
         
         $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
+        if ($next_log != false)
         {
             $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$next_log->alias.'/',
                 'title' => $next_log->title,
                 'date' => $next_log->date);
         }
@@ -146,7 +146,7 @@ 
         
         $sidebar['companion_list'] = array();
         $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
+        foreach ($companions as $companion)
         {
             $sidebar['companion_list'][] = (object) array(
                 'title' => $companion->name,
@@ -155,7 +155,7 @@ 
         
         $sidebar['tag_list'] = array();
         $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
+        foreach ($tags as $tag)
         {
             $sidebar['tag_list'][] = (object) array(
                 'title' => $tag->name,
@@ -164,7 +164,7 @@ 
         
         $sidebar['waterfall_list'] = array();
         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
+        foreach ($waterfalls as $waterfall)
         {
             $sidebar['waterfall_list'][] = (object) array(
                 'title' => $waterfall->name,
@@ -178,17 +178,17 @@ 
     {
         $album = array();
         
-        if($this->log->album == 0)
+        if ($this->log->album == 0)
             return $album;
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
+        foreach ($photo_list as $photo)
         {
             $photo_array = array();
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
+            if ($photo->height < $photo->width)
                 list($height, $width) = array(75, 100);
             else
                 list($height, $width) = array(100, 75);

Braces +31 added lines, -28 removed lines

@@ -5,8 +5,8 @@ 
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class LogController extends DefaultPageController
-{
+final class LogController extends DefaultPageController

+{

 
     private static $AUTHOR = 'Jacob Emerick';
     private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
@@ -18,15 +18,16 @@ 
 
     private $log;
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
         
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
+        if(!$this->log) {

+                    $this->eject();

+        }

 
         $this->parent_navigation_item = 'journal';
         
@@ -39,8 +40,8 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
@@ -56,8 +57,8 @@ 
         $this->set_keywords($keyword_array);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')

+    {

         parent::set_body_data($page_type);
         
         $this->set_body('view', 'Log');
@@ -71,8 +72,8 @@ 
         $this->set_body('data', $body_data);
     }
 
-    private function get_formatted_log()
-    {
+    private function get_formatted_log()

+    {

         $formatted_log = array();
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
@@ -84,8 +85,8 @@ 
         return $formatted_log;
     }
 
-    private function get_log_introduction($log)
-    {
+    private function get_log_introduction($log)

+    {

         return array(
             'title' => $log->title,
             'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
@@ -103,8 +104,8 @@ 
     }
 
     // @todo - link things up
-    private function get_formatted_log_body()
-    {
+    private function get_formatted_log_body()

+    {

         $body = $this->log->body;
         
         $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -113,8 +114,8 @@ 
         return $body;
     }
 
-    private function get_series()
-    {
+    private function get_series()

+    {

         $series = array(
             'previous' => array(),
             'next' => array());
@@ -140,8 +141,8 @@ 
         return $series;
     }
 
-    private function get_sidebar()
-    {
+    private function get_sidebar()

+    {

         $sidebar = array();
         
         $sidebar['companion_list'] = array();
@@ -174,12 +175,13 @@ 
         return $sidebar;
     }
 
-    private function get_album()
-    {
+    private function get_album()

+    {

         $album = array();
         
-        if($this->log->album == 0)
-            return $album;
+        if($this->log->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
         foreach($photo_list as $photo)
@@ -188,10 +190,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,

controller/waterfalls/WaterfallController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
+            Loader::getRootUrl('waterfalls')."{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
             $this->waterfall->name);
         
         $this->add_waterfall_js();
@@ -43,7 +43,7 @@ 
     {
         parent::set_head_data();
 
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
+        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | ".self::$WEBSITE_TITLE);
         $this->set_description($this->waterfall->description);
         $this->set_keywords((array) $this->waterfall->name);
     }
@@ -112,17 +112,17 @@ 
     {
         $album = array();
         
-        if($this->waterfall->album == 0)
+        if ($this->waterfall->album == 0)
             return $album;
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
-        foreach($photo_list as $photo)
+        foreach ($photo_list as $photo)
         {
             $photo_array = array();
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
+            if ($photo->height < $photo->width)
                 list($height, $width) = array(75, 100);
             else
                 list($height, $width) = array(100, 75);
@@ -147,14 +147,14 @@ 
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
+		$sidebar_data['rating_display'] = ($waterfall->rating / 2).'/5';
         $sidebar_data['rating'] = $waterfall->rating;
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
 		
-        $sidebar_data['county'] = (object) array (
+        $sidebar_data['county'] = (object) array(
             'name' => $waterfall->county,
             'alias' => $waterfall->county_alias,
             'title' => $waterfall->county_title,

Indentation +17 added lines, -17 removed lines

@@ -27,7 +27,7 @@ 
 
         $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
         if (!$this->waterfall) {
-              $this->eject();
+                $this->eject();
         }
         
         $this->handle_comment_submit(
@@ -141,18 +141,18 @@ 
         return $album;
     }
 
-	private function get_sidebar($waterfall)
-	{
-		$sidebar_data = array();
-		$sidebar_data['name'] = $waterfall->name;
-		$sidebar_data['watercourse'] = $waterfall->watercourse;
+    private function get_sidebar($waterfall)
+    {
+        $sidebar_data = array();
+        $sidebar_data['name'] = $waterfall->name;
+        $sidebar_data['watercourse'] = $waterfall->watercourse;
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
+        $sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
         $sidebar_data['rating'] = $waterfall->rating;
-		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
-		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
-		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
-		$sidebar_data['drop_count'] = $waterfall->drop_count;
+        $sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
+        $sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
+        $sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
+        $sidebar_data['drop_count'] = $waterfall->drop_count;
 		
         $sidebar_data['county'] = (object) array (
             'name' => $waterfall->county,
@@ -160,10 +160,10 @@ 
             'title' => $waterfall->county_title,
         );
         
-		$sidebar_data['nearest_town'] = $waterfall->nearest_town;
-		$sidebar_data['latitude'] = round($waterfall->latitude, 5);
-		$sidebar_data['longitude'] = round($waterfall->longitude, 5);
-		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
+        $sidebar_data['nearest_town'] = $waterfall->nearest_town;
+        $sidebar_data['latitude'] = round($waterfall->latitude, 5);
+        $sidebar_data['longitude'] = round($waterfall->longitude, 5);
+        $sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
         
         $sidebar_data['map'] = $this->get_map_piece($waterfall);
         
@@ -171,8 +171,8 @@ 
         
         $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
 		
-		return $sidebar_data;
-	}
+        return $sidebar_data;
+    }
 
     private function get_journal_list($waterfall)
     {

Braces +34 added lines, -32 removed lines

@@ -7,8 +7,8 @@ 
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class WaterfallController extends DefaultPageController
-{
+final class WaterfallController extends DefaultPageController

+{

 
     private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
 
@@ -18,8 +18,8 @@ 
 
     private $waterfall;
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $path_watercourse = URLDecode::getPiece(1);
@@ -39,8 +39,8 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
 
         $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
@@ -48,8 +48,8 @@ 
         $this->set_keywords((array) $this->waterfall->name);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')

+    {

         parent::set_body_data($page_type);
 
         $body_data = $this->format_waterfall_data($this->waterfall);
@@ -60,8 +60,8 @@ 
         $this->set_body('view', 'Fall');
     }
 
-    private function format_waterfall_data($waterfall)
-    {
+    private function format_waterfall_data($waterfall)

+    {

         $waterfall_data = array();
         $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
         $waterfall_data['name'] = $waterfall->name;
@@ -77,8 +77,8 @@ 
         return $waterfall_data;
     }
 
-    private function get_waterfall_introduction($waterfall)
-    {
+    private function get_waterfall_introduction($waterfall)

+    {

         return array(
             'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
             'name' => $waterfall->name,
@@ -87,8 +87,8 @@ 
         );
     }
 
-    private function get_main_watercourse($alias)
-    {
+    private function get_main_watercourse($alias)

+    {

         $watercourse = WatercourseCollector::getByAlias($alias);
         if ($watercourse->parent != 0) {
             $watercourse = WatercourseCollector::getById($watercourse->parent);
@@ -101,19 +101,20 @@ 
         );
     }
 
-    private function format_waterfall_content($content)
-    {
+    private function format_waterfall_content($content)

+    {

         $content = Content::instance('FixInternalLink', $content)->activate();
         
         return $content;
     }
 
-    private function get_album()
-    {
+    private function get_album()

+    {

         $album = array();
         
-        if($this->waterfall->album == 0)
-            return $album;
+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
         foreach($photo_list as $photo)
@@ -122,10 +123,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,
@@ -141,8 +143,8 @@ 
         return $album;
     }
 
-	private function get_sidebar($waterfall)
-	{
+	private function get_sidebar($waterfall)

+	{

 		$sidebar_data = array();
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
@@ -174,8 +176,8 @@ 
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
+    private function get_journal_list($waterfall)

+    {

         $list = array();
         $log_result = LogCollector::getLogListForWaterfall($waterfall);
         foreach ($log_result as $log_row) {
@@ -189,8 +191,8 @@ 
         return $list;
     }
 
-    private function get_map_piece($waterfall)
-    {
+    private function get_map_piece($waterfall)

+    {

         $map_holder = array();
         
         $url = 'https://maps.googleapis.com/maps/api/staticmap';
@@ -211,8 +213,8 @@ 
         return (object) $map_holder;
     }
 
-    private function get_nearby_list($waterfall)
-    {
+    private function get_nearby_list($waterfall)

+    {

         $nearby_list = array();
         
         $result = WaterfallCollector::getNearbyList($waterfall);