From 5be34453ce62fc0a2bea3c52c8f7e39ffc70dcc0 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Thu, 10 Nov 2022 10:26:59 +0900 Subject: [PATCH] Fix in Smarty Template class and PAGE WIDTH set --- .../20220617-edit_user_login_user_id_add.sql | 32 +++++++++---------- www/configs/config.master.php | 8 ++--- www/lib/CoreLibs/Template/SmartyExtend.php | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql b/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql index 32f0053f..45e46f08 100644 --- a/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql +++ b/4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql @@ -26,22 +26,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date() RETURNS TRIGGER AS $$ BEGIN - -- if new is not null/empty - -- and old one is null or old one different new one - -- set NOW() - -- if new one is NULL - -- set NULL - IF - NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND - (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id) - THEN - NEW.login_user_id_set_date = NOW(); - NEW.login_user_id_last_revalidate = NOW(); - ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN - NEW.login_user_id_set_date = NULL; - NEW.login_user_id_last_revalidate = NULL; - END IF; - RETURN NEW; + -- if new is not null/empty + -- and old one is null or old one different new one + -- set NOW() + -- if new one is NULL + -- set NULL + IF + NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND + (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id) + THEN + NEW.login_user_id_set_date = NOW(); + NEW.login_user_id_last_revalidate = NOW(); + ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN + NEW.login_user_id_set_date = NULL; + NEW.login_user_id_last_revalidate = NULL; + END IF; + RETURN NEW; END; $$ LANGUAGE 'plpgsql'; diff --git a/www/configs/config.master.php b/www/configs/config.master.php index 163f957b..355ab937 100644 --- a/www/configs/config.master.php +++ b/www/configs/config.master.php @@ -249,7 +249,7 @@ if ($is_secure) { define('HOST_PROTOCOL', 'http://'); } // 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] ?? []); // because we can't change constant, but we want to for db debug flag $GLOBALS['DB_CONFIG_SET'] = DB_CONFIG; @@ -268,9 +268,9 @@ define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCO define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false); define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false); // paths -// define('CSV_PATH', $PATHS[TARGET]['csv_path']); -// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']); -// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url']); +// define('CSV_PATH', $PATHS[TARGET]['csv_path'] ?? ''); +// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? ''); +// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? ''); // show all errors if debug_all & show_error_handling are enabled define('SHOW_ALL_ERRORS', true); diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index 24443a75..08bef934 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -465,7 +465,7 @@ class SmartyExtend extends \Smarty $this->HEADER['JAVASCRIPT'] = $this->ADMIN_JAVASCRIPT ? $this->ADMIN_JAVASCRIPT : ADMIN_JAVASCRIPT; // the page name $this->DATA['page_name'] = $this->page_name; - $this->DATA['table_width'] = empty($this->PAGE_WIDTH) ?: PAGE_WIDTH; + $this->DATA['table_width'] = !empty($this->PAGE_WIDTH) ?: PAGE_WIDTH; $this->DATA['form_name'] = $this->DATA['FORM_NAME']; // for tinymce special $this->DATA['TINYMCE_LANG'] = $this->lang_short;