@@ -7,38 +7,38 @@ |
||
| 7 | 7 | class MysqlWaterfallRepository implements WaterfallRepositoryInterface |
| 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 getWaterfalls($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 getWaterfalls($limit = null, $offset = 0) |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `waterfall`.`id`, `waterfall`.`name`, `waterfall`.`alias`, |
| 25 | 25 | `watercourse`.`name` AS `watercourse`, `watercourse`.`alias` AS `watercourse_alias` |
| 26 | 26 | FROM `jpemeric_waterfall`.`waterfall` |
| 27 | 27 | INNER JOIN `jpemeric_waterfall`.`watercourse` ON `waterfall`.`watercourse` = `watercourse`.`id` |
| 28 | 28 | WHERE `is_public` = :public |
| 29 | 29 | ORDER BY `name`, `watercourse`"; |
| 30 | - if ($limit != null) { |
|
| 31 | - $query .= " |
|
| 30 | + if ($limit != null) { |
|
| 31 | + $query .= " |
|
| 32 | 32 | LIMIT {$offset}, {$limit}"; |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - $bindings = [ |
|
| 36 | - 'public' => 1, |
|
| 37 | - ]; |
|
| 35 | + $bindings = [ |
|
| 36 | + 'public' => 1, |
|
| 37 | + ]; |
|
| 38 | 38 | |
| 39 | - return $this |
|
| 40 | - ->connections |
|
| 41 | - ->getRead() |
|
| 42 | - ->fetchAll($query, $bindings); |
|
| 43 | - } |
|
| 39 | + return $this |
|
| 40 | + ->connections |
|
| 41 | + ->getRead() |
|
| 42 | + ->fetchAll($query, $bindings); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface WaterfallRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getWaterfalls($limit = null, $offset= 0); |
|
| 7 | + public function getWaterfalls($limit = null, $offset= 0); |
|
| 8 | 8 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface ChangelogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getChanges($limit = null, $offset = 0); |
|
| 7 | + public function getChanges($limit = null, $offset = 0); |
|
| 8 | 8 | } |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | |
| 29 | 29 | private function get_changelog() |
| 30 | 30 | { |
| 31 | - global $container; |
|
| 32 | - $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']); |
|
| 33 | - $changelog_result = $changelogRepository->getChanges(40); |
|
| 31 | + global $container; |
|
| 32 | + $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']); |
|
| 33 | + $changelog_result = $changelogRepository->getChanges(40); |
|
| 34 | 34 | |
| 35 | 35 | foreach($changelog_result as $change) |
| 36 | 36 | { |
@@ -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 | } |
@@ -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 | } |
@@ -20,14 +20,14 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | protected function set_head_data() |
| 22 | 22 | { |
| 23 | - $this->set_head('rss_link', [ |
|
| 24 | - 'title' => 'Jacob Emerick Blog Feed', |
|
| 25 | - 'url' => '/rss.xml' |
|
| 26 | - ]); |
|
| 27 | - $this->set_head('rss_comment_link', [ |
|
| 28 | - 'title' => 'Jacob Emerick Blog Comment Feed', |
|
| 29 | - 'url' => '/rss-comments.xml' |
|
| 30 | - ]); |
|
| 23 | + $this->set_head('rss_link', [ |
|
| 24 | + 'title' => 'Jacob Emerick Blog Feed', |
|
| 25 | + 'url' => '/rss.xml' |
|
| 26 | + ]); |
|
| 27 | + $this->set_head('rss_comment_link', [ |
|
| 28 | + 'title' => 'Jacob Emerick Blog Comment Feed', |
|
| 29 | + 'url' => '/rss-comments.xml' |
|
| 30 | + ]); |
|
| 31 | 31 | |
| 32 | 32 | $this->add_css('normalize'); |
| 33 | 33 | $this->add_css('blog'); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | Loader::load('collector', 'blog/TagCollector'); |
| 93 | 93 | |
| 94 | 94 | $tag_result = TagCollector::getTagsForPost($post->id); |
| 95 | - $tag_array = array(); |
|
| 95 | + $tag_array = array(); |
|
| 96 | 96 | foreach($tag_result as $tag) |
| 97 | 97 | { |
| 98 | 98 | $tag_object = new stdclass(); |
@@ -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() |