Completed
Push — master ( 460d04...99f0cc )
by Jacob
03:38 queued 10s
created
utility/CronController.class.inc.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 
21 21
 	public function activate()
22 22
 	{
23
-		foreach(self::$CRON_ARRAY as $cron => $frequency)
23
+		foreach (self::$CRON_ARRAY as $cron => $frequency)
24 24
 		{
25
-			if(!$this->time_to_run($frequency))
25
+			if (!$this->time_to_run($frequency))
26 26
 				continue;
27 27
 			
28 28
 			Loader::load('utility', "cron/{$cron}");
@@ -46,19 +46,19 @@  discard block
 block discarded – undo
46 46
 		$operator = explode(' ', $frequency);
47 47
 		list($time['minute'], $time['hour'], $time['day'], $time['month'], $time['weekday']) = $operator;
48 48
 		
49
-		foreach($time as $key => $value)
49
+		foreach ($time as $key => $value)
50 50
 		{
51
-			if($value == '*')
51
+			if ($value == '*')
52 52
 				continue;
53
-			if(stristr($value, '/'))
53
+			if (stristr($value, '/'))
54 54
 			{
55 55
 				$value = substr($value, 2);
56
-				if($cur[$key] % $value == 0)
56
+				if ($cur[$key] % $value == 0)
57 57
 					continue;
58 58
 				else
59 59
 					return;
60 60
 			}
61
-			if($cur[$key] == $value)
61
+			if ($cur[$key] == $value)
62 62
 				continue;
63 63
 			return;
64 64
 		}
Please login to merge, or discard this patch.
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 	{
23 23
 		foreach(self::$CRON_ARRAY as $cron => $frequency)
24 24
 		{
25
-			if(!$this->time_to_run($frequency))
26
-				continue;
25
+			if(!$this->time_to_run($frequency)) {
26
+							continue;
27
+			}
27 28
 			
28 29
 			Loader::load('utility', "cron/{$cron}");
29 30
 			$reflection = new ReflectionClass($cron);
@@ -48,18 +49,21 @@  discard block
 block discarded – undo
48 49
 		
49 50
 		foreach($time as $key => $value)
50 51
 		{
51
-			if($value == '*')
52
-				continue;
52
+			if($value == '*') {
53
+							continue;
54
+			}
53 55
 			if(stristr($value, '/'))
54 56
 			{
55 57
 				$value = substr($value, 2);
56
-				if($cur[$key] % $value == 0)
57
-					continue;
58
-				else
59
-					return;
58
+				if($cur[$key] % $value == 0) {
59
+									continue;
60
+				} else {
61
+									return;
62
+				}
60 63
 			}
61
-			if($cur[$key] == $value)
62
-				continue;
64
+			if($cur[$key] == $value) {
65
+							continue;
66
+			}
63 67
 			return;
64 68
 		}
65 69
 		return true;
Please login to merge, or discard this patch.
controller/Error404Controller.class.inc.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -32,37 +32,37 @@
 block discarded – undo
32 32
 
33 33
 	private function get_sites()
34 34
 	{
35
-    return [
36
-      [
37
-        'url' => 'http://home.jacobemerick.com/',
38
-        'title' => "Jacob Emerick's Home",
39
-        'name' => 'Home'
40
-      ],
41
-      [
42
-        'url' => 'http://blog.jacobemerick.com/',
43
-        'title' => "Jacob Emerick's Blog",
44
-        'name' => 'Blog'
45
-      ],
46
-      [
47
-        'url' => 'http://lifestream.jacobemerick.com/',
48
-        'title' => "Jacob Emerick's Lifestream",
49
-        'name' => 'Lifestream'
50
-      ],
51
-      [
52
-        'url' => 'http://map.jacobemerick.com/',
53
-        'title' => "Jacob Emerick's Hiking Map",
54
-        'name' => 'Map'
55
-      ],
56
-      [
57
-        'url' => 'http://portfolio.jacobemerick.com/',
58
-        'title' => "Jacob Emerick's Portfolio",
59
-        'name' => 'Portfolio',
60
-      ],
61
-      [
62
-        'url' => 'http://www.waterfallsofthekeweenaw.com/',
63
-        'title' => 'Waterfalls of the Keweenaw',
64
-        'name' => 'Waterfalls'
65
-      ]
35
+	return [
36
+	  [
37
+		'url' => 'http://home.jacobemerick.com/',
38
+		'title' => "Jacob Emerick's Home",
39
+		'name' => 'Home'
40
+	  ],
41
+	  [
42
+		'url' => 'http://blog.jacobemerick.com/',
43
+		'title' => "Jacob Emerick's Blog",
44
+		'name' => 'Blog'
45
+	  ],
46
+	  [
47
+		'url' => 'http://lifestream.jacobemerick.com/',
48
+		'title' => "Jacob Emerick's Lifestream",
49
+		'name' => 'Lifestream'
50
+	  ],
51
+	  [
52
+		'url' => 'http://map.jacobemerick.com/',
53
+		'title' => "Jacob Emerick's Hiking Map",
54
+		'name' => 'Map'
55
+	  ],
56
+	  [
57
+		'url' => 'http://portfolio.jacobemerick.com/',
58
+		'title' => "Jacob Emerick's Portfolio",
59
+		'name' => 'Portfolio',
60
+	  ],
61
+	  [
62
+		'url' => 'http://www.waterfallsofthekeweenaw.com/',
63
+		'title' => 'Waterfalls of the Keweenaw',
64
+		'name' => 'Waterfalls'
65
+	  ]
66 66
   ];
67 67
 	}
68 68
 
Please login to merge, or discard this patch.
controller/waterfalls/DefaultPageController.class.inc.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 	protected static $WATERFALL_SITE_ID = 5;
12 12
 
13
-    protected $parent_navigation_item = '';
13
+	protected $parent_navigation_item = '';
14 14
 
15 15
 	protected function set_head_data()
16 16
 	{
@@ -19,45 +19,45 @@  discard block
 block discarded – undo
19 19
 		$this->add_css('waterfalls');
20 20
 	}
21 21
 
22
-    protected function add_waterfall_js()
23
-    {
24
-        $this->add_js('jquery');
25
-        $this->add_js('imagelightbox');
26
-        $this->add_js('waterfalls');
27
-    }
22
+	protected function add_waterfall_js()
23
+	{
24
+		$this->add_js('jquery');
25
+		$this->add_js('imagelightbox');
26
+		$this->add_js('waterfalls');
27
+	}
28 28
 
29 29
 	protected function set_body_data($page_type = 'normal')
30 30
 	{
31 31
 		$this->set_body('activity_array', $this->get_recent_activity());
32 32
 
33
-        $this->set_body('main_navigation', array(
34
-                (object) array(
35
-                    'uri' => '/falls/',
36
-                    'anchor' => 'Falls',
37
-                    'is_active' => $this->parent_navigation_item === 'falls',
38
-                ),
39
-                (object) array(
40
-                    'uri' => '/map/',
41
-                    'anchor' => 'Map',
42
-                    'is_active' => $this->parent_navigation_item === 'map',
43
-                ),
44
-                (object) array(
45
-                    'uri' => '/journal/',
46
-                    'anchor' => 'Journal',
47
-                    'is_active' => $this->parent_navigation_item === 'journal',
48
-                ),
49
-                (object) array(
50
-                    'uri' => '/about/',
51
-                    'anchor' => 'About',
52
-                    'is_active' => $this->parent_navigation_item === 'about',
53
-                )
54
-        ));
55
-
56
-        if ($page_type == 'wide') {
57
-            $this->set_body_view('WidePage');
58
-        } else {
59
-            $this->set_body_view('Page');
60
-        }
61
-    }
33
+		$this->set_body('main_navigation', array(
34
+				(object) array(
35
+					'uri' => '/falls/',
36
+					'anchor' => 'Falls',
37
+					'is_active' => $this->parent_navigation_item === 'falls',
38
+				),
39
+				(object) array(
40
+					'uri' => '/map/',
41
+					'anchor' => 'Map',
42
+					'is_active' => $this->parent_navigation_item === 'map',
43
+				),
44
+				(object) array(
45
+					'uri' => '/journal/',
46
+					'anchor' => 'Journal',
47
+					'is_active' => $this->parent_navigation_item === 'journal',
48
+				),
49
+				(object) array(
50
+					'uri' => '/about/',
51
+					'anchor' => 'About',
52
+					'is_active' => $this->parent_navigation_item === 'about',
53
+				)
54
+		));
55
+
56
+		if ($page_type == 'wide') {
57
+			$this->set_body_view('WidePage');
58
+		} else {
59
+			$this->set_body_view('Page');
60
+		}
61
+	}
62 62
 
63 63
 }
Please login to merge, or discard this patch.
controller/ajax/GetPortfolioImageController.class.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 		
13 13
 		$portfolio_result = PortfolioCollector::getImageById($id);
14 14
 
15
-    $image_path = "portfolio/{$portfolio_result->name}";
16
-    $image_path = Loader::getImagePath('image', $image_path);
17
-    $image_size = getimagesize($image_path);
15
+	$image_path = "portfolio/{$portfolio_result->name}";
16
+	$image_path = Loader::getImagePath('image', $image_path);
17
+	$image_size = getimagesize($image_path);
18 18
 
19 19
 		$main_image = new stdclass();
20 20
 		$main_image->id = $portfolio_result->id;
Please login to merge, or discard this patch.
router/Router.class.inc.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
81 81
 			$redirect_uri .= '/';
82 82
 		
83
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85
-        }
83
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85
+		}
86 86
         
87 87
 		if($redirect_uri == URLDecode::getURI())
88 88
 			return;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			URLDecode::getExtension() != 'json' &&
148 148
 			URLDecode::getExtension() != 'jpg' &&
149 149
 			URLDecode::getExtension() != 'png' &&
150
-            strstr(URLDecode::getURI(), '#') === false);
150
+			strstr(URLDecode::getURI(), '#') === false);
151 151
 	}
