@@ -152,7 +152,7 @@ |
||
| 152 | 152 | private static function start_gzipping() |
| 153 | 153 | { |
| 154 | 154 | if(!ob_start('ob_gzhandler')) |
| 155 | - ob_start(); |
|
| 155 | + ob_start(); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -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 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface CountyRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getCountyList(); |
|
| 7 | + public function getCountyList(); |
|
| 8 | 8 | } |
@@ -7,20 +7,20 @@ discard block |
||
| 7 | 7 | class MysqlCountyRepository implements CountyRepositoryInterface |
| 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 getCountyList() |
|
| 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 getCountyList() |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `county`.`name`, `county`.`alias`, COUNT(1) AS `count` |
| 25 | 25 | FROM `jpemeric_waterfall`.`county` |
| 26 | 26 | INNER JOIN `jpemeric_waterfall`.`waterfall` ON `waterfall`.`county` = `county`.`id` AND |
@@ -28,13 +28,13 @@ discard block |
||
| 28 | 28 | GROUP BY `alias` |
| 29 | 29 | ORDER BY `name`"; |
| 30 | 30 | |
| 31 | - $bindings = [ |
|
| 32 | - 'public' => 1, |
|
| 33 | - ]; |
|
| 31 | + $bindings = [ |
|
| 32 | + 'public' => 1, |
|
| 33 | + ]; |
|
| 34 | 34 | |
| 35 | - return $this |
|
| 36 | - ->connections |
|
| 37 | - ->getRead() |
|
| 38 | - ->fetchAll($query, $bindings); |
|
| 39 | - } |
|
| 35 | + return $this |
|
| 36 | + ->connections |
|
| 37 | + ->getRead() |
|
| 38 | + ->fetchAll($query, $bindings); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -4,5 +4,5 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface LogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getActiveLogs($limit = null, $offset= 0); |
|
| 7 | + public function getActiveLogs($limit = null, $offset= 0); |
|
| 8 | 8 | } |
@@ -7,36 +7,36 @@ |
||
| 7 | 7 | class MysqlLogRepository implements LogRepositoryInterface |
| 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 getActiveLogs($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 getActiveLogs($limit = null, $offset = 0) |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `id`, `title`, `alias`, `date`, `publish_date`, `introduction` |
| 25 | 25 | FROM `jpemeric_waterfall`.`log` |
| 26 | 26 | WHERE `is_public` = :public |
| 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 | - 'public' => 1, |
|
| 35 | - ]; |
|
| 33 | + $bindings = [ |
|
| 34 | + 'public' => 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 | } |
@@ -7,20 +7,20 @@ discard block |
||
| 7 | 7 | class MysqlPeriodRepository implements PeriodRepositoryInterface |
| 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 getPeriodList() |
|
| 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 getPeriodList() |
|
| 22 | + { |
|
| 23 | + $query = " |
|
| 24 | 24 | SELECT `period`.`name`, `period`.`alias`, COUNT(1) AS `count` |
| 25 | 25 | FROM `jpemeric_waterfall`.`period` |
| 26 | 26 | INNER JOIN `jpemeric_waterfall`.`log` ON `log`.`period` = `log`.`id` AND |
@@ -28,13 +28,13 @@ discard block |
||
| 28 | 28 | GROUP BY `alias` |
| 29 | 29 | ORDER BY `name`"; |
| 30 | 30 | |
| 31 | - $bindings = [ |
|
| 32 | - 'public' => 1, |
|
| 33 | - ]; |
|
| 31 | + $bindings = [ |
|
| 32 | + 'public' => 1, |
|
| 33 | + ]; |
|
| 34 | 34 | |
| 35 | - return $this |
|
| 36 | - ->connections |
|
| 37 | - ->getRead() |
|
| 38 | - ->fetchAll($query, $bindings); |
|
| 39 | - } |
|
| 35 | + return $this |
|
| 36 | + ->connections |
|
| 37 | + ->getRead() |
|
| 38 | + ->fetchAll($query, $bindings); |
|
| 39 | + } |
|
| 40 | 40 | } |