@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | // configure the db connections holder |
| 22 | 22 | $db_connections = new Aura\Sql\ConnectionLocator(); |
| 23 | -$db_connections->setDefault(function () use ($configuration) { |
|
| 23 | +$db_connections->setDefault(function() use ($configuration) { |
|
| 24 | 24 | $connection = $configuration->database->slave; |
| 25 | 25 | return new Aura\Sql\ExtendedPdo( |
| 26 | 26 | "mysql:host={$connection->host}", |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $connection->password |
| 29 | 29 | ); |
| 30 | 30 | }); |
| 31 | -$db_connections->setWrite('master', function () use ($configuration) { |
|
| 31 | +$db_connections->setWrite('master', function() use ($configuration) { |
|
| 32 | 32 | $connection = $configuration->database->master; |
| 33 | 33 | return new Aura\Sql\ExtendedPdo( |
| 34 | 34 | "mysql:host={$connection->host}", |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $connection->password |
| 37 | 37 | ); |
| 38 | 38 | }); |
| 39 | -$db_connections->setRead('slave', function () use ($configuration) { |
|
| 39 | +$db_connections->setRead('slave', function() use ($configuration) { |
|
| 40 | 40 | $connection = $configuration->database->slave; |
| 41 | 41 | return new Aura\Sql\ExtendedPdo( |
| 42 | 42 | "mysql:host={$connection->host}", |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $tag_clause = "'{$tag_clause}'";
|
| 81 | 81 | |
| 82 | 82 | $exclude_clause = ''; |
| 83 | - if(count($exclude_posts) > 0) |
|
| 83 | + if (count($exclude_posts) > 0) |
|
| 84 | 84 | {
|
| 85 | 85 | $exclude_clause .= " && `ptlink`.`post_id` NOT IN ('";
|
| 86 | 86 | $exclude_clause .= implode("', '", $exclude_posts);
|
@@ -163,7 +163,7 @@ |
||
| 163 | 163 | {
|
| 164 | 164 | $path = self::escape($path); |
| 165 | 165 | |
| 166 | - if($commenter != 0) |
|
| 166 | + if ($commenter != 0) |
|
| 167 | 167 | $trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
|
| 168 | 168 | else |
| 169 | 169 | $trusted_commenter_clause = "`commenter`.`trusted` = '1'"; |
@@ -163,10 +163,11 @@ |
||
| 163 | 163 | {
|
| 164 | 164 | $path = self::escape($path); |
| 165 | 165 | |
| 166 | - if($commenter != 0) |
|
| 167 | - $trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
|
|
| 168 | - else |
|
| 169 | - $trusted_commenter_clause = "`commenter`.`trusted` = '1'"; |
|
| 166 | + if($commenter != 0) {
|
|
| 167 | + $trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
|
|
| 168 | + } else {
|
|
| 169 | + $trusted_commenter_clause = "`commenter`.`trusted` = '1'"; |
|
| 170 | + } |
|
| 170 | 171 | |
| 171 | 172 | $query = " |
| 172 | 173 | SELECT |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | protected function set_response($message, $type = 'internal') |
| 30 | 30 | {
|
| 31 | - switch($type) |
|
| 31 | + switch ($type) |
|
| 32 | 32 | {
|
| 33 | 33 | case 'internal' : |
| 34 | 34 | $this->response['internal'] = $message; |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | Loader::load('collector', 'SiteCollector');
|
| 36 | 36 | $site_result = SiteCollector::getSitesForMenu(); |
| 37 | 37 | |
| 38 | - foreach($site_result as $site) |
|
| 38 | + foreach ($site_result as $site) |
|
| 39 | 39 | {
|
| 40 | 40 | $site_array[] = array( |
| 41 | 41 | 'url' => $site->url, |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | 'date' => date('Y')));
|
| 41 | 41 | |
| 42 | 42 | Loader::loadInstance('utility', 'Database');
|
| 43 | - if(Database::isConnected() === false) |
|
| 43 | + if (Database::isConnected() === false) |
|
| 44 | 44 | $this->unavailable(); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -65,9 +65,9 @@ discard block |
||
| 65 | 65 | $post_array = array(); |
| 66 | 66 | $post_result = ActivityCollector::getRecent(); |
| 67 | 67 | |
| 68 | - foreach($post_result as $row) |
|
| 68 | + foreach ($post_result as $row) |
|
| 69 | 69 | {
|
| 70 | - $post_array[] = $this->expand_post($row);; |
|
| 70 | + $post_array[] = $this->expand_post($row); ; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | return $post_array; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | $post = new stdclass(); |
| 88 | 88 | |
| 89 | - switch($raw_post->type) |
|
| 89 | + switch ($raw_post->type) |
|
| 90 | 90 | {
|
| 91 | 91 | case 'blog' : |
| 92 | 92 | $row = BlogCollector::getRow($raw_post->type_id); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
|
| 98 | 98 | $post->comments = $row->comments; |
| 99 | 99 | |
| 100 | - if($format == 'full') |
|
| 100 | + if ($format == 'full') |
|
| 101 | 101 | $post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
|
| 102 | 102 | break; |
| 103 | 103 | case 'book' : |
@@ -106,23 +106,23 @@ discard block |
||
| 106 | 106 | $post->type = 'book'; |
| 107 | 107 | $post->title = "Just finished reading {$row->title} by {$row->author}.";
|
| 108 | 108 | |
| 109 | - if($format == 'full') |
|
| 109 | + if ($format == 'full') |
|
| 110 | 110 | $post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
|
| 111 | 111 | break; |
| 112 | 112 | case 'distance' : |
| 113 | 113 | $row = DistanceCollector::getRow($raw_post->type_id); |
| 114 | 114 | |
| 115 | 115 | $post->type = 'distance'; |
| 116 | - if($row->type == 'running') |
|
| 116 | + if ($row->type == 'running') |
|
| 117 | 117 | {
|
| 118 | 118 | $post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
|
| 119 | - if(strlen($row->message) > 0) |
|
| 119 | + if (strlen($row->message) > 0) |
|
| 120 | 120 | $post->title .= " Afterwards, I was all like '{$row->message}'.";
|
| 121 | 121 | } |
| 122 | - else if($row->type == 'hiking') |
|
| 122 | + else if ($row->type == 'hiking') |
|
| 123 | 123 | {
|
| 124 | 124 | $post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
|
| 125 | - if(strlen($row->title) > 0) |
|
| 125 | + if (strlen($row->title) > 0) |
|
| 126 | 126 | $post->title .= " I was hiking up around the {$row->title} area.";
|
| 127 | 127 | } |
| 128 | 128 | else if ($row->type == 'walking') {
|
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | $post->type = 'twitter'; |
| 142 | 142 | |
| 143 | - if($format == 'full') |
|
| 143 | + if ($format == 'full') |
|
| 144 | 144 | $post->title = $row->text_formatted_full; |
| 145 | 145 | else |
| 146 | 146 | $post->title = $row->text_formatted; |
@@ -153,12 +153,12 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | $post->type = 'youtube'; |
| 155 | 155 | |
| 156 | - if($format == 'full') |
|
| 156 | + if ($format == 'full') |
|
| 157 | 157 | $post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
|
| 158 | 158 | else |
| 159 | 159 | $post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
|
| 160 | 160 | |
| 161 | - if($format == 'full') |
|
| 161 | + if ($format == 'full') |
|
| 162 | 162 | $post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
|
| 163 | 163 | break; |
| 164 | 164 | } |
@@ -186,9 +186,9 @@ discard block |
||
| 186 | 186 | $headers = $this->headers; |
| 187 | 187 | Header::$headers(); |
| 188 | 188 | Loader::load('view', '/Head', $this->data_array['head']);
|
| 189 | - foreach($this->body_view_array as $view) |
|
| 189 | + foreach ($this->body_view_array as $view) |
|
| 190 | 190 | {
|
| 191 | - if(substr($view, 0, 1) == '/') |
|
| 191 | + if (substr($view, 0, 1) == '/') |
|
| 192 | 192 | Loader::load('view', $view, $this->data_array['body']);
|
| 193 | 193 | else |
| 194 | 194 | Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
|
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - if($view == '/404' || $view == '/503') |
|
| 203 | + if ($view == '/404' || $view == '/503') |
|
| 204 | 204 | exit; |
| 205 | 205 | } |
| 206 | 206 | |
@@ -261,10 +261,10 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | $js_array = array(); |
| 263 | 263 | |
| 264 | - if(count($this->js_array) > 0) |
|
| 264 | + if (count($this->js_array) > 0) |
|
| 265 | 265 | $js_array = array_merge($js_array, $this->js_array); |
| 266 | 266 | |
| 267 | - if(count($js_array) > 0) |
|
| 267 | + if (count($js_array) > 0) |
|
| 268 | 268 | $js_array = Asset::getJS($js_array); |
| 269 | 269 | |
| 270 | 270 | $this->set_head('css_link_array', $css_array);
|
@@ -278,26 +278,26 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | protected function eject() |
| 280 | 280 | {
|
| 281 | - if(get_class($this) !== 'Error404Controller') |
|
| 281 | + if (get_class($this) !== 'Error404Controller') |
|
| 282 | 282 | Loader::loadNew('controller', '/Error404Controller')->activate();
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | protected function unavailable() |
| 286 | 286 | {
|
| 287 | - if(get_class($this) !== 'Error503Controller') |
|
| 287 | + if (get_class($this) !== 'Error503Controller') |
|
| 288 | 288 | Loader::loadNew('controller', '/Error503Controller')->activate();
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | protected function redirect($uri, $method = 301) |
| 292 | 292 | {
|
| 293 | - switch($method) |
|
| 293 | + switch ($method) |
|
| 294 | 294 | {
|
| 295 | 295 | case 301 : |
| 296 | - if(get_class($this) !== 'Error301Controller') |
|
| 296 | + if (get_class($this) !== 'Error301Controller') |
|
| 297 | 297 | Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
|
| 298 | 298 | break; |
| 299 | 299 | case 303 : |
| 300 | - if(get_class($this) !== 'Error303Controller') |
|
| 300 | + if (get_class($this) !== 'Error303Controller') |
|
| 301 | 301 | Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
|
| 302 | 302 | break; |
| 303 | 303 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | private $comment_errors; |
| 318 | 318 | protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title) |
| 319 | 319 | {
|
| 320 | - if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
|
|
| 320 | + if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
|
|
| 321 | 321 | {
|
| 322 | 322 | $parameters = array($site_id, $path, $redirect_url, $page_title); |
| 323 | 323 | $this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
|
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $comment_array = array(); |
| 336 | 336 | $comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id); |
| 337 | 337 | |
| 338 | - foreach($comment_result as $comment) |
|
| 338 | + foreach ($comment_result as $comment) |
|
| 339 | 339 | {
|
| 340 | 340 | $comment_object = new stdclass(); |
| 341 | 341 | $comment_object->id = $comment->id; |
@@ -345,12 +345,12 @@ discard block |
||
| 345 | 345 | $comment_object->url = $comment->url; |
| 346 | 346 | $comment_object->trusted = $comment->trusted; |
| 347 | 347 | |
| 348 | - if($comment->reply == 0 && Request::getPost('type') == $comment->id)
|
|
| 348 | + if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
|
|
| 349 | 349 | $comment_object->errors = $this->comment_errors; |
| 350 | 350 | else |
| 351 | 351 | $comment_object->errors = array(); |
| 352 | 352 | |
| 353 | - if($comment->reply == 0) |
|
| 353 | + if ($comment->reply == 0) |
|
| 354 | 354 | {
|
| 355 | 355 | $comment_object->replies = array(); |
| 356 | 356 | $comment_array[$comment->id] = $comment_object; |
@@ -381,21 +381,21 @@ discard block |
||
| 381 | 381 | $commenter->website = ''; |
| 382 | 382 | |
| 383 | 383 | $commenter_cookie = Cookie::instance('Commenter');
|
| 384 | - if(!$commenter_cookie->exists()) |
|
| 384 | + if (!$commenter_cookie->exists()) |
|
| 385 | 385 | return $commenter; |
| 386 | 386 | |
| 387 | 387 | $commenter_cookie_value = $commenter_cookie->getValue(); |
| 388 | 388 | $commenter_cookie_value = json_decode($commenter_cookie_value); |
| 389 | 389 | |
| 390 | - if($commenter_cookie_value === NULL) |
|
| 390 | + if ($commenter_cookie_value === NULL) |
|
| 391 | 391 | return $commenter; |
| 392 | 392 | |
| 393 | - if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
| 393 | + if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
| 394 | 394 | return $commenter; |
| 395 | 395 | |
| 396 | 396 | $commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : '')); |
| 397 | 397 | |
| 398 | - if($commenter_object === NULL) |
|
| 398 | + if ($commenter_object === NULL) |
|
| 399 | 399 | return $commenter; |
| 400 | 400 | |
| 401 | 401 | $commenter->id = $commenter_object->id; |
@@ -40,8 +40,9 @@ discard block |
||
| 40 | 40 | 'date' => date('Y')));
|
| 41 | 41 | |
| 42 | 42 | Loader::loadInstance('utility', 'Database');
|
| 43 | - if(Database::isConnected() === false) |
|
| 44 | - $this->unavailable(); |
|
| 43 | + if(Database::isConnected() === false) {
|
|
| 44 | + $this->unavailable(); |
|
| 45 | + } |
|
| 45 | 46 | } |
| 46 | 47 | |
| 47 | 48 | protected function get_domain_container() |
@@ -97,8 +98,9 @@ discard block |
||
| 97 | 98 | $post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
|
| 98 | 99 | $post->comments = $row->comments; |
| 99 | 100 | |
| 100 | - if($format == 'full') |
|
| 101 | - $post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
|
|
| 101 | + if($format == 'full') {
|
|
| 102 | + $post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
|
|
| 103 | + } |
|
| 102 | 104 | break; |
| 103 | 105 | case 'book' : |
| 104 | 106 | $row = BookCollector::getRow($raw_post->type_id); |
@@ -106,8 +108,9 @@ discard block |
||
| 106 | 108 | $post->type = 'book'; |
| 107 | 109 | $post->title = "Just finished reading {$row->title} by {$row->author}.";
|
| 108 | 110 | |
| 109 | - if($format == 'full') |
|
| 110 | - $post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
|
|
| 111 | + if($format == 'full') {
|
|
| 112 | + $post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
|
|
| 113 | + } |
|
| 111 | 114 | break; |
| 112 | 115 | case 'distance' : |
| 113 | 116 | $row = DistanceCollector::getRow($raw_post->type_id); |
@@ -116,16 +119,16 @@ discard block |
||
| 116 | 119 | if($row->type == 'running') |
| 117 | 120 | {
|
| 118 | 121 | $post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
|
| 119 | - if(strlen($row->message) > 0) |
|
| 120 | - $post->title .= " Afterwards, I was all like '{$row->message}'.";
|
|
| 121 | - } |
|
| 122 | - else if($row->type == 'hiking') |
|
| 122 | + if(strlen($row->message) > 0) {
|
|
| 123 | + $post->title .= " Afterwards, I was all like '{$row->message}'.";
|
|
| 124 | + } |
|
| 125 | + } else if($row->type == 'hiking') |
|
| 123 | 126 | {
|
| 124 | 127 | $post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
|
| 125 | - if(strlen($row->title) > 0) |
|
| 126 | - $post->title .= " I was hiking up around the {$row->title} area.";
|
|
| 127 | - } |
|
| 128 | - else if ($row->type == 'walking') {
|
|
| 128 | + if(strlen($row->title) > 0) {
|
|
| 129 | + $post->title .= " I was hiking up around the {$row->title} area.";
|
|
| 130 | + } |
|
| 131 | + } else if ($row->type == 'walking') {
|
|
| 129 | 132 | $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
|
| 130 | 133 | } |
| 131 | 134 | break; |
@@ -140,10 +143,11 @@ discard block |
||
| 140 | 143 | |
| 141 | 144 | $post->type = 'twitter'; |
| 142 | 145 | |
| 143 | - if($format == 'full') |
|
| 144 | - $post->title = $row->text_formatted_full; |
|
| 145 | - else |
|
| 146 | - $post->title = $row->text_formatted; |
|
| 146 | + if($format == 'full') {
|
|
| 147 | + $post->title = $row->text_formatted_full; |
|
| 148 | + } else {
|
|
| 149 | + $post->title = $row->text_formatted; |
|
| 150 | + } |
|
| 147 | 151 | |
| 148 | 152 | $post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0; |
| 149 | 153 | $post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0; |
@@ -153,13 +157,15 @@ discard block |
||
| 153 | 157 | |
| 154 | 158 | $post->type = 'youtube'; |
| 155 | 159 | |
| 156 | - if($format == 'full') |
|
| 157 | - $post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
|
|
| 158 | - else |
|
| 159 | - $post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
|
|
| 160 | + if($format == 'full') {
|
|
| 161 | + $post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
|
|
| 162 | + } else {
|
|
| 163 | + $post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
|
|
| 164 | + } |
|
| 160 | 165 | |
| 161 | - if($format == 'full') |
|
| 162 | - $post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
|
|
| 166 | + if($format == 'full') {
|
|
| 167 | + $post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
|
|
| 168 | + } |
|
| 163 | 169 | break; |
| 164 | 170 | } |
| 165 | 171 | |
@@ -188,10 +194,11 @@ discard block |
||
| 188 | 194 | Loader::load('view', '/Head', $this->data_array['head']);
|
| 189 | 195 | foreach($this->body_view_array as $view) |
| 190 | 196 | {
|
| 191 | - if(substr($view, 0, 1) == '/') |
|
| 192 | - Loader::load('view', $view, $this->data_array['body']);
|
|
| 193 | - else |
|
| 194 | - Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
|
|
| 197 | + if(substr($view, 0, 1) == '/') {
|
|
| 198 | + Loader::load('view', $view, $this->data_array['body']);
|
|
| 199 | + } else {
|
|
| 200 | + Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
|
|
| 201 | + } |
|
| 195 | 202 | } |
| 196 | 203 | |
| 197 | 204 | if (URLDecode::getSite() == 'waterfalls') {
|
@@ -200,8 +207,9 @@ discard block |
||
| 200 | 207 | Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
|
| 201 | 208 | } |
| 202 | 209 | |
| 203 | - if($view == '/404' || $view == '/503') |
|
| 204 | - exit; |
|
| 210 | + if($view == '/404' || $view == '/503') {
|
|
| 211 | + exit; |
|
| 212 | + } |
|
| 205 | 213 | } |
| 206 | 214 | |
| 207 | 215 | protected function set_header_method($method) |
@@ -261,11 +269,13 @@ discard block |
||
| 261 | 269 | |
| 262 | 270 | $js_array = array(); |
| 263 | 271 | |
| 264 | - if(count($this->js_array) > 0) |
|
| 265 | - $js_array = array_merge($js_array, $this->js_array); |
|
| 272 | + if(count($this->js_array) > 0) {
|
|
| 273 | + $js_array = array_merge($js_array, $this->js_array); |
|
| 274 | + } |
|
| 266 | 275 | |
| 267 | - if(count($js_array) > 0) |
|
| 268 | - $js_array = Asset::getJS($js_array); |
|
| 276 | + if(count($js_array) > 0) {
|
|
| 277 | + $js_array = Asset::getJS($js_array); |
|
| 278 | + } |
|
| 269 | 279 | |
| 270 | 280 | $this->set_head('css_link_array', $css_array);
|
| 271 | 281 | $this->set_head('js_link_array', $js_array);
|
@@ -278,14 +288,16 @@ discard block |
||
| 278 | 288 | |
| 279 | 289 | protected function eject() |
| 280 | 290 | {
|
| 281 | - if(get_class($this) !== 'Error404Controller') |
|
| 282 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 291 | + if(get_class($this) !== 'Error404Controller') {
|
|
| 292 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 293 | + } |
|
| 283 | 294 | } |
| 284 | 295 | |
| 285 | 296 | protected function unavailable() |
| 286 | 297 | {
|
| 287 | - if(get_class($this) !== 'Error503Controller') |
|
| 288 | - Loader::loadNew('controller', '/Error503Controller')->activate();
|
|
| 298 | + if(get_class($this) !== 'Error503Controller') {
|
|
| 299 | + Loader::loadNew('controller', '/Error503Controller')->activate();
|
|
| 300 | + } |
|
| 289 | 301 | } |
| 290 | 302 | |
| 291 | 303 | protected function redirect($uri, $method = 301) |
@@ -293,12 +305,14 @@ discard block |
||
| 293 | 305 | switch($method) |
| 294 | 306 | {
|
| 295 | 307 | case 301 : |
| 296 | - if(get_class($this) !== 'Error301Controller') |
|
| 297 | - Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
|
|
| 308 | + if(get_class($this) !== 'Error301Controller') {
|
|
| 309 | + Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
|
|
| 310 | + } |
|
| 298 | 311 | break; |
| 299 | 312 | case 303 : |
| 300 | - if(get_class($this) !== 'Error303Controller') |
|
| 301 | - Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
|
|
| 313 | + if(get_class($this) !== 'Error303Controller') {
|
|
| 314 | + Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
|
|
| 315 | + } |
|
| 302 | 316 | break; |
| 303 | 317 | } |
| 304 | 318 | } |
@@ -345,18 +359,19 @@ discard block |
||
| 345 | 359 | $comment_object->url = $comment->url; |
| 346 | 360 | $comment_object->trusted = $comment->trusted; |
| 347 | 361 | |
| 348 | - if($comment->reply == 0 && Request::getPost('type') == $comment->id)
|
|
| 349 | - $comment_object->errors = $this->comment_errors; |
|
| 350 | - else |
|
| 351 | - $comment_object->errors = array(); |
|
| 362 | + if($comment->reply == 0 && Request::getPost('type') == $comment->id) {
|
|
| 363 | + $comment_object->errors = $this->comment_errors; |
|
| 364 | + } else {
|
|
| 365 | + $comment_object->errors = array(); |
|
| 366 | + } |
|
| 352 | 367 | |
| 353 | 368 | if($comment->reply == 0) |
| 354 | 369 | {
|
| 355 | 370 | $comment_object->replies = array(); |
| 356 | 371 | $comment_array[$comment->id] = $comment_object; |
| 372 | + } else {
|
|
| 373 | + $comment_array[$comment->reply]->replies[$comment->id] = $comment_object; |
|
| 357 | 374 | } |
| 358 | - else |
|
| 359 | - $comment_array[$comment->reply]->replies[$comment->id] = $comment_object; |
|
| 360 | 375 | } |
| 361 | 376 | |
| 362 | 377 | $comment_count = CommentCollector::getCommentCountForURL($site, $path); |
@@ -381,22 +396,26 @@ discard block |
||
| 381 | 396 | $commenter->website = ''; |
| 382 | 397 | |
| 383 | 398 | $commenter_cookie = Cookie::instance('Commenter');
|
| 384 | - if(!$commenter_cookie->exists()) |
|
| 385 | - return $commenter; |
|
| 399 | + if(!$commenter_cookie->exists()) {
|
|
| 400 | + return $commenter; |
|
| 401 | + } |
|
| 386 | 402 | |
| 387 | 403 | $commenter_cookie_value = $commenter_cookie->getValue(); |
| 388 | 404 | $commenter_cookie_value = json_decode($commenter_cookie_value); |
| 389 | 405 | |
| 390 | - if($commenter_cookie_value === NULL) |
|
| 391 | - return $commenter; |
|
| 406 | + if($commenter_cookie_value === NULL) {
|
|
| 407 | + return $commenter; |
|
| 408 | + } |
|
| 392 | 409 | |
| 393 | - if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
| 394 | - return $commenter; |
|
| 410 | + if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {
|
|
| 411 | + return $commenter; |
|
| 412 | + } |
|
| 395 | 413 | |
| 396 | 414 | $commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : '')); |
| 397 | 415 | |
| 398 | - if($commenter_object === NULL) |
|
| 399 | - return $commenter; |
|
| 416 | + if($commenter_object === NULL) {
|
|
| 417 | + return $commenter; |
|
| 418 | + } |
|
| 400 | 419 | |
| 401 | 420 | $commenter->id = $commenter_object->id; |
| 402 | 421 | $commenter->name = $commenter_object->name; |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | final protected function setLink($url = null) |
| 27 | 27 | {
|
| 28 | - if(!isset($url)) |
|
| 28 | + if (!isset($url)) |
|
| 29 | 29 | $url = URLDecode::getBase(); |
| 30 | 30 | $this->xml->channel->addChild('link', $url);
|
| 31 | 31 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | final protected function setCopyright($copyright = null) |
| 52 | 52 | {
|
| 53 | - if(!isset($copyright)) |
|
| 53 | + if (!isset($copyright)) |
|
| 54 | 54 | $copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
|
| 55 | 55 | $this->xml->channel->addChild('copyright', $copyright);
|
| 56 | 56 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | final protected function setPubDate($date = null) |
| 68 | 68 | {
|
| 69 | - if(!isset($date)) |
|
| 69 | + if (!isset($date)) |
|
| 70 | 70 | $date = date('r');
|
| 71 | 71 | $this->xml->channel->addChild('pubDate', $date);
|
| 72 | 72 | } |
@@ -25,8 +25,9 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | final protected function setLink($url = null) |
| 27 | 27 | {
|
| 28 | - if(!isset($url)) |
|
| 29 | - $url = URLDecode::getBase(); |
|
| 28 | + if(!isset($url)) {
|
|
| 29 | + $url = URLDecode::getBase(); |
|
| 30 | + } |
|
| 30 | 31 | $this->xml->channel->addChild('link', $url);
|
| 31 | 32 | } |
| 32 | 33 | |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | |
| 51 | 52 | final protected function setCopyright($copyright = null) |
| 52 | 53 | {
|
| 53 | - if(!isset($copyright)) |
|
| 54 | - $copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
|
|
| 54 | + if(!isset($copyright)) {
|
|
| 55 | + $copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
|
|
| 56 | + } |
|
| 55 | 57 | $this->xml->channel->addChild('copyright', $copyright);
|
| 56 | 58 | } |
| 57 | 59 | |
@@ -66,8 +68,9 @@ discard block |
||
| 66 | 68 | |
| 67 | 69 | final protected function setPubDate($date = null) |
| 68 | 70 | {
|
| 69 | - if(!isset($date)) |
|
| 70 | - $date = date('r');
|
|
| 71 | + if(!isset($date)) {
|
|
| 72 | + $date = date('r');
|
|
| 73 | + } |
|
| 71 | 74 | $this->xml->channel->addChild('pubDate', $date);
|
| 72 | 75 | } |
| 73 | 76 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | {
|
| 28 | 28 | $entry = new stdclass(); |
| 29 | 29 | $entry->agent = self::$ALL_ROBOTS; |
| 30 | - if($url) |
|
| 30 | + if ($url) |
|
| 31 | 31 | $entry->allow = $url; |
| 32 | 32 | else |
| 33 | 33 | {
|
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | {
|
| 43 | 43 | $entry = new stdclass(); |
| 44 | 44 | $entry->agent = self::$ALL_ROBOTS; |
| 45 | - if($url) |
|
| 45 | + if ($url) |
|
| 46 | 46 | $entry->disallow = $url; |
| 47 | 47 | else |
| 48 | 48 | $entry->disallow = self::$ALL_URL; |
@@ -55,18 +55,18 @@ discard block |
||
| 55 | 55 | $this->set_data(); |
| 56 | 56 | Header::sendRobot(); |
| 57 | 57 | |
| 58 | - foreach($this->entries as $key => $entry) |
|
| 58 | + foreach ($this->entries as $key => $entry) |
|
| 59 | 59 | {
|
| 60 | - if($key == 0) |
|
| 60 | + if ($key == 0) |
|
| 61 | 61 | echo "User-agent: {$entry->agent}\n";
|
| 62 | - if(isset($entry->disallow) && $entry->disallow != '') |
|
| 62 | + if (isset($entry->disallow) && $entry->disallow != '') |
|
| 63 | 63 | echo "Disallow: {$entry->disallow}\n";
|
| 64 | - if(isset($entry->allow)) |
|
| 64 | + if (isset($entry->allow)) |
|
| 65 | 65 | echo "Allow: {$entry->allow}\n";
|
| 66 | 66 | //echo "\n"; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - if($this->show_sitemap) |
|
| 69 | + if ($this->show_sitemap) |
|
| 70 | 70 | {
|
| 71 | 71 | echo "\n"; |
| 72 | 72 | $sitemap = URLDecode::getBase() . 'sitemap.xml'; |
@@ -27,9 +27,9 @@ discard block |
||
| 27 | 27 | {
|
| 28 | 28 | $entry = new stdclass(); |
| 29 | 29 | $entry->agent = self::$ALL_ROBOTS; |
| 30 | - if($url) |
|
| 31 | - $entry->allow = $url; |
|
| 32 | - else |
|
| 30 | + if($url) {
|
|
| 31 | + $entry->allow = $url; |
|
| 32 | + } else |
|
| 33 | 33 | {
|
| 34 | 34 | $entry->disallow = ''; |
| 35 | 35 | $entry->allow = self::$ALL_URL; |
@@ -42,10 +42,11 @@ discard block |
||
| 42 | 42 | {
|
| 43 | 43 | $entry = new stdclass(); |
| 44 | 44 | $entry->agent = self::$ALL_ROBOTS; |
| 45 | - if($url) |
|
| 46 | - $entry->disallow = $url; |
|
| 47 | - else |
|
| 48 | - $entry->disallow = self::$ALL_URL; |
|
| 45 | + if($url) {
|
|
| 46 | + $entry->disallow = $url; |
|
| 47 | + } else {
|
|
| 48 | + $entry->disallow = self::$ALL_URL; |
|
| 49 | + } |
|
| 49 | 50 | |
| 50 | 51 | $this->entries[] = $entry; |
| 51 | 52 | } |
@@ -57,12 +58,15 @@ discard block |
||
| 57 | 58 | |
| 58 | 59 | foreach($this->entries as $key => $entry) |
| 59 | 60 | {
|
| 60 | - if($key == 0) |
|
| 61 | - echo "User-agent: {$entry->agent}\n";
|
|
| 62 | - if(isset($entry->disallow) && $entry->disallow != '') |
|
| 63 | - echo "Disallow: {$entry->disallow}\n";
|
|
| 64 | - if(isset($entry->allow)) |
|
| 65 | - echo "Allow: {$entry->allow}\n";
|
|
| 61 | + if($key == 0) {
|
|
| 62 | + echo "User-agent: {$entry->agent}\n";
|
|
| 63 | + } |
|
| 64 | + if(isset($entry->disallow) && $entry->disallow != '') {
|
|
| 65 | + echo "Disallow: {$entry->disallow}\n";
|
|
| 66 | + } |
|
| 67 | + if(isset($entry->allow)) {
|
|
| 68 | + echo "Allow: {$entry->allow}\n";
|
|
| 69 | + } |
|
| 66 | 70 | //echo "\n"; |
| 67 | 71 | } |
| 68 | 72 | |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | |
| 23 | 23 | protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5) |
| 24 | 24 | {
|
| 25 | - if(!$lastmod) |
|
| 25 | + if (!$lastmod) |
|
| 26 | 26 | $lastmod = $this->default_lastmod; |
| 27 | 27 | |
| 28 | 28 | $url = $this->xml->addChild('url');
|
@@ -22,8 +22,9 @@ |
||
| 22 | 22 | |
| 23 | 23 | protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5) |
| 24 | 24 | {
|
| 25 | - if(!$lastmod) |
|
| 26 | - $lastmod = $this->default_lastmod; |
|
| 25 | + if(!$lastmod) {
|
|
| 26 | + $lastmod = $this->default_lastmod; |
|
| 27 | + } |
|
| 27 | 28 | |
| 28 | 29 | $url = $this->xml->addChild('url');
|
| 29 | 30 | |