@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | |
17 | 17 | private function __construct($write_params, $read_params) |
18 | 18 | { |
19 | - $this->write_connection = $this->connect( |
|
20 | - $write_params->host, |
|
21 | - $write_params->user, |
|
22 | - $write_params->password |
|
23 | - ); |
|
24 | - |
|
25 | - $this->read_connection = $this->connect( |
|
26 | - $read_params->host, |
|
27 | - $read_params->user, |
|
28 | - $read_params->password |
|
29 | - ); |
|
19 | + $this->write_connection = $this->connect( |
|
20 | + $write_params->host, |
|
21 | + $write_params->user, |
|
22 | + $write_params->password |
|
23 | + ); |
|
24 | + |
|
25 | + $this->read_connection = $this->connect( |
|
26 | + $read_params->host, |
|
27 | + $read_params->user, |
|
28 | + $read_params->password |
|
29 | + ); |
|
30 | 30 | |
31 | 31 | return $this; |
32 | 32 | } |
@@ -45,12 +45,12 @@ discard block |
||
45 | 45 | public static function instance() |
46 | 46 | { |
47 | 47 | if(!isset(self::$instance)) { |
48 | - global $config; |
|
49 | - self::$instance = new Database( |
|
50 | - $config->database->master, |
|
51 | - $config->database->slave |
|
52 | - ); |
|
53 | - } |
|
48 | + global $config; |
|
49 | + self::$instance = new Database( |
|
50 | + $config->database->master, |
|
51 | + $config->database->slave |
|
52 | + ); |
|
53 | + } |
|
54 | 54 | |
55 | 55 | return self::$instance; |
56 | 56 | } |
@@ -205,7 +205,7 @@ |
||
205 | 205 | private static function start_gzipping() |
206 | 206 | { |
207 | 207 | if(!ob_start('ob_gzhandler')) |
208 | - ob_start(); |
|
208 | + ob_start(); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | } |
212 | 212 | \ No newline at end of file |
@@ -179,16 +179,16 @@ |
||
179 | 179 | return self::instance()->is_live; |
180 | 180 | } |
181 | 181 | |
182 | - public static function getRootURL($site = '') |
|
183 | - { |
|
184 | - if (strlen($site) > 0) { |
|
185 | - if ($site == 'waterfalls' && self::instance()->is_live) { |
|
186 | - return 'http://www.waterfallsofthekeweenaw.com/'; |
|
187 | - } else { |
|
188 | - return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
189 | - } |
|
190 | - } |
|
191 | - return '/'; |
|
192 | - } |
|
182 | + public static function getRootURL($site = '') |
|
183 | + { |
|
184 | + if (strlen($site) > 0) { |
|
185 | + if ($site == 'waterfalls' && self::instance()->is_live) { |
|
186 | + return 'http://www.waterfallsofthekeweenaw.com/'; |
|
187 | + } else { |
|
188 | + return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
189 | + } |
|
190 | + } |
|
191 | + return '/'; |
|
192 | + } |
|
193 | 193 | |
194 | 194 | } |
195 | 195 | \ No newline at end of file |
@@ -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}>"; |
@@ -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; |
@@ -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) |
@@ -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 | } |
@@ -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 |