james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

set_default_bool should take a bool, always

Browse Source
This commit is contained in:
Shish 2015-08-08 17:17:14 +01:00
parent fa2f17817e
commit 45d090054b
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/config.class.php
View File

@ -88,10 +88,10 @@ interface Config {
* parameter won't show up. * parameter won't show up.
* *
* @param string $name * @param string $name
* @param bool|string|null $value * @param bool $value
* @return void * @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. * 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 string $name
* @param bool|null|string $value * @param bool $value
* @return void * @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))) { if(is_null($this->get($name))) {
$this->values[$name] = (($value == 'on' || $value === true) ? 'Y' : 'N'); $this->values[$name] = (($value == 'on' || $value === true) ? 'Y' : 'N');
} }

31
ext/pools/main.php
View File

@ -29,6 +29,16 @@ class Pools extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; 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 // Create the database tables
if ($config->get_int("ext_pools_version") < 1){ if ($config->get_int("ext_pools_version") < 1){
$database->create_table("pools", " $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 (pool_id) REFERENCES pools(id) ON UPDATE CASCADE ON DELETE CASCADE,
FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE FOREIGN KEY (user_id) REFERENCES users(id) ON UPDATE CASCADE ON DELETE CASCADE
"); ");
$config->set_int("ext_pools_version", 3);
// 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");
log_info("pools", "extension installed"); 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 UNIQUE INDEX (title);");
$database->Execute("ALTER TABLE pools ADD lastupdated TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"); $database->Execute("ALTER TABLE pools ADD lastupdated TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;");
$config->set_int("ext_pools_version", 2); $config->set_int("ext_pools_version", 3); // skip 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);
} }
} }