jacobemerick / web

bootstrap.php

Indentation +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
 
 $handle = @fopen($configuration_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load configuration");
+	throw new RuntimeException("Could not load configuration");
 }
 $configuration = fread($handle, filesize($configuration_path));
 fclose($handle);
@@ -15,34 +15,34 @@ 
 $configuration = json_decode($configuration);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse configuration - JSON error detected");
+	throw new RuntimeException("Could not parse configuration - JSON error detected");
 }
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($configuration) {
-    $connection = $configuration->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($configuration) {
-    $connection = $configuration->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($configuration) {
-    $connection = $configuration->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 
 // setup the service locator

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($configuration) {
+$db_connections->setDefault(function() use ($configuration) {
     $connection = $configuration->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -28,7 +28,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($configuration) {
+$db_connections->setWrite('master', function() use ($configuration) {
     $connection = $configuration->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -36,7 +36,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($configuration) {
+$db_connections->setRead('slave', function() use ($configuration) {
     $connection = $configuration->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",

collector/blog/PostCollector.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		$tag_clause = "'{$tag_clause}'";

 		

 		$exclude_clause = '';

-		if(count($exclude_posts) > 0)

+		if (count($exclude_posts) > 0)

 		{

 			$exclude_clause .= " && `ptlink`.`post_id` NOT IN ('";

 			$exclude_clause .= implode("', '", $exclude_posts);

collector/comment/CommentCollector.class.inc.php

Indentation +5 added lines, -5 removed lines

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

 	}

 

-    public static function getRecentWaterfallComments($count = 5)

-    {

-        $query = "

+	public static function getRecentWaterfallComments($count = 5)

+	{

+		$query = "

             SELECT

                 `comment_meta`.`id`,

                 CONCAT('journal/', `log`.`alias`) AS `log_path`,

@@ -156,8 +156,8 @@ 
                 `comment_meta`.`date` DESC

             LIMIT {$count}";

         

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

 	public static function getCommentsForURL($site, $path, $commenter = 0)

 	{

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 	{

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

 		

-		if($commenter != 0)

+		if ($commenter != 0)

 			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";

 		else

 			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";

collector/waterfall/LogCollector.class.inc.php

Indentation +11 added lines, -11 removed lines

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

 	}

 

-    public static function getRecentList($total)

-    {

-        $query = "

+	public static function getRecentList($total)

+	{

+		$query = "

             SELECT

                 `log`.`title`,

                 `log`.`alias`,

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

             LIMIT

                 {$total}";

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

 	public static function getListCount()

 	{

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

 	}

 

-    public static function getByDate($date)

-    {

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

+	public static function getByDate($date)

+	{

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

         

-        $query = "

+		$query = "

             SELECT

                 `log`.`alias`

             FROM

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

             LIMIT 1";

         

-        return self::run_row_query($query);

-    }

+		return self::run_row_query($query);

+	}

 	

 	public static function getById($log)

 	{

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +3 added lines, -3 removed lines

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

 	}

 

-    public static function getParentWatercourse($watercourse)

-    {

-    }

+	public static function getParentWatercourse($watercourse)

+	{

+	}

 

 	public static function getLogCountForWatercourse($watercourse)

 	{

collector/waterfall/WaterfallCollector.class.inc.php

Indentation +16 added lines, -16 removed lines

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

 	}

 

-    public static function getMapList()

-    {

-        $query = "

+	public static function getMapList()

+	{

+		$query = "

             SELECT

                 `waterfall`.`name`,

                 `waterfall`.`alias`,

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

                 `waterfall`.`name`";

         

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

 	public static function getListCount()

 	{

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

 	}

 

-    public static function getNearbyList($waterfall)

-    {

-        $query = "

+	public static function getNearbyList($waterfall)

+	{

+		$query = "

             SELECT

                 `waterfall`.`name`,

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

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

                 `watercourse`.`name`";

         

-        return self::run_query($query);

-    }

+		return self::run_query($query);

+	}

 

-    public static function getByOldAlias($alias)

-    {

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

+	public static function getByOldAlias($alias)

+	{

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

         

-        $query = "

+		$query = "

             SELECT

                 `waterfall`.`alias`,

                 `watercourse`.`alias` AS `watercourse_alias`

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

             LIMIT 1";

         

-        return self::run_row_query($query);

-    }

+		return self::run_row_query($query);

+	}

 

 	public static function getByAlias($watercourse, $waterfall)

 	{

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

controller/Error404Controller.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		Loader::load('collector', 'SiteCollector');

 		$site_result = SiteCollector::getSitesForMenu();

 		

-		foreach($site_result as $site)

+		foreach ($site_result as $site)

 		{

 			$site_array[] = array(

 				'url' => $site->url,

controller/PageController.class.inc.php

Indentation +8 added lines, -8 removed lines

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

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

 				}

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

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

-                }

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

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

+				}

 			break;

 			case 'hulu' :

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

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

 		}

         

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

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

-        } else {

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

-        }

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

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

+		} else {

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

+		}

 		

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

 			exit;

Spacing +31 added lines, -31 removed lines

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

 		

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

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

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

 			$this->unavailable();

 	}

 

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

 		$post_result = ActivityCollector::getRecent();

 		

-		foreach($post_result as $row)

+		foreach ($post_result as $row)

 		{

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

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

 		}

 		

 		return $post_array;

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

 		$post = new stdclass();

 		

-		switch($raw_post->type)

+		switch ($raw_post->type)

 		{

 			case 'blog' :

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

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

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

 				

-				if($format == 'full')

+				if ($format == 'full')

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

 			break;

 			case 'book' :

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

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

 				

-				if($format == 'full')

+				if ($format == 'full')

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

 			break;

 			case 'distance' :

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

 				

 				$post->type = 'distance';

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

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

 				{

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

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

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

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

 				}

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

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

 				{

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

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

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

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

 				}

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

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

 				$post->type = 'twitter';

 				

-				if($format == 'full')

+				if ($format == 'full')

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

 				else

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

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

 				$post->type = 'youtube';

 				

-				if($format == 'full')

+				if ($format == 'full')

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

 				else

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

 				

-				if($format == 'full')

+				if ($format == 'full')

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

 			break;

 		}

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

 		Header::$headers();

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

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

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

 		{

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

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

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

 			else

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

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

         }

 		

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

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

 			exit;

 	}

 

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

 		$js_array = array();

 		

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

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

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

 		

-		if(count($js_array) > 0)

+		if (count($js_array) > 0)

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

 		

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

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

 	protected function eject()

 	{

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

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

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

 	}

 

 	protected function unavailable()

 	{

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

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

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

 	}

 

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

 	{

-		switch($method)

+		switch ($method)

 		{

 			case 301 :

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

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

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

 				break;

 			case 303 :

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

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

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

 				break;

 		}

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

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

 	{

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

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

 		{

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

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

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

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

 		

-		foreach($comment_result as $comment)

+		foreach ($comment_result as $comment)

 		{

 			$comment_object = new stdclass();

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

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

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

 			

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

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

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

 			else

 				$comment_object->errors = array();

 			

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

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

 			{

 				$comment_object->replies = array();

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

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

 		

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

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

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

 			return $commenter;

 		

 		$commenter_cookie_value = $commenter_cookie->getValue();

 		$commenter_cookie_value = json_decode($commenter_cookie_value);

 		

-		if($commenter_cookie_value === NULL)

+		if ($commenter_cookie_value === NULL)

 			return $commenter;

 		

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

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

 			return $commenter;

 		

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

 		

-		if($commenter_object === NULL)

+		if ($commenter_object === NULL)

 			return $commenter;

 		

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