jacobemerick / web

utility/CronController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -20,9 +20,9 @@ 
 
 	public function activate()
 	{
-		foreach(self::$CRON_ARRAY as $cron => $frequency)
+		foreach (self::$CRON_ARRAY as $cron => $frequency)
 		{
-			if(!$this->time_to_run($frequency))
+			if (!$this->time_to_run($frequency))
 				continue;
 			
 			Loader::load('utility', "cron/{$cron}");
@@ -46,19 +46,19 @@ 
 		$operator = explode(' ', $frequency);
 		list($time['minute'], $time['hour'], $time['day'], $time['month'], $time['weekday']) = $operator;
 		
-		foreach($time as $key => $value)
+		foreach ($time as $key => $value)
 		{
-			if($value == '*')
+			if ($value == '*')
 				continue;
-			if(stristr($value, '/'))
+			if (stristr($value, '/'))
 			{
 				$value = substr($value, 2);
-				if($cur[$key] % $value == 0)
+				if ($cur[$key] % $value == 0)
 					continue;
 				else
 					return;
 			}
-			if($cur[$key] == $value)
+			if ($cur[$key] == $value)
 				continue;
 			return;
 		}

Braces +14 added lines, -10 removed lines

@@ -22,8 +22,9 @@ 
 	{
 		foreach(self::$CRON_ARRAY as $cron => $frequency)
 		{
-			if(!$this->time_to_run($frequency))
-				continue;
+			if(!$this->time_to_run($frequency)) {

+							continue;

+			}

 			
 			Loader::load('utility', "cron/{$cron}");
 			$reflection = new ReflectionClass($cron);
@@ -48,18 +49,21 @@ 
 		
 		foreach($time as $key => $value)
 		{
-			if($value == '*')
-				continue;
+			if($value == '*') {

+							continue;

+			}

 			if(stristr($value, '/'))
 			{
 				$value = substr($value, 2);
-				if($cur[$key] % $value == 0)
-					continue;
-				else
-					return;
+				if($cur[$key] % $value == 0) {

+									continue;

+				} else {

+									return;

+				}

 			}
-			if($cur[$key] == $value)
-				continue;
+			if($cur[$key] == $value) {

+							continue;

+			}

 			return;
 		}
 		return true;

controller/Error404Controller.class.inc.php

Indentation +31 added lines, -31 removed lines

@@ -32,37 +32,37 @@
 
 	private function get_sites()
 	{
-    return [
-      [
-        'url' => 'http://home.jacobemerick.com/',
-        'title' => "Jacob Emerick's Home",
-        'name' => 'Home'
-      ],
-      [
-        'url' => 'http://blog.jacobemerick.com/',
-        'title' => "Jacob Emerick's Blog",
-        'name' => 'Blog'
-      ],
-      [
-        'url' => 'http://lifestream.jacobemerick.com/',
-        'title' => "Jacob Emerick's Lifestream",
-        'name' => 'Lifestream'
-      ],
-      [
-        'url' => 'http://map.jacobemerick.com/',
-        'title' => "Jacob Emerick's Hiking Map",
-        'name' => 'Map'
-      ],
-      [
-        'url' => 'http://portfolio.jacobemerick.com/',
-        'title' => "Jacob Emerick's Portfolio",
-        'name' => 'Portfolio',
-      ],
-      [
-        'url' => 'http://www.waterfallsofthekeweenaw.com/',
-        'title' => 'Waterfalls of the Keweenaw',
-        'name' => 'Waterfalls'
-      ]
+	return [
+	  [
+		'url' => 'http://home.jacobemerick.com/',
+		'title' => "Jacob Emerick's Home",
+		'name' => 'Home'
+	  ],
+	  [
+		'url' => 'http://blog.jacobemerick.com/',
+		'title' => "Jacob Emerick's Blog",
+		'name' => 'Blog'
+	  ],
+	  [
+		'url' => 'http://lifestream.jacobemerick.com/',
+		'title' => "Jacob Emerick's Lifestream",
+		'name' => 'Lifestream'
+	  ],
+	  [
+		'url' => 'http://map.jacobemerick.com/',
+		'title' => "Jacob Emerick's Hiking Map",
+		'name' => 'Map'
+	  ],
+	  [
+		'url' => 'http://portfolio.jacobemerick.com/',
+		'title' => "Jacob Emerick's Portfolio",
+		'name' => 'Portfolio',
+	  ],
+	  [
+		'url' => 'http://www.waterfallsofthekeweenaw.com/',
+		'title' => 'Waterfalls of the Keweenaw',
+		'name' => 'Waterfalls'
+	  ]
   ];
 	}
 

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 
 	protected static $WATERFALL_SITE_ID = 5;
 
-    protected $parent_navigation_item = '';
+	protected $parent_navigation_item = '';
 
 	protected function set_head_data()
 	{
@@ -19,45 +19,45 @@ 
 		$this->add_css('waterfalls');
 	}
 
-    protected function add_waterfall_js()
-    {
-        $this->add_js('jquery');
-        $this->add_js('imagelightbox');
-        $this->add_js('waterfalls');
-    }
+	protected function add_waterfall_js()
+	{
+		$this->add_js('jquery');
+		$this->add_js('imagelightbox');
+		$this->add_js('waterfalls');
+	}
 
 	protected function set_body_data($page_type = 'normal')
 	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
-        $this->set_body('main_navigation', array(
-                (object) array(
-                    'uri' => '/falls/',
-                    'anchor' => 'Falls',
-                    'is_active' => $this->parent_navigation_item === 'falls',
-                ),
-                (object) array(
-                    'uri' => '/map/',
-                    'anchor' => 'Map',
-                    'is_active' => $this->parent_navigation_item === 'map',
-                ),
-                (object) array(
-                    'uri' => '/journal/',
-                    'anchor' => 'Journal',
-                    'is_active' => $this->parent_navigation_item === 'journal',
-                ),
-                (object) array(
-                    'uri' => '/about/',
-                    'anchor' => 'About',
-                    'is_active' => $this->parent_navigation_item === 'about',
-                )
-        ));
-
-        if ($page_type == 'wide') {
-            $this->set_body_view('WidePage');
-        } else {
-            $this->set_body_view('Page');
-        }
-    }
+		$this->set_body('main_navigation', array(
+				(object) array(
+					'uri' => '/falls/',
+					'anchor' => 'Falls',
+					'is_active' => $this->parent_navigation_item === 'falls',
+				),
+				(object) array(
+					'uri' => '/map/',
+					'anchor' => 'Map',
+					'is_active' => $this->parent_navigation_item === 'map',
+				),
+				(object) array(
+					'uri' => '/journal/',
+					'anchor' => 'Journal',
+					'is_active' => $this->parent_navigation_item === 'journal',
+				),
+				(object) array(
+					'uri' => '/about/',
+					'anchor' => 'About',
+					'is_active' => $this->parent_navigation_item === 'about',
+				)
+		));
+
+		if ($page_type == 'wide') {
+			$this->set_body_view('WidePage');
+		} else {
+			$this->set_body_view('Page');
+		}
+	}
 
 }

controller/ajax/GetPortfolioImageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 		
 		$portfolio_result = PortfolioCollector::getImageById($id);
 
-    $image_path = "portfolio/{$portfolio_result->name}";
-    $image_path = Loader::getImagePath('image', $image_path);
-    $image_size = getimagesize($image_path);
+	$image_path = "portfolio/{$portfolio_result->name}";
+	$image_path = Loader::getImagePath('image', $image_path);
+	$image_size = getimagesize($image_path);
 
 		$main_image = new stdclass();
 		$main_image->id = $portfolio_result->id;

router/Router.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -80,9 +80,9 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
@@ -147,7 +147,7 @@ 
 			URLDecode::getExtension() != 'json' &&
 			URLDecode::getExtension() != 'jpg' &&
 			URLDecode::getExtension() != 'png' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

Spacing +12 added lines, -12 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -66,36 +66,36 @@ 
 
 	final protected function check_for_redirect($redirect_uri)
 	{
-		foreach($this->get_redirect_array() as $check)
+		foreach ($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
 		}
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
+		if ($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http')
+		if (substr($redirect_uri, 0, 4) == 'http')
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			Loader::loadNew('controller', '/Error404Controller')
 				->activate();
 			exit;
 		}
 
-		if(substr($redirect_uri, 0, 4) != 'http')
+		if (substr($redirect_uri, 0, 4) != 'http')
 		{
 			$redirect_uri = substr($redirect_uri, 1);
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -112,12 +112,12 @@ 
 
 	final private function get_controller($uri)
 	{
-		foreach($this->get_direct_array() as $check)
+		foreach ($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
+			if ($uri == $check->match)
 				return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
+			if (preg_match("@^{$check->match}$@", $uri))
 				return "{$this->get_primary_folder()}/{$check->controller}";
 		}
 		
@@ -126,7 +126,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

Braces +21 added lines, -14 removed lines

@@ -18,8 +18,9 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -73,19 +74,22 @@ 
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http')
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
+		if(substr($redirect_uri, 0, 4) == 'http') {

+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		}

 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -114,11 +118,13 @@ 
 	{
 		foreach($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}
 		
 		return '/Error404Controller';
@@ -126,8 +132,9 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

 		
 		return URLDecode::getSite();
 	}

public/site/index.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 $formatter = new LineFormatter('[%datetime%] %channel%.%level_name%: %message%');
 
 $handler = new StreamHandler(
-    __DIR__ . '/../../logs/site.log',
-    Logger::DEBUG
+	__DIR__ . '/../../logs/site.log',
+	Logger::DEBUG
 );
 $handler->setFormatter($formatter);
 

script/cron/generate-rss-feeds.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @param string $folder
  * @return boolean
  */
-$buildFeed = function (Feed $feed, $folder) {
+$buildFeed = function(Feed $feed, $folder) {
     $tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
     $finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
 

Indentation +34 added lines, -34 removed lines

@@ -16,14 +16,14 @@ 
  * @return boolean
  */
 $buildFeed = function (Feed $feed, $folder) {
-    $tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
-    $finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
+	$tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
+	$finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
 
-    $feedHandle = fopen($tempFeed, 'w');
-    fwrite($feedHandle, $feed->render());
-    fclose($feedHandle);
+	$feedHandle = fopen($tempFeed, 'w');
+	fwrite($feedHandle, $feed->render());
+	fclose($feedHandle);
 
-    rename($tempFeed, $finalFeed);
+	rename($tempFeed, $finalFeed);
 };
 
 
@@ -42,34 +42,34 @@ 
 $activeBlogPosts = $blogPostRepository->getActivePosts();
 
 foreach ($activeBlogPosts as $blogPost) {
-    $blogPostItem = new Item();
-
-    $blogPostItem->title($blogPost['title']);
-
-    $url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
-    $blogPostItem->url($url);
-    $blogPostItem->guid($url, true);
-
-    $description = $blogPost['body'];
-    $description = strip_tags($description);
-    $description = strtok($description, "\n");
-    if (strlen($description) > 250) {
-        $description = wordwrap($description, 250);
-        $description = strtok($description, "\n");
-        if (substr($description, -1) != '.') {
-            $description .= '…';
-        }
-    }
-    $description = html_entity_decode($description);
-    $blogPostItem->description($description);
-
-    $categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
-    $blogPostItem->category($blogPost['category'], $categoryUrl);
-
-    $pubDate = new DateTime($blogPost['date']);
-    $blogPostItem->pubDate($pubDate->getTimestamp());
-
-    $blogPostItem->appendTo($blogPostChannel);
+	$blogPostItem = new Item();
+
+	$blogPostItem->title($blogPost['title']);
+
+	$url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
+	$blogPostItem->url($url);
+	$blogPostItem->guid($url, true);
+
+	$description = $blogPost['body'];
+	$description = strip_tags($description);
+	$description = strtok($description, "\n");
+	if (strlen($description) > 250) {
+		$description = wordwrap($description, 250);
+		$description = strtok($description, "\n");
+		if (substr($description, -1) != '.') {
+			$description .= '…';
+		}
+	}
+	$description = html_entity_decode($description);
+	$blogPostItem->description($description);
+
+	$categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
+	$blogPostItem->category($blogPost['category'], $categoryUrl);
+
+	$pubDate = new DateTime($blogPost['date']);
+	$blogPostItem->pubDate($pubDate->getTimestamp());
+
+	$blogPostItem->appendTo($blogPostChannel);
 }
 
 $buildFeed($blogPostFeed, 'blog');

src/Domain/Waterfall/Waterfall/MysqlWaterfallRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Indentation +25 added lines, -25 removed lines

@@ -7,38 +7,38 @@
 class MysqlWaterfallRepository implements WaterfallRepositoryInterface
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param Aura\Sql\ConnectionLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    public function getWaterfalls($limit = null, $offset = 0)
-    {
-        $query = "
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param Aura\Sql\ConnectionLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	public function getWaterfalls($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `waterfall`.`id`, `waterfall`.`name`, `waterfall`.`alias`,
                    `watercourse`.`name` AS `watercourse`, `watercourse`.`alias` AS `watercourse_alias`
             FROM `jpemeric_waterfall`.`waterfall`
             INNER JOIN `jpemeric_waterfall`.`watercourse` ON `waterfall`.`watercourse` = `watercourse`.`id`
             WHERE `is_public` = :public
             ORDER BY `name`, `watercourse`";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        $bindings = [
-            'public' => 1,
-        ];
+		$bindings = [
+			'public' => 1,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 }

script/cron/generate-sitemaps.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
  * @param string $domain
  * @return boolean
  */
-$buildSitemap = function (array $entries, $domain, $folder) {
+$buildSitemap = function(array $entries, $domain, $folder) {
     $urlSet = new Urlset();
     foreach ($entries as $path => $entry) {
         $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
@@ -52,13 +52,13 @@ 
 /*********************************************
  * blog.jacobemerick.com
  *********************************************/
-$reduceToMostRecentBlogPost = function ($recentPost, $post) {
+$reduceToMostRecentBlogPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -93,7 +93,7 @@ 
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+    $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) {
         return $post['category'] == $blogCategory;
     });
     $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
@@ -206,13 +206,13 @@ 
 /*********************************************
  * lifestream.jacobemerick.com
  *********************************************/
-$reduceToMostRecentStreamPost = function ($recentPost, $post) {
+$reduceToMostRecentStreamPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $streamPostsPerPage = 15;
@@ -249,7 +249,7 @@ 
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypePosts = array_filter($streamPosts, function ($post) use ($streamType) {
+    $streamTypePosts = array_filter($streamPosts, function($post) use ($streamType) {
         return $post['type'] == $streamType;
     });
     $mostRecentStreamTypePost = array_reduce($streamTypePosts, $reduceToMostRecentStreamPost);
@@ -379,13 +379,13 @@ 
 /*********************************************
  * waterfall.jacobemerick.com
  *********************************************/
-$reduceToMostRecentJournalLog = function ($recentLog, $log) {
+$reduceToMostRecentJournalLog = function($recentLog, $log) {
     if (is_null($recentLog)) {
         return $log;
     }
     $logDate = new DateTime($log['publish_date']);
     $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+    return ($logDate > $recentLogDate) ? log : $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);

Indentation +377 added lines, -377 removed lines

@@ -27,26 +27,26 @@ 
  * @return boolean
  */
 $buildSitemap = function (array $entries, $domain, $folder) {
-    $urlSet = new Urlset();
-    foreach ($entries as $path => $entry) {
-        $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
-        $url->setLastMod($entry['lastmod']); // todo check if exists
-        $url->setChangeFreq($entry['changefreq']); // todo check if exists
-        $url->setPriority($entry['priority']); // todo check if exists
-        $urlSet->addUrl($url);
-    }
-
-    $output = new Output();
-    $output->setIndentString('  '); // change indentation from 4 to 2 spaces
-
-    $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
-    $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
-
-    $sitemapHandle = fopen($tempSitemap, 'w');
-    fwrite($sitemapHandle, $output->getOutput($urlSet));
-    fclose($sitemapHandle);
-
-    rename($tempSitemap, $finalSitemap);
+	$urlSet = new Urlset();
+	foreach ($entries as $path => $entry) {
+		$url = new Url("{$domain}{$path}"); // todo better detection of domain by env
+		$url->setLastMod($entry['lastmod']); // todo check if exists
+		$url->setChangeFreq($entry['changefreq']); // todo check if exists
+		$url->setPriority($entry['priority']); // todo check if exists
+		$urlSet->addUrl($url);
+	}
+
+	$output = new Output();
+	$output->setIndentString('  '); // change indentation from 4 to 2 spaces
+
+	$tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
+	$finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
+
+	$sitemapHandle = fopen($tempSitemap, 'w');
+	fwrite($sitemapHandle, $output->getOutput($urlSet));
+	fclose($sitemapHandle);
+
+	rename($tempSitemap, $finalSitemap);
 };
 
 
@@ -54,12 +54,12 @@ 
  * blog.jacobemerick.com
  *********************************************/
 $reduceToMostRecentBlogPost = function ($recentPost, $post) {
-    if (is_null($recentPost)) {
-        return $post;
-    }
-    $postDate = new DateTime($post['date']);
-    $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+	if (is_null($recentPost)) {
+		return $post;
+	}
+	$postDate = new DateTime($post['date']);
+	$recentPostDate = new DateTime($recentPost['date']);
+	return ($postDate > $recentPostDate) ? $post: $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -70,107 +70,107 @@ 
 
 // todo these post-level dates should be accurate to H:i:s
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) {
-    $entryKey = "/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
 }
 
 $blogCategoryArray = [
-    'hiking',
-    'personal',
-    'web-development',
+	'hiking',
+	'personal',
+	'web-development',
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
-        return $post['category'] == $blogCategory;
-    });
-    $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
-
-    $entryKey = "/{$blogCategory}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
-        $entryKey = "/{$blogCategory}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+		return $post['category'] == $blogCategory;
+	});
+	$mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
+
+	$entryKey = "/{$blogCategory}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
+		$entryKey = "/{$blogCategory}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $blogTagRepository = new BlogTagRepository($container['db_connection_locator']);
 $blogTags = $blogTagRepository->getAllTags();
 foreach ($blogTags as $blogTag) {
-    $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
-    if (count($blogPostsWithTag) < 1) {
-        continue;
-    }
-
-    $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
-
-    $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-    $entryKey = "/tag/{$blogTagPath}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
-        $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-        $entryKey = "/tag/{$blogTagPath}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
+	if (count($blogPostsWithTag) < 1) {
+		continue;
+	}
+
+	$mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
+
+	$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+	$entryKey = "/tag/{$blogTagPath}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
+		$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+		$entryKey = "/tag/{$blogTagPath}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedBlogPosts = array_reverse($activeBlogPosts);
 foreach ($reversedBlogPosts as $blogPost) {
-    $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .2,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .2,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog');
@@ -184,21 +184,21 @@ 
 $mostRecentPost = current($mostRecentPost);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .4,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .4,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .3,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://home.jacobemerick.com', 'home');
@@ -208,12 +208,12 @@ 
  * lifestream.jacobemerick.com
  *********************************************/
 $reduceToMostRecentStreamPost = function ($recentPost, $post) {
-    if (is_null($recentPost)) {
-        return $post;
-    }
-    $postDate = new DateTime($post['date']);
-    $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+	if (is_null($recentPost)) {
+		return $post;
+	}
+	$postDate = new DateTime($post['date']);
+	$recentPostDate = new DateTime($recentPost['date']);
+	return ($postDate > $recentPostDate) ? $post: $recentPost;
 };
 
 $streamPostsPerPage = 15;
@@ -223,77 +223,77 @@ 
 $mostRecentStreamPost = array_reduce($streamPosts, $reduceToMostRecentStreamPost);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentStreamPost['date']))->format('c'),
-        'changefreq' => 'hourly',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentStreamPost['date']))->format('c'),
+		'changefreq' => 'hourly',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $streamPostsPerPage) < count($streamPosts); $i++) {
-    $entryKey = "/page/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamPost['date']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/page/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamPost['date']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .1,
+		]
+	];
 }
 
 $streamTypeArray = [
-    'blog',
-    'books',
-    'distance',
-    'hulu',
-    'twitter',
-    'youtube',
+	'blog',
+	'books',
+	'distance',
+	'hulu',
+	'twitter',
+	'youtube',
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypePosts = array_filter($streamPosts, function ($post) use ($streamType) {
-        return $post['type'] == $streamType;
-    });
-    $mostRecentStreamTypePost = array_reduce($streamTypePosts, $reduceToMostRecentStreamPost);
-
-    $entryKey = "/{$streamType}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamTypePost['date']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $streamPostsPerPage) < count($streamTypePosts); $i++) {
-        $entryKey = "/{$streamType}/page/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentStreamTypePost['date']))->format('c'),
-                'changefreq' => 'hourly',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$streamTypePosts = array_filter($streamPosts, function ($post) use ($streamType) {
+		return $post['type'] == $streamType;
+	});
+	$mostRecentStreamTypePost = array_reduce($streamTypePosts, $reduceToMostRecentStreamPost);
+
+	$entryKey = "/{$streamType}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamTypePost['date']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $streamPostsPerPage) < count($streamTypePosts); $i++) {
+		$entryKey = "/{$streamType}/page/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentStreamTypePost['date']))->format('c'),
+				'changefreq' => 'hourly',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedStreamPosts = array_reverse($streamPosts);
 foreach ($reversedStreamPosts as $streamPost) {
-    $entryKey = "/{$streamPost['type']}/{$streamPost['id']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($streamPost['date']))->format('c'),
-            'changefreq' => 'never',
-            'priority' => .5,
-        ],
-    ];
+	$entryKey = "/{$streamPost['type']}/{$streamPost['id']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($streamPost['date']))->format('c'),
+			'changefreq' => 'never',
+			'priority' => .5,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .7,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .7,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://lifestream.jacobemerick.com', 'lifestream');
@@ -306,43 +306,43 @@ 
 $portfolioPieces = $portfolioRepository->getPieces();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/print/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/web/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .4,
-    ],
-    '/resume/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'yearly',
-        'priority' => .9,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/print/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/web/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .4,
+	],
+	'/resume/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'yearly',
+		'priority' => .9,
+	],
 ];
 
 foreach ($portfolioPieces as $portfolioPiece) {
-    $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
-    $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'never',
-            'priority' => .7,
-        ],
-    ];
+	$portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
+	$entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'never',
+			'priority' => .7,
+		],
+	];
 }
 
 $buildSitemap($entryArray, 'http://portfolio.jacobemerick.com', 'portfolio');
