diff --git a/core/config.class.php b/core/config.class.php index ebd3e8b5..dd488b46 100644 --- a/core/config.class.php +++ b/core/config.class.php @@ -88,10 +88,10 @@ interface Config { * parameter won't show up. * * @param string $name - * @param bool|string|null $value + * @param bool $value * @return void */ - public function set_default_bool(/*string*/ $name, $value); + public function set_default_bool(/*string*/ $name, /*bool*/ $value); /** * Set a configuration option to a new value, if there is no value currently. @@ -218,10 +218,10 @@ abstract class BaseConfig implements Config { /** * @param string $name - * @param bool|null|string $value + * @param bool $value * @return void */ - public function set_default_bool(/*string*/ $name, $value) { + public function set_default_bool(/*string*/ $name, /*bool*/ $value) { if(is_null($this->get($name))) { $this->values[$name] = (($value == 'on' || $value === true) ? 'Y' : 'N'); } diff --git a/ext/pools/main.php b/ext/pools/main.php index bc190ae7..6536a527 100644 --- a/ext/pools/main.php +++ b/ext/pools/main.php @@ -29,6 +29,16 @@ class Pools extends Extension { public function onInitExt(InitExtEvent $event) { global $config, $database; + // Set the defaults for the pools extension + $config->set_default_int("poolsMaxImportResults", 1000); + $config->set_default_int("poolsImagesPerPage", 20); + $config->set_default_int("poolsListsPerPage", 20); + $config->set_default_int("poolsUpdatedPerPage", 20); + $config->set_default_bool("poolsInfoOnViewImage", false); + $config->set_default_bool("poolsAdderOnViewImage", false); + $config->set_default_bool("poolsShowNavLinks", false); + $config->set_default_bool("poolsAutoIncrementOrder", false); + // Create the database tables if ($config->get_int("ext_pools_version") < 1){ $database->create_table("pools", " @@ -59,17 +69,7 @@ class Pools extends Extension { FOREIGN KEY (pool_id) REFERENCES pools(id) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE "); - - // Set the defaults for the pools extension - $config->set_int("ext_pools_version", 1); - - $config->set_int("poolsMaxImportResults", 1000); - $config->set_int("poolsImagesPerPage", 20); - $config->set_int("poolsListsPerPage", 20); - $config->set_int("poolsUpdatedPerPage", 20); - $config->set_bool("poolsInfoOnViewImage", "N"); - $config->set_bool("poolsAdderOnViewImage", "N"); - $config->set_bool("poolsShowNextLink","N"); + $config->set_int("ext_pools_version", 3); log_info("pools", "extension installed"); } @@ -78,14 +78,7 @@ class Pools extends Extension { $database->Execute("ALTER TABLE pools ADD UNIQUE INDEX (title);"); $database->Execute("ALTER TABLE pools ADD lastupdated TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"); - $config->set_int("ext_pools_version", 2); - } - - if ($config->get_int("ext_pools_version") < 3){ - $config->set_bool("poolsShowNavLinks","N"); //A $config->rename() function would be nice here... - $config->set_bool("poolsAutoIncrementOrder","N"); - - $config->set_int("ext_pools_version", 3); + $config->set_int("ext_pools_version", 3); // skip 2 } }