Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:seblucas/cops

Browse source
This commit is contained in:
George Litos 2015-10-29 19:46:06 +02:00
commit 62a7034ab8
4 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base.php
View file

@ -1201,6 +1201,9 @@ abstract class Base
global $config;
if (self::isMultipleDatabaseEnabled ()) {
if (is_null ($database)) $database = GetUrlParam (DB, 0);
if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
return self::error ($database);
}
$array = array_keys ($config['calibre_directory']);
return $array[$database];
}
@ -1211,6 +1214,9 @@ abstract class Base
global $config;
if (self::isMultipleDatabaseEnabled ()) {
if (is_null ($database)) $database = GetUrlParam (DB, 0);
if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
return self::error ($database);
}
$array = array_values ($config['calibre_directory']);
return $array[$database];
}
@ -1222,11 +1228,11 @@ abstract class Base
return self::getDbDirectory ($database) .'metadata.db';
}
private static function error () {
private static function error ($database) {
if (php_sapi_name() != "cli") {
header("location: checkconfig.php?err=1");
}
throw new Exception('Database not found.');
throw new Exception("Database <{$database}> not found.");
}
public static function getDb ($database = NULL) {
@ -1238,10 +1244,10 @@ abstract class Base
self::$db->sqliteCreateFunction ('normAndUp', 'normAndUp', 1);
}
} else {
self::error ();
self::error ($database);
}
} catch (Exception $e) {
self::error ();
self::error ($database);
}
}
return self::$db;