From 433b21ab6fe8bb7c0c10f100eb7906beb7ce46b1 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 19 Oct 2018 10:17:41 +0900 Subject: [PATCH] Fix default edit_* tables and triggers --- 4dev/database/table/edit_scheme.sql | 2 +- 4dev/database/table/edit_user.sql | 4 ++-- 4dev/database/trigger/trg_edit_access.sql | 5 +++++ 4dev/database/trigger/trg_set_edit_access_uid.sql | 4 ---- www/includes/admin_set_paths.inc | 5 ++++- 5 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 4dev/database/trigger/trg_set_edit_access_uid.sql diff --git a/4dev/database/table/edit_scheme.sql b/4dev/database/table/edit_scheme.sql index 2612d98a..8a03d0a7 100644 --- a/4dev/database/table/edit_scheme.sql +++ b/4dev/database/table/edit_scheme.sql @@ -12,5 +12,5 @@ CREATE TABLE edit_scheme ( name VARCHAR, header_color VARCHAR, css_file VARCHAR, - template VARCHARs + template VARCHAR ) INHERITS (edit_generic) WITHOUT OIDS; diff --git a/4dev/database/table/edit_user.sql b/4dev/database/table/edit_user.sql index 41f4329c..1051b7ee 100644 --- a/4dev/database/table/edit_user.sql +++ b/4dev/database/table/edit_user.sql @@ -26,8 +26,8 @@ CREATE TABLE edit_user ( edit_scheme_id INT, edit_access_right_id INT NOT NULL, login_error_count INT, - login_error_date_last TIMESTAMP WTIHOUT TIME ZONE, - login_error_date_first TIMESTAMP WTIHOUT TIME ZONE, + login_error_date_last TIMESTAMP WITHOUT TIME ZONE, + login_error_date_first TIMESTAMP WITHOUT TIME ZONE, strict SMALLINT DEFAULT 0, locked SMALLINT DEFAULT 0, password_change_date TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed diff --git a/4dev/database/trigger/trg_edit_access.sql b/4dev/database/trigger/trg_edit_access.sql index cd05aaa5..e2734b9c 100644 --- a/4dev/database/trigger/trg_edit_access.sql +++ b/4dev/database/trigger/trg_edit_access.sql @@ -2,3 +2,8 @@ DROP TRIGGER trg_edit_access ON edit_access; CREATE TRIGGER trg_edit_access BEFORE INSERT OR UPDATE ON edit_access FOR EACH ROW EXECUTE PROCEDURE set_edit_generic(); + +DROP TRIGGER trg_set_edit_access_uid ON edit_access; +CREATE TRIGGER trg_set_edit_access_uid +BEFORE INSERT OR UPDATE ON edit_access +FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid(); diff --git a/4dev/database/trigger/trg_set_edit_access_uid.sql b/4dev/database/trigger/trg_set_edit_access_uid.sql deleted file mode 100644 index b602a293..00000000 --- a/4dev/database/trigger/trg_set_edit_access_uid.sql +++ /dev/null @@ -1,4 +0,0 @@ --- DROP TRIGGER trg_set_edit_access_uid ON edit_access; -CREATE TRIGGER trg_set_edit_access_uid -BEFORE INSERT OR UPDATE ON edit_access -FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid(); diff --git a/www/includes/admin_set_paths.inc b/www/includes/admin_set_paths.inc index 3162bb1a..98bab5ea 100644 --- a/www/includes/admin_set_paths.inc +++ b/www/includes/admin_set_paths.inc @@ -55,7 +55,10 @@ $cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME; $cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME; // set basic template path (tmp) -$smarty->setTemplateDir(LAYOUT.$TEMPLATE_DIR.TEMPLATES); // no outside +$cms->template_path = LAYOUT.$TEMPLATE_DIR.TEMPLATES; +if ($smarty) { + $smarty->setTemplateDir($cms->template_path); +} $cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG; // no outside $cms->includes = BASE.INCLUDES; // no longer in templates, only global $cms->javascript = LAYOUT.$TEMPLATE_DIR.JS;