@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | $portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2); |
42 | 42 | |
43 | - $image_path = "portfolio/{$portfolio_image_result[0]->name}"; |
|
44 | - $image_path = Loader::getImagePath('image', $image_path); |
|
45 | - $image_size = getimagesize($image_path); |
|
43 | + $image_path = "portfolio/{$portfolio_image_result[0]->name}"; |
|
44 | + $image_path = Loader::getImagePath('image', $image_path); |
|
45 | + $image_size = getimagesize($image_path); |
|
46 | 46 | |
47 | 47 | $main_image = new stdclass(); |
48 | 48 | $main_image->id = $portfolio_image_result[0]->id; |
@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | $thumb_array = explode('.', $thumb); |
58 | 58 | $thumb = "{$thumb_array[0]}_clip.{$thumb_array[1]}"; |
59 | 59 | |
60 | - $image_path = "portfolio/{$thumb}"; |
|
61 | - $image_path = Loader::getImagePath('image', $image_path); |
|
62 | - $image_size = getimagesize($image_path); |
|
60 | + $image_path = "portfolio/{$thumb}"; |
|
61 | + $image_path = Loader::getImagePath('image', $image_path); |
|
62 | + $image_size = getimagesize($image_path); |
|
63 | 63 | |
64 | 64 | $image_obj = new stdclass(); |
65 | 65 | $image_obj->id = $portfolio_image->id; |
@@ -12,9 +12,9 @@ |
||
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; |
@@ -80,9 +80,9 @@ discard block |
||
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 |
||
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 | } |
@@ -12,8 +12,8 @@ |
||
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 |
@@ -19,14 +19,14 @@ discard block |
||
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 |
||
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'); |
@@ -7,36 +7,36 @@ |
||
7 | 7 | class MysqlPieceRepository implements PieceRepositoryInterface |
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 getPieces($limit = null, $offset = 0) |
|
22 | - { |
|
23 | - $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 getPieces($limit = null, $offset = 0) |
|
22 | + { |
|
23 | + $query = " |
|
24 | 24 | SELECT `id`, `title`, `title_url`, `category` |
25 | 25 | FROM `jpemeric_portfolio`.`piece` |
26 | 26 | WHERE `display` = :is_active |
27 | 27 | ORDER BY `date` DESC"; |
28 | - if ($limit != null) { |
|
29 | - $query .= " |
|
28 | + if ($limit != null) { |
|
29 | + $query .= " |
|
30 | 30 | LIMIT {$offset}, {$limit}"; |
31 | - } |
|
31 | + } |
|
32 | 32 | |
33 | - $bindings = [ |
|
34 | - 'is_active' => 1, |
|
35 | - ]; |
|
33 | + $bindings = [ |
|
34 | + 'is_active' => 1, |
|
35 | + ]; |
|
36 | 36 | |
37 | - return $this |
|
38 | - ->connections |
|
39 | - ->getRead() |
|
40 | - ->fetchAll($query, $bindings); |
|
41 | - } |
|
37 | + return $this |
|
38 | + ->connections |
|
39 | + ->getRead() |
|
40 | + ->fetchAll($query, $bindings); |
|
41 | + } |
|
42 | 42 | } |
@@ -4,5 +4,5 @@ |
||
4 | 4 | |
5 | 5 | interface PieceRepositoryInterface |
6 | 6 | { |
7 | - public function getPieces($limit = null, $offset= 0); |
|
7 | + public function getPieces($limit = null, $offset= 0); |
|
8 | 8 | } |
@@ -4,5 +4,5 @@ |
||
4 | 4 | |
5 | 5 | interface CompanionRepositoryInterface |
6 | 6 | { |
7 | - public function getCompanionList(); |
|
7 | + public function getCompanionList(); |
|
8 | 8 | } |
@@ -7,20 +7,20 @@ discard block |
||
7 | 7 | class MysqlCompanionRepository implements CompanionRepositoryInterface |
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 getCompanionList() |
|
22 | - { |
|
23 | - $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 getCompanionList() |
|
22 | + { |
|
23 | + $query = " |
|
24 | 24 | SELECT `companion`.`name`, `companion`.`alias`, COUNT(1) AS `count` |
25 | 25 | FROM `jpemeric_waterfall`.`companion` |
26 | 26 | INNER JOIN `jpemeric_waterfall`.`log_companion_map` ON `log_companion_map`.`companion` = `companion`.`id` |
@@ -29,13 +29,13 @@ discard block |
||
29 | 29 | GROUP BY `alias` |
30 | 30 | ORDER BY `name`"; |
31 | 31 | |
32 | - $bindings = [ |
|
33 | - 'public' => 1, |
|
34 | - ]; |
|
32 | + $bindings = [ |
|
33 | + 'public' => 1, |
|
34 | + ]; |
|
35 | 35 | |
36 | - return $this |
|
37 | - ->connections |
|
38 | - ->getRead() |
|
39 | - ->fetchAll($query, $bindings); |
|
40 | - } |
|
36 | + return $this |
|
37 | + ->connections |
|
38 | + ->getRead() |
|
39 | + ->fetchAll($query, $bindings); |
|
40 | + } |
|
41 | 41 | } |