@@ -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 | } |
@@ -44,9 +44,9 @@ |
||
44 | 44 | $width = $file_size[0]; |
45 | 45 | $description = $photo_result->description; |
46 | 46 | |
47 | - if ($description == '') { |
|
48 | - Debugger::logMessage("No description for {$category}/{$photo}"); |
|
49 | - } |
|
47 | + if ($description == '') { |
|
48 | + Debugger::logMessage("No description for {$category}/{$photo}"); |
|
49 | + } |
|
50 | 50 | |
51 | 51 | $domain = '/'; |
52 | 52 | if($is_absolute) |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | public function __construct() |
14 | 14 | { |
15 | - global $config; |
|
15 | + global $config; |
|
16 | 16 | $this->headers['From'] = self::$FROM; |
17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | public function __construct() |
14 | 14 | { |
15 | - global $config; |
|
15 | + global $config; |
|
16 | 16 | $this->headers['From'] = self::$FROM; |
17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | public function __construct() |
14 | 14 | { |
15 | - global $config; |
|
15 | + global $config; |
|
16 | 16 | $this->headers['From'] = self::$FROM; |
17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | public function __construct() |
14 | 14 | { |
15 | - global $config; |
|
15 | + global $config; |
|
16 | 16 | $this->headers['From'] = self::$FROM; |
17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -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 | } |
@@ -32,37 +32,37 @@ |
||
32 | 32 | |
33 | 33 | private function get_sites() |
34 | 34 | { |
35 | - return [ |
|
36 | - [ |
|
37 | - 'url' => 'http://home.jacobemerick.com/', |
|
38 | - 'title' => "Jacob Emerick's Home", |
|
39 | - 'name' => 'Home' |
|
40 | - ], |
|
41 | - [ |
|
42 | - 'url' => 'http://blog.jacobemerick.com/', |
|
43 | - 'title' => "Jacob Emerick's Blog", |
|
44 | - 'name' => 'Blog' |
|
45 | - ], |
|
46 | - [ |
|
47 | - 'url' => 'http://lifestream.jacobemerick.com/', |
|
48 | - 'title' => "Jacob Emerick's Lifestream", |
|
49 | - 'name' => 'Lifestream' |
|
50 | - ], |
|
51 | - [ |
|
52 | - 'url' => 'http://map.jacobemerick.com/', |
|
53 | - 'title' => "Jacob Emerick's Hiking Map", |
|
54 | - 'name' => 'Map' |
|
55 | - ], |
|
56 | - [ |
|
57 | - 'url' => 'http://portfolio.jacobemerick.com/', |
|
58 | - 'title' => "Jacob Emerick's Portfolio", |
|
59 | - 'name' => 'Portfolio', |
|
60 | - ], |
|
61 | - [ |
|
62 | - 'url' => 'http://www.waterfallsofthekeweenaw.com/', |
|
63 | - 'title' => 'Waterfalls of the Keweenaw', |
|
64 | - 'name' => 'Waterfalls' |
|
65 | - ] |
|
35 | + return [ |
|
36 | + [ |
|
37 | + 'url' => 'http://home.jacobemerick.com/', |
|
38 | + 'title' => "Jacob Emerick's Home", |
|
39 | + 'name' => 'Home' |
|
40 | + ], |
|
41 | + [ |
|
42 | + 'url' => 'http://blog.jacobemerick.com/', |
|
43 | + 'title' => "Jacob Emerick's Blog", |
|
44 | + 'name' => 'Blog' |
|
45 | + ], |
|
46 | + [ |
|
47 | + 'url' => 'http://lifestream.jacobemerick.com/', |
|
48 | + 'title' => "Jacob Emerick's Lifestream", |
|
49 | + 'name' => 'Lifestream' |
|
50 | + ], |
|
51 | + [ |
|
52 | + 'url' => 'http://map.jacobemerick.com/', |
|
53 | + 'title' => "Jacob Emerick's Hiking Map", |
|
54 | + 'name' => 'Map' |
|
55 | + ], |
|
56 | + [ |
|
57 | + 'url' => 'http://portfolio.jacobemerick.com/', |
|
58 | + 'title' => "Jacob Emerick's Portfolio", |
|
59 | + 'name' => 'Portfolio', |
|
60 | + ], |
|
61 | + [ |
|
62 | + 'url' => 'http://www.waterfallsofthekeweenaw.com/', |
|
63 | + 'title' => 'Waterfalls of the Keweenaw', |
|
64 | + 'name' => 'Waterfalls' |
|
65 | + ] |
|
66 | 66 | ]; |
67 | 67 | } |
68 | 68 |
@@ -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 | } |