@@ -356,26 +356,26 @@ 
 $mostRecentChange = current($mostRecentChange);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/terms/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
-    '/change-log/' => [
-        'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
-        'changefreq' => 'daily',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .6,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/terms/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
+	'/change-log/' => [
+		'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
+		'changefreq' => 'daily',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .6,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site');
@@ -385,108 +385,108 @@ 
  * www.waterfallofthekeweenaw.com
  *********************************************/
 $reduceToMostRecentJournalLog = function ($recentLog, $log) {
-    if (is_null($recentLog)) {
-        return $log;
-    }
-    $logDate = new DateTime($log['publish_date']);
-    $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+	if (is_null($recentLog)) {
+		return $log;
+	}
+	$logDate = new DateTime($log['publish_date']);
+	$recentLogDate = new DateTime($recentLog['publish_date']);
+	return ($logDate > $recentLogDate) ? log: $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);
 $waterfallList = $waterfallRepository->getWaterfalls();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/falls/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/falls/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 24) < count($waterfallList); $i++) {
-    $entryKey = "/falls/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/falls/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCountyRepository = new WaterfallCountyRepository($container['db_connection_locator']);
 $waterfallCountyList = $waterfallCountyRepository->getCountyList();
 
 foreach ($waterfallCountyList as $waterfallCounty) {
-    $entryKey = "/{$waterfallCounty['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
-        $entryKey = "/{$waterfallCounty['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallCounty['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
+		$entryKey = "/{$waterfallCounty['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallWatercourseRepository = new WaterfallWatercourseRepository($container['db_connection_locator']);
 $waterfallWatercourseList = $waterfallWatercourseRepository->getWatercourseList();
 
 foreach ($waterfallWatercourseList as $waterfallWatercourse) {
-    $entryKey = "/{$waterfallWatercourse['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
-        $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallWatercourse['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
+		$entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($waterfallList as $waterfall) {
-    $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/map/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/map/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $waterfallLogRepository = new WaterfallLogRepository($container['db_connection_locator']);
@@ -495,91 +495,91 @@ 
 $mostRecentWaterfallLog = array_reduce($activeWaterfallLogs, $reduceToMostRecentJournalLog);
 
 $entryArray += [
-    '/journal/' => [
-        'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/journal/' => [
+		'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 10) < count($activeWaterfallLogs); $i++) {
-    $entryKey = "/journal/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/journal/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCompanionRepository = new WaterfallCompanionRepository($container['db_connection_locator']);
 $waterfallCompanionList = $waterfallCompanionRepository->getCompanionList();
 
 foreach ($waterfallCompanionList as $waterfallCompanion) {
-    $entryKey = "/companion/{$waterfallCompanion['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
-        $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/companion/{$waterfallCompanion['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
+		$entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallPeriodRepository = new WaterfallPeriodRepository($container['db_connection_locator']);
 $waterfallPeriodList = $waterfallPeriodRepository->getPeriodList();
 
 foreach ($waterfallPeriodList as $waterfallPeriod) {
-    $entryKey = "/period/{$waterfallPeriod['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
-        $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/period/{$waterfallPeriod['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
+		$entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($activeWaterfallLogs as $waterfallLog) {
-    $entryKey = "/journal/{$waterfallLog['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .4,
-        ],
-    ];
+	$entryKey = "/journal/{$waterfallLog['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .4,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://www.waterfallsofthekeweenaw.com', 'waterfalls');