152 152
 
153 153
 }
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 	private static function get_router_name()
20 20
 	{
21
-		if(Request::isAJAX())
21
+		if (Request::isAJAX())
22 22
 			return 'AJAXRouter';
23
-		if(URLDecode::getURI() == '/sitemap.xml')
23
+		if (URLDecode::getURI() == '/sitemap.xml')
24 24
 			return 'SitemapRouter';
25
-		if(URLDecode::getURI() == '/rss/')
25
+		if (URLDecode::getURI() == '/rss/')
26 26
 			return 'RSSRouter';
27 27
 		
28
-		switch(URLDecode::getSite())
28
+		switch (URLDecode::getSite())
29 29
 		{
30 30
 			case 'ajax' :
31 31
 				return 'AjaxRouter';
@@ -70,36 +70,36 @@  discard block
 block discarded – undo
70 70
 
71 71
 	final protected function check_for_redirect($redirect_uri)
72 72
 	{
73
-		foreach($this->get_redirect_array() as $check)
73
+		foreach ($this->get_redirect_array() as $check)
74 74
 		{
75 75
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
76 76
 		}
77 77
 		
78 78
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
79 79
 		
80
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
80
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
81 81
 			$redirect_uri .= '/';
82 82
 		
83 83
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84 84
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85 85
         }
86 86
         
87
-		if($redirect_uri == URLDecode::getURI())
87
+		if ($redirect_uri == URLDecode::getURI())
88 88
 			return;
89 89
 		
90 90
 		$controller_check = $redirect_uri;
91
-		if(substr($redirect_uri, 0, 4) == 'http')
91
+		if (substr($redirect_uri, 0, 4) == 'http')
92 92
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
93 93
 		
94 94
 		$controller = $this->get_controller($controller_check);
95
-		if($controller == '/Error404Controller')
95
+		if ($controller == '/Error404Controller')
96 96
 		{
97 97
 			Loader::loadNew('controller', '/Error404Controller')
98 98
 				->activate();
99 99
 			exit;
100 100
 		}
101 101
 
102
-		if(substr($redirect_uri, 0, 4) != 'http')
102
+		if (substr($redirect_uri, 0, 4) != 'http')
103 103
 		{
104 104
 			$redirect_uri = substr($redirect_uri, 1);
105 105
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 
117 117
 	final private function get_controller($uri)
118 118
 	{
119
-		foreach($this->get_direct_array() as $check)
119
+		foreach ($this->get_direct_array() as $check)
120 120
 		{
121
-			if($uri == $check->match)
121
+			if ($uri == $check->match)
122 122
 				return "{$this->get_primary_folder()}/{$check->controller}";
123 123
 			
124
-			if(preg_match("@^{$check->match}$@", $uri))
124
+			if (preg_match("@^{$check->match}$@", $uri))
125 125
 				return "{$this->get_primary_folder()}/{$check->controller}";
126 126
 		}
127 127
 		
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
130 130
 
131 131
 	final private function get_primary_folder()
132 132
 	{
133
-		if(Request::isAjax())
133
+		if (Request::isAjax())
134 134
 			return 'ajax';
135
-		if(URLDecode::getURI() == '/sitemap.xml')
135
+		if (URLDecode::getURI() == '/sitemap.xml')
136 136
 			return 'sitemap';
137
-		if(URLDecode::getURI() == '/rss/')
137
+		if (URLDecode::getURI() == '/rss/')
138 138
 			return 'rss';
139 139
 		
140 140
 		return URLDecode::getSite();
Please login to merge, or discard this patch.
Braces   +33 added lines, -22 removed lines patch added patch discarded remove patch
@@ -18,12 +18,15 @@  discard block
 block discarded – undo
18 18
 
19 19
 	private static function get_router_name()
20 20
 	{
21
-		if(Request::isAJAX())
22
-			return 'AJAXRouter';
23
-		if(URLDecode::getURI() == '/sitemap.xml')
24
-			return 'SitemapRouter';
25
-		if(URLDecode::getURI() == '/rss/')
26
-			return 'RSSRouter';
21
+		if(Request::isAJAX()) {
22
+					return 'AJAXRouter';
23
+		}
24
+		if(URLDecode::getURI() == '/sitemap.xml') {
25
+					return 'SitemapRouter';
26
+		}
27
+		if(URLDecode::getURI() == '/rss/') {
28
+					return 'RSSRouter';
29
+		}
27 30
 		
28 31
 		switch(URLDecode::getSite())
29 32
 		{
@@ -77,19 +80,22 @@  discard block
 block discarded – undo
77 80
 		
78 81
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
79 82
 		
80
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
81
-			$redirect_uri .= '/';
83
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
84
+					$redirect_uri .= '/';
85
+		}
82 86
 		
83 87
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84 88
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85 89
         }
86 90
         
87
-		if($redirect_uri == URLDecode::getURI())
88
-			return;
91
+		if($redirect_uri == URLDecode::getURI()) {
92
+					return;
93
+		}
89 94
 		
90 95
 		$controller_check = $redirect_uri;
91
-		if(substr($redirect_uri, 0, 4) == 'http')
92
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
96
+		if(substr($redirect_uri, 0, 4) == 'http') {
97
+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
98
+		}
93 99
 		
94 100
 		$controller = $this->get_controller($controller_check);
95 101
 		if($controller == '/Error404Controller')
@@ -118,11 +124,13 @@  discard block
 block discarded – undo
118 124
 	{
119 125
 		foreach($this->get_direct_array() as $check)
120 126
 		{
121
-			if($uri == $check->match)
122
-				return "{$this->get_primary_folder()}/{$check->controller}";
127
+			if($uri == $check->match) {
128
+							return "{$this->get_primary_folder()}/{$check->controller}";
129
+			}
123 130
 			
124
-			if(preg_match("@^{$check->match}$@", $uri))
125
-				return "{$this->get_primary_folder()}/{$check->controller}";
131
+			if(preg_match("@^{$check->match}$@", $uri)) {
132
+							return "{$this->get_primary_folder()}/{$check->controller}";
133
+			}
126 134
 		}
127 135
 		
128 136
 		return '/Error404Controller';
@@ -130,12 +138,15 @@  discard block
 block discarded – undo
130 138
 
131 139
 	final private function get_primary_folder()
132 140
 	{
133
-		if(Request::isAjax())
134
-			return 'ajax';
135
-		if(URLDecode::getURI() == '/sitemap.xml')
136
-			return 'sitemap';
137
-		if(URLDecode::getURI() == '/rss/')
138
-			return 'rss';
141
+		if(Request::isAjax()) {
142
+					return 'ajax';
143
+		}
144
+		if(URLDecode::getURI() == '/sitemap.xml') {
145
+					return 'sitemap';
146
+		}
147
+		if(URLDecode::getURI() == '/rss/') {
148
+					return 'rss';
149
+		}
139 150
 		
140 151
 		return URLDecode::getSite();
141 152
 	}
Please login to merge, or discard this patch.
public/site/index.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@
 block discarded – undo
12 12
 $formatter = new LineFormatter('[%datetime%] %channel%.%level_name%: %message%');
13 13
 
14 14
 $handler = new StreamHandler(
15
-    __DIR__ . '/../../logs/site.log',
16
-    Logger::DEBUG
15
+	__DIR__ . '/../../logs/site.log',
16
+	Logger::DEBUG
17 17
 );
18 18
 $handler->setFormatter($formatter);
19 19
 
Please login to merge, or discard this patch.
script/cron/generate-rss-feeds.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
  * @return boolean
20 20
  */
21 21
 $buildFeed = function (Feed $feed, $folder) {
22
-    $tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
23
-    $finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
22
+	$tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
23
+	$finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
24 24
 
25
-    $feedHandle = fopen($tempFeed, 'w');
26
-    fwrite($feedHandle, $feed->render());
27
-    fclose($feedHandle);
25
+	$feedHandle = fopen($tempFeed, 'w');
26
+	fwrite($feedHandle, $feed->render());
27
+	fclose($feedHandle);
28 28
 
29
-    rename($tempFeed, $finalFeed);
29
+	rename($tempFeed, $finalFeed);
30 30
 };
31 31
 
32 32
 
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
45 45
 $activeBlogPosts = $blogPostRepository->getActivePosts();
46 46
 
47 47
 foreach ($activeBlogPosts as $blogPost) {
48
-    $blogPostItem = new Item();
48
+	$blogPostItem = new Item();
49 49
 
50
-    $blogPostItem->title($blogPost['title']);
50
+	$blogPostItem->title($blogPost['title']);
51 51
 
52
-    $url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
53
-    $blogPostItem->url($url);
54
-    $blogPostItem->guid($url, true);
52
+	$url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
53
+	$blogPostItem->url($url);
54
+	$blogPostItem->guid($url, true);
55 55
 
56
-    $description = $blogPost['body'];
57
-    $description = Content::instance('FixPhoto', $description)->activate(true); // todo kill this with fire
58
-    $description = htmlentities($description);
59
-    $blogPostItem->description($description);
56
+	$description = $blogPost['body'];
57
+	$description = Content::instance('FixPhoto', $description)->activate(true); // todo kill this with fire
58
+	$description = htmlentities($description);
59
+	$blogPostItem->description($description);
60 60
 
61
-    $categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
62
-    $blogPostItem->category($blogPost['category'], $categoryUrl);
61
+	$categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
62
+	$blogPostItem->category($blogPost['category'], $categoryUrl);
63 63
 
64
-    $pubDate = new DateTime($blogPost['date']);
65
-    $blogPostItem->pubDate($pubDate->getTimestamp());
64
+	$pubDate = new DateTime($blogPost['date']);
65
+	$blogPostItem->pubDate($pubDate->getTimestamp());
66 66
 
67
-    $blogPostItem->appendTo($blogPostChannel);
67
+	$blogPostItem->appendTo($blogPostChannel);
68 68
 }
69 69
 
70 70
 $buildFeed($blogPostFeed, 'blog');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
  * @param string $folder
19 19
  * @return boolean
20 20
  */
21
-$buildFeed = function (Feed $feed, $folder) {
21
+$buildFeed = function(Feed $feed, $folder) {
22 22
     $tempFeed = __DIR__ . "/../../public/{$folder}/rss-new.xml";
23 23
     $finalFeed = __DIR__ . "/../../public/{$folder}/rss.xml";
24 24
 
Please login to merge, or discard this patch.
script/cron/generate-sitemaps.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @param string $domain
17 17
  * @return boolean
18 18
  */
19
-$buildSitemap = function (array $entries, $domain, $folder) {
19
+$buildSitemap = function(array $entries, $domain, $folder) {
20 20
     $urlSet = new Urlset();
21 21
     foreach ($entries as $path => $entry) {
22 22
         $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
@@ -43,13 +43,13 @@  discard block
 block discarded – undo
43 43
 /*********************************************
44 44
  * blog.jacobemerick.com
45 45
  *********************************************/
46
-$reduceToMostRecentBlogPost = function ($recentPost, $post) {
46
+$reduceToMostRecentBlogPost = function($recentPost, $post) {
47 47
     if (is_null($recentPost)) {
48 48
         return $post;
49 49
     }
50 50
     $postDate = new DateTime($post['date']);
51 51
     $recentPostDate = new DateTime($recentPost['date']);
52
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
52
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
53 53
 };
54 54
 
55 55
 $blogPostsPerPage = 10;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 ];
85 85
 
86 86
 foreach ($blogCategoryArray as $blogCategory) {
87
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
87
+    $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) {
88 88
         return $post['category'] == $blogCategory;
89 89
     });
90 90
     $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
Please login to merge, or discard this patch.
Indentation   +127 added lines, -127 removed lines patch added patch discarded remove patch
@@ -17,26 +17,26 @@  discard block
 block discarded – undo
17 17
  * @return boolean
18 18
  */
19 19
 $buildSitemap = function (array $entries, $domain, $folder) {
20
-    $urlSet = new Urlset();
21
-    foreach ($entries as $path => $entry) {
22
-        $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
23
-        $url->setLastMod($entry['lastmod']); // todo check if exists
24
-        $url->setChangeFreq($entry['changefreq']); // todo check if exists
25
-        $url->setPriority($entry['priority']); // todo check if exists
26
-        $urlSet->addUrl($url);
27
-    }
28
-
29
-    $output = new Output();
30
-    $output->setIndentString('  '); // change indentation from 4 to 2 spaces
31
-
32
-    $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
33
-    $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
34
-
35
-    $sitemapHandle = fopen($tempSitemap, 'w');
36
-    fwrite($sitemapHandle, $output->getOutput($urlSet));
37
-    fclose($sitemapHandle);
38
-
39
-    rename($tempSitemap, $finalSitemap);
20
+	$urlSet = new Urlset();
21
+	foreach ($entries as $path => $entry) {
22
+		$url = new Url("{$domain}{$path}"); // todo better detection of domain by env
23
+		$url->setLastMod($entry['lastmod']); // todo check if exists
24
+		$url->setChangeFreq($entry['changefreq']); // todo check if exists
25
+		$url->setPriority($entry['priority']); // todo check if exists
26
+		$urlSet->addUrl($url);
27
+	}
28
+
29
+	$output = new Output();
30
+	$output->setIndentString('  '); // change indentation from 4 to 2 spaces
31
+
32
+	$tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
33
+	$finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
34
+
35
+	$sitemapHandle = fopen($tempSitemap, 'w');
36
+	fwrite($sitemapHandle, $output->getOutput($urlSet));
37
+	fclose($sitemapHandle);
38
+
39
+	rename($tempSitemap, $finalSitemap);
40 40
 };
41 41
 
42 42
 
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
  * blog.jacobemerick.com
45 45
  *********************************************/
46 46
 $reduceToMostRecentBlogPost = function ($recentPost, $post) {
47
-    if (is_null($recentPost)) {
48
-        return $post;
49
-    }
50
-    $postDate = new DateTime($post['date']);
51
-    $recentPostDate = new DateTime($recentPost['date']);
52
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
47
+	if (is_null($recentPost)) {
48
+		return $post;
49
+	}
50
+	$postDate = new DateTime($post['date']);
51
+	$recentPostDate = new DateTime($recentPost['date']);
52
+	return ($postDate > $recentPostDate) ? $post: $recentPost;
53 53
 };
54 54
 
55 55
 $blogPostsPerPage = 10;
@@ -60,107 +60,107 @@  discard block
 block discarded – undo
60 60
 
61 61
 // todo these post-level dates should be accurate to H:i:s
62 62
 $entryArray = [
63
-    '/' => [
64
-        'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
65
-        'changefreq' => 'daily',
66
-        'priority' => .9,
67
-    ]
63
+	'/' => [
64
+		'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
65
+		'changefreq' => 'daily',
66
+		'priority' => .9,
67
+	]
68 68
 ];
69 69
 for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) {
70
-    $entryKey = "/{$i}/";
71
-    $entryArray += [
72
-        $entryKey => [
73
-            'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
74
-            'changefreq' => 'daily',
75
-            'priority' => .1,
76
-        ]
77
-    ];
70
+	$entryKey = "/{$i}/";
71
+	$entryArray += [
72
+		$entryKey => [
73
+			'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
74
+			'changefreq' => 'daily',
75
+			'priority' => .1,
76
+		]
77
+	];
78 78
 }
79 79
 
80 80
 $blogCategoryArray = [
81
-    'hiking',
82
-    'personal',
83
-    'web-development',
81
+	'hiking',
82
+	'personal',
83
+	'web-development',
84 84
 ];
85 85
 
86 86
 foreach ($blogCategoryArray as $blogCategory) {
87
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
88
-        return $post['category'] == $blogCategory;
89
-    });
90
-    $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
91
-
92
-    $entryKey = "/{$blogCategory}/";
93
-    $entryArray += [
94
-        $entryKey => [
95
-            'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
96
-            'changefreq' => 'daily',
97
-            'priority' => .3,
98
-        ]
99
-    ];
100
-
101
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
102
-        $entryKey = "/{$blogCategory}/{$i}/";
103
-        $entryArray += [
104
-            $entryKey => [
105
-                'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
106
-                'changefreq' => 'daily',
107
-                'priority' => .1,
108
-            ]
109
-        ];
110
-    }
87
+	$blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
88
+		return $post['category'] == $blogCategory;
89
+	});
90
+	$mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
91
+
92
+	$entryKey = "/{$blogCategory}/";
93
+	$entryArray += [
94
+		$entryKey => [
95
+			'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
96
+			'changefreq' => 'daily',
97
+			'priority' => .3,
98
+		]
99
+	];
100
+
101
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
102
+		$entryKey = "/{$blogCategory}/{$i}/";
103
+		$entryArray += [
104
+			$entryKey => [
105
+				'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
106
+				'changefreq' => 'daily',
107
+				'priority' => .1,
108
+			]
109
+		];
110
+	}
111 111
 }
112 112
 
113 113
 $blogTagRepository = new BlogTagRepository($container['db_connection_locator']);
114 114
 $blogTags = $blogTagRepository->getAllTags();
115 115
 foreach ($blogTags as $blogTag) {
116
-    $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
117
-    if (count($blogPostsWithTag) < 1) {
118
-        continue;
119
-    }
120
-
121
-    $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
122
-
123
-    $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
124
-    $entryKey = "/tag/{$blogTagPath}/";
125
-    $entryArray += [
126
-        $entryKey => [
127
-            'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
128
-            'changefreq' => 'daily',
129
-            'priority' => .1,
130
-        ]
131
-    ];
132
-
133
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
134
-        $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
135
-        $entryKey = "/tag/{$blogTagPath}/{$i}/";
136
-        $entryArray += [
137
-            $entryKey => [
138
-                'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
139
-                'changefreq' => 'daily',
140
-                'priority' => .1,
141
-            ]
142
-        ];
143
-    }
116
+	$blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
117
+	if (count($blogPostsWithTag) < 1) {
118
+		continue;
119
+	}
120
+
121
+	$mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
122
+
123
+	$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
124
+	$entryKey = "/tag/{$blogTagPath}/";
125
+	$entryArray += [
126
+		$entryKey => [
127
+			'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
128
+			'changefreq' => 'daily',
129
+			'priority' => .1,
130
+		]
131
+	];
132
+
133
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
134
+		$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
135
+		$entryKey = "/tag/{$blogTagPath}/{$i}/";
136
+		$entryArray += [
137
+			$entryKey => [
138
+				'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
139
+				'changefreq' => 'daily',
140
+				'priority' => .1,
141
+			]
142
+		];
143
+	}
144 144
 }
145 145
 
146 146
 $reversedBlogPosts = array_reverse($activeBlogPosts);
147 147
 foreach ($reversedBlogPosts as $blogPost) {
148
-    $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
149
-    $entryArray += [
150
-        $entryKey => [
151
-            'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
152
-            'changefreq' => 'weekly',
153
-            'priority' => .8,
154
-        ],
155
-    ];
148
+	$entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
149
+	$entryArray += [
150
+		$entryKey => [
151
+			'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
152
+			'changefreq' => 'weekly',
153
+			'priority' => .8,
154
+		],
155
+	];
156 156
 }
157 157
 
158 158
 $entryArray += [
159
-    '/about/' => [
160
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
161
-        'changefreq' => 'monthly',
162
-        'priority' => .2,
163
-    ]
159
+	'/about/' => [
160
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
161
+		'changefreq' => 'monthly',
162
+		'priority' => .2,
163
+	]
164 164
 ];
165 165
 
166 166
 $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog');
@@ -170,26 +170,26 @@  discard block
 block discarded – undo
170 170
  * site.jacobemerick.com
171 171
  *********************************************/
172 172
 $entryArray = [
173
-    '/' => [
174
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
175
-        'changefreq' => 'weekly',
176
-        'priority' => 1,
177
-    ],
178
-    '/terms/' => [
179
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
180
-        'changefreq' => 'weekly',
181
-        'priority' => .3,
182
-    ],
183
-    '/change-log/' => [
184
-        'lastmod' => (new DateTime('now'))->format('Y-m-d'), // todo lookup based on changelog
185
-        'changefreq' => 'daily',
186
-        'priority' => .1,
187
-    ],
188
-    '/contact/' => [
189
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
190
-        'changefreq' => 'weekly',
191
-        'priority' => .6,
192
-    ],
173
+	'/' => [
174
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
175
+		'changefreq' => 'weekly',
176
+		'priority' => 1,
177
+	],
178
+	'/terms/' => [
179
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
180
+		'changefreq' => 'weekly',
181
+		'priority' => .3,
182
+	],
183
+	'/change-log/' => [
184
+		'lastmod' => (new DateTime('now'))->format('Y-m-d'), // todo lookup based on changelog
185
+		'changefreq' => 'daily',
186
+		'priority' => .1,
187
+	],
188
+	'/contact/' => [
189
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
190
+		'changefreq' => 'weekly',
191
+		'priority' => .6,
192
+	],
193 193
 ];
194 194
 
195 195
 $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site');
Please login to merge, or discard this patch.