@@ -22,10 +22,10 @@ |
||
| 22 | 22 | |
| 23 | 23 | protected function getDomain() |
| 24 | 24 | { |
| 25 | - $site = URLDecode::getSite(); |
|
| 26 | - if ($site == 'waterfalls' && Loader::isLive()) { |
|
| 27 | - return 'waterfallsofthekeweenaw.com'; |
|
| 28 | - } |
|
| 25 | + $site = URLDecode::getSite(); |
|
| 26 | + if ($site == 'waterfalls' && Loader::isLive()) { |
|
| 27 | + return 'waterfallsofthekeweenaw.com'; |
|
| 28 | + } |
|
| 29 | 29 | return self::$COOKIE_DOMAIN; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -72,38 +72,38 @@ |
||
| 72 | 72 | |
| 73 | 73 | break; |
| 74 | 74 | case 'falls' : |
| 75 | - $pieces = explode('/', $uri); |
|
| 76 | - if (count($pieces) == 1) { |
|
| 77 | - Loader::load('collector', 'waterfall/WatercourseCollector'); |
|
| 78 | - list ($watercourse_alias) = $pieces; |
|
| 79 | - $watercourse = WatercourseCollector::getByAlias($watercourse_alias); |
|
| 75 | + $pieces = explode('/', $uri); |
|
| 76 | + if (count($pieces) == 1) { |
|
| 77 | + Loader::load('collector', 'waterfall/WatercourseCollector'); |
|
| 78 | + list ($watercourse_alias) = $pieces; |
|
| 79 | + $watercourse = WatercourseCollector::getByAlias($watercourse_alias); |
|
| 80 | 80 | |
| 81 | - if ($watercourse == null) { |
|
| 82 | - return; |
|
| 83 | - } |
|
| 81 | + if ($watercourse == null) { |
|
| 82 | + return; |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 86 | - $link .= "{$watercourse->alias}/"; |
|
| 85 | + $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 86 | + $link .= "{$watercourse->alias}/"; |
|
| 87 | 87 | |
| 88 | - if ($anchor == '') { |
|
| 89 | - $anchor = $watercourse->name; |
|
| 90 | - } |
|
| 91 | - } else if (count($pieces) == 2) { |
|
| 92 | - Loader::load('collector', 'waterfall/WaterfallCollector'); |
|
| 93 | - list ($watercourse_alias, $waterfall_alias) = $pieces; |
|
| 94 | - $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias); |
|
| 88 | + if ($anchor == '') { |
|
| 89 | + $anchor = $watercourse->name; |
|
| 90 | + } |
|
| 91 | + } else if (count($pieces) == 2) { |
|
| 92 | + Loader::load('collector', 'waterfall/WaterfallCollector'); |
|
| 93 | + list ($watercourse_alias, $waterfall_alias) = $pieces; |
|
| 94 | + $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias); |
|
| 95 | 95 | |
| 96 | - if ($waterfall == null) { |
|
| 97 | - return; |
|
| 98 | - } |
|
| 96 | + if ($waterfall == null) { |
|
| 97 | + return; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 101 | - $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/"; |
|
| 100 | + $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 101 | + $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/"; |
|
| 102 | 102 | |
| 103 | - if ($anchor == '') { |
|
| 104 | - $anchor = $waterfall->name; |
|
| 105 | - } |
|
| 106 | - } |
|
| 103 | + if ($anchor == '') { |
|
| 104 | + $anchor = $waterfall->name; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | break; |
| 108 | 108 | default : |
| 109 | 109 | break; |
@@ -5,56 +5,56 @@ |
||
| 5 | 5 | final class ImperialUnitContent extends Content |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - protected function execute($type = '') |
|
| 9 | - { |
|
| 10 | - $number = floatval($this->content); |
|
| 11 | - $number *= 39.37; // convert to inches |
|
| 8 | + protected function execute($type = '') |
|
| 9 | + { |
|
| 10 | + $number = floatval($this->content); |
|
| 11 | + $number *= 39.37; // convert to inches |
|
| 12 | 12 | |
| 13 | - if ($type == '') { |
|
| 14 | - if ($number > (12 * 3 * 1760 * 5)) { |
|
| 15 | - $type = 'full miles'; |
|
| 16 | - } else if ($number > (12 * 3 * 1760 * .5)) { |
|
| 17 | - $type = 'tenth miles'; |
|
| 18 | - } else if ($number > (12 * 3 * 150)) { |
|
| 19 | - $type = 'yards'; |
|
| 20 | - } else if ($number > (12 * 10)) { |
|
| 21 | - $type = 'feet'; |
|
| 22 | - } else { |
|
| 23 | - $type = 'inches'; |
|
| 24 | - } |
|
| 25 | - } |
|
| 13 | + if ($type == '') { |
|
| 14 | + if ($number > (12 * 3 * 1760 * 5)) { |
|
| 15 | + $type = 'full miles'; |
|
| 16 | + } else if ($number > (12 * 3 * 1760 * .5)) { |
|
| 17 | + $type = 'tenth miles'; |
|
| 18 | + } else if ($number > (12 * 3 * 150)) { |
|
| 19 | + $type = 'yards'; |
|
| 20 | + } else if ($number > (12 * 10)) { |
|
| 21 | + $type = 'feet'; |
|
| 22 | + } else { |
|
| 23 | + $type = 'inches'; |
|
| 24 | + } |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - switch ($type) { |
|
| 28 | - case 'full miles' : |
|
| 29 | - $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles'; |
|
| 30 | - break; |
|
| 31 | - case 'tenth miles' : |
|
| 32 | - $this->content = round($number / (12 * 3 * 1760), 1) . ' miles'; |
|
| 33 | - break; |
|
| 34 | - case 'yards' : |
|
| 35 | - $this->content = number_format(round($number / (12 * 3))) . ' yards'; |
|
| 36 | - break; |
|
| 37 | - case 'feet' : |
|
| 38 | - $this->content = number_format(round($number / 12)) . "'"; |
|
| 39 | - break; |
|
| 40 | - case 'inches' : |
|
| 41 | - $feet = floor($number / 12); |
|
| 27 | + switch ($type) { |
|
| 28 | + case 'full miles' : |
|
| 29 | + $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles'; |
|
| 30 | + break; |
|
| 31 | + case 'tenth miles' : |
|
| 32 | + $this->content = round($number / (12 * 3 * 1760), 1) . ' miles'; |
|
| 33 | + break; |
|
| 34 | + case 'yards' : |
|
| 35 | + $this->content = number_format(round($number / (12 * 3))) . ' yards'; |
|
| 36 | + break; |
|
| 37 | + case 'feet' : |
|
| 38 | + $this->content = number_format(round($number / 12)) . "'"; |
|
| 39 | + break; |
|
| 40 | + case 'inches' : |
|
| 41 | + $feet = floor($number / 12); |
|
| 42 | 42 | |
| 43 | - $inches = $number - $feet * 12; |
|
| 44 | - $inches = round($inches); |
|
| 43 | + $inches = $number - $feet * 12; |
|
| 44 | + $inches = round($inches); |
|
| 45 | 45 | |
| 46 | - if ($inches == 12) { |
|
| 47 | - $feet++; |
|
| 48 | - $inches = 0; |
|
| 49 | - } |
|
| 46 | + if ($inches == 12) { |
|
| 47 | + $feet++; |
|
| 48 | + $inches = 0; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - $this->content = ''; |
|
| 52 | - $this->content .= number_format($feet) . "'"; |
|
| 53 | - if (isset($inches) && $inches > 0) { |
|
| 54 | - $this->content .= " {$inches}\""; |
|
| 55 | - } |
|
| 56 | - break; |
|
| 57 | - } |
|
| 58 | - } |
|
| 51 | + $this->content = ''; |
|
| 52 | + $this->content .= number_format($feet) . "'"; |
|
| 53 | + if (isset($inches) && $inches > 0) { |
|
| 54 | + $this->content .= " {$inches}\""; |
|
| 55 | + } |
|
| 56 | + break; |
|
| 57 | + } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | } |
| 61 | 61 | \ No newline at end of file |
@@ -42,8 +42,8 @@ |
||
| 42 | 42 | |
| 43 | 43 | if($length < strlen($this->content)) |
| 44 | 44 | $this->trim_string($length); |
| 45 | - else |
|
| 46 | - $etc = ''; |
|
| 45 | + else |
|
| 46 | + $etc = ''; |
|
| 47 | 47 | $this->check_exclude_tags(); |
| 48 | 48 | $this->close_tags($etc); |
| 49 | 49 | } |
@@ -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 | } |
@@ -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; |
@@ -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 | } |