diff --git a/core/_bootstrap.php b/core/_bootstrap.php index 28f2a08b..2d720564 100644 --- a/core/_bootstrap.php +++ b/core/_bootstrap.php @@ -77,7 +77,7 @@ _load_event_listeners(); $_tracer->end(); send_event(new InitExtEvent()); -if(AUTO_DB_UPGRADE) { - send_event(new DatabaseUpgradeEvent()); +if (AUTO_DB_UPGRADE) { + send_event(new DatabaseUpgradeEvent()); } $_tracer->end(); diff --git a/core/event.php b/core/event.php index 37d60d57..24699291 100644 --- a/core/event.php +++ b/core/event.php @@ -317,5 +317,6 @@ class LogEvent extends Event } } -class DatabaseUpgradeEvent extends Event { +class DatabaseUpgradeEvent extends Event +{ } diff --git a/ext/admin/main.php b/ext/admin/main.php index faadfe87..800e3567 100644 --- a/ext/admin/main.php +++ b/ext/admin/main.php @@ -70,9 +70,9 @@ class AdminPage extends Extension } if ($event->cmd == "db-upgrade") { print("Running DB Upgrade\n"); - global $database; + global $database; $database->set_timeout(300000); // These updates can take a little bit - send_event(new DatabaseUpgradeEvent()); + send_event(new DatabaseUpgradeEvent()); } if ($event->cmd == "get-page") { global $page; diff --git a/ext/approval/main.php b/ext/approval/main.php index 809b323b..6a18a8c0 100644 --- a/ext/approval/main.php +++ b/ext/approval/main.php @@ -77,8 +77,8 @@ class Approval extends Extension $database->set_timeout(300000); // These updates can take a little bit $database->execute( $database->scoreql_to_sql( - "UPDATE images SET approved = SCORE_BOOL_Y, approved_by_id = :approved_by_id WHERE approved = SCORE_BOOL_N" - ), + "UPDATE images SET approved = SCORE_BOOL_Y, approved_by_id = :approved_by_id WHERE approved = SCORE_BOOL_N" + ), ["approved_by_id"=>$user->id] ); break; @@ -169,8 +169,8 @@ class Approval extends Extension $database->execute( $database->scoreql_to_sql( - "UPDATE images SET approved = SCORE_BOOL_Y, approved_by_id = :approved_by_id WHERE id = :id AND approved = SCORE_BOOL_N" - ), + "UPDATE images SET approved = SCORE_BOOL_Y, approved_by_id = :approved_by_id WHERE id = :id AND approved = SCORE_BOOL_N" + ), ["approved_by_id"=>$user->id, "id"=>$image_id] ); } @@ -181,8 +181,8 @@ class Approval extends Extension $database->execute( $database->scoreql_to_sql( - "UPDATE images SET approved = SCORE_BOOL_N, approved_by_id = NULL WHERE id = :id AND approved = SCORE_BOOL_Y" - ), + "UPDATE images SET approved = SCORE_BOOL_N, approved_by_id = NULL WHERE id = :id AND approved = SCORE_BOOL_Y" + ), ["id"=>$image_id] ); } diff --git a/ext/comment/main.php b/ext/comment/main.php index c0eac631..10c6a531 100644 --- a/ext/comment/main.php +++ b/ext/comment/main.php @@ -90,7 +90,8 @@ class CommentList extends Extension /** @var CommentListTheme $theme */ public $theme; - public function onInitExt(InitExtEvent $event) { + public function onInitExt(InitExtEvent $event) + { global $config; $config->set_default_int('comment_window', 5); $config->set_default_int('comment_limit', 10); diff --git a/ext/log_db/main.php b/ext/log_db/main.php index 2c33c8d7..8a86d8a9 100644 --- a/ext/log_db/main.php +++ b/ext/log_db/main.php @@ -8,7 +8,8 @@ class LogDatabase extends Extension $config->set_default_int("log_db_priority", SCORE_LOG_INFO); } - public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) { + public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) + { global $config, $database; if ($config->get_int("ext_log_database_version") < 1) { diff --git a/ext/pools/main.php b/ext/pools/main.php index 09eb95ce..85f0e06c 100644 --- a/ext/pools/main.php +++ b/ext/pools/main.php @@ -61,7 +61,8 @@ class PoolCreationEvent extends Event class Pools extends Extension { - public function onInitExt(InitExtEvent $event) { + public function onInitExt(InitExtEvent $event) + { global $config; // Set the defaults for the pools extension @@ -75,7 +76,8 @@ class Pools extends Extension $config->set_default_bool(PoolsConfig::AUTO_INCREMENT_ORDER, false); } - public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) { + public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) + { global $config, $database; // Create the database tables diff --git a/ext/tag_categories/main.php b/ext/tag_categories/main.php index adbaf00c..c0488c2a 100644 --- a/ext/tag_categories/main.php +++ b/ext/tag_categories/main.php @@ -5,7 +5,8 @@ require_once "config.php"; class TagCategories extends Extension { - public function onInitExt(InitExtEvent $event) { + public function onInitExt(InitExtEvent $event) + { global $config; // whether we split out separate categories on post view by default @@ -13,7 +14,8 @@ class TagCategories extends Extension $config->set_default_bool(TagCategoriesConfig::SPLIT_ON_VIEW, true); } - public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) { + public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) + { global $config, $database; if ($config->get_int(TagCategoriesConfig::VERSION) < 1) {