@@ -11,7 +11,7 @@ |
||
11 | 11 | protected $connections; |
12 | 12 | |
13 | 13 | /** |
14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
14 | + * @param ConnectionLocator $connections |
|
15 | 15 | */ |
16 | 16 | public function __construct(ConnectionLocator $connections) |
17 | 17 | { |
@@ -7,26 +7,26 @@ discard block |
||
7 | 7 | class MysqlCommentRepository implements CommentRepositoryInterface |
8 | 8 | { |
9 | 9 | |
10 | - /** @var Aura\Sql\ConnectionLocator */ |
|
11 | - protected $connections; |
|
12 | - |
|
13 | - /** |
|
14 | - * @param Aura\Sql\ConnectionLocator $connections |
|
15 | - */ |
|
16 | - public function __construct(ConnectionLocator $connections) |
|
17 | - { |
|
18 | - $this->connections = $connections; |
|
19 | - } |
|
20 | - |
|
21 | - public function getActiveCommentsBySite($site, $limit = null, $offset = 0) |
|
22 | - { |
|
23 | - if ($site == 'blog') { |
|
24 | - $site_id = 2; |
|
25 | - } else { |
|
26 | - throw new Exception('Unrecognized site id in comment repository'); |
|
27 | - } |
|
28 | - |
|
29 | - $query = " |
|
10 | + /** @var Aura\Sql\ConnectionLocator */ |
|
11 | + protected $connections; |
|
12 | + |
|
13 | + /** |
|
14 | + * @param Aura\Sql\ConnectionLocator $connections |
|
15 | + */ |
|
16 | + public function __construct(ConnectionLocator $connections) |
|
17 | + { |
|
18 | + $this->connections = $connections; |
|
19 | + } |
|
20 | + |
|
21 | + public function getActiveCommentsBySite($site, $limit = null, $offset = 0) |
|
22 | + { |
|
23 | + if ($site == 'blog') { |
|
24 | + $site_id = 2; |
|
25 | + } else { |
|
26 | + throw new Exception('Unrecognized site id in comment repository'); |
|
27 | + } |
|
28 | + |
|
29 | + $query = " |
|
30 | 30 | SELECT `comment_meta`.`id`, `comment_meta`.`date`, `comment`.`body`, `commenter`.`name`, |
31 | 31 | `post`.`title`, `post`.`category`, `post`.`path` |
32 | 32 | FROM `jpemeric_comment`.`comment_meta` |
@@ -39,21 +39,21 @@ discard block |
||
39 | 39 | `post`.`display` = :display_post |
40 | 40 | WHERE `comment_meta`.`display` = :active_comment |
41 | 41 | ORDER BY `comment_meta`.`date` DESC"; |
42 | - if ($limit != null) { |
|
43 | - $query .= " |
|
42 | + if ($limit != null) { |
|
43 | + $query .= " |
|
44 | 44 | LIMIT {$offset}, {$limit}"; |
45 | - } |
|
46 | - |
|
47 | - $bindings = [ |
|
48 | - 'trusted_commenter' => 1, |
|
49 | - 'comment_site' => $site_id, |
|
50 | - 'display_post' => 1, |
|
51 | - 'active_comment' => 1, |
|
52 | - ]; |
|
53 | - |
|
54 | - return $this |
|
55 | - ->connections |
|
56 | - ->getRead() |
|
57 | - ->fetchAll($query, $bindings); |
|
58 | - } |
|
45 | + } |
|
46 | + |
|
47 | + $bindings = [ |
|
48 | + 'trusted_commenter' => 1, |
|
49 | + 'comment_site' => $site_id, |
|
50 | + 'display_post' => 1, |
|
51 | + 'active_comment' => 1, |
|
52 | + ]; |
|
53 | + |
|
54 | + return $this |
|
55 | + ->connections |
|
56 | + ->getRead() |
|
57 | + ->fetchAll($query, $bindings); |
|
58 | + } |
|
59 | 59 | } |
@@ -4,5 +4,5 @@ |
||
4 | 4 | |
5 | 5 | interface CommentRepositoryInterface |
6 | 6 | { |
7 | - public function getActiveCommentsBySite($site, $limit = null, $offset= 0); |
|
7 | + public function getActiveCommentsBySite($site, $limit = null, $offset= 0); |
|
8 | 8 | } |
@@ -4,5 +4,5 @@ |
||
4 | 4 | |
5 | 5 | interface CommentRepositoryInterface |
6 | 6 | { |
7 | - public function getActiveCommentsBySite($site, $limit = null, $offset= 0); |
|
7 | + public function getActiveCommentsBySite($site, $limit = null, $offset = 0); |
|
8 | 8 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | * @param string $folder |
17 | 17 | * @return boolean |
18 | 18 | */ |
19 | -$buildFeed = function (Feed $feed, $folder, $name = 'rss') { |
|
19 | +$buildFeed = function(Feed $feed, $folder, $name = 'rss') { |
|
20 | 20 | $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml"; |
21 | 21 | $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml"; |
22 | 22 |
@@ -21,14 +21,14 @@ discard block |
||
21 | 21 | * @return boolean |
22 | 22 | */ |
23 | 23 | $buildFeed = function (Feed $feed, $folder, $name = 'rss') { |
24 | - $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml"; |
|
25 | - $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml"; |
|
24 | + $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml"; |
|
25 | + $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml"; |
|
26 | 26 | |
27 | - $feedHandle = fopen($tempFeed, 'w'); |
|
28 | - fwrite($feedHandle, $feed->render()); |
|
29 | - fclose($feedHandle); |
|
27 | + $feedHandle = fopen($tempFeed, 'w'); |
|
28 | + fwrite($feedHandle, $feed->render()); |
|
29 | + fclose($feedHandle); |
|
30 | 30 | |
31 | - rename($tempFeed, $finalFeed); |
|
31 | + rename($tempFeed, $finalFeed); |
|
32 | 32 | }; |
33 | 33 | |
34 | 34 | |
@@ -47,56 +47,56 @@ discard block |
||
47 | 47 | $activeBlogPosts = $blogPostRepository->getActivePosts(); |
48 | 48 | |
49 | 49 | foreach ($activeBlogPosts as $blogPost) { |
50 | - $blogPostItem = new Item(); |
|
51 | - |
|
52 | - $blogPostItem->title($blogPost['title']); |
|
53 | - |
|
54 | - $url = "https://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/"; |
|
55 | - $blogPostItem->url($url); |
|
56 | - $blogPostItem->guid($url, true); |
|
57 | - |
|
58 | - $description = $blogPost['body']; |
|
59 | - $description = strip_tags($description); |
|
60 | - $description = strtok($description, "\n"); |
|
61 | - if (strlen($description) > 250) { |
|
62 | - $description = wordwrap($description, 250); |
|
63 | - $description = strtok($description, "\n"); |
|
64 | - if (substr($description, -1) != '.') { |
|
65 | - $description .= '…'; |
|
66 | - } |
|
67 | - } |
|
68 | - $description = html_entity_decode($description); |
|
69 | - $blogPostItem->description($description); |
|
70 | - |
|
71 | - $categoryUrl = "https://blog.jacobemerick.com/{$blogPost['category']}/"; |
|
72 | - $blogPostItem->category($blogPost['category'], $categoryUrl); |
|
73 | - |
|
74 | - $pubDate = new DateTime($blogPost['date']); |
|
75 | - $blogPostItem->pubDate($pubDate->getTimestamp()); |
|
76 | - |
|
77 | - $firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large'); |
|
78 | - if (!empty($firstPhoto)) { |
|
79 | - $firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />'); |
|
80 | - $firstPhotoPath = current($firstPhotoPieces); |
|
81 | - $firstPhotoPath = trim($firstPhotoPath, '"'); |
|
82 | - |
|
83 | - $firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath; |
|
84 | - |
|
85 | - $firstPhotoSize = filesize($firstPhotoInternalPath); |
|
86 | - |
|
87 | - /** |
|
88 | - * ugh, remote host does not have pecl fileinfo |
|
89 | - * |
|
90 | - * $fInfo = new finfo(FILEINFO_MIME_TYPE); |
|
91 | - * $firstPhotoType = $fInfo->file($firstPhotoInternalPath); |
|
92 | - * unset($fInfo); |
|
93 | - **/ |
|
94 | - $firstPhotoType = 'image/jpeg'; |
|
95 | - |
|
96 | - $blogPostItem->enclosure("https://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType); |
|
97 | - } |
|
98 | - |
|
99 | - $blogPostItem->appendTo($blogPostChannel); |
|
50 | + $blogPostItem = new Item(); |
|
51 | + |
|
52 | + $blogPostItem->title($blogPost['title']); |
|
53 | + |
|
54 | + $url = "https://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/"; |
|
55 | + $blogPostItem->url($url); |
|
56 | + $blogPostItem->guid($url, true); |
|
57 | + |
|
58 | + $description = $blogPost['body']; |
|
59 | + $description = strip_tags($description); |
|
60 | + $description = strtok($description, "\n"); |
|
61 | + if (strlen($description) > 250) { |
|
62 | + $description = wordwrap($description, 250); |
|
63 | + $description = strtok($description, "\n"); |
|
64 | + if (substr($description, -1) != '.') { |
|
65 | + $description .= '…'; |
|
66 | + } |
|
67 | + } |
|
68 | + $description = html_entity_decode($description); |
|
69 | + $blogPostItem->description($description); |
|
70 | + |
|
71 | + $categoryUrl = "https://blog.jacobemerick.com/{$blogPost['category']}/"; |
|
72 | + $blogPostItem->category($blogPost['category'], $categoryUrl); |
|
73 | + |
|
74 | + $pubDate = new DateTime($blogPost['date']); |
|
75 | + $blogPostItem->pubDate($pubDate->getTimestamp()); |
|
76 | + |
|
77 | + $firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large'); |
|
78 | + if (!empty($firstPhoto)) { |
|
79 | + $firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />'); |
|
80 | + $firstPhotoPath = current($firstPhotoPieces); |
|
81 | + $firstPhotoPath = trim($firstPhotoPath, '"'); |
|
82 | + |
|
83 | + $firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath; |
|
84 | + |
|
85 | + $firstPhotoSize = filesize($firstPhotoInternalPath); |
|
86 | + |
|
87 | + /** |
|
88 | + * ugh, remote host does not have pecl fileinfo |
|
89 | + * |
|
90 | + * $fInfo = new finfo(FILEINFO_MIME_TYPE); |
|
91 | + * $firstPhotoType = $fInfo->file($firstPhotoInternalPath); |
|
92 | + * unset($fInfo); |
|
93 | + **/ |
|
94 | + $firstPhotoType = 'image/jpeg'; |
|
95 | + |
|
96 | + $blogPostItem->enclosure("https://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType); |
|
97 | + } |
|
98 | + |
|
99 | + $blogPostItem->appendTo($blogPostChannel); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $buildFeed($blogPostFeed, 'blog'); |
@@ -114,33 +114,33 @@ discard block |
||
114 | 114 | $activeBlogComments = $commentRepository->getActiveCommentsBySite('blog'); |
115 | 115 | |
116 | 116 | foreach ($activeBlogComments as $blogComment) { |
117 | - $blogCommentItem = new Item(); |
|
118 | - |
|
119 | - $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}"); |
|
120 | - |
|
121 | - $url = "https://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/"; |
|
122 | - $url .= "#comment-{$blogComment['id']}"; |
|
123 | - $blogCommentItem->url($url); |
|
124 | - $blogCommentItem->guid($url, true); |
|
125 | - |
|
126 | - $description = $blogComment['body']; |
|
127 | - $description = strip_tags($description); |
|
128 | - $description = strtok($description, "\n"); |
|
129 | - if (strlen($description) > 250) { |
|
130 | - $description = wordwrap($description, 250); |
|
131 | - $description = strtok($description, "\n"); |
|
132 | - if (substr($description, -1) != '.') { |
|
133 | - $description .= '…'; |
|
134 | - } |
|
135 | - } |
|
136 | - $description = html_entity_decode($description); |
|
137 | - $description = trim($description); |
|
138 | - $blogCommentItem->description($description); |
|
139 | - |
|
140 | - $pubDate = new DateTime($blogComment['date']); |
|
141 | - $blogCommentItem->pubDate($pubDate->getTimestamp()); |
|
142 | - |
|
143 | - $blogCommentItem->appendTo($blogCommentChannel); |
|
117 | + $blogCommentItem = new Item(); |
|
118 | + |
|
119 | + $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}"); |
|
120 | + |
|
121 | + $url = "https://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/"; |
|
122 | + $url .= "#comment-{$blogComment['id']}"; |
|
123 | + $blogCommentItem->url($url); |
|
124 | + $blogCommentItem->guid($url, true); |
|
125 | + |
|
126 | + $description = $blogComment['body']; |
|
127 | + $description = strip_tags($description); |
|
128 | + $description = strtok($description, "\n"); |
|
129 | + if (strlen($description) > 250) { |
|
130 | + $description = wordwrap($description, 250); |
|
131 | + $description = strtok($description, "\n"); |
|
132 | + if (substr($description, -1) != '.') { |
|
133 | + $description .= '…'; |
|
134 | + } |
|
135 | + } |
|
136 | + $description = html_entity_decode($description); |
|
137 | + $description = trim($description); |
|
138 | + $blogCommentItem->description($description); |
|
139 | + |
|
140 | + $pubDate = new DateTime($blogComment['date']); |
|
141 | + $blogCommentItem->pubDate($pubDate->getTimestamp()); |
|
142 | + |
|
143 | + $blogCommentItem->appendTo($blogCommentChannel); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | $buildFeed($blogCommentFeed, 'blog', 'rss-comments'); |
@@ -4,9 +4,9 @@ |
||
4 | 4 | |
5 | 5 | interface ActivityRepositoryInterface |
6 | 6 | { |
7 | - public function getActivityById($id); |
|
8 | - public function getActivities($limit = null, $offset = 0); |
|
9 | - public function getActivitiesCount(); |
|
10 | - public function getActivitiesByType($type, $limit = null, $offset = 0); |
|
11 | - public function getActivitiesByTypeCount($type); |
|
7 | + public function getActivityById($id); |
|
8 | + public function getActivities($limit = null, $offset = 0); |
|
9 | + public function getActivitiesCount(); |
|
10 | + public function getActivitiesByType($type, $limit = null, $offset = 0); |
|
11 | + public function getActivitiesByTypeCount($type); |
|
12 | 12 | } |
@@ -10,10 +10,10 @@ |
||
10 | 10 | |
11 | 11 | public function __construct() |
12 | 12 | { |
13 | - parent::__construct(); |
|
13 | + parent::__construct(); |
|
14 | 14 | |
15 | - global $container; |
|
16 | - $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']); |
|
15 | + global $container; |
|
16 | + $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | protected function set_head_data() |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @param string $domain |
27 | 27 | * @return boolean |
28 | 28 | */ |
29 | -$buildSitemap = function (array $entries, $domain, $folder) { |
|
29 | +$buildSitemap = function(array $entries, $domain, $folder) { |
|
30 | 30 | $urlSet = new Urlset(); |
31 | 31 | foreach ($entries as $path => $entry) { |
32 | 32 | $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
@@ -53,13 +53,13 @@ discard block |
||
53 | 53 | /********************************************* |
54 | 54 | * blog.jacobemerick.com |
55 | 55 | *********************************************/ |
56 | -$reduceToMostRecentBlogPost = function ($recentPost, $post) { |
|
56 | +$reduceToMostRecentBlogPost = function($recentPost, $post) { |
|
57 | 57 | if (is_null($recentPost)) { |
58 | 58 | return $post; |
59 | 59 | } |
60 | 60 | $postDate = new DateTime($post['date']); |
61 | 61 | $recentPostDate = new DateTime($recentPost['date']); |
62 | - return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
62 | + return ($postDate > $recentPostDate) ? $post : $recentPost; |
|
63 | 63 | }; |
64 | 64 | |
65 | 65 | $blogPostsPerPage = 10; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | ]; |
95 | 95 | |
96 | 96 | foreach ($blogCategoryArray as $blogCategory) { |
97 | - $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
97 | + $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) { |
|
98 | 98 | return $post['category'] == $blogCategory; |
99 | 99 | }); |
100 | 100 | $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
@@ -207,13 +207,13 @@ discard block |
||
207 | 207 | /********************************************* |
208 | 208 | * lifestream.jacobemerick.com |
209 | 209 | *********************************************/ |
210 | -$reduceToMostRecentStreamActivity = function ($recentActivity, $activity) { |
|
210 | +$reduceToMostRecentStreamActivity = function($recentActivity, $activity) { |
|
211 | 211 | if (is_null($recentActivity)) { |
212 | 212 | return $activity; |
213 | 213 | } |
214 | 214 | $activityDate = new DateTime($activity['datetime']); |
215 | 215 | $recentActivityDate = new DateTime($recentActivity['datetime']); |
216 | - return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
216 | + return ($activityDate > $recentActivityDate) ? $activity : $recentActivity; |
|
217 | 217 | }; |
218 | 218 | |
219 | 219 | $streamActivitiesPerPage = 15; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | ]; |
252 | 252 | |
253 | 253 | foreach ($streamTypeArray as $streamType) { |
254 | - $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
254 | + $streamTypeActivities = array_filter($streamActivities, function($post) use ($streamType) { |
|
255 | 255 | return $post['type'] == $streamType; |
256 | 256 | }); |
257 | 257 | $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
@@ -385,13 +385,13 @@ discard block |
||
385 | 385 | /********************************************* |
386 | 386 | * www.waterfallofthekeweenaw.com |
387 | 387 | *********************************************/ |
388 | -$reduceToMostRecentJournalLog = function ($recentLog, $log) { |
|
388 | +$reduceToMostRecentJournalLog = function($recentLog, $log) { |
|
389 | 389 | if (is_null($recentLog)) { |
390 | 390 | return $log; |
391 | 391 | } |
392 | 392 | $logDate = new DateTime($log['publish_date']); |
393 | 393 | $recentLogDate = new DateTime($recentLog['publish_date']); |
394 | - return ($logDate > $recentLogDate) ? log: $recentLog; |
|
394 | + return ($logDate > $recentLogDate) ? log : $recentLog; |
|
395 | 395 | }; |
396 | 396 | |
397 | 397 | $waterfallRepository = new WaterfallRepository($container['db_connection_locator']); |
@@ -27,26 +27,26 @@ discard block |
||
27 | 27 | * @return boolean |
28 | 28 | */ |
29 | 29 | $buildSitemap = function (array $entries, $domain, $folder) { |
30 | - $urlSet = new Urlset(); |
|
31 | - foreach ($entries as $path => $entry) { |
|
32 | - $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
|
33 | - $url->setLastMod($entry['lastmod']); // todo check if exists |
|
34 | - $url->setChangeFreq($entry['changefreq']); // todo check if exists |
|
35 | - $url->setPriority($entry['priority']); // todo check if exists |
|
36 | - $urlSet->addUrl($url); |
|
37 | - } |
|
38 | - |
|
39 | - $output = new Output(); |
|
40 | - $output->setIndentString(' '); // change indentation from 4 to 2 spaces |
|
41 | - |
|
42 | - $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml"; |
|
43 | - $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml"; |
|
44 | - |
|
45 | - $sitemapHandle = fopen($tempSitemap, 'w'); |
|
46 | - fwrite($sitemapHandle, $output->getOutput($urlSet)); |
|
47 | - fclose($sitemapHandle); |
|
48 | - |
|
49 | - rename($tempSitemap, $finalSitemap); |
|
30 | + $urlSet = new Urlset(); |
|
31 | + foreach ($entries as $path => $entry) { |
|
32 | + $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
|
33 | + $url->setLastMod($entry['lastmod']); // todo check if exists |
|
34 | + $url->setChangeFreq($entry['changefreq']); // todo check if exists |
|
35 | + $url->setPriority($entry['priority']); // todo check if exists |
|
36 | + $urlSet->addUrl($url); |
|
37 | + } |
|
38 | + |
|
39 | + $output = new Output(); |
|
40 | + $output->setIndentString(' '); // change indentation from 4 to 2 spaces |
|
41 | + |
|
42 | + $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml"; |
|
43 | + $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml"; |
|
44 | + |
|
45 | + $sitemapHandle = fopen($tempSitemap, 'w'); |
|
46 | + fwrite($sitemapHandle, $output->getOutput($urlSet)); |
|
47 | + fclose($sitemapHandle); |
|
48 | + |
|
49 | + rename($tempSitemap, $finalSitemap); |
|
50 | 50 | }; |
51 | 51 | |
52 | 52 | |
@@ -54,12 +54,12 @@ discard block |
||
54 | 54 | * blog.jacobemerick.com |
55 | 55 | *********************************************/ |
56 | 56 | $reduceToMostRecentBlogPost = function ($recentPost, $post) { |
57 | - if (is_null($recentPost)) { |
|
58 | - return $post; |
|
59 | - } |
|
60 | - $postDate = new DateTime($post['date']); |
|
61 | - $recentPostDate = new DateTime($recentPost['date']); |
|
62 | - return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
57 | + if (is_null($recentPost)) { |
|
58 | + return $post; |
|
59 | + } |
|
60 | + $postDate = new DateTime($post['date']); |
|
61 | + $recentPostDate = new DateTime($recentPost['date']); |
|
62 | + return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
63 | 63 | }; |
64 | 64 | |
65 | 65 | $blogPostsPerPage = 10; |
@@ -70,107 +70,107 @@ discard block |
||
70 | 70 | |
71 | 71 | // todo these post-level dates should be accurate to H:i:s |
72 | 72 | $entryArray = [ |
73 | - '/' => [ |
|
74 | - 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
75 | - 'changefreq' => 'daily', |
|
76 | - 'priority' => .9, |
|
77 | - ] |
|
73 | + '/' => [ |
|
74 | + 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
75 | + 'changefreq' => 'daily', |
|
76 | + 'priority' => .9, |
|
77 | + ] |
|
78 | 78 | ]; |
79 | 79 | for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) { |
80 | - $entryKey = "/{$i}/"; |
|
81 | - $entryArray += [ |
|
82 | - $entryKey => [ |
|
83 | - 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
84 | - 'changefreq' => 'daily', |
|
85 | - 'priority' => .1, |
|
86 | - ] |
|
87 | - ]; |
|
80 | + $entryKey = "/{$i}/"; |
|
81 | + $entryArray += [ |
|
82 | + $entryKey => [ |
|
83 | + 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
84 | + 'changefreq' => 'daily', |
|
85 | + 'priority' => .1, |
|
86 | + ] |
|
87 | + ]; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | $blogCategoryArray = [ |
91 | - 'hiking', |
|
92 | - 'personal', |
|
93 | - 'web-development', |
|
91 | + 'hiking', |
|
92 | + 'personal', |
|
93 | + 'web-development', |
|
94 | 94 | ]; |
95 | 95 | |
96 | 96 | foreach ($blogCategoryArray as $blogCategory) { |
97 | - $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
98 | - return $post['category'] == $blogCategory; |
|
99 | - }); |
|
100 | - $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
|
101 | - |
|
102 | - $entryKey = "/{$blogCategory}/"; |
|
103 | - $entryArray += [ |
|
104 | - $entryKey => [ |
|
105 | - 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
106 | - 'changefreq' => 'daily', |
|
107 | - 'priority' => .3, |
|
108 | - ] |
|
109 | - ]; |
|
110 | - |
|
111 | - for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) { |
|
112 | - $entryKey = "/{$blogCategory}/{$i}/"; |
|
113 | - $entryArray += [ |
|
114 | - $entryKey => [ |
|
115 | - 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
116 | - 'changefreq' => 'daily', |
|
117 | - 'priority' => .1, |
|
118 | - ] |
|
119 | - ]; |
|
120 | - } |
|
97 | + $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
98 | + return $post['category'] == $blogCategory; |
|
99 | + }); |
|
100 | + $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
|
101 | + |
|
102 | + $entryKey = "/{$blogCategory}/"; |
|
103 | + $entryArray += [ |
|
104 | + $entryKey => [ |
|
105 | + 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
106 | + 'changefreq' => 'daily', |
|
107 | + 'priority' => .3, |
|
108 | + ] |
|
109 | + ]; |
|
110 | + |
|
111 | + for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) { |
|
112 | + $entryKey = "/{$blogCategory}/{$i}/"; |
|
113 | + $entryArray += [ |
|
114 | + $entryKey => [ |
|
115 | + 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
116 | + 'changefreq' => 'daily', |
|
117 | + 'priority' => .1, |
|
118 | + ] |
|
119 | + ]; |
|
120 | + } |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | $blogTagRepository = new BlogTagRepository($container['db_connection_locator']); |
124 | 124 | $blogTags = $blogTagRepository->getAllTags(); |
125 | 125 | foreach ($blogTags as $blogTag) { |
126 | - $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']); |
|
127 | - if (count($blogPostsWithTag) < 1) { |
|
128 | - continue; |
|
129 | - } |
|
130 | - |
|
131 | - $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost); |
|
132 | - |
|
133 | - $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
134 | - $entryKey = "/tag/{$blogTagPath}/"; |
|
135 | - $entryArray += [ |
|
136 | - $entryKey => [ |
|
137 | - 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
138 | - 'changefreq' => 'daily', |
|
139 | - 'priority' => .1, |
|
140 | - ] |
|
141 | - ]; |
|
142 | - |
|
143 | - for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) { |
|
144 | - $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
145 | - $entryKey = "/tag/{$blogTagPath}/{$i}/"; |
|
146 | - $entryArray += [ |
|
147 | - $entryKey => [ |
|
148 | - 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
149 | - 'changefreq' => 'daily', |
|
150 | - 'priority' => .1, |
|
151 | - ] |
|
152 | - ]; |
|
153 | - } |
|
126 | + $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']); |
|
127 | + if (count($blogPostsWithTag) < 1) { |
|
128 | + continue; |
|
129 | + } |
|
130 | + |
|
131 | + $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost); |
|
132 | + |
|
133 | + $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
134 | + $entryKey = "/tag/{$blogTagPath}/"; |
|
135 | + $entryArray += [ |
|
136 | + $entryKey => [ |
|
137 | + 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
138 | + 'changefreq' => 'daily', |
|
139 | + 'priority' => .1, |
|
140 | + ] |
|
141 | + ]; |
|
142 | + |
|
143 | + for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) { |
|
144 | + $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
145 | + $entryKey = "/tag/{$blogTagPath}/{$i}/"; |
|
146 | + $entryArray += [ |
|
147 | + $entryKey => [ |
|
148 | + 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
149 | + 'changefreq' => 'daily', |
|
150 | + 'priority' => .1, |
|
151 | + ] |
|
152 | + ]; |
|
153 | + } |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | $reversedBlogPosts = array_reverse($activeBlogPosts); |
157 | 157 | foreach ($reversedBlogPosts as $blogPost) { |
158 | - $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/"; |
|
159 | - $entryArray += [ |
|
160 | - $entryKey => [ |
|
161 | - 'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment |
|
162 | - 'changefreq' => 'weekly', |
|
163 | - 'priority' => .8, |
|
164 | - ], |
|
165 | - ]; |
|
158 | + $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/"; |
|
159 | + $entryArray += [ |
|
160 | + $entryKey => [ |
|
161 | + 'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment |
|
162 | + 'changefreq' => 'weekly', |
|
163 | + 'priority' => .8, |
|
164 | + ], |
|
165 | + ]; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | $entryArray += [ |
169 | - '/about/' => [ |
|
170 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
171 | - 'changefreq' => 'monthly', |
|
172 | - 'priority' => .2, |
|
173 | - ] |
|
169 | + '/about/' => [ |
|
170 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
171 | + 'changefreq' => 'monthly', |
|
172 | + 'priority' => .2, |
|
173 | + ] |
|
174 | 174 | ]; |
175 | 175 | |
176 | 176 | $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog'); |
@@ -184,21 +184,21 @@ discard block |
||
184 | 184 | $mostRecentPost = current($mostRecentPost); |
185 | 185 | |
186 | 186 | $entryArray = [ |
187 | - '/' => [ |
|
188 | - 'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'), |
|
189 | - 'changefreq' => 'daily', |
|
190 | - 'priority' => 1, |
|
191 | - ], |
|
192 | - '/about/' => [ |
|
193 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
194 | - 'changefreq' => 'monthly', |
|
195 | - 'priority' => .4, |
|
196 | - ], |
|
197 | - '/contact/' => [ |
|
198 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
199 | - 'changefreq' => 'monthly', |
|
200 | - 'priority' => .3, |
|
201 | - ], |
|
187 | + '/' => [ |
|
188 | + 'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'), |
|
189 | + 'changefreq' => 'daily', |
|
190 | + 'priority' => 1, |
|
191 | + ], |
|
192 | + '/about/' => [ |
|
193 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
194 | + 'changefreq' => 'monthly', |
|
195 | + 'priority' => .4, |
|
196 | + ], |
|
197 | + '/contact/' => [ |
|
198 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
199 | + 'changefreq' => 'monthly', |
|
200 | + 'priority' => .3, |
|
201 | + ], |
|
202 | 202 | ]; |
203 | 203 | |
204 | 204 | $buildSitemap($entryArray, 'http://home.jacobemerick.com', 'home'); |
@@ -208,12 +208,12 @@ discard block |
||
208 | 208 | * lifestream.jacobemerick.com |
209 | 209 | *********************************************/ |
210 | 210 | $reduceToMostRecentStreamActivity = function ($recentActivity, $activity) { |
211 | - if (is_null($recentActivity)) { |
|
212 | - return $activity; |
|
213 | - } |
|
214 | - $activityDate = new DateTime($activity['datetime']); |
|
215 | - $recentActivityDate = new DateTime($recentActivity['datetime']); |
|
216 | - return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
211 | + if (is_null($recentActivity)) { |
|
212 | + return $activity; |
|
213 | + } |
|
214 | + $activityDate = new DateTime($activity['datetime']); |
|
215 | + $recentActivityDate = new DateTime($recentActivity['datetime']); |
|
216 | + return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
217 | 217 | }; |
218 | 218 | |
219 | 219 | $streamActivitiesPerPage = 15; |
@@ -223,78 +223,78 @@ discard block |
||
223 | 223 | $mostRecentStreamActivity = array_reduce($streamActivities, $reduceToMostRecentStreamActivity); |
224 | 224 | |
225 | 225 | $entryArray = [ |
226 | - '/' => [ |
|
227 | - 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
228 | - 'changefreq' => 'hourly', |
|
229 | - 'priority' => .9, |
|
230 | - ] |
|
226 | + '/' => [ |
|
227 | + 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
228 | + 'changefreq' => 'hourly', |
|
229 | + 'priority' => .9, |
|
230 | + ] |
|
231 | 231 | ]; |
232 | 232 | for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamActivities); $i++) { |
233 | - $entryKey = "/page/{$i}/"; |
|
234 | - $entryArray += [ |
|
235 | - $entryKey => [ |
|
236 | - 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
237 | - 'changefreq' => 'hourly', |
|
238 | - 'priority' => .1, |
|
239 | - ] |
|
240 | - ]; |
|
233 | + $entryKey = "/page/{$i}/"; |
|
234 | + $entryArray += [ |
|
235 | + $entryKey => [ |
|
236 | + 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
237 | + 'changefreq' => 'hourly', |
|
238 | + 'priority' => .1, |
|
239 | + ] |
|
240 | + ]; |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | $streamTypeArray = [ |
244 | - 'blog', |
|
245 | - 'books', |
|
246 | - 'distance', |
|
247 | - 'github', |
|
248 | - 'hulu', |
|
249 | - 'twitter', |
|
250 | - 'youtube', |
|
244 | + 'blog', |
|
245 | + 'books', |
|
246 | + 'distance', |
|
247 | + 'github', |
|
248 | + 'hulu', |
|
249 | + 'twitter', |
|
250 | + 'youtube', |
|
251 | 251 | ]; |
252 | 252 | |
253 | 253 | foreach ($streamTypeArray as $streamType) { |
254 | - $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
255 | - return $post['type'] == $streamType; |
|
256 | - }); |
|
257 | - $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
|
258 | - |
|
259 | - $entryKey = "/{$streamType}/"; |
|
260 | - $entryArray += [ |
|
261 | - $entryKey => [ |
|
262 | - 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
263 | - 'changefreq' => 'hourly', |
|
264 | - 'priority' => .3, |
|
265 | - ] |
|
266 | - ]; |
|
267 | - |
|
268 | - for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) { |
|
269 | - $entryKey = "/{$streamType}/page/{$i}/"; |
|
270 | - $entryArray += [ |
|
271 | - $entryKey => [ |
|
272 | - 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
273 | - 'changefreq' => 'hourly', |
|
274 | - 'priority' => .1, |
|
275 | - ] |
|
276 | - ]; |
|
277 | - } |
|
254 | + $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
255 | + return $post['type'] == $streamType; |
|
256 | + }); |
|
257 | + $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
|
258 | + |
|
259 | + $entryKey = "/{$streamType}/"; |
|
260 | + $entryArray += [ |
|
261 | + $entryKey => [ |
|
262 | + 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
263 | + 'changefreq' => 'hourly', |
|
264 | + 'priority' => .3, |
|
265 | + ] |
|
266 | + ]; |
|
267 | + |
|
268 | + for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) { |
|
269 | + $entryKey = "/{$streamType}/page/{$i}/"; |
|
270 | + $entryArray += [ |
|
271 | + $entryKey => [ |
|
272 | + 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
273 | + 'changefreq' => 'hourly', |
|
274 | + 'priority' => .1, |
|
275 | + ] |
|
276 | + ]; |
|
277 | + } |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | $reversedStreamActivities = array_reverse($streamActivities); |
281 | 281 | foreach ($reversedStreamActivities as $streamActivity) { |
282 | - $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/"; |
|
283 | - $entryArray += [ |
|
284 | - $entryKey => [ |
|
285 | - 'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'), |
|
286 | - 'changefreq' => 'never', |
|
287 | - 'priority' => .5, |
|
288 | - ], |
|
289 | - ]; |
|
282 | + $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/"; |
|
283 | + $entryArray += [ |
|
284 | + $entryKey => [ |
|
285 | + 'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'), |
|
286 | + 'changefreq' => 'never', |
|
287 | + 'priority' => .5, |
|
288 | + ], |
|
289 | + ]; |
|
290 | 290 | } |
291 | 291 | |
292 | 292 | $entryArray += [ |
293 | - '/about/' => [ |
|
294 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
295 | - 'changefreq' => 'monthly', |
|
296 | - 'priority' => .7, |
|
297 | - ] |
|
293 | + '/about/' => [ |
|
294 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
295 | + 'changefreq' => 'monthly', |
|
296 | + 'priority' => .7, |
|
297 | + ] |
|
298 | 298 | ]; |
299 | 299 | |
300 | 300 | $buildSitemap($entryArray, 'http://lifestream.jacobemerick.com', 'lifestream'); |
@@ -307,43 +307,43 @@ discard block |
||
307 | 307 | $portfolioPieces = $portfolioRepository->getPieces(); |
308 | 308 | |
309 | 309 | $entryArray = [ |
310 | - '/' => [ |
|
311 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
312 | - 'changefreq' => 'weekly', |
|
313 | - 'priority' => 1, |
|
314 | - ], |
|
315 | - '/print/' => [ |
|
316 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
317 | - 'changefreq' => 'never', |
|
318 | - 'priority' => .1, |
|
319 | - ], |
|
320 | - '/web/' => [ |
|
321 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
322 | - 'changefreq' => 'never', |
|
323 | - 'priority' => .1, |
|
324 | - ], |
|
325 | - '/contact/' => [ |
|
326 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
327 | - 'changefreq' => 'never', |
|
328 | - 'priority' => .4, |
|
329 | - ], |
|
330 | - '/resume/' => [ |
|
331 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
332 | - 'changefreq' => 'yearly', |
|
333 | - 'priority' => .9, |
|
334 | - ], |
|
310 | + '/' => [ |
|
311 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
312 | + 'changefreq' => 'weekly', |
|
313 | + 'priority' => 1, |
|
314 | + ], |
|
315 | + '/print/' => [ |
|
316 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
317 | + 'changefreq' => 'never', |
|
318 | + 'priority' => .1, |
|
319 | + ], |
|
320 | + '/web/' => [ |
|
321 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
322 | + 'changefreq' => 'never', |
|
323 | + 'priority' => .1, |
|
324 | + ], |
|
325 | + '/contact/' => [ |
|
326 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
327 | + 'changefreq' => 'never', |
|
328 | + 'priority' => .4, |
|
329 | + ], |
|
330 | + '/resume/' => [ |
|
331 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
332 | + 'changefreq' => 'yearly', |
|
333 | + 'priority' => .9, |
|
334 | + ], |
|
335 | 335 | ]; |
336 | 336 | |
337 | 337 | foreach ($portfolioPieces as $portfolioPiece) { |
338 | - $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print'; |
|
339 | - $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/"; |
|
340 | - $entryArray += [ |
|
341 | - $entryKey => [ |
|
342 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
343 | - 'changefreq' => 'never', |
|
344 | - 'priority' => .7, |
|
345 | - ], |
|
346 | - ]; |
|
338 | + $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print'; |
|
339 | + $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/"; |
|
340 | + $entryArray += [ |
|
341 | + $entryKey => [ |
|
342 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
343 | + 'changefreq' => 'never', |
|
344 | + 'priority' => .7, |
|
345 | + ], |
|
346 | + ]; |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | $buildSitemap($entryArray, 'http://portfolio.jacobemerick.com', 'portfolio'); |
@@ -357,26 +357,26 @@ discard block |
||
357 | 357 | $mostRecentChange = current($mostRecentChange); |
358 | 358 | |
359 | 359 | $entryArray = [ |
360 | - '/' => [ |
|
361 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
362 | - 'changefreq' => 'weekly', |
|
363 | - 'priority' => 1, |
|
364 | - ], |
|
365 | - '/terms/' => [ |
|
366 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
367 | - 'changefreq' => 'weekly', |
|
368 | - 'priority' => .3, |
|
369 | - ], |
|
370 | - '/change-log/' => [ |
|
371 | - 'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'), |
|
372 | - 'changefreq' => 'daily', |
|
373 | - 'priority' => .1, |
|
374 | - ], |
|
375 | - '/contact/' => [ |
|
376 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
377 | - 'changefreq' => 'weekly', |
|
378 | - 'priority' => .6, |
|
379 | - ], |
|
360 | + '/' => [ |
|
361 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
362 | + 'changefreq' => 'weekly', |
|
363 | + 'priority' => 1, |
|
364 | + ], |
|
365 | + '/terms/' => [ |
|
366 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
367 | + 'changefreq' => 'weekly', |
|
368 | + 'priority' => .3, |
|
369 | + ], |
|
370 | + '/change-log/' => [ |
|
371 | + 'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'), |
|
372 | + 'changefreq' => 'daily', |
|
373 | + 'priority' => .1, |
|
374 | + ], |
|
375 | + '/contact/' => [ |
|
376 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
377 | + 'changefreq' => 'weekly', |
|
378 | + 'priority' => .6, |
|
379 | + ], |
|
380 | 380 | ]; |
381 | 381 | |
382 | 382 | $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site'); |
@@ -386,108 +386,108 @@ discard block |
||
386 | 386 | * www.waterfallofthekeweenaw.com |
387 | 387 | *********************************************/ |
388 | 388 | $reduceToMostRecentJournalLog = function ($recentLog, $log) { |
389 | - if (is_null($recentLog)) { |
|
390 | - return $log; |
|
391 | - } |
|
392 | - $logDate = new DateTime($log['publish_date']); |
|
393 | - $recentLogDate = new DateTime($recentLog['publish_date']); |
|
394 | - return ($logDate > $recentLogDate) ? log: $recentLog; |
|
389 | + if (is_null($recentLog)) { |
|
390 | + return $log; |
|
391 | + } |
|
392 | + $logDate = new DateTime($log['publish_date']); |
|
393 | + $recentLogDate = new DateTime($recentLog['publish_date']); |
|
394 | + return ($logDate > $recentLogDate) ? log: $recentLog; |
|
395 | 395 | }; |
396 | 396 | |
397 | 397 | $waterfallRepository = new WaterfallRepository($container['db_connection_locator']); |
398 | 398 | $waterfallList = $waterfallRepository->getWaterfalls(); |
399 | 399 | |
400 | 400 | $entryArray = [ |
401 | - '/' => [ |
|
402 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
403 | - 'changefreq' => 'daily', |
|
404 | - 'priority' => 1, |
|
405 | - ], |
|
406 | - '/falls/' => [ |
|
407 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
408 | - 'changefreq' => 'weekly', |
|
409 | - 'priority' => .3, |
|
410 | - ], |
|
401 | + '/' => [ |
|
402 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
403 | + 'changefreq' => 'daily', |
|
404 | + 'priority' => 1, |
|
405 | + ], |
|
406 | + '/falls/' => [ |
|
407 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
408 | + 'changefreq' => 'weekly', |
|
409 | + 'priority' => .3, |
|
410 | + ], |
|
411 | 411 | ]; |
412 | 412 | |
413 | 413 | for ($i = 2; (($i - 1) * 24) < count($waterfallList); $i++) { |
414 | - $entryKey = "/falls/{$i}/"; |
|
415 | - $entryArray += [ |
|
416 | - $entryKey => [ |
|
417 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
418 | - 'changefreq' => 'weekly', |
|
419 | - 'priority' => .1, |
|
420 | - ] |
|
421 | - ]; |
|
414 | + $entryKey = "/falls/{$i}/"; |
|
415 | + $entryArray += [ |
|
416 | + $entryKey => [ |
|
417 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
418 | + 'changefreq' => 'weekly', |
|
419 | + 'priority' => .1, |
|
420 | + ] |
|
421 | + ]; |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | $waterfallCountyRepository = new WaterfallCountyRepository($container['db_connection_locator']); |
425 | 425 | $waterfallCountyList = $waterfallCountyRepository->getCountyList(); |
426 | 426 | |
427 | 427 | foreach ($waterfallCountyList as $waterfallCounty) { |
428 | - $entryKey = "/{$waterfallCounty['alias']}/"; |
|
429 | - $entryArray += [ |
|
430 | - $entryKey => [ |
|
431 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
432 | - 'changefreq' => 'monthly', |
|
433 | - 'priority' => .6 |
|
434 | - ] |
|
435 | - ]; |
|
436 | - |
|
437 | - for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) { |
|
438 | - $entryKey = "/{$waterfallCounty['alias']}/{$i}/"; |
|
439 | - $entryArray += [ |
|
440 | - $entryKey => [ |
|
441 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
442 | - 'changefreq' => 'monthly', |
|
443 | - 'priority' => .1 |
|
444 | - ] |
|
445 | - ]; |
|
446 | - } |
|
428 | + $entryKey = "/{$waterfallCounty['alias']}/"; |
|
429 | + $entryArray += [ |
|
430 | + $entryKey => [ |
|
431 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
432 | + 'changefreq' => 'monthly', |
|
433 | + 'priority' => .6 |
|
434 | + ] |
|
435 | + ]; |
|
436 | + |
|
437 | + for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) { |
|
438 | + $entryKey = "/{$waterfallCounty['alias']}/{$i}/"; |
|
439 | + $entryArray += [ |
|
440 | + $entryKey => [ |
|
441 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
442 | + 'changefreq' => 'monthly', |
|
443 | + 'priority' => .1 |
|
444 | + ] |
|
445 | + ]; |
|
446 | + } |
|
447 | 447 | } |
448 | 448 | |
449 | 449 | $waterfallWatercourseRepository = new WaterfallWatercourseRepository($container['db_connection_locator']); |
450 | 450 | $waterfallWatercourseList = $waterfallWatercourseRepository->getWatercourseList(); |
451 | 451 | |
452 | 452 | foreach ($waterfallWatercourseList as $waterfallWatercourse) { |
453 | - $entryKey = "/{$waterfallWatercourse['alias']}/"; |
|
454 | - $entryArray += [ |
|
455 | - $entryKey => [ |
|
456 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
457 | - 'changefreq' => 'monthly', |
|
458 | - 'priority' => .6 |
|
459 | - ] |
|
460 | - ]; |
|
461 | - |
|
462 | - for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) { |
|
463 | - $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/"; |
|
464 | - $entryArray += [ |
|
465 | - $entryKey => [ |
|
466 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
467 | - 'changefreq' => 'monthly', |
|
468 | - 'priority' => .1 |
|
469 | - ] |
|
470 | - ]; |
|
471 | - } |
|
453 | + $entryKey = "/{$waterfallWatercourse['alias']}/"; |
|
454 | + $entryArray += [ |
|
455 | + $entryKey => [ |
|
456 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
457 | + 'changefreq' => 'monthly', |
|
458 | + 'priority' => .6 |
|
459 | + ] |
|
460 | + ]; |
|
461 | + |
|
462 | + for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) { |
|
463 | + $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/"; |
|
464 | + $entryArray += [ |
|
465 | + $entryKey => [ |
|
466 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
467 | + 'changefreq' => 'monthly', |
|
468 | + 'priority' => .1 |
|
469 | + ] |
|
470 | + ]; |
|
471 | + } |
|
472 | 472 | } |
473 | 473 | |
474 | 474 | foreach ($waterfallList as $waterfall) { |
475 | - $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/"; |
|
476 | - $entryArray += [ |
|
477 | - $entryKey => [ |
|
478 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
479 | - 'changefreq' => 'weekly', |
|
480 | - 'priority' => .8, |
|
481 | - ], |
|
482 | - ]; |
|
475 | + $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/"; |
|
476 | + $entryArray += [ |
|
477 | + $entryKey => [ |
|
478 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
479 | + 'changefreq' => 'weekly', |
|
480 | + 'priority' => .8, |
|
481 | + ], |
|
482 | + ]; |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | $entryArray += [ |
486 | - '/map/' => [ |
|
487 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
488 | - 'changefreq' => 'monthly', |
|
489 | - 'priority' => .6, |
|
490 | - ] |
|
486 | + '/map/' => [ |
|
487 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
488 | + 'changefreq' => 'monthly', |
|
489 | + 'priority' => .6, |
|
490 | + ] |
|
491 | 491 | ]; |
492 | 492 | |
493 | 493 | $waterfallLogRepository = new WaterfallLogRepository($container['db_connection_locator']); |
@@ -496,91 +496,91 @@ discard block |
||
496 | 496 | $mostRecentWaterfallLog = array_reduce($activeWaterfallLogs, $reduceToMostRecentJournalLog); |
497 | 497 | |
498 | 498 | $entryArray += [ |
499 | - '/journal/' => [ |
|
500 | - 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
501 | - 'changefreq' => 'weekly', |
|
502 | - 'priority' => .3, |
|
503 | - ], |
|
499 | + '/journal/' => [ |
|
500 | + 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
501 | + 'changefreq' => 'weekly', |
|
502 | + 'priority' => .3, |
|
503 | + ], |
|
504 | 504 | ]; |
505 | 505 | |
506 | 506 | for ($i = 2; (($i - 1) * 10) < count($activeWaterfallLogs); $i++) { |
507 | - $entryKey = "/journal/{$i}/"; |
|
508 | - $entryArray += [ |
|
509 | - $entryKey => [ |
|
510 | - 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
511 | - 'changefreq' => 'weekly', |
|
512 | - 'priority' => .1, |
|
513 | - ] |
|
514 | - ]; |
|
507 | + $entryKey = "/journal/{$i}/"; |
|
508 | + $entryArray += [ |
|
509 | + $entryKey => [ |
|
510 | + 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
511 | + 'changefreq' => 'weekly', |
|
512 | + 'priority' => .1, |
|
513 | + ] |
|
514 | + ]; |
|
515 | 515 | } |
516 | 516 | |
517 | 517 | $waterfallCompanionRepository = new WaterfallCompanionRepository($container['db_connection_locator']); |
518 | 518 | $waterfallCompanionList = $waterfallCompanionRepository->getCompanionList(); |
519 | 519 | |
520 | 520 | foreach ($waterfallCompanionList as $waterfallCompanion) { |
521 | - $entryKey = "/companion/{$waterfallCompanion['alias']}/"; |
|
522 | - $entryArray += [ |
|
523 | - $entryKey => [ |
|
524 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
525 | - 'changefreq' => 'monthly', |
|
526 | - 'priority' => .2 |
|
527 | - ] |
|
528 | - ]; |
|
529 | - |
|
530 | - for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) { |
|
531 | - $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/"; |
|
532 | - $entryArray += [ |
|
533 | - $entryKey => [ |
|
534 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
535 | - 'changefreq' => 'monthly', |
|
536 | - 'priority' => .1 |
|
537 | - ] |
|
538 | - ]; |
|
539 | - } |
|
521 | + $entryKey = "/companion/{$waterfallCompanion['alias']}/"; |
|
522 | + $entryArray += [ |
|
523 | + $entryKey => [ |
|
524 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
525 | + 'changefreq' => 'monthly', |
|
526 | + 'priority' => .2 |
|
527 | + ] |
|
528 | + ]; |
|
529 | + |
|
530 | + for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) { |
|
531 | + $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/"; |
|
532 | + $entryArray += [ |
|
533 | + $entryKey => [ |
|
534 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
535 | + 'changefreq' => 'monthly', |
|
536 | + 'priority' => .1 |
|
537 | + ] |
|
538 | + ]; |
|
539 | + } |
|
540 | 540 | } |
541 | 541 | |
542 | 542 | $waterfallPeriodRepository = new WaterfallPeriodRepository($container['db_connection_locator']); |
543 | 543 | $waterfallPeriodList = $waterfallPeriodRepository->getPeriodList(); |
544 | 544 | |
545 | 545 | foreach ($waterfallPeriodList as $waterfallPeriod) { |
546 | - $entryKey = "/period/{$waterfallPeriod['alias']}/"; |
|
547 | - $entryArray += [ |
|
548 | - $entryKey => [ |
|
549 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
550 | - 'changefreq' => 'monthly', |
|
551 | - 'priority' => .2 |
|
552 | - ] |
|
553 | - ]; |
|
554 | - |
|
555 | - for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) { |
|
556 | - $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/"; |
|
557 | - $entryArray += [ |
|
558 | - $entryKey => [ |
|
559 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
560 | - 'changefreq' => 'monthly', |
|
561 | - 'priority' => .1 |
|
562 | - ] |
|
563 | - ]; |
|
564 | - } |
|
546 | + $entryKey = "/period/{$waterfallPeriod['alias']}/"; |
|
547 | + $entryArray += [ |
|
548 | + $entryKey => [ |
|
549 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
550 | + 'changefreq' => 'monthly', |
|
551 | + 'priority' => .2 |
|
552 | + ] |
|
553 | + ]; |
|
554 | + |
|
555 | + for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) { |
|
556 | + $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/"; |
|
557 | + $entryArray += [ |
|
558 | + $entryKey => [ |
|
559 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
560 | + 'changefreq' => 'monthly', |
|
561 | + 'priority' => .1 |
|
562 | + ] |
|
563 | + ]; |
|
564 | + } |
|
565 | 565 | } |
566 | 566 | |
567 | 567 | foreach ($activeWaterfallLogs as $waterfallLog) { |
568 | - $entryKey = "/journal/{$waterfallLog['alias']}/"; |
|
569 | - $entryArray += [ |
|
570 | - $entryKey => [ |
|
571 | - 'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'), |
|
572 | - 'changefreq' => 'weekly', |
|
573 | - 'priority' => .4, |
|
574 | - ], |
|
575 | - ]; |
|
568 | + $entryKey = "/journal/{$waterfallLog['alias']}/"; |
|
569 | + $entryArray += [ |
|
570 | + $entryKey => [ |
|
571 | + 'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'), |
|
572 | + 'changefreq' => 'weekly', |
|
573 | + 'priority' => .4, |
|
574 | + ], |
|
575 | + ]; |
|
576 | 576 | } |
577 | 577 | |
578 | 578 | $entryArray += [ |
579 | - '/about/' => [ |
|
580 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
581 | - 'changefreq' => 'monthly', |
|
582 | - 'priority' => .6, |
|
583 | - ] |
|
579 | + '/about/' => [ |
|
580 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
581 | + 'changefreq' => 'monthly', |
|
582 | + 'priority' => .6, |
|
583 | + ] |
|
584 | 584 | ]; |
585 | 585 | |
586 | 586 | $buildSitemap($entryArray, 'http://www.waterfallsofthekeweenaw.com', 'waterfalls'); |
@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | $this->add_posts($youtube_result, 'youtube'); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $type |
|
64 | + */ |
|
62 | 65 | private function remove_existing($result, $type) |
63 | 66 | { |
64 | 67 | foreach($result as $key => $row) |
@@ -70,6 +73,9 @@ discard block |
||
70 | 73 | return $result; |
71 | 74 | } |
72 | 75 | |
76 | + /** |
|
77 | + * @param string $type |
|
78 | + */ |
|
73 | 79 | private function add_posts($result, $type) |
74 | 80 | { |
75 | 81 | foreach($result as $row) |
@@ -17,14 +17,14 @@ discard block |
||
17 | 17 | |
18 | 18 | public static function instance() |
19 | 19 | { |
20 | - if(!isset(self::$instance)) |
|
20 | + if (!isset(self::$instance)) |
|
21 | 21 | self::$instance = new Loader(); |
22 | 22 | return self::$instance; |
23 | 23 | } |
24 | 24 | |
25 | 25 | private function get_root() |
26 | 26 | { |
27 | - if(!isset($this->root)) |
|
27 | + if (!isset($this->root)) |
|
28 | 28 | { |
29 | 29 | $current_directory = dirname(__FILE__); |
30 | 30 | $current_directory = substr($current_directory, 0, -7); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | private static function get_extension($type) |
54 | 54 | { |
55 | - switch($type) |
|
55 | + switch ($type) |
|
56 | 56 | { |
57 | 57 | case 'collector' : |
58 | 58 | case 'controller' : |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | |
105 | 105 | public static function load($type, $files, $data = array()) |
106 | 106 | { |
107 | - foreach((array) $files as $file) |
|
107 | + foreach ((array) $files as $file) |
|
108 | 108 | { |
109 | 109 | $file_path = self::instance()->get_path($type, $file); |
110 | - if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') |
|
110 | + if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') |
|
111 | 111 | continue; |
112 | 112 | |
113 | 113 | // if(!file_exists($file_path)) |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | self::instance()->add_included_file($file_path); |
117 | 117 | |
118 | - switch($type) |
|
118 | + switch ($type) |
|
119 | 119 | { |
120 | 120 | case 'images' : |
121 | 121 | case 'scripts' : |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | $reflectionObject = self::create_reflection_class($file); |
147 | 147 | |
148 | - if( |
|
148 | + if ( |
|
149 | 149 | $reflectionObject->hasMethod('instance') && |
150 | 150 | $reflectionObject->getMethod('instance')->isStatic()) |
151 | 151 | { |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | $reflectionObject = self::create_reflection_class($file); |
162 | 162 | |
163 | - if($reflectionObject->hasMethod('__construct')) |
|
163 | + if ($reflectionObject->hasMethod('__construct')) |
|
164 | 164 | return $reflectionObject->newInstanceArgs($data); |
165 | 165 | else |
166 | 166 | return $reflectionObject->newInstance(); |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | |
18 | 18 | public static function instance() |
19 | 19 | { |
20 | - if(!isset(self::$instance)) |
|
21 | - self::$instance = new Loader(); |
|
20 | + if(!isset(self::$instance)) { |
|
21 | + self::$instance = new Loader(); |
|
22 | + } |
|
22 | 23 | return self::$instance; |
23 | 24 | } |
24 | 25 | |
@@ -107,8 +108,9 @@ discard block |
||
107 | 108 | foreach((array) $files as $file) |
108 | 109 | { |
109 | 110 | $file_path = self::instance()->get_path($type, $file); |
110 | - if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') |
|
111 | - continue; |
|
111 | + if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') { |
|
112 | + continue; |
|
113 | + } |
|
112 | 114 | |
113 | 115 | // if(!file_exists($file_path)) |
114 | 116 | // Debugger::logMessage("Requested file does not exist: {$type}, {$file}"); |
@@ -160,10 +162,11 @@ discard block |
||
160 | 162 | |
161 | 163 | $reflectionObject = self::create_reflection_class($file); |
162 | 164 | |
163 | - if($reflectionObject->hasMethod('__construct')) |
|
164 | - return $reflectionObject->newInstanceArgs($data); |
|
165 | - else |
|
166 | - return $reflectionObject->newInstance(); |
|
165 | + if($reflectionObject->hasMethod('__construct')) { |
|
166 | + return $reflectionObject->newInstanceArgs($data); |
|
167 | + } else { |
|
168 | + return $reflectionObject->newInstance(); |
|
169 | + } |
|
167 | 170 | } |
168 | 171 | |
169 | 172 | public static function getRoot() |
@@ -173,17 +173,17 @@ |
||
173 | 173 | return self::instance()->is_live; |
174 | 174 | } |
175 | 175 | |
176 | - public static function getRootURL($site = '') |
|
177 | - { |
|
178 | - if (strlen($site) > 0) { |
|
179 | - $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
180 | - if ($site == 'waterfalls' && self::instance()->is_live) { |
|
181 | - return "{$protocol}://www.waterfallsofthekeweenaw.com/"; |
|
182 | - } else { |
|
183 | - return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
184 | - } |
|
185 | - } |
|
186 | - return '/'; |
|
187 | - } |
|
176 | + public static function getRootURL($site = '') |
|
177 | + { |
|
178 | + if (strlen($site) > 0) { |
|
179 | + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
180 | + if ($site == 'waterfalls' && self::instance()->is_live) { |
|
181 | + return "{$protocol}://www.waterfallsofthekeweenaw.com/"; |
|
182 | + } else { |
|
183 | + return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
184 | + } |
|
185 | + } |
|
186 | + return '/'; |
|
187 | + } |
|
188 | 188 | |
189 | 189 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | (object) array( |
20 | 20 | 'match' => '/get/portfolioImage.json', |
21 | 21 | 'controller' => 'GetPortfolioImageController'), |
22 | - ); |
|
22 | + ); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | } |
@@ -22,28 +22,28 @@ |
||
22 | 22 | |
23 | 23 | // sets up shutdown function to display profiler |
24 | 24 | register_shutdown_function(function () use ($container) { |
25 | - if ( |
|
26 | - !isset($_COOKIE['debugger']) || |
|
27 | - $_COOKIE['debugger'] != 'display' |
|
28 | - ) { |
|
29 | - return; |
|
30 | - } |
|
31 | - |
|
32 | - $dbProfiles = $container['db_connection_locator'] |
|
33 | - ->getRead() |
|
34 | - ->getProfiler() |
|
35 | - ->getProfiles(); |
|
36 | - $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
37 | - return $profile['function'] == 'perform'; |
|
38 | - }); |
|
39 | - $dbProfiles = array_map(function ($profile) { |
|
40 | - return [ |
|
41 | - 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
|
42 | - 'parameters' => $profile['bind_values'], |
|
43 | - 'time' => $profile['duration'], |
|
44 | - ]; |
|
45 | - }, $dbProfiles); |
|
46 | - $container['profiler']->setProfiledQueries($dbProfiles); |
|
47 | - $container['profiler']->setDisplay(new Particletree\Pqp\Display()); |
|
48 | - $container['profiler']->display($container['db_connection_locator']->getRead()); |
|
25 | + if ( |
|
26 | + !isset($_COOKIE['debugger']) || |
|
27 | + $_COOKIE['debugger'] != 'display' |
|
28 | + ) { |
|
29 | + return; |
|
30 | + } |
|
31 | + |
|
32 | + $dbProfiles = $container['db_connection_locator'] |
|
33 | + ->getRead() |
|
34 | + ->getProfiler() |
|
35 | + ->getProfiles(); |
|
36 | + $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
37 | + return $profile['function'] == 'perform'; |
|
38 | + }); |
|
39 | + $dbProfiles = array_map(function ($profile) { |
|
40 | + return [ |
|
41 | + 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
|
42 | + 'parameters' => $profile['bind_values'], |
|
43 | + 'time' => $profile['duration'], |
|
44 | + ]; |
|
45 | + }, $dbProfiles); |
|
46 | + $container['profiler']->setProfiledQueries($dbProfiles); |
|
47 | + $container['profiler']->setDisplay(new Particletree\Pqp\Display()); |
|
48 | + $container['profiler']->display($container['db_connection_locator']->getRead()); |
|
49 | 49 | }); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | |
23 | 23 | // sets up shutdown function to display profiler |
24 | -register_shutdown_function(function () use ($container) { |
|
24 | +register_shutdown_function(function() use ($container) { |
|
25 | 25 | if ( |
26 | 26 | !isset($_COOKIE['debugger']) || |
27 | 27 | $_COOKIE['debugger'] != 'display' |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | ->getRead() |
34 | 34 | ->getProfiler() |
35 | 35 | ->getProfiles(); |
36 | - $dbProfiles = array_filter($dbProfiles, function ($profile) { |
|
36 | + $dbProfiles = array_filter($dbProfiles, function($profile) { |
|
37 | 37 | return $profile['function'] == 'perform'; |
38 | 38 | }); |
39 | - $dbProfiles = array_map(function ($profile) { |
|
39 | + $dbProfiles = array_map(function($profile) { |
|
40 | 40 | return [ |
41 | 41 | 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])), |
42 | 42 | 'parameters' => $profile['bind_values'], |