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

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)

 	{

Braces +5 added lines, -4 removed lines

@@ -163,10 +163,11 @@
 	{

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

 		

-		if($commenter != 0)

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

-		else

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

+		if($commenter != 0) {

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

+		} else {

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

+		}

 		

 		$query = "

 			SELECT

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

Braces +75 added lines, -56 removed lines

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

 		

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

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

-			$this->unavailable();

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

+					$this->unavailable();

+		}

 	}

 

 	protected function get_domain_container()

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

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

 				

-				if($format == 'full')

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

+				if($format == 'full') {

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

+				}

 			break;

 			case 'book' :

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

@@ -106,8 +108,9 @@ 
 				$post->type = 'book';

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

 				

-				if($format == 'full')

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

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

@@ -116,16 +119,16 @@ 
 				if($row->type == 'running')

 				{

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

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

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

-				}

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

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

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

+					}

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

 				{

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

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

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

-				}

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

+					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}.";

                 }

 			break;

@@ -140,10 +143,11 @@ 
 				

 				$post->type = 'twitter';

 				

-				if($format == 'full')

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

-				else

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

+				if($format == 'full') {

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

+				} else {

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

+				}

 				

 				$post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0;

 				$post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0;

@@ -153,13 +157,15 @@ 
 				

 				$post->type = 'youtube';

 				

-				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') {

+									$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')

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

+				if($format == 'full') {

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

+				}

 			break;

 		}

 		

@@ -188,10 +194,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);

 		foreach($this->body_view_array as $view)

 		{

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

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

-			else

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

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

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

+			} else {

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

+			}

 		}

         

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

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

         }

 		

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

-			exit;

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

+					exit;

+		}

 	}

 

 	protected function set_header_method($method)

@@ -261,11 +269,13 @@ 
 		

 		$js_array = array();

 		

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

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

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

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

+		}

 		

-		if(count($js_array) > 0)

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

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

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

+		}

 		

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

 		$this->set_head('js_link_array', $js_array);

@@ -278,14 +288,16 @@ 
 

 	protected function eject()

 	{

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

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

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

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

+		}

 	}

 

 	protected function unavailable()

 	{

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

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

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

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

+		}

 	}

 

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

@@ -293,12 +305,14 @@ 
 		switch($method)

 		{

 			case 301 :

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

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

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

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

+				}

 				break;

 			case 303 :

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

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

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

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

+				}

 				break;

 		}

 	}

@@ -345,18 +359,19 @@ 
 			$comment_object->url = $comment->url;

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

 			

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

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

-			else

-				$comment_object->errors = array();

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

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

+			} else {

+							$comment_object->errors = array();

+			}

 			

 			if($comment->reply == 0)

 			{

 				$comment_object->replies = array();

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

+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

 			}

-			else

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

 		}

 		

 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);

@@ -381,22 +396,26 @@ 
 		$commenter->website = '';

 		

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

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

-			return $commenter;

+		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)

-			return $commenter;

+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		

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

-			return $commenter;

+		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)

-			return $commenter;

+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		

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

 		$commenter->name = $commenter_object->name;

controller/RSSController.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -57,10 +57,10 @@
 

 	final protected function setWebMaster($webmaster = '')

 	{

-        if ($webmaster == '') {

-            global $config;

-            $webmaster = "{$config->admin_email} (Jacob Emerick)";

-        }

+		if ($webmaster == '') {

+			global $config;

+			$webmaster = "{$config->admin_email} (Jacob Emerick)";

+		}

 		$this->xml->channel->addChild('webMaster', $webmaster);

 	}

 

Braces +9 added lines, -6 removed lines

@@ -25,8 +25,9 @@ 
 

 	final protected function setLink($url = null)

 	{

-		if(!isset($url))

-			$url = URLDecode::getBase();

+		if(!isset($url)) {

+					$url = URLDecode::getBase();

+		}

 		$this->xml->channel->addChild('link', $url);

 	}

 

@@ -50,8 +51,9 @@ 
 

 	final protected function setCopyright($copyright = null)

 	{

-		if(!isset($copyright))

-			$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

+		if(!isset($copyright)) {

+					$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

+		}

 		$this->xml->channel->addChild('copyright', $copyright);

 	}

 

@@ -66,8 +68,9 @@ 
 

 	final protected function setPubDate($date = null)

 	{

-		if(!isset($date))

-			$date = date('r');

+		if(!isset($date)) {

+					$date = date('r');

+		}

 		$this->xml->channel->addChild('pubDate', $date);

 	}

 

controller/RobotController.class.inc.php

Braces +17 added lines, -13 removed lines

@@ -27,9 +27,9 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

-			$entry->allow = $url;

-		else

+		if($url) {

+					$entry->allow = $url;

+		} else

 		{

 			$entry->disallow = '';

 			$entry->allow = self::$ALL_URL;

@@ -42,10 +42,11 @@ 
 	{

 		$entry = new stdclass();

 		$entry->agent = self::$ALL_ROBOTS;

-		if($url)

-			$entry->disallow = $url;

-		else

-			$entry->disallow = self::$ALL_URL;

+		if($url) {

+					$entry->disallow = $url;

+		} else {

+					$entry->disallow = self::$ALL_URL;

+		}

 		

 		$this->entries[] = $entry;

 	}

@@ -57,12 +58,15 @@ 
 		

 		foreach($this->entries as $key => $entry)

 		{

-			if($key == 0)

-				echo "User-agent: {$entry->agent}\n";

-			if(isset($entry->disallow) && $entry->disallow != '')

-				echo "Disallow: {$entry->disallow}\n";

-			if(isset($entry->allow))

-				echo "Allow: {$entry->allow}\n";

+			if($key == 0) {

+							echo "User-agent: {$entry->agent}\n";

+			}

+			if(isset($entry->disallow) && $entry->disallow != '') {

+							echo "Disallow: {$entry->disallow}\n";

+			}

+			if(isset($entry->allow)) {

+							echo "Allow: {$entry->allow}\n";

+			}

 			//echo "\n";

 		}

 		

controller/SitemapController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 

 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)

 	{

-		if(!$lastmod)

-			$lastmod = $this->default_lastmod;

+		if(!$lastmod) {

+					$lastmod = $this->default_lastmod;

+		}

 		

 		$url = $this->xml->addChild('url');