Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f2668b011 | ||
|
|
eba1ef9c59 | ||
|
|
8497144053 | ||
|
|
2006798388 |
@@ -222,7 +222,17 @@ if ($is_secure) {
|
|||||||
}
|
}
|
||||||
// define the db config set name, the db config and the db schema
|
// define the db config set name, the db config and the db schema
|
||||||
define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host'] ?? '');
|
define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host'] ?? '');
|
||||||
define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? []);
|
define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? [
|
||||||
|
'db_name' => '',
|
||||||
|
'db_user' => '',
|
||||||
|
'db_pass' => '',
|
||||||
|
'db_host' => '',
|
||||||
|
'db_port' => 5432,
|
||||||
|
'db_schema' => '',
|
||||||
|
'db_encoding' => '',
|
||||||
|
'db_type' => '',
|
||||||
|
'db_ssl' => ''
|
||||||
|
]);
|
||||||
// because we can't change constant, but we want to for db debug flag
|
// because we can't change constant, but we want to for db debug flag
|
||||||
$GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
|
$GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
|
||||||
// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
|
// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ $l10n = new \CoreLibs\Language\L10n(
|
|||||||
$locale['locale'],
|
$locale['locale'],
|
||||||
$locale['domain'],
|
$locale['domain'],
|
||||||
$locale['path'],
|
$locale['path'],
|
||||||
$locale['encoding']
|
$locale['encoding'],
|
||||||
);
|
);
|
||||||
|
|
||||||
// create smarty object
|
// create smarty object
|
||||||
|
|||||||
@@ -231,8 +231,6 @@ class Login
|
|||||||
) {
|
) {
|
||||||
// attach db class
|
// attach db class
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
// log login data for this class only
|
|
||||||
$log->setLogFlag(\CoreLibs\Logging\Logger\Flag::per_class);
|
|
||||||
// attach logger
|
// attach logger
|
||||||
$this->log = $log;
|
$this->log = $log;
|
||||||
// attach session class
|
// attach session class
|
||||||
|
|||||||
@@ -164,6 +164,10 @@ class Backend
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
$this->default_acl = $set_default_acl_level ?? DEFAULT_ACL_LEVEL;
|
$this->default_acl = $set_default_acl_level ?? DEFAULT_ACL_LEVEL;
|
||||||
|
// if negative or larger than 100, reset to 0
|
||||||
|
if ($this->default_acl < 0 || $this->default_acl > 100) {
|
||||||
|
$this->default_acl = 0;
|
||||||
|
}
|
||||||
|
|
||||||
// queue key
|
// queue key
|
||||||
if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action)) {
|
if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action)) {
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ class IO
|
|||||||
// basic vars
|
// basic vars
|
||||||
// the dbh handler, if disconnected by command is null, bool:false on error,
|
// the dbh handler, if disconnected by command is null, bool:false on error,
|
||||||
/** @var \PgSql\Connection|false|null */
|
/** @var \PgSql\Connection|false|null */
|
||||||
private \PgSql\Connection|false|null $dbh;
|
private \PgSql\Connection|false|null $dbh = null;
|
||||||
/** @var bool DB_DEBUG ... (if set prints out debug msgs) */
|
/** @var bool DB_DEBUG ... (if set prints out debug msgs) */
|
||||||
private bool $db_debug = false;
|
private bool $db_debug = false;
|
||||||
/** @var string the DB connected to */
|
/** @var string the DB connected to */
|
||||||
@@ -814,13 +814,13 @@ class IO
|
|||||||
switch ($id) {
|
switch ($id) {
|
||||||
case 'DB_ERROR':
|
case 'DB_ERROR':
|
||||||
$this->log->error(
|
$this->log->error(
|
||||||
$debug_id . ' :' . $prefix . $error_string,
|
$prefix . $error_string,
|
||||||
$context
|
$context
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case 'DB_WARNING':
|
case 'DB_WARNING':
|
||||||
$this->log->warning(
|
$this->log->warning(
|
||||||
$debug_id . ' :' . $prefix . $error_string,
|
$prefix . $error_string,
|
||||||
$context
|
$context
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user