@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | protected function get_recent_activity() |
| 60 | 60 | { |
| 61 | - global $container; |
|
| 62 | - $activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']); |
|
| 63 | - $post_result = $activityRepository->getPosts(5); |
|
| 61 | + global $container; |
|
| 62 | + $activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']); |
|
| 63 | + $post_result = $activityRepository->getPosts(5); |
|
| 64 | 64 | |
| 65 | 65 | $post_array = array(); |
| 66 | 66 | foreach($post_result as $row) |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | { |
| 76 | 76 | Loader::load('utility', 'Content'); |
| 77 | 77 | |
| 78 | - global $container; |
|
| 79 | - $blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']); |
|
| 80 | - $bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']); |
|
| 81 | - $distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']); |
|
| 82 | - $huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']); |
|
| 83 | - $twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']); |
|
| 84 | - $youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']); |
|
| 78 | + global $container; |
|
| 79 | + $blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']); |
|
| 80 | + $bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']); |
|
| 81 | + $distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']); |
|
| 82 | + $huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']); |
|
| 83 | + $twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']); |
|
| 84 | + $youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']); |
|
| 85 | 85 | |
| 86 | 86 | $post = new stdclass(); |
| 87 | 87 | |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | if(strlen($row['title']) > 0) |
| 125 | 125 | $post->title .= " I was hiking up around the {$row['title']} area."; |
| 126 | 126 | } |
| 127 | - else if ($row['type'] == 'walking') { |
|
| 128 | - $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}."; |
|
| 129 | - } |
|
| 127 | + else if ($row['type'] == 'walking') { |
|
| 128 | + $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}."; |
|
| 129 | + } |
|
| 130 | 130 | break; |
| 131 | 131 | case 'hulu' : |
| 132 | 132 | $row = $huluRepository->getHuluById($raw_post['type_id']); |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']); |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - if (URLDecode::getSite() == 'waterfalls') { |
|
| 197 | - Loader::load('view', '/WaterfallFoot'); |
|
| 198 | - } else { |
|
| 199 | - Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
|
| 200 | - } |
|
| 196 | + if (URLDecode::getSite() == 'waterfalls') { |
|
| 197 | + Loader::load('view', '/WaterfallFoot'); |
|
| 198 | + } else { |
|
| 199 | + Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
|
| 200 | + } |
|
| 201 | 201 | |
| 202 | 202 | if($view == '/404' || $view == '/503') |
| 203 | 203 | exit; |
@@ -255,15 +255,15 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | private function load_assets() |
| 257 | 257 | { |
| 258 | - $css_array = array_map(function ($stylesheet) { |
|
| 259 | - return "/css/{$stylesheet}.css"; |
|
| 260 | - }, $this->css_array); |
|
| 261 | - $js_array = array_map(function ($script) { |
|
| 262 | - if (substr($script, 0, 4) == 'http') { |
|
| 263 | - return $script; |
|
| 264 | - } |
|
| 265 | - return "/js/{$script}.min.js"; |
|
| 266 | - }, $this->js_array); |
|
| 258 | + $css_array = array_map(function ($stylesheet) { |
|
| 259 | + return "/css/{$stylesheet}.css"; |
|
| 260 | + }, $this->css_array); |
|
| 261 | + $js_array = array_map(function ($script) { |
|
| 262 | + if (substr($script, 0, 4) == 'http') { |
|
| 263 | + return $script; |
|
| 264 | + } |
|
| 265 | + return "/js/{$script}.min.js"; |
|
| 266 | + }, $this->js_array); |
|
| 267 | 267 | |
| 268 | 268 | $this->set_head('css_link_array', $css_array); |
| 269 | 269 | $this->set_head('js_link_array', $js_array); |
@@ -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 | } |
@@ -24,10 +24,10 @@ |
||
| 24 | 24 | |
| 25 | 25 | self::$array['host'] = $host; |
| 26 | 26 | |
| 27 | - if ( |
|
| 28 | - $host == 'www.waterfallsofthekeweenaw.com' || |
|
| 29 | - $host == 'waterfallsofthekeweenaw.com' |
|
| 30 | - ) { |
|
| 27 | + if ( |
|
| 28 | + $host == 'www.waterfallsofthekeweenaw.com' || |
|
| 29 | + $host == 'waterfallsofthekeweenaw.com' |
|
| 30 | + ) { |
|
| 31 | 31 | self::$array['site'] = 'waterfalls'; |
| 32 | 32 | } else { |
| 33 | 33 | self::$array['site'] = substr($host, 0, strpos($host, '.')); |
@@ -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 | |
@@ -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 | } |