@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | $handle = @fopen($configuration_path, 'r'); |
9 | 9 | if ($handle === false) { |
10 | - throw new RuntimeException("Could not load configuration"); |
|
10 | + throw new RuntimeException("Could not load configuration"); |
|
11 | 11 | } |
12 | 12 | $configuration = fread($handle, filesize($configuration_path)); |
13 | 13 | fclose($handle); |
@@ -15,34 +15,34 @@ discard block |
||
15 | 15 | $configuration = json_decode($configuration); |
16 | 16 | $last_json_error = json_last_error(); |
17 | 17 | if ($last_json_error !== JSON_ERROR_NONE) { |
18 | - throw new RuntimeException("Could not parse configuration - JSON error detected"); |
|
18 | + throw new RuntimeException("Could not parse configuration - JSON error detected"); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | // configure the db connections holder |
22 | 22 | $db_connections = new Aura\Sql\ConnectionLocator(); |
23 | 23 | $db_connections->setDefault(function () use ($configuration) { |
24 | - $connection = $configuration->database->slave; |
|
25 | - return new Aura\Sql\ExtendedPdo( |
|
26 | - "mysql:host={$connection->host}", |
|
27 | - $connection->user, |
|
28 | - $connection->password |
|
29 | - ); |
|
24 | + $connection = $configuration->database->slave; |
|
25 | + return new Aura\Sql\ExtendedPdo( |
|
26 | + "mysql:host={$connection->host}", |
|
27 | + $connection->user, |
|
28 | + $connection->password |
|
29 | + ); |
|
30 | 30 | }); |
31 | 31 | $db_connections->setWrite('master', function () use ($configuration) { |
32 | - $connection = $configuration->database->master; |
|
33 | - return new Aura\Sql\ExtendedPdo( |
|
34 | - "mysql:host={$connection->host}", |
|
35 | - $connection->user, |
|
36 | - $connection->password |
|
37 | - ); |
|
32 | + $connection = $configuration->database->master; |
|
33 | + return new Aura\Sql\ExtendedPdo( |
|
34 | + "mysql:host={$connection->host}", |
|
35 | + $connection->user, |
|
36 | + $connection->password |
|
37 | + ); |
|
38 | 38 | }); |
39 | 39 | $db_connections->setRead('slave', function () use ($configuration) { |
40 | - $connection = $configuration->database->slave; |
|
41 | - return new Aura\Sql\ExtendedPdo( |
|
42 | - "mysql:host={$connection->host}", |
|
43 | - $connection->user, |
|
44 | - $connection->password |
|
45 | - ); |
|
40 | + $connection = $configuration->database->slave; |
|
41 | + return new Aura\Sql\ExtendedPdo( |
|
42 | + "mysql:host={$connection->host}", |
|
43 | + $connection->user, |
|
44 | + $connection->password |
|
45 | + ); |
|
46 | 46 | }); |
47 | 47 | |
48 | 48 | // setup the service locator |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | return self::run_query($query); |
115 | 115 | } |
116 | 116 | |
117 | - public static function getRecentWaterfallComments($count = 5) |
|
118 | - { |
|
119 | - $query = " |
|
117 | + public static function getRecentWaterfallComments($count = 5) |
|
118 | + { |
|
119 | + $query = " |
|
120 | 120 | SELECT |
121 | 121 | `comment_meta`.`id`, |
122 | 122 | CONCAT('journal/', `log`.`alias`) AS `log_path`, |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | `comment_meta`.`date` DESC |
157 | 157 | LIMIT {$count}"; |
158 | 158 | |
159 | - return self::run_query($query); |
|
160 | - } |
|
159 | + return self::run_query($query); |
|
160 | + } |
|
161 | 161 | |
162 | 162 | public static function getCommentsForURL($site, $path, $commenter = 0) |
163 | 163 | { |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | return self::run_query($query); |
35 | 35 | } |
36 | 36 | |
37 | - public static function getRecentList($total) |
|
38 | - { |
|
39 | - $query = " |
|
37 | + public static function getRecentList($total) |
|
38 | + { |
|
39 | + $query = " |
|
40 | 40 | SELECT |
41 | 41 | `log`.`title`, |
42 | 42 | `log`.`alias`, |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | `log`.`date` DESC |
60 | 60 | LIMIT |
61 | 61 | {$total}"; |
62 | - return self::run_query($query); |
|
63 | - } |
|
62 | + return self::run_query($query); |
|
63 | + } |
|
64 | 64 | |
65 | 65 | public static function getListCount() |
66 | 66 | { |
@@ -178,11 +178,11 @@ discard block |
||
178 | 178 | return self::run_row_query($query); |
179 | 179 | } |
180 | 180 | |
181 | - public static function getByDate($date) |
|
182 | - { |
|
183 | - $date = self::escape($date); |
|
181 | + public static function getByDate($date) |
|
182 | + { |
|
183 | + $date = self::escape($date); |
|
184 | 184 | |
185 | - $query = " |
|
185 | + $query = " |
|
186 | 186 | SELECT |
187 | 187 | `log`.`alias` |
188 | 188 | FROM |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | `log`.`is_public` = '1' |
193 | 193 | LIMIT 1"; |
194 | 194 | |
195 | - return self::run_row_query($query); |
|
196 | - } |
|
195 | + return self::run_row_query($query); |
|
196 | + } |
|
197 | 197 | |
198 | 198 | public static function getById($log) |
199 | 199 | { |
@@ -153,9 +153,9 @@ |
||
153 | 153 | return self::run_query($query); |
154 | 154 | } |
155 | 155 | |
156 | - public static function getParentWatercourse($watercourse) |
|
157 | - { |
|
158 | - } |
|
156 | + public static function getParentWatercourse($watercourse) |
|
157 | + { |
|
158 | + } |
|
159 | 159 | |
160 | 160 | public static function getLogCountForWatercourse($watercourse) |
161 | 161 | { |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | return self::run_query($query); |
44 | 44 | } |
45 | 45 | |
46 | - public static function getMapList() |
|
47 | - { |
|
48 | - $query = " |
|
46 | + public static function getMapList() |
|
47 | + { |
|
48 | + $query = " |
|
49 | 49 | SELECT |
50 | 50 | `waterfall`.`name`, |
51 | 51 | `waterfall`.`alias`, |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | ORDER BY |
72 | 72 | `waterfall`.`name`"; |
73 | 73 | |
74 | - return self::run_query($query); |
|
75 | - } |
|
74 | + return self::run_query($query); |
|
75 | + } |
|
76 | 76 | |
77 | 77 | public static function getListCount() |
78 | 78 | { |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | return self::get_count($query); |
93 | 93 | } |
94 | 94 | |
95 | - public static function getNearbyList($waterfall) |
|
96 | - { |
|
97 | - $query = " |
|
95 | + public static function getNearbyList($waterfall) |
|
96 | + { |
|
97 | + $query = " |
|
98 | 98 | SELECT |
99 | 99 | `waterfall`.`name`, |
100 | 100 | `waterfall`.`alias` AS `alias`, |
@@ -114,14 +114,14 @@ discard block |
||
114 | 114 | `waterfall`.`name`, |
115 | 115 | `watercourse`.`name`"; |
116 | 116 | |
117 | - return self::run_query($query); |
|
118 | - } |
|
117 | + return self::run_query($query); |
|
118 | + } |
|
119 | 119 | |
120 | - public static function getByOldAlias($alias) |
|
121 | - { |
|
122 | - $alias = self::escape($alias); |
|
120 | + public static function getByOldAlias($alias) |
|
121 | + { |
|
122 | + $alias = self::escape($alias); |
|
123 | 123 | |
124 | - $query = " |
|
124 | + $query = " |
|
125 | 125 | SELECT |
126 | 126 | `waterfall`.`alias`, |
127 | 127 | `watercourse`.`alias` AS `watercourse_alias` |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | `waterfall`.`is_public` = '1' |
135 | 135 | LIMIT 1"; |
136 | 136 | |
137 | - return self::run_row_query($query); |
|
138 | - } |
|
137 | + return self::run_row_query($query); |
|
138 | + } |
|
139 | 139 | |
140 | 140 | public static function getByAlias($watercourse, $waterfall) |
141 | 141 | { |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | if(strlen($row->title) > 0) |
126 | 126 | $post->title .= " I was hiking up around the {$row->title} area."; |
127 | 127 | } |
128 | - else if ($row->type == 'walking') { |
|
129 | - $post->title = "Walked {$row->distance} miles and felt {$row->felt}."; |
|
130 | - } |
|
128 | + else if ($row->type == 'walking') { |
|
129 | + $post->title = "Walked {$row->distance} miles and felt {$row->felt}."; |
|
130 | + } |
|
131 | 131 | break; |
132 | 132 | case 'hulu' : |
133 | 133 | $row = HuluCollector::getRow($raw_post->type_id); |
@@ -194,11 +194,11 @@ discard block |
||
194 | 194 | Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']); |
195 | 195 | } |
196 | 196 | |
197 | - if (URLDecode::getSite() == 'waterfalls') { |
|
198 | - Loader::load('view', '/WaterfallFoot'); |
|
199 | - } else { |
|
200 | - Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
|
201 | - } |
|
197 | + if (URLDecode::getSite() == 'waterfalls') { |
|
198 | + Loader::load('view', '/WaterfallFoot'); |
|
199 | + } else { |
|
200 | + Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
|
201 | + } |
|
202 | 202 | |
203 | 203 | if($view == '/404' || $view == '/503') |
204 | 204 | exit; |
@@ -57,10 +57,10 @@ |
||
57 | 57 | |
58 | 58 | final protected function setWebMaster($webmaster = '') |
59 | 59 | { |
60 | - if ($webmaster == '') { |
|
61 | - global $config; |
|
62 | - $webmaster = "{$config->admin_email} (Jacob Emerick)"; |
|
63 | - } |
|
60 | + if ($webmaster == '') { |
|
61 | + global $config; |
|
62 | + $webmaster = "{$config->admin_email} (Jacob Emerick)"; |
|
63 | + } |
|
64 | 64 | $this->xml->channel->addChild('webMaster', $webmaster); |
65 | 65 | } |
66 | 66 |
@@ -86,7 +86,7 @@ |
||
86 | 86 | Loader::load('collector', 'blog/TagCollector'); |
87 | 87 | |
88 | 88 | $tag_result = TagCollector::getTagsForPost($post->id); |
89 | - $tag_array = array(); |
|
89 | + $tag_array = array(); |
|
90 | 90 | foreach($tag_result as $tag) |
91 | 91 | { |
92 | 92 | $tag_object = new stdclass(); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | { |
35 | 35 | $query = URLDecode::getPiece(2); |
36 | 36 | $query = urldecode($query); |
37 | - $query = str_replace('-', ' ', $query); |
|
37 | + $query = str_replace('-', ' ', $query); |
|
38 | 38 | |
39 | 39 | $this->query = $query; |
40 | 40 |