Fix ACL Login phpunit test

Session class rewrite
create new session on class call, there is no need to delay that at all new option to auto write close a session session_id and session_name are stored as class vars deprecate the __set/__get part because we do not want to set via ->session_var_name but use the set()/get() methods. They have been renamed from setS/getS... to set/get alone
2024-12-04 14:17:16 +09:00 · 2024-12-04 14:10:36 +09:00 · 2024-12-03 13:16:47 +09:00 · 2024-12-02 17:09:02 +09:00
17 changed files with 1058 additions and 806 deletions
--- a/4dev/database/function/set_edit_generic.sql
+++ b/4dev/database/function/set_edit_generic.sql
@@ -9,6 +9,7 @@ BEGIN
    IF TG_OP = 'INSERT' THEN
        NEW.date_created := 'now';
        NEW.cuid := random_string(random_length);
        NEW.cuuid := gen_random_uuid();
    ELSIF TG_OP = 'UPDATE' THEN
        NEW.date_updated := 'now';
    END IF;
--- a/4dev/database/table/edit_generic.sql
+++ b/4dev/database/table/edit_generic.sql
@@ -8,6 +8,7 @@
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
    cuid VARCHAR,
    cuuid UUID DEFAULT gen_random_uuid(),
    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
    date_updated TIMESTAMP WITHOUT TIME ZONE
 );
--- a/4dev/database/table/edit_log.sql
+++ b/4dev/database/table/edit_log.sql
@@ -12,6 +12,8 @@ CREATE TABLE edit_log (
    FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
    username VARCHAR,
    password VARCHAR,
    ecuid VARCHAR,
    ecuuid UUID,
    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
    ip VARCHAR,
    error TEXT,
@@ -21,6 +23,7 @@ CREATE TABLE edit_log (
    page VARCHAR,
    action VARCHAR,
    action_id VARCHAR,
    action_sub_id VARCHAR,
    action_yes VARCHAR,
    action_flag VARCHAR,
    action_menu VARCHAR,
--- a/4dev/tests/ACL/CoreLibsACLLoginTest.php
+++ b/4dev/tests/ACL/CoreLibsACLLoginTest.php
@@ -243,6 +243,8 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[
 					'EUID' => 1,
 					'ECUID' => 'abc',
 					'ECUUID' => '1233456-1234-1234-1234-123456789012',
 				],
 				2,
 				[],
@@ -260,6 +262,8 @@ final class CoreLibsACLLoginTest extends TestCase
 				[],
 				[
 					'EUID' => 1,
 					'ECUID' => 'abc',
 					'ECUUID' => '1233456-1234-1234-1234-123456789012',
 					'USER_NAME' => '',
 					'GROUP_NAME' => '',
 					'ADMIN' => 1,
@@ -1085,9 +1089,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['startSession', 'checkActiveSession', 'sessionDestroy']
+			['getSessionId', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('startSession')->willReturn('ACLLOGINTEST12');
+		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST12');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -1788,9 +1792,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['startSession', 'checkActiveSession', 'sessionDestroy']
+			['getSessionId', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -1902,9 +1906,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['startSession', 'checkActiveSession', 'sessionDestroy']
+			['getSessionId', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -1990,9 +1994,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['startSession', 'checkActiveSession', 'sessionDestroy']
+			['getSessionId', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
@@ -2086,9 +2090,9 @@ final class CoreLibsACLLoginTest extends TestCase
 		/** @var \CoreLibs\Create\Session&MockObject */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
-			['startSession', 'checkActiveSession', 'sessionDestroy']
+			['getSessionId', 'checkActiveSession', 'sessionDestroy']
 		);
-		$session_mock->method('startSession')->willReturn('ACLLOGINTEST34');
+		$session_mock->method('getSessionId')->willReturn('ACLLOGINTEST34');
 		$session_mock->method('checkActiveSession')->willReturn(true);
 		$session_mock->method('sessionDestroy')->will(
 			$this->returnCallback(function () {
--- a/4dev/tests/ACL/database/CoreLibsACLLogin_database_create_data.sql
+++ b/4dev/tests/ACL/database/CoreLibsACLLogin_database_create_data.sql
@@ -5,15 +5,15 @@ CREATE FUNCTION random_string(randomLength int)
 RETURNS text AS
 $$
 SELECT array_to_string(
-	ARRAY(
+    ARRAY(
-		SELECT substring(
+        SELECT substring(
-			'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-			trunc(random() * 62)::int + 1,
+            trunc(random() * 62)::int + 1,
-			1
+            1
-		)
+        )
-		FROM generate_series(1, randomLength) AS gs(x)
+        FROM generate_series(1, randomLength) AS gs(x)
-	),
+    ),
-	''
+    ''
 )
 $$
 LANGUAGE SQL
@@ -27,15 +27,16 @@ CREATE OR REPLACE FUNCTION set_edit_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 12; -- that should be long enough
+    random_length INT = 12; -- that should be long enough
 BEGIN
-	IF TG_OP = 'INSERT' THEN
+    IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
+        NEW.date_created := 'now';
-		NEW.cuid := random_string(random_length);
+        NEW.cuid := random_string(random_length);
-	ELSIF TG_OP = 'UPDATE' THEN
+        NEW.cuuid := gen_random_uuid();
-		NEW.date_updated := 'now';
+    ELSIF TG_OP = 'UPDATE' THEN
-	END IF;
+        NEW.date_updated := 'now';
-	RETURN NEW;
+    END IF;
    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
@@ -46,29 +47,29 @@ LANGUAGE 'plpgsql';
 CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
+    myrec RECORD;
-	v_uid VARCHAR;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
+    -- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
+        -- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
+        -- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
+        v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
+        IF TG_OP = 'INSERT' THEN
-			-- always set
+            -- always set
-			NEW.uid := v_uid;
+            NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
+        ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
+            -- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
+            SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
-			IF FOUND THEN
+            IF FOUND THEN
-				NEW.uid := v_uid;
+                NEW.uid := v_uid;
-			END IF;
+            END IF;
-		END IF;
+        END IF;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+    LANGUAGE 'plpgsql';
 -- END: function/edit_access_set_uid.sql
 -- START: function/edit_group_set_uid.sql
 -- add uid add for edit_group table
@@ -76,29 +77,29 @@ $$
 CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
+    myrec RECORD;
-	v_uid VARCHAR;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
+    -- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
+        -- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
+        -- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
+        v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
+        IF TG_OP = 'INSERT' THEN
-			-- always set
+            -- always set
-			NEW.uid := v_uid;
+            NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
+        ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
+            -- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
+            SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
-			IF FOUND THEN
+            IF FOUND THEN
-				NEW.uid := v_uid;
+                NEW.uid := v_uid;
-			END IF;
+            END IF;
-		END IF;
+        END IF;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+    LANGUAGE 'plpgsql';
 -- END: function/edit_group_set_uid.sql
 -- START: function/edit_log_partition_insert.sql
 -- AUTHOR: Clemens Schwaighofer
@@ -112,142 +113,142 @@ CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	start_date DATE := '2010-01-01';
+    start_date DATE := '2010-01-01';
-	end_date DATE;
+    end_date DATE;
-	timeformat TEXT := 'YYYY';
+    timeformat TEXT := 'YYYY';
-	selector TEXT := 'year';
+    selector TEXT := 'year';
-	base_table TEXT := 'edit_log';
+    base_table TEXT := 'edit_log';
-	_interval INTERVAL := '1 ' || selector;
+    _interval INTERVAL := '1 ' || selector;
-	_interval_next INTERVAL := '2 ' || selector;
+    _interval_next INTERVAL := '2 ' || selector;
-	table_name TEXT;
+    table_name TEXT;
-	-- compare date column
+    -- compare date column
-	compare_date DATE := NEW.event_date;
+    compare_date DATE := NEW.event_date;
-	compare_date_name TEXT := 'event_date';
+    compare_date_name TEXT := 'event_date';
-	-- the create commands
+    -- the create commands
-	command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
+    command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
-	command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
+    command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
-	command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
+    command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
-	command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+    command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
 BEGIN
-	-- we are in valid start time area
+    -- we are in valid start time area
-	IF (NEW.event_date >= start_date) THEN
+    IF (NEW.event_date >= start_date) THEN
-		-- current table name
+        -- current table name
-		table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
+        table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
-		BEGIN
+        BEGIN
-			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+            EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-		-- if insert failed because of missing table, create new below
+        -- if insert failed because of missing table, create new below
-		EXCEPTION
+        EXCEPTION
-		WHEN undefined_table THEN
+        WHEN undefined_table THEN
-			-- another block, so in case the creation fails here too
+            -- another block, so in case the creation fails here too
-			BEGIN
+            BEGIN
-				-- create new table here + all indexes
+                -- create new table here + all indexes
-				start_date := date_trunc(selector, NEW.event_date);
+                start_date := date_trunc(selector, NEW.event_date);
-				end_date := date_trunc(selector, NEW.event_date + _interval);
+                end_date := date_trunc(selector, NEW.event_date + _interval);
-				-- creat table
+                -- creat table
-				EXECUTE format(REPLACE( -- end date
+                EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
+                    REPLACE( -- start date
-						REPLACE( -- compare date name
+                        REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
+                            REPLACE( -- base name (inherit)
-								REPLACE( -- table name
+                                REPLACE( -- table name
-									command_create_table,
+                                    command_create_table,
-									'{TABLE_NAME}',
+                                    '{TABLE_NAME}',
-									table_name
+                                    table_name
-								),
+                                ),
-								'{BASE_NAME}',
+                                '{BASE_NAME}',
-								base_table
+                                base_table
-							),
+                            ),
-							'{COMPARE_DATE_NAME}',
+                            '{COMPARE_DATE_NAME}',
-							compare_date_name
+                            compare_date_name
-						),
+                        ),
-						'{START_DATE}',
+                        '{START_DATE}',
-						quote_literal(start_date)
+                        quote_literal(start_date)
-					),
+                    ),
-					'{END_DATE}',
+                    '{END_DATE}',
-					quote_literal(end_date)
+                    quote_literal(end_date)
-				));
+                ));
-				-- create all indexes and triggers
+                -- create all indexes and triggers
-				EXECUTE format(REPLACE(
+                EXECUTE format(REPLACE(
-					REPLACE(
+                    REPLACE(
-						command_create_primary_key,
+                        command_create_primary_key,
-						'{TABLE_NAME}',
+                        '{TABLE_NAME}',
-						table_name
+                        table_name
-					),
+                    ),
-					'{BASE_TABLE}',
+                    '{BASE_TABLE}',
-					base_table
+                    base_table
-				));
+                ));
-				-- FK constraints
+                -- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
+                -- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
-				-- insert try again
+                -- insert try again
-				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+                EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-			EXCEPTION
+            EXCEPTION
-			WHEN OTHERS THEN
+            WHEN OTHERS THEN
-				-- if this faled, throw it into the overflow table (so we don't loose anything)
+                -- if this faled, throw it into the overflow table (so we don't loose anything)
-				INSERT INTO edit_log_overflow VALUES (NEW.*);
+                INSERT INTO edit_log_overflow VALUES (NEW.*);
-			END;
+            END;
-		-- other errors, insert into overlow
+        -- other errors, insert into overlow
-		WHEN OTHERS THEN
+        WHEN OTHERS THEN
-			-- if this faled, throw it into the overflow table (so we don't loose anything)
+            -- if this faled, throw it into the overflow table (so we don't loose anything)
-			INSERT INTO edit_log_overflow VALUES (NEW.*);
+            INSERT INTO edit_log_overflow VALUES (NEW.*);
-		END;
+        END;
-		-- main insert run done, check if we have to create next months table
+        -- main insert run done, check if we have to create next months table
-		BEGIN
+        BEGIN
-			-- check if next month table exists
+            -- check if next month table exists
-			table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
+            table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
-			-- RAISE NOTICE 'SEARCH NEXT: %', table_name;
+            -- RAISE NOTICE 'SEARCH NEXT: %', table_name;
-			IF  (SELECT to_regclass(table_name)) IS NULL THEN
+            IF  (SELECT to_regclass(table_name)) IS NULL THEN
-				-- move inner interval same
+                -- move inner interval same
-				start_date := date_trunc(selector, NEW.event_date + _interval);
+                start_date := date_trunc(selector, NEW.event_date + _interval);
-				end_date := date_trunc(selector, NEW.event_date + _interval_next);
+                end_date := date_trunc(selector, NEW.event_date + _interval_next);
-				-- RAISE NOTICE 'CREATE NEXT: %', table_name;
+                -- RAISE NOTICE 'CREATE NEXT: %', table_name;
-				-- create table
+                -- create table
-				EXECUTE format(REPLACE( -- end date
+                EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
+                    REPLACE( -- start date
-						REPLACE( -- compare date name
+                        REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
+                            REPLACE( -- base name (inherit)
-								REPLACE( -- table name
+                                REPLACE( -- table name
-									command_create_table,
+                                    command_create_table,
-									'{TABLE_NAME}',
+                                    '{TABLE_NAME}',
-									table_name
+                                    table_name
-								),
+                                ),
-								'{BASE_NAME}',
+                                '{BASE_NAME}',
-								base_table
+                                base_table
-							),
+                            ),
-							'{COMPARE_DATE_NAME}',
+                            '{COMPARE_DATE_NAME}',
-							compare_date_name
+                            compare_date_name
-						),
+                        ),
-						'{START_DATE}',
+                        '{START_DATE}',
-						quote_literal(start_date)
+                        quote_literal(start_date)
-					),
+                    ),
-					'{END_DATE}',
+                    '{END_DATE}',
-					quote_literal(end_date)
+                    quote_literal(end_date)
-				));
+                ));
-				-- create all indexes and triggers
+                -- create all indexes and triggers
-				EXECUTE format(REPLACE(
+                EXECUTE format(REPLACE(
-					REPLACE(
+                    REPLACE(
-						command_create_primary_key,
+                        command_create_primary_key,
-						'{TABLE_NAME}',
+                        '{TABLE_NAME}',
-						table_name
+                        table_name
-					),
+                    ),
-					'{BASE_TABLE}',
+                    '{BASE_TABLE}',
-					base_table
+                    base_table
-				));
+                ));
-				-- FK constraints
+                -- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
+                -- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
-			END IF;
+            END IF;
-		EXCEPTION
+        EXCEPTION
-		WHEN OTHERS THEN
+        WHEN OTHERS THEN
-			RAISE NOTICE 'Failed to create next table: %', table_name;
+            RAISE NOTICE 'Failed to create next table: %', table_name;
-		END;
+        END;
-	ELSE
+    ELSE
-		-- if outside valid date, insert into overflow
+        -- if outside valid date, insert into overflow
-		INSERT INTO edit_log_overflow VALUES (NEW.*);
+        INSERT INTO edit_log_overflow VALUES (NEW.*);
-	END IF;
+    END IF;
-	RETURN NULL;
+    RETURN NULL;
 END
 $$
 LANGUAGE 'plpgsql';
@@ -260,22 +261,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	-- if new is not null/empty
+    -- if new is not null/empty
-	-- and old one is null or old one different new one
+    -- and old one is null or old one different new one
-	-- set NOW()
+    -- set NOW()
-	-- if new one is NULL
+    -- if new one is NULL
-	-- set NULL
+    -- set NULL
-	IF
+    IF
-		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+        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)
+        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-	THEN
+    THEN
-		NEW.login_user_id_set_date = NOW();
+        NEW.login_user_id_set_date = NOW();
-		NEW.login_user_id_last_revalidate = NOW();
+        NEW.login_user_id_last_revalidate = NOW();
-	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-		NEW.login_user_id_set_date = NULL;
+        NEW.login_user_id_set_date = NULL;
-		NEW.login_user_id_last_revalidate = NULL;
+        NEW.login_user_id_last_revalidate = NULL;
-	END IF;
+    END IF;
-	RETURN NEW;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
@@ -290,8 +291,8 @@ LANGUAGE 'plpgsql';
 -- DROP TABLE temp_files;
 CREATE TABLE temp_files (
-	filename	VARCHAR,
+    filename VARCHAR,
-	folder	VARCHAR
+    folder VARCHAR
 );
 -- END: table/edit_temp_files.sql
 -- START: table/edit_generic.sql
@@ -304,9 +305,10 @@ CREATE TABLE temp_files (
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
-	cuid	VARCHAR,
+    cuid VARCHAR,
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+    cuuid UUID,
-	date_updated	TIMESTAMP WITHOUT TIME ZONE
+    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
    date_updated TIMESTAMP WITHOUT TIME ZONE
 );
 -- END: table/edit_generic.sql
 -- START: table/edit_visible_group.sql
@@ -319,9 +321,9 @@ CREATE TABLE edit_generic (
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-	edit_visible_group_id	SERIAL PRIMARY KEY,
+    edit_visible_group_id SERIAL PRIMARY KEY,
-	name	VARCHAR,
+    name VARCHAR,
-	flag	VARCHAR
+    flag VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_visible_group.sql
 -- START: table/edit_menu_group.sql
@@ -334,10 +336,10 @@ CREATE TABLE edit_visible_group (
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-	edit_menu_group_id	SERIAL PRIMARY KEY,
+    edit_menu_group_id SERIAL PRIMARY KEY,
-	name	VARCHAR,
+    name VARCHAR,
-	flag	VARCHAR,
+    flag VARCHAR,
-	order_number	INT NOT NULL
+    order_number INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
@@ -352,18 +354,18 @@ CREATE TABLE edit_menu_group (
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-	edit_page_id	SERIAL PRIMARY KEY,
+    edit_page_id SERIAL PRIMARY KEY,
-	content_alias_edit_page_id	INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
+    content_alias_edit_page_id	INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
-	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+    FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-	filename	VARCHAR,
+    filename VARCHAR,
-	name	VARCHAR UNIQUE,
+    name VARCHAR UNIQUE,
-	order_number INT NOT NULL,
+    order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0,
+    online SMALLINT NOT NULL DEFAULT 0,
-	menu	SMALLINT NOT NULL DEFAULT 0,
+    menu SMALLINT NOT NULL DEFAULT 0,
-	popup	SMALLINT NOT NULL DEFAULT 0,
+    popup SMALLINT NOT NULL DEFAULT 0,
-	popup_x	SMALLINT,
+    popup_x SMALLINT,
-	popup_y SMALLINT,
+    popup_y SMALLINT,
-	hostname	VARCHAR
+    hostname VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_page.sql
 -- START: table/edit_query_string.sql
@@ -376,13 +378,13 @@ CREATE TABLE edit_page (
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-	edit_query_string_id	SERIAL PRIMARY KEY,
+    edit_query_string_id SERIAL PRIMARY KEY,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	value	VARCHAR,
+    value VARCHAR,
-	dynamic	SMALLINT NOT NULL DEFAULT 0
+    dynamic SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_query_string.sql
 -- START: table/edit_page_visible_group.sql
@@ -395,10 +397,10 @@ CREATE TABLE edit_query_string (
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
-	edit_page_id INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_visible_group_id INT NOT NULL,
+    edit_visible_group_id INT NOT NULL,
-	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+    FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
 -- END: table/edit_page_visible_group.sql
 -- START: table/edit_page_menu_group.sql
@@ -411,10 +413,10 @@ CREATE TABLE edit_page_visible_group (
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
-	edit_page_id INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_menu_group_id INT NOT NULL,
+    edit_menu_group_id INT NOT NULL,
-	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+    FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
 -- END: table/edit_page_menu_group.sql
 -- START: table/edit_access_right.sql
@@ -428,11 +430,11 @@ CREATE TABLE edit_page_menu_group (
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-	edit_access_right_id SERIAL PRIMARY KEY,
+    edit_access_right_id SERIAL PRIMARY KEY,
-	name VARCHAR,
+    name VARCHAR,
-	level SMALLINT,
+    level SMALLINT,
-	type VARCHAR,
+    type VARCHAR,
-	UNIQUE (level,type)
+    UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access_right.sql
 -- START: table/edit_scheme.sql
@@ -445,12 +447,12 @@ CREATE TABLE edit_access_right (
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-	edit_scheme_id	SERIAL PRIMARY KEY,
+    edit_scheme_id SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	header_color	VARCHAR,
+    header_color VARCHAR,
-	css_file	VARCHAR,
+    css_file VARCHAR,
-	template	VARCHAR
+    template VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_scheme.sql
 -- START: table/edit_language.sql
@@ -464,13 +466,13 @@ CREATE TABLE edit_scheme (
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-	edit_language_id SERIAL PRIMARY KEY,
+    edit_language_id SERIAL PRIMARY KEY,
-	enabled SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0,
+    lang_default SMALLINT NOT NULL DEFAULT 0,
-	long_name VARCHAR,
+    long_name VARCHAR,
-	short_name VARCHAR, -- en_US, en or en_US@latin without encoding
+    short_name VARCHAR, -- en_US, en or en_US@latin without encoding
-	iso_name VARCHAR, -- should actually be encoding
+    iso_name VARCHAR, -- should actually be encoding
-	order_number INT
+    order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_language.sql
 -- START: table/edit_group.sql
@@ -483,16 +485,16 @@ CREATE TABLE edit_language (
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-	edit_group_id	SERIAL PRIMARY KEY,
+    edit_group_id SERIAL PRIMARY KEY,
-	edit_scheme_id INT,
+    edit_scheme_id INT,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
+    deleted SMALLINT DEFAULT 0,
-	uid	VARCHAR,
+    uid VARCHAR,
-	name	VARCHAR,
+    name VARCHAR,
-	additional_acl	JSONB
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_group.sql
 -- START: table/edit_page_access.sql
@@ -505,14 +507,14 @@ CREATE TABLE edit_group (
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-	edit_page_access_id	SERIAL PRIMARY KEY,
+    edit_page_access_id SERIAL PRIMARY KEY,
-	edit_group_id	INT NOT NULL,
+    edit_group_id INT NOT NULL,
-	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
@@ -528,15 +530,15 @@ CREATE TABLE edit_page_access (
 -- DROP TABLE edit_page_content;
 CREATE TABLE edit_page_content (
-	edit_page_content_id	SERIAL PRIMARY KEY,
+    edit_page_content_id SERIAL PRIMARY KEY,
-	edit_page_id	INT NOT NULL,
+    edit_page_id INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	uid	VARCHAR UNIQUE,
+    uid VARCHAR UNIQUE,
-	name	VARCHAR,
+    name VARCHAR,
-	order_number INT NOT NULL,
+    order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0
+    online SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_page_content.sql
 -- START: table/edit_user.sql
@@ -549,63 +551,63 @@ CREATE TABLE edit_page_content (
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-	edit_user_id	SERIAL PRIMARY KEY,
+    edit_user_id SERIAL PRIMARY KEY,
-	connect_edit_user_id	INT, -- possible reference to other user
+    connect_edit_user_id INT, -- possible reference to other user
-	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_language_id INT NOT NULL,
+    edit_language_id INT NOT NULL,
-	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_group_id INT NOT NULL,
+    edit_group_id INT NOT NULL,
-	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_scheme_id INT,
+    edit_scheme_id INT,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	-- username/password
+    -- username/password
-	username	VARCHAR UNIQUE,
+    username VARCHAR UNIQUE,
-	password	VARCHAR,
+    password VARCHAR,
-	-- name block
+    -- name block
-	first_name	VARCHAR,
+    first_name VARCHAR,
-	last_name	VARCHAR,
+    last_name VARCHAR,
-	first_name_furigana	VARCHAR,
+    first_name_furigana VARCHAR,
-	last_name_furigana	VARCHAR,
+    last_name_furigana VARCHAR,
-	-- email
+    -- email
-	email	VARCHAR,
+    email VARCHAR,
-	-- eanbled/deleted flag
+    -- eanbled/deleted flag
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT NOT NULL DEFAULT 0,
+    deleted SMALLINT NOT NULL DEFAULT 0,
-	-- general flags
+    -- general flags
-	strict	SMALLINT DEFAULT 0,
+    strict SMALLINT DEFAULT 0,
-	locked	SMALLINT DEFAULT 0,
+    locked SMALLINT DEFAULT 0,
-	protected SMALLINT NOT NULL DEFAULT 0,
+    protected SMALLINT NOT NULL DEFAULT 0,
-	-- legacy, debug flags
+    -- legacy, debug flags
-	debug	SMALLINT NOT NULL DEFAULT 0,
+    debug SMALLINT NOT NULL DEFAULT 0,
-	db_debug	SMALLINT NOT NULL DEFAULT 0,
+    db_debug SMALLINT NOT NULL DEFAULT 0,
-	-- is admin user
+    -- is admin user
-	admin	SMALLINT NOT NULL DEFAULT 0,
+    admin SMALLINT NOT NULL DEFAULT 0,
-	-- last login log
+    -- last login log
-	last_login	TIMESTAMP WITHOUT TIME ZONE,
+    last_login TIMESTAMP WITHOUT TIME ZONE,
-	-- login error
+    -- login error
-	login_error_count	INT DEFAULT 0,
+    login_error_count INT DEFAULT 0,
-	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
+    login_error_date_last TIMESTAMP WITHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
+    login_error_date_first TIMESTAMP WITHOUT TIME ZONE,
-	-- time locked
+    -- time locked
-	lock_until	TIMESTAMP WITHOUT TIME ZONE,
+    lock_until TIMESTAMP WITHOUT TIME ZONE,
-	lock_after	TIMESTAMP WITHOUT TIME ZONE,
+    lock_after TIMESTAMP WITHOUT TIME ZONE,
-	-- password change
+    -- password change
-	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
+    password_change_date TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
-	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
+    password_change_interval INTERVAL, -- null if no change is needed, or d/m/y time interval
-	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
+    password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-	password_reset_uid	VARCHAR, -- the uid to access the password reset page
+    password_reset_uid VARCHAR, -- the uid to access the password reset page
-	-- _GET login id for direct login
+    -- _GET login id for direct login
-	login_user_id	VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
+    login_user_id VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
-	login_user_id_set_date	TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
+    login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
-	login_user_id_last_revalidate	TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
+    login_user_id_last_revalidate TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
-	login_user_id_valid_from	TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
+    login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
-	login_user_id_valid_until	TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
+    login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
-	login_user_id_revalidate_after	INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
+    login_user_id_revalidate_after INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
-	login_user_id_locked	SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
+    login_user_id_locked SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
-	-- additional ACL json block
+    -- additional ACL json block
-	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
+    additional_acl JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- create unique index
@@ -650,37 +652,40 @@ COMMENT ON COLUMN edit_user.additional_acl IS 'Additional Access Control List st
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-	edit_log_id	SERIAL PRIMARY KEY,
+    edit_log_id SERIAL PRIMARY KEY,
-	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
+    euid INT, -- this is a foreign key, but I don't nedd to reference to it
-	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
+    ecuid VARCHAR,
-	username	VARCHAR,
+    ecuuid UUID,
-	password	VARCHAR,
+    FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
-	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    username VARCHAR,
-	ip	VARCHAR,
+    password VARCHAR,
-	error	TEXT,
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-	event	TEXT,
+    ip VARCHAR,
-	data_binary	BYTEA,
+    error TEXT,
-	data	TEXT,
+    event TEXT,
-	page	VARCHAR,
+    data_binary BYTEA,
-	action	VARCHAR,
+    data TEXT,
-	action_id	VARCHAR,
+    page VARCHAR,
-	action_yes	VARCHAR,
+    action VARCHAR,
-	action_flag	VARCHAR,
+    action_id VARCHAR,
-	action_menu	VARCHAR,
+    action_sub_id VARCHAR,
-	action_loaded	VARCHAR,
+    action_yes VARCHAR,
-	action_value	VARCHAR,
+    action_flag VARCHAR,
-	action_type	VARCHAR,
+    action_menu VARCHAR,
-	action_error	VARCHAR,
+    action_loaded VARCHAR,
-	user_agent	VARCHAR,
+    action_value VARCHAR,
-	referer	VARCHAR,
+    action_type VARCHAR,
-	script_name	VARCHAR,
+    action_error VARCHAR,
-	query_string	VARCHAR,
+    user_agent VARCHAR,
-	server_name	VARCHAR,
+    referer VARCHAR,
-	http_host	VARCHAR,
+    script_name VARCHAR,
-	http_accept	VARCHAR,
+    query_string VARCHAR,
-	http_accept_charset	VARCHAR,
+    server_name VARCHAR,
-	http_accept_encoding	VARCHAR,
+    http_host VARCHAR,
-	session_id	VARCHAR
+    http_accept VARCHAR,
    http_accept_charset VARCHAR,
    http_accept_encoding VARCHAR,
    session_id VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_log.sql
 -- START: table/edit_log_overflow.sql
@@ -707,15 +712,15 @@ ALTER TABLE edit_log_overflow ADD CONSTRAINT edit_log_overflow_euid_fkey FOREIGN
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-	edit_access_id	SERIAL PRIMARY KEY,
+    edit_access_id SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	protected SMALLINT DEFAULT 0,
+    protected SMALLINT DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
+    deleted SMALLINT DEFAULT 0,
-	uid	VARCHAR,
+    uid VARCHAR,
-	name	VARCHAR UNIQUE,
+    name VARCHAR UNIQUE,
-	description	VARCHAR,
+    description VARCHAR,
-	color	VARCHAR,
+    color VARCHAR,
-	additional_acl	JSONB
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access.sql
 -- START: table/edit_access_user.sql
@@ -728,15 +733,15 @@ CREATE TABLE edit_access (
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-	edit_access_user_id	SERIAL PRIMARY KEY,
+    edit_access_user_id SERIAL PRIMARY KEY,
-	edit_access_id	INT NOT NULL,
+    edit_access_id INT NOT NULL,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_user_id	INT NOT NULL,
+    edit_user_id INT NOT NULL,
-	FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_access_right_id	INT NOT NULL,
+    edit_access_right_id INT NOT NULL,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	edit_default	SMALLINT DEFAULT 0,
+    edit_default SMALLINT DEFAULT 0,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- END: table/edit_access_user.sql
 -- START: table/edit_access_data.sql
@@ -749,12 +754,12 @@ CREATE TABLE edit_access_user (
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-	edit_access_data_id	SERIAL PRIMARY KEY,
+    edit_access_data_id SERIAL PRIMARY KEY,
-	edit_access_id INT NOT NULL,
+    edit_access_id INT NOT NULL,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
+    name VARCHAR,
-	value	VARCHAR
+    value VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 -- create a unique index for each attached data block for each edit access can
--- a/4dev/tests/Create/CoreLibsCreateSessionTest.php
+++ b/4dev/tests/Create/CoreLibsCreateSessionTest.php
@@ -22,7 +22,6 @@ final class CoreLibsCreateSessionTest extends TestCase
 	public function sessionProvider(): array
 	{
 		// 0: session name as parameter or for GLOBAL value
 		// 1: type p: parameter, g: global, d: php.ini default
 		// 2: mock data as array
 		//    checkCliStatus: true/false,
 		//    getSessionStatus: PHP_SESSION_DISABLED for abort,
@@ -31,13 +30,10 @@ final class CoreLibsCreateSessionTest extends TestCase
 		//    checkActiveSession: true/false, [1st call, 2nd call]
 		//    getSessionId: string or false
 		// 3: exepcted name (session)]
-		// 4: Exception thrown on error
+		// 4: auto write close flag
 		// 5: exception code, null for none
 		// 6: expected error string
 		return [
 			'session parameter' => [
 				'sessionNameParameter',
 				'p',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -47,12 +43,9 @@ final class CoreLibsCreateSessionTest extends TestCase
 				],
 				'sessionNameParameter',
 				null,
 				null,
 				'',
 			],
 			'session globals' => [
 				'sessionNameGlobals',
 				'g',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -61,13 +54,10 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'getSessionId' => '1234abcd4567'
 				],
 				'sessionNameGlobals',
-				null,
+				false,
 				null,
 				'',
 			],
-			'session name default' => [
+			'auto write close' => [
-				'',
+				'sessionNameAutoWriteClose',
 				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
@@ -75,109 +65,8 @@ final class CoreLibsCreateSessionTest extends TestCase
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
-				'',
+				'sessionNameAutoWriteClose',
-				null,
+				true,
 				null,
 				'',
 			],
 			// error checks
 			// 1: we are in cli
 			'on cli error' => [
 				'',
 				'd',
 				[
 					'checkCliStatus' => true,
 					'getSessionStatus' => PHP_SESSION_NONE,
 					'setSessionName' => true,
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
 				'',
 				'RuntimeException',
 				1,
 				'[SESSION] No sessions in php cli'
 			],
 			// 2: session disabled
 			'session disabled error' => [
 				'',
 				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_DISABLED,
 					'setSessionName' => true,
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
 				'',
 				'RuntimeException',
 				2,
 				'[SESSION] Sessions are disabled'
 			],
 			// 3: invalid session name: string
 			'invalid name chars error' => [
 				'1invalid$session#;',
 				'p',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
 					'setSessionName' => false,
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
 				'',
 				'UnexpectedValueException',
 				3,
 				'[SESSION] Invalid session name: 1invalid$session#;'
 			],
 			// 3: invalid session name: only numbers
 			'invalid name numbers only error' => [
 				'123',
 				'p',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
 					'setSessionName' => false,
 					'checkActiveSession' => [false, true],
 					'getSessionId' => '1234abcd4567'
 				],
 				'',
 				'UnexpectedValueException',
 				3,
 				'[SESSION] Invalid session name: 123'
 			],
 			// 3: invalid session name: invalid name short
 			// 3: invalid session name: too long (128)
 			// 4: failed to start session (2nd false on check active session)
 			'invalid name numbers only error' => [
 				'',
 				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
 					'setSessionName' => true,
 					'checkActiveSession' => [false, false],
 					'getSessionId' => '1234abcd4567'
 				],
 				'',
 				'RuntimeException',
 				4,
 				'[SESSION] Failed to activate session'
 			],
 			// 5: get session id return false
 			'invalid name numbers only error' => [
 				'',
 				'd',
 				[
 					'checkCliStatus' => false,
 					'getSessionStatus' => PHP_SESSION_NONE,
 					'setSessionName' => true,
 					'checkActiveSession' => [false, true],
 					'getSessionId' => false
 				],
 				'',
 				'UnexpectedValueException',
 				5,
 				'[SESSION] getSessionId did not return a session id'
 			],
 		];
 	}
@@ -190,32 +79,23 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 * @testdox startSession $input name for $type will be $expected (error: $expected_error) [$_dataName]
 	 *
 	 * @param string $input
 	 * @param string $type
 	 * @param array<mixed> $mock_data
 	 * @param string $expected
 	 * @param string|null $exception
 	 * @param string $expected_error
 	 * @return void
 	 */
 	public function testStartSession(
 		string $input,
 		string $type,
 		array $mock_data,
 		string $expected,
-		?string $exception,
+		?bool $auto_write_close,
 		?int $exception_code,
 		string $expected_error
 	): void {
 		// override expected
 		if ($type == 'd') {
 			$expected = ini_get('session.name');
 		}
 		/** @var \CoreLibs\Create\Session&MockObject $session_mock */
 		$session_mock = $this->createPartialMock(
 			\CoreLibs\Create\Session::class,
 			[
-				'checkCliStatus', 'getSessionStatus', 'checkActiveSession',
+				'checkCliStatus',
-				'setSessionName', 'startSessionCall', 'getSessionId',
+				'getSessionStatus', 'checkActiveSession',
 				'getSessionId',
 				'getSessionName'
 			]
 		);
@@ -234,12 +114,8 @@ final class CoreLibsCreateSessionTest extends TestCase
 				$mock_data['checkActiveSession'][0],
 				$mock_data['checkActiveSession'][1],
 			);
 		// dummy set for session name
 		$session_mock->method('setSessionName')->with($input)->willReturn($mock_data['setSessionName']);
 		// set session name & return bsed on request data
 		$session_mock->method('getSessionName')->willReturn($expected);
 		// will not return anything
 		$session_mock->method('startSessionCall');
 		// in test case only return string
 		// false: will return false
 		$session_mock->method('getSessionId')->willReturn($mock_data['getSessionId']);
@@ -247,25 +123,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 		// regex for session id
 		$ression_id_regex = "/^\w+$/";
-		if ($exception !== null) {
+		$session_id = $session_mock->getSessionId();
 			$this->expectException($exception);
 			$this->expectExceptionCode($exception_code);
 		}
 		unset($GLOBALS['SET_SESSION_NAME']);
 		$session_id = '';
 		switch ($type) {
 			case 'p':
 				$session_id = $session_mock->startSession($input);
 				break;
 			case 'g':
 				$GLOBALS['SET_SESSION_NAME'] = $input;
 				$session_id = $session_mock->startSession();
 				break;
 			case 'd':
 				$session_id = $session_mock->startSession();
 				break;
 		}
 		// asert checks
 		if (!empty($session_id)) {
 			$this->assertMatchesRegularExpression(
@@ -284,6 +142,73 @@ final class CoreLibsCreateSessionTest extends TestCase
 		}
 	}
 	/**
 	 * Undocumented function
 	 *
 	 * @return array
 	 */
 	public function providerSessionException(): array
 	{
 		return [
 			'not cli' => [
 				'TEST_EXCEPTION',
 				\RuntimeException::class,
 				1,
 				'/^\[SESSION\] No sessions in php cli$/',
 			],
 			/* 'session disabled ' => [
 				'TEST_EXCEPTION',
 				\RuntimeException::class,
 				2,
 				'/^\[SESSION\] Sessions are disabled/'
 			],
 			'invalid session name' => [
 				'--#as^-292p-',
 				\UnexpectedValueException::class,
 				3,
 				'/^\[SESSION\] Invalid session name: /'
 			],
 			'failed to activate session' => [
 				'TEST_EXCEPTION',
 				\RuntimeException::class,
 				4,
 				'/^\[SESSION\] Failed to activate session/'
 			],
 			'not a valid session id returned' => [
 				\UnexpectedValueException::class,
 				5,
 				'/^\[SESSION\] getSessionId did not return a session id/'
 			], */
 		];
 	}
 	/**
 	 * exception checks
 	 *
 	 * @covers ::initSession
 	 * @dataProvider providerSessionException
 	 * @testdox create session $session_name with exception $exception ($exception_code) [$_dataName]
 	 *
 	 * @param  string $session_name
 	 * @param  string $exception
 	 * @param  int    $exception_code
 	 * @param  string $expected_error
 	 * @return void
 	 */
 	public function testSessionException(
 		string $session_name,
 		string $exception,
 		int $exception_code,
 		string $expected_error,
 	): void {
 		//
 		// throws only on new Object creation
 		$this->expectException($exception);
 		$this->expectExceptionCode($exception_code);
 		$this->expectExceptionMessageMatches($expected_error);
 		new \CoreLibs\Create\Session($session_name);
 	}
 	/**
 	 * provider for session name check
 	 *
@@ -369,6 +294,8 @@ final class CoreLibsCreateSessionTest extends TestCase
 		];
 	}
 	// NOTE: with auto start session, we cannot test this in the command line
 	/**
 	 * method call test
 	 *
@@ -384,74 +311,32 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 * @param  mixed $expected
 	 * @return void
 	 */
-	public function testMethodSetGet($name, $input, $expected): void
+/* 	public function testMethodSetGet($name, $input, $expected): void
 	{
-		$session = new \CoreLibs\Create\Session();
+		$session = new \CoreLibs\Create\Session('TEST_METHOD');
-		$session->setS($name, $input);
+		$session->set($name, $input);
 		$this->assertEquals(
 			$expected,
-			$session->getS($name),
+			$session->get($name),
 			'method set assert'
 		);
 		// isset true
 		$this->assertTrue(
-			$session->issetS($name),
+			$session->isset($name),
 			'method isset assert ok'
 		);
-		$session->unsetS($name);
+		$session->unset($name);
 		$this->assertEquals(
 			'',
-			$session->getS($name),
+			$session->get($name),
 			'method unset assert'
 		);
 		// iset false
 		$this->assertFalse(
-			$session->issetS($name),
+			$session->isset($name),
 			'method isset assert false'
 		);
-	}
+	} */
 	/**
 	 * magic call test
 	 *
 	 * @covers ::__set
 	 * @covers ::__get
 	 * @covers ::__isset
 	 * @covers ::__unset
 	 * @dataProvider sessionDataProvider
 	 * @testdox __set/__get/__iseet/__unset $name with $input is $expected [$_dataName]
 	 *
 	 * @param  string|int $name
 	 * @param  mixed $input
 	 * @param  mixed $expected
 	 * @return void
 	 */
 	public function testMagicSetGet($name, $input, $expected): void
 	{
 		$session = new \CoreLibs\Create\Session();
 		$session->$name = $input;
 		$this->assertEquals(
 			$expected,
 			$session->$name,
 			'magic set assert'
 		);
 		// isset true
 		$this->assertTrue(
 			isset($session->$name),
 			'magic isset assert ok'
 		);
 		unset($session->$name);
 		$this->assertEquals(
 			'',
 			$session->$name,
 			'magic unset assert'
 		);
 		// isset true
 		$this->assertFalse(
 			isset($session->$name),
 			'magic isset assert false'
 		);
 	}
 	/**
 	 * unset all test
@@ -461,33 +346,33 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 *
 	 * @return void
 	 */
-	public function testUnsetAll(): void
+/* 	public function testUnsetAll(): void
 	{
 		$test_values = [
 			'foo' => 'abc',
 			'bar' => '123'
 		];
-		$session = new \CoreLibs\Create\Session();
+		$session = new \CoreLibs\Create\Session('TEST_UNSET');
 		foreach ($test_values as $name => $value) {
-			$session->setS($name, $value);
+			$session->set($name, $value);
 			// confirm set
 			$this->assertEquals(
 				$value,
-				$session->getS($name),
+				$session->get($name),
 				'set assert: ' . $name
 			);
 		}
 		// unset all
-		$session->unsetAllS();
+		$session->unsetAll();
 		// check unset
 		foreach (array_keys($test_values) as $name) {
 			$this->assertEquals(
 				'',
-				$session->getS($name),
+				$session->get($name),
 				'unsert assert: ' . $name
 			);
 		}
-	}
+	} */
 }
 // __END__
--- a/4dev/update/20241203_update_edit_tables/edit_tables_cuid_cuuid_update_add.sql
+++ b/4dev/update/20241203_update_edit_tables/edit_tables_cuid_cuuid_update_add.sql
@@ -0,0 +1,26 @@
 -- 20241203: update edit tables
 ALTER TABLE edit_generic ADD cuuid UUID DEFAULT gen_random_uuid();
 ALTER TABLE edit_log ADD ecuid VARCHAR;
 ALTER TABLE edit_log ADD ecuuid VARCHAR;
 ALTER TABLE edit_log ADD action_sub_id VARCHAR;
 -- update set_edit_gneric
 -- adds the created or updated date tags
 CREATE OR REPLACE FUNCTION set_edit_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
    random_length INT = 25; -- that should be long enough
 BEGIN
    IF TG_OP = 'INSERT' THEN
        NEW.date_created := 'now';
        NEW.cuid := random_string(random_length);
        NEW.cuuid := gen_random_uuid();
    ELSIF TG_OP = 'UPDATE' THEN
        NEW.date_updated := 'now';
    END IF;
    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';
--- a/www/admin/class_test.admin.backend.php
+++ b/www/admin/class_test.admin.backend.php
@@ -42,6 +42,20 @@ $backend = new CoreLibs\Admin\Backend(
 	$l10n,
 	DEFAULT_ACL_LEVEL
 );
 $login = new CoreLibs\ACL\Login(
 	$db,
 	$log,
 	$session,
 	[
 		'auto_login' => false,
 		'default_acl_level' => DEFAULT_ACL_LEVEL,
 		'logout_target' => '',
 		'site_locale' => SITE_LOCALE,
 		'site_domain' => SITE_DOMAIN,
 		'site_encoding' => SITE_ENCODING,
 		'locale_path' => BASE . INCLUDES . LOCALE,
 	]
 );
 use CoreLibs\Debug\Support;
 $PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
@@ -55,10 +69,30 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 print "SETACL[]: <br>";
 $backend->setACL(['EMPTY' => 'EMPTY']);
 print "ADBEDITLOG: <br>";
-$backend->adbEditLog('CLASSTEST-ADMIN-BINARY', 'Some info string', 'BINARY');
+$login->writeLog(
-$backend->adbEditLog('CLASSTEST-ADMIN-ZLIB', 'Some info string', 'ZLIB');
+	'CLASSTEST-ADMIN-BINARY',
-$backend->adbEditLog('CLASSTEST-ADMIN-SERIAL', 'Some info string', 'SERIAL');
+	'Some info string',
-$backend->adbEditLog('CLASSTEST-ADMIN-INVALID', 'Some info string', 'INVALID');
+	$backend->adbGetActionSet(),
 	write_type:'BINARY'
 );
 $login->writeLog(
 	'CLASSTEST-ADMIN-ZLIB',
 	'Some info string',
 	$backend->adbGetActionSet(),
 	write_type:'ZLIB'
 );
 $login->writeLog(
 	'CLASSTEST-ADMIN-SERIAL',
 	'Some info string',
 	$backend->adbGetActionSet(),
 	write_type:'SERIAL'
 );
 $login->writeLog(
 	'CLASSTEST-ADMIN-INVALID',
 	'Some info string',
 	$backend->adbGetActionSet(),
 	write_type:'INVALID'
 );
 // test with various
 $backend->action = 'TEST ACTION';
 $backend->action_id = 'TEST ACTION ID';
@@ -69,10 +103,10 @@ $backend->action_loaded = 'TEST ACTION LOADED';
 $backend->action_value = 'TEST ACTION VALUE';
 $backend->action_type = 'TEST ACTION TYPE';
 $backend->action_error = 'TEST ACTION ERROR';
-$backend->adbEditLog('CLASSTEST-ADMIN-JSON', [
+$login->writeLog('CLASSTEST-ADMIN-JSON', [
 	"_GET" => $_GET,
 	"_POST" => $_POST,
-], 'JSON');
+], $backend->adbGetActionSet(), write_type:'JSON');
 print "ADBTOPMENU(0): " . Support::printAr($backend->adbTopMenu(CONTENT_PATH)) . "<br>";
 print "ADBMSG: <br>";
--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -228,7 +228,7 @@ print "RETURN ROW PARAMS: " . print_r(
 $db->dbPrepare("ins_test_foo", "INSERT INTO test_foo (test) VALUES ($1) RETURNING test");
 $status = $db->dbExecute("ins_test_foo", ['BAR TEST ' . time()]);
 print "PREPARE INSERT[ins_test_foo] STATUS: " . Support::printToString($status) . " |<br>"
-	. "QUERY: " . $db->dbGetPrepareCursorValue('ins_test_foo', 'query') . " |<br>"
+	. "QUERY: " . Support::printToString($db->dbGetPrepareCursorValue('ins_test_foo', 'query')) . " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
@@ -255,7 +255,7 @@ SQL;
 $db->dbPrepare("ins_test_foo_eom", $query);
 $status = $db->dbExecute("ins_test_foo_eom", ['EOM BAR TEST ' . time()]);
 print "EOM STRING PREPARE INSERT[ins_test_foo_eom] STATUS: " . Support::printToString($status) . " |<br>"
-	. "QUERY: " . $db->dbGetPrepareCursorValue('ins_test_foo_eom', 'query') . " |<br>"
+	. "QUERY: " . Support::printToString($db->dbGetPrepareCursorValue('ins_test_foo_eom', 'query')) . " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
--- a/www/admin/class_test.login.php
+++ b/www/admin/class_test.login.php
@@ -58,4 +58,16 @@ echo "ACL: " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()) . "<br>";
 echo "ACL (MIN): " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()['min'] ?? []) . "<br>";
 echo "LOCALE: " . \CoreLibs\Debug\Support::printAr($login->loginGetLocale()) . "<br>";
 echo "ECUID: " . $login->loginGetEcuid() . "<br>";
 echo "ECUUID: " . $login->loginGetEcuuid() . "<br>";
 $login->writeLog(
 	'TEST LOG',
 	[
 		'test' => 'TEST A'
 	],
 	error:'No Error',
 	write_type:'JSON'
 );
 print "</body></html>";
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -205,6 +205,9 @@ print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . Support
 print "DS is: " . DIRECTORY_SEPARATOR . "<br>";
 print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
 print "ECUID: " . $_SESSION['ECUID'] . "<br>";
 print "ECUUID: " . $_SESSION['ECUUID'] . "<br>";
 print "</body></html>";
 # __END__
--- a/www/admin/class_test.session.php
+++ b/www/admin/class_test.session.php
@@ -46,7 +46,6 @@ $log = new CoreLibs\Logging\Logging([
 	'log_per_date' => true,
 ]);
 use CoreLibs\Create\Session;
 $session = new Session();
 $PAGE_NAME = 'TEST CLASS: SESSION';
 print "<!DOCTYPE html>";
@@ -56,50 +55,30 @@ print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 $session_name = 'class-test-session';
 print "Valid session name static check for '" . $session_name . "': "
 	. \CoreLibs\Debug\Support::prBl(Session::checkValidSessionName($session_name)) . "<br>";
 $var = 'foo';
 $value = 'bar';
 $session = new Session($session_name);
 foreach (['123', '123-123', '123abc'] as $_session_name) {
-	print "[UNSET] Session Name valid for " . $_session_name . ": "
+	print "[UNSET] Session Name valid for '" . $_session_name . "': "
 		. ($session->checkValidSessionName($_session_name) ? 'Valid' : 'Invalid') . "<br>";
 }
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
 print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
 print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
 print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
 print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 if (isset($_SESSION)) {
 	print "[UNSET] _SESSION is: set<br>";
 } else {
 	print "[UNSET] _SESSION is: not set<br>";
 }
 #
 print "[UNSET] To set session name valid: "
 	. ($session->checkValidSessionName($session_name) ? 'Valid' : 'Invalid') . "<br>";
 try {
 	$session_id = $session->startSession($session_name);
 	print "[SET] Current session id: " . $session_id . "<br>";
 } catch (\Exception $e) {
 	print "[FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
 // set again
 try {
 	$session_id = $session->startSession($session_name);
 	print "[2 SET] Current session id: " . $session_id . "<br>";
 } catch (\Exception $e) {
 	print "[2 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
 print "[SET] Current session id: " . $session->getSessionId() . "<br>";
 print "[SET] Current session name: " . $session->getSessionName() . "<br>";
 print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
 print "[SET] Current session auto write close: " . ($session->checkAutoWriteClose() ? 'Yes' : 'No') . "<br>";
 print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 if (isset($_SESSION)) {
 	print "[SET] _SESSION is: set<br>";
 } else {
 	print "[SET] _SESSION is: not set<br>";
 }
 #
 if (!isset($_SESSION['counter'])) {
 	$_SESSION['counter'] = 0;
 }
@@ -111,12 +90,12 @@ print "[READ] Confirm " . $var . " is " . $value . ": "
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
 // test set wrappers methods
-$session->setS('setwrap', 'YES, method set _SESSION var');
+$session->set('setwrap', 'YES, method set _SESSION var');
-print "[READ WRAP] A setwrap: " . $session->getS('setwrap') . "<br>";
+print "[READ WRAP] A setwrap: " . $session->get('setwrap') . "<br>";
-print "[READ WRAP] Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
+print "[READ WRAP] Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br>";
-$session->unsetS('setwrap');
+$session->unset('setwrap');
-print "[READ WRAP] unset setwrap: " . $session->getS('setwrap') . "<br>";
+print "[READ WRAP] unset setwrap: " . $session->get('setwrap') . "<br>";
-print "[READ WRAP] unset Isset: " . ($session->issetS('setwrap') ? 'Yes' : 'No') . "<br>";
+print "[READ WRAP] unset Isset: " . ($session->isset('setwrap') ? 'Yes' : 'No') . "<br>";
 // test __get/__set
 $session->setwrap = 'YES, magic set _SESSION var'; /** @phpstan-ignore-line GET/SETTER */
 print "[READ MAGIC] A setwrap: " . ($session->setwrap ?? '') . "<br>";
@@ -125,15 +104,16 @@ unset($session->setwrap);
 print "[READ MAGIC] unset setwrap: " . ($session->setwrap ?? '') . "<br>";
 print "[READ MAGIC] unset Isset: " . (isset($session->setwrap) ? 'Yes' : 'No') . "<br>";
 print "<hr>";
 // differnt session name
 $session_name = 'class-test-session-ALT';
 try {
-	$session_id = $session->startSession($session_name);
+	$session_alt = new Session($session_name);
-	print "[3 SET] Current session id: " . $session_id . "<br>";
+	print "[3 SET] Current session id: " . $session_alt->getSessionId() . "<br>";
 	print "[SET AGAIN] Current session id: " . $session_alt->getSessionId() . "<br>";
 } catch (\Exception $e) {
-	print "[3 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+	print "[3 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
 }
 print "[SET AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
@@ -141,32 +121,39 @@ print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
 $session->writeClose();
 // will never be written
 $_SESSION['will_never_be_written'] = 'empty';
 // auto open session if closed to write
 $session->set('auto_write_session', 'Some value');
 // restart session
 $session->restartSession();
 $_SESSION['this_will_be_written'] = 'not empty';
-// open again
+// open again with same name
 $session_name = 'class-test-session';
 try {
-	$session_id = $session->startSession($session_name);
+	$session_alt = new Session($session_name, auto_write_close:true);
-	print "[4 SET] Current session id: " . $session_id . "<br>";
+	print "[4 SET] Current session id: " . $session_alt->getSessionId() . "<br>";
 	print "[4 SET] Current session auto write close: " . ($session_alt->checkAutoWriteClose() ? 'Yes' : 'No') . "<br>";
 	print "[START AGAIN] Current session id: " . $session_alt->getSessionId() . "<br>";
 	$session_alt->set('alt_write_auto_close', 'set auto');
 	// below is deprecated
 	// $session_alt->do_not_do_this = 'foo bar auto set';
 } catch (\Exception $e) {
-	print "[4 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+	print "[4 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
 }
 print "[START AGAIN] Current session id: " . $session->getSessionId() . "<br>";
 $_SESSION['will_be_written_again'] = 'Full';
 print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
 // close session
 $session->writeClose();
 // invalid
 $session_name = '123';
 try {
-	$session_id = $session->startSession($session_name);
+	$session_bad = new Session($session_name);
-	print "[5 SET] Current session id: " . $session_id . "<br>";
+	print "[5 SET] Current session id: " . $session_bad->getSessionId() . "<br>";
 } catch (\Exception $e) {
-	print "[5 FAILED] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
+	print "[5 FAILED] Session start failed:<br>" . $e->getMessage() . "<br><pre>" . $e . "</pre><br>";
 }
 print "[BAD NAME] Current session id: " . $session->getSessionId() . "<br>";
 print "[BAD NAME] Current session name: " . $session->getSessionName() . "<br>";
 print "[BAD NAME] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
 print "[BAD NAME] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 print "</body></html>";
--- a/www/admin/class_test.session.read.php
+++ b/www/admin/class_test.session.read.php
@@ -46,7 +46,6 @@ $log = new CoreLibs\Logging\Logging([
 	'log_per_date' => true,
 ]);
 use CoreLibs\Create\Session;
 $session = new Session();
 $PAGE_NAME = 'TEST CLASS: SESSION (READ)';
 print "<!DOCTYPE html>";
@@ -56,32 +55,22 @@ print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 $session_name = 'class-test-session';
 $session = new Session($session_name);
 // $session_name = '';
 $var = 'foo';
 $value = 'bar';
 echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
-print "[UNSET] Current session id: " . $session->getSessionId() . "<br>";
+print "[SET] Current session id: " . $session->getSessionId() . "<br>";
-print "[UNSET] Current session name: " . $session->getSessionName() . "<br>";
+print "[SET] Current session name: " . $session->getSessionName() . "<br>";
-print "[UNSET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
-print "[UNSET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
+print "[SET] Current session status: " . getSessionStatusString($session->getSessionStatus()) . "<br>";
 print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
-// start
+
 try {
 	$session_id = $session->startSession($session_name);
 	print "[1] Current session id: " . $session_id . "<br>";
 } catch (\Exception $e) {
 	print "[1] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
 // set again
-try {
+print "[2] Restarted session: " . \CoreLibs\Debug\Support::prBl($session->restartSession()) . "<br>";
 	$session_id = $session->startSession($session_name);
 	print "[2] Current session id: " . $session_id . "<br>";
 } catch (\Exception $e) {
 	print "[2] Session start failed:<br>" . $e->getMessage() . "<br>" . $e . "<br>";
 }
 print "[SET] Current session id: " . $session->getSessionId() . "<br>";
 print "[SET] Current session name: " . $session->getSessionName() . "<br>";
 print "[SET] Current session active: " . ($session->checkActiveSession() ? 'Yes' : 'No') . "<br>";
--- a/www/includes/admin_header.php
+++ b/www/includes/admin_header.php
@@ -116,7 +116,7 @@ $data = [
 // log action
 // no log if login
 if (!$login->loginActionRun()) {
-	$cms->adbEditLog('Submit', $data, 'BINARY');
+	$login->writeLog('Submit', $data, $cms->adbGetActionSet(), 'BINARY');
 }
 //------------------------------ logging end
--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -69,12 +69,17 @@ declare(strict_types=1);
 namespace CoreLibs\ACL;
 use CoreLibs\Security\Password;
 use CoreLibs\Create\Uids;
 use CoreLibs\Convert\Json;
 class Login
 {
 	/** @var ?int the user id var*/
 	private ?int $euid;
 	/** @var ?string the user cuid (note will be super seeded with uuid v4 later) */
 	private ?string $ecuid;
 	/** @var ?string UUIDv4, will superseed the ecuid and replace euid as login id */
 	private ?string $ecuuid;
 	/** @var string _GET/_POST loginUserId parameter for non password login */
 	private string $login_user_id = '';
 	/** @var string source, either _GET or _POST or empty */
@@ -193,6 +198,12 @@ class Login
 	/** @var bool */
 	private bool $login_is_ajax_page = false;
 	// logging
 	/** @var array<string> list of allowed types for edit log write */
 	private const WRITE_TYPES = ['BINARY', 'BZIP2', 'LZIP', 'STRING', 'SERIAL', 'JSON'];
 	/** @var array<string> list of available write types for log */
 	private array $write_types_available = [];
 	// settings
 	/** @var array<string,mixed> options */
 	private array $options = [];
@@ -379,6 +390,8 @@ class Login
 		$_SESSION['DEFAULT_ACL_LIST'] = $this->default_acl_list;
 		$_SESSION['DEFAULT_ACL_LIST_TYPE'] = $this->default_acl_list_type;
 		$this->loginSetEditLogWriteTypeAvailable();
 		// this will be deprecated
 		if ($this->options['auto_login'] === true) {
 			$this->loginMainCall();
@@ -757,7 +770,7 @@ class Login
 		}
 		// have to get the global stuff here for setting it later
 		// we have to get the themes in here too
-		$q = "SELECT eu.edit_user_id, eu.username, eu.password, "
+		$q = "SELECT eu.edit_user_id, eu.cuid, eu.cuuid, eu.username, eu.password, "
 			. "eu.edit_group_id, "
 			. "eg.name AS edit_group_name, eu.admin, "
 			// additinal acl lists
@@ -889,6 +902,8 @@ class Login
 			// normal user processing
 			// set class var and session var
 			$_SESSION['EUID'] = $this->euid = (int)$res['edit_user_id'];
 			$_SESSION['ECUID'] = $this->ecuid = (string)$res['cuid'];
 			$_SESSION['ECUUID'] = $this->ecuuid = (string)$res['cuuid'];
 			// check if user is okay
 			$this->loginCheckPermissions();
 			if ($this->login_error == 0) {
@@ -1132,6 +1147,9 @@ class Login
 		// username (login), group name
 		$this->acl['user_name'] = $_SESSION['USER_NAME'];
 		$this->acl['group_name'] = $_SESSION['GROUP_NAME'];
 		// edit user cuid
 		$this->acl['ecuid'] = $_SESSION['ECUID'];
 		$this->acl['ecuuid'] = $_SESSION['ECUUID'];
 		// set additional acl
 		$this->acl['additional_acl'] = [
 			'user' => $_SESSION['USER_ADDITIONAL_ACL'],
@@ -1425,7 +1443,7 @@ class Login
 			$data = 'Illegal user for password change: ' . $this->pw_username;
 		}
 		// log this password change attempt
-		$this->writeLog($event, $data, $this->login_error, $this->pw_username);
+		$this->writeEditLog($event, $data, $this->login_error, $this->pw_username);
 	}
 	/**
@@ -1566,7 +1584,7 @@ class Login
 					$username = $res['username'];
 				}
 			} // if euid is set, get username (or try)
-			$this->writeLog($event, '', $this->login_error, $username);
+			$this->writeEditLog($event, '', $this->login_error, $username);
 		} // write log under certain settings
 		// now close DB connection
 		// $this->error_msg = $this->_login();
@@ -1722,6 +1740,8 @@ HTML;
 		}
 	}
 	// MARK: LOGGING
 	/**
 	 * writes detailed data into the edit user log table (keep log what user does)
 	 *
@@ -1731,7 +1751,7 @@ HTML;
 	 * @param  string     $username login user username
 	 * @return void                 has no return
 	 */
-	private function writeLog(
+	private function writeEditLog(
 		string $event,
 		string $data,
 		string|int $error = '',
@@ -1749,50 +1769,191 @@ HTML;
 				'_GET' => $_GET,
 				'_POST' => $_POST,
 				'_FILES' => $_FILES,
-				'error' => $this->login_error
+				'error' => $this->login_error,
 				'data' => $data,
 		];
-		$data_binary = $this->db->dbEscapeBytea((string)bzcompress(serialize($_data_binary)));
+		$_action_set = [
-		// SQL querie for log entry
+			'action' => $this->action,
-		$q = "INSERT INTO edit_log "
+			'action_id' => $this->username,
-			. "(username, password, euid, event_date, event, error, data, data_binary, page, "
+			'action_flag' => (string)$this->login_error,
-			. "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
+			'action_value' => (string)$this->permission_okay,
-			. "http_accept, http_accept_charset, http_accept_encoding, session_id, "
+		];
-			. "action, action_id, action_yes, action_flag, action_menu, action_loaded, "
+
-			. "action_value, action_error) "
+		$this->writeLog($event, $_data_binary, $_action_set, $error, $username);
-			. "VALUES ('" . $this->db->dbEscapeString($username) . "', 'PASSWORD', "
+	}
-			. ($this->euid ? $this->euid : 'NULL') . ", "
+
-			. "NOW(), '" . $this->db->dbEscapeString($event) . "', "
+	/**
-			. "'" . $this->db->dbEscapeString((string)$error) . "', "
+	 * writes all action vars plus other info into edit_log table
-			. "'" . $this->db->dbEscapeString($data) . "', '" . $data_binary . "', "
+	 * this is for public class
-			. "'" . $this->page_name . "', ";
+	 *
-		foreach (
+	 * phpcs:disable Generic.Files.LineLength
-			[
+	 * @param  string              $event [default='']        any kind of event description,
-				'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME',
+	 * @param  string|array<mixed> $data [default='']         any kind of data related to that event
-				'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT',
+	 * @param  array{action?:?string,action_id?:null|string|int,action_sub_id?:null|string|int,action_yes?:null|string|int|bool,action_flag?:?string,action_menu?:?string,action_loaded?:?string,action_value?:?string,action_type?:?string,action_error?:?string} $action_set [default=[]] action set names
-				'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
+	 * @param  string|int          $error    error id (mostly an int)
-			] as $server_code
+	 * @param  string              $write_type [default=JSON] write type can be
-		) {
+	 *                                                        JSON, STRING/SERIEAL, BINARY/BZIP or ZLIB
-			if (array_key_exists($server_code, $_SERVER)) {
+	 * @param  string|null         $db_schema [default=null]  override target schema
-				$q .= "'" . $this->db->dbEscapeString($_SERVER[$server_code]) . "', ";
+	 * @return void
-			} else {
+	 * phpcs:enable Generic.Files.LineLength
-				$q .= "NULL, ";
+	 */
-			}
+	public function writeLog(
 		string $event = '',
 		string|array $data = '',
 		array $action_set = [],
 		string|int $error = '',
 		string $username = '',
 		string $write_type = 'JSON',
 		?string $db_schema = null
 	): void {
 		$data_binary = '';
 		$data_write = '';
 		// check if write type is valid, if not fallback to JSON
 		if (!in_array(strtoupper($write_type), $this->write_types_available)) {
 			$this->log->warning('Write type not in allowed array, fallback to JSON', context:[
 				"write_type" => $write_type,
 				"write_list" => $this->write_types_available,
 			]);
 			$write_type = 'JSON';
 		}
 		switch ($write_type) {
 			case 'BINARY':
 			case 'BZIP':
 				$data_binary = $this->db->dbEscapeBytea((string)bzcompress(serialize($data)));
 				$data_write = Json::jsonConvertArrayTo([
 					'type' => 'BZIP',
 					'message' => 'see bzip compressed data_binary field'
 				]);
 				break;
 			case 'ZLIB':
 				$data_binary = $this->db->dbEscapeBytea((string)gzcompress(serialize($data)));
 				$data_write = Json::jsonConvertArrayTo([
 					'type' => 'ZLIB',
 					'message' => 'see zlib compressed data_binary field'
 				]);
 				break;
 			case 'STRING':
 			case 'SERIAL':
 				$data_binary = $this->db->dbEscapeBytea(Json::jsonConvertArrayTo([
 					'type' => 'SERIAL',
 					'message' => 'see serial string data field'
 				]));
 				$data_write = serialize($data);
 				break;
 			case 'JSON':
 				$data_binary = $this->db->dbEscapeBytea(Json::jsonConvertArrayTo([
 					'type' => 'JSON',
 					'message' => 'see json string data field'
 				]));
 				// must be converted to array
 				if (!is_array($data)) {
 					$data = ["data" => $data];
 				}
 				$data_write = Json::jsonConvertArrayTo($data);
 				break;
 			default:
 				$this->log->alert('Invalid type for data compression was set', context:[
 					"write_type" => $write_type
 				]);
 				break;
 		}
 		/** @var string $DB_SCHEMA check schema */
 		$DB_SCHEMA = 'public';
 		if ($db_schema !== null) {
 			$DB_SCHEMA = $db_schema;
 		} elseif (!empty($this->db->dbGetSchema())) {
 			$DB_SCHEMA = $this->db->dbGetSchema();
 		}
 		$q = <<<SQL
 		INSERT INTO {DB_SCHEMA}.edit_log (
 			username, euid, ecuid, ecuuid, event_date, event, error, data, data_binary, page,
 			ip, user_agent, referer, script_name, query_string, server_name, http_host,
 			http_accept, http_accept_charset, http_accept_encoding, session_id,
 			action, action_id, action_sub_id, action_yes, action_flag, action_menu, action_loaded,
 			action_value, action_type, action_error
 		) VALUES (
 			$1, $2, $3, $4, NOW(), $5, $6, $7, $8, $9,
 			$10, $11, $12, $13, $14, $15, $16,
 			$17, $18, $19, $20,
 			$21, $22, $23, $24, $25, $26, $27,
 			$28, $29, $30
 		)
 		SQL;
 		$this->db->dbExecParams(
 			str_replace(
 				['{DB_SCHEMA}'],
 				[$DB_SCHEMA],
 				$q
 			),
 			[
 				// row 1
 				empty($username) ? $_SESSION['USER_NAME'] ?? '' : $username,
 				!empty($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
 					$_SESSION['EUID'] : null,
 				!empty($_SESSION['ECUID']) && is_string($_SESSION['ECUID']) ?
 					$_SESSION['ECUID'] : null,
 				!empty($_SESSION['ECUUID']) && Uids::validateUuuidv4($_SESSION['ECUUID']) ?
 					$_SESSION['ECUUID'] : null,
 				(string)$event,
 				(string)$error,
 				$data_write,
 				$data_binary,
 				(string)$this->page_name,
 				// row 2
 				$_SERVER["REMOTE_ADDR"] ?? null,
 				$_SERVER['HTTP_USER_AGENT'] ?? null,
 				$_SERVER['HTTP_REFERER'] ?? null,
 				$_SERVER['SCRIPT_FILENAME'] ?? null,
 				$_SERVER['QUERY_STRING'] ?? null,
 				$_SERVER['SERVER_NAME'] ?? null,
 				$_SERVER['HTTP_HOST'] ?? null,
 				// row 3
 				$_SERVER['HTTP_ACCEPT'] ?? null,
 				$_SERVER['HTTP_ACCEPT_CHARSET'] ?? null,
 				$_SERVER['HTTP_ACCEPT_ENCODING'] ?? null,
 				$this->session->getSessionId() !== '' ?
 					$this->session->getSessionId() : null,
 				// row 4
 				$action_set['action'] ?? null,
 				$action_set['action_id'] ?? null,
 				$action_set['action_sub_id'] ?? null,
 				$action_set['action_yes'] ?? null,
 				$action_set['action_flag'] ?? null,
 				$action_set['action_menu'] ?? null,
 				$action_set['action_loaded'] ?? null,
 				$action_set['action_value'] ?? null,
 				$action_set['action_type'] ?? null,
 				$action_set['action_error'] ?? null,
 			],
 			'NULL'
 		);
 	}
 	/**
 	 * set the write types that are allowed
 	 *
 	 * @return void
 	 */
 	private function loginSetEditLogWriteTypeAvailable()
 	{
 		// check what edit log data write types are allowed
 		$this->write_types_available = self::WRITE_TYPES;
 		if (!function_exists('bzcompress')) {
 			$this->write_types_available = array_diff($this->write_types_available, ['BINARY', 'BZIP']);
 		}
 		if (!function_exists('gzcompress')) {
 			$this->write_types_available = array_diff($this->write_types_available, ['LZIP']);
 		}
 		$q .= "'" . $this->session->getSessionId() . "', ";
 		$q .= "'" . $this->db->dbEscapeString($this->action) . "', ";
 		$q .= "'" . $this->db->dbEscapeString($this->username) . "', ";
 		$q .= "NULL, ";
 		$q .= "'" . $this->db->dbEscapeString((string)$this->login_error) . "', ";
 		$q .= "NULL, NULL, ";
 		$q .= "'" . $this->db->dbEscapeString((string)$this->permission_okay) . "', ";
 		$q .= "NULL)";
 		$this->db->dbExec($q, 'NULL');
 	}
 	// *************************************************************************
 	// **** PUBLIC INTERNAL
 	// *************************************************************************
 	// MARK: LOGIN CALL
 	/**
 	 * Main call that needs to be run to actaully check for login
 	 * If this is not called, no login checks are done, unless the class
@@ -1862,6 +2023,9 @@ HTML;
 		}
 		// if there is none, there is none, saves me POST/GET check
 		$this->euid = array_key_exists('EUID', $_SESSION) ? (int)$_SESSION['EUID'] : 0;
 		// TODO: allow load from cuid
 		// $this->ecuid = array_key_exists('ECUID', $_SESSION) ? (string)$_SESSION['ECUID'] : '';
 		// $this->ecuuid = array_key_exists('ECUUID', $_SESSION) ? (string)$_SESSION['ECUUID'] : '';
 		// get login vars, are so, can't be changed
 		// prepare
 		// pass on vars to Object vars
@@ -1942,6 +2106,8 @@ HTML;
 		$this->loginSetAcl();
 	}
 	// MARK: setters/getters
 	/**
 	 * Returns current set login_html content
 	 *
@@ -2111,6 +2277,8 @@ HTML;
 		$this->session->sessionDestroy();
 		// unset euid
 		$this->euid = null;
 		$this->ecuid = null;
 		$this->ecuuid = null;
 		// then prints the login screen again
 		$this->permission_okay = false;
 	}
@@ -2128,11 +2296,12 @@ HTML;
 		if (empty($this->euid)) {
 			return $this->permission_okay;
 		}
 		// euid must match ecuid and ecuuid
 		// bail for previous wrong page match, eg if method is called twice
 		if ($this->login_error == 103) {
 			return $this->permission_okay;
 		}
-		$q = "SELECT ep.filename, "
+		$q = "SELECT ep.filename, eu.cuid, eu.cuuid, "
 			// base lock flags
 			. "eu.deleted, eu.enabled, eu.locked, "
 			// date based lock
@@ -2198,6 +2367,9 @@ HTML;
 		} else {
 			$this->login_error = 103;
 		}
 		// set ECUID
 		$_SESSION['ECUID'] = $this->ecuid = (string)$res['cuid'];
 		$_SESSION['ECUUID'] = $this->ecuuid = (string)$res['cuuid'];
 		// if called from public, so we can check if the permissions are ok
 		return $this->permission_okay;
 	}
@@ -2503,6 +2675,26 @@ HTML;
 	{
 		return (string)$this->euid;
 	}
 	/**
 	 * Get the current set ECUID (edit user cuid)
 	 *
 	 * @return string ECUID as string
 	 */
 	public function loginGetEcuid(): string
 	{
 		return (string)$this->ecuid;
 	}
 	/**
 	 * Get the current set ECUUID (edit user cuuid)
 	 *
 	 * @return string ECUUID as string
 	 */
 	public function loginGetEcuuid(): string
 	{
 		return (string)$this->ecuuid;
 	}
 }
 // __END__
--- a/www/lib/CoreLibs/Admin/Backend.php
+++ b/www/lib/CoreLibs/Admin/Backend.php
@@ -31,6 +31,7 @@ declare(strict_types=1);
 namespace CoreLibs\Admin;
 use CoreLibs\Create\Uids;
 use CoreLibs\Convert\Json;
 class Backend
@@ -258,6 +259,27 @@ class Backend
 		}
 	}
 	/**
 	 * return all the action data, if not set, sets entry to null
 	 *
 	 * @return array{action:?string,action_id:null|string|int,action_sub_id:null|string|int,action_yes:null|string|int|bool,action_flag:?string,action_menu:?string,action_loaded:?string,action_value:?string,action_type:?string,action_error:?string}
 	 */
 	public function adbGetActionSet(): array
 	{
 		return [
 			'action' => $this->action ?? null,
 			'action_id' => $this->action_id ?? null,
 			'action_sub_id' => $this->action_sub_id ?? null,
 			'action_yes' => $this->action_yes ?? null,
 			'action_flag' => $this->action_flag ?? null,
 			'action_menu' => $this->action_menu ?? null,
 			'action_loaded' => $this->action_loaded ?? null,
 			'action_value' => $this->action_value ?? null,
 			'action_type' => $this->action_type ?? null,
 			'action_error' => $this->action_error ?? null,
 		];
 	}
 	/**
 	 * writes all action vars plus other info into edit_log table
 	 *
@@ -267,6 +289,7 @@ class Backend
 	 *                                                        JSON, STRING/SERIEAL, BINARY/BZIP or ZLIB
 	 * @param  string|null         $db_schema [default=null]  override target schema
 	 * @return void
 	 * @deprecated Use $login->writeLog() and set action_set from ->adbGetActionSet()
 	 */
 	public function adbEditLog(
 		string $event = '',
@@ -335,17 +358,17 @@ class Backend
 		}
 		$q = <<<SQL
 		INSERT INTO {DB_SCHEMA}.edit_log (
-			euid, event_date, event, data, data_binary, page,
+			username, euid, ecuid, ecuuid, event_date, event, error, data, data_binary, page,
 			ip, user_agent, referer, script_name, query_string, server_name, http_host,
 			http_accept, http_accept_charset, http_accept_encoding, session_id,
-			action, action_id, action_yes, action_flag, action_menu, action_loaded,
+			action, action_id, action_sub_id, action_yes, action_flag, action_menu, action_loaded,
 			action_value, action_type, action_error
 		) VALUES (
-			$1, NOW(), $2, $3, $4, $5,
+			$1, $2, $3, $4, NOW(), $5, $6, $7, $8, $9,
-			$6, $7, $8, $9, $10, $11, $12,
+			$10, $11, $12, $13, $14, $15, $16,
-			$13, $14, $15, $16,
+			$17, $18, $19, $20,
-			$17, $18, $19, $20, $21, $22,
+			$21, $22, $23, $24, $25, $26, $27,
-			$23, $24, $25
+			$28, $29, $30
 		)
 		SQL;
 		$this->db->dbExecParams(
@@ -356,9 +379,15 @@ class Backend
 			),
 			[
 				// row 1
-				isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+				'',
 				!empty($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
 					$_SESSION['EUID'] : null,
 				!empty($_SESSION['ECUID']) && is_string($_SESSION['ECUID']) ?
 					$_SESSION['ECUID'] : null,
 				!empty($_SESSION['ECUUID']) && Uids::validateUuuidv4($_SESSION['ECUID']) ?
 					$_SESSION['ECUID'] : null,
 				(string)$event,
 				'',
 				$data_write,
 				$data_binary,
 				(string)$this->page_name,
@@ -374,11 +403,12 @@ class Backend
 				$_SERVER['HTTP_ACCEPT'] ?? '',
 				$_SERVER['HTTP_ACCEPT_CHARSET'] ?? '',
 				$_SERVER['HTTP_ACCEPT_ENCODING'] ?? '',
-				$this->session->getSessionId() !== false ?
+				$this->session->getSessionId() !== '' ?
 					$this->session->getSessionId() : null,
 				// row 4
 				$this->action ?? '',
 				$this->action_id ?? '',
 				$this->action_sub_id ?? '',
 				$this->action_yes ?? '',
 				$this->action_flag ?? '',
 				$this->action_menu ?? '',
--- a/www/lib/CoreLibs/Create/Session.php
+++ b/www/lib/CoreLibs/Create/Session.php
@@ -15,19 +15,27 @@ namespace CoreLibs\Create;
 class Session
 {
 	/** @var string current session name */
 	private string $session_name = '';
 	/** @var string current session id */
 	private string $session_id = '';
 	/** @var bool flag auto write close */
 	private bool $auto_write_close = false;
 	/**
 	 * init a session, if array is empty or array does not have session_name set
 	 * then no auto init is run
 	 *
 	 * @param string $session_name if set and not empty, will start session
 	 */
-	public function __construct(string $session_name = '')
+	public function __construct(string $session_name, bool $auto_write_close = false)
 	{
-		if (!empty($session_name)) {
+		$this->initSession($session_name);
-			$this->startSession($session_name);
+		$this->auto_write_close = $auto_write_close;
 		}
 	}
 	// MARK: private methods
 	/**
 	 * Start session
 	 * startSession should be called for complete check
@@ -36,36 +44,32 @@ class Session
 	 *
 	 * @return void
 	 */
-	protected function startSessionCall(): void
+	private function startSessionCall(): void
 	{
 		session_start();
 	}
 	/**
-	 * check if we are in CLI, we set this, so we can mock this
+	 * get current set session id or false if none started
 	 * Not this is just a wrapper for the static System::checkCLI call
 	 *
-	 * @return bool True if we are in a CLI enviroment, or false for everything else
+	 * @return string|false
 	 */
-	public function checkCliStatus(): bool
+	public function getSessionIdCall(): string|false
 	{
-		return \CoreLibs\Get\System::checkCLI();
+		return session_id();
 	}
 	/**
-	 * Set session name call. If not valid session name, will return false
+	 * automatically closes a session if the auto write close flag is set
 	 *
-	 * @param  string $session_name A valid string for session name
+	 * @return bool
 	 * @return bool                 True if session name is valid,
 	 *                              False if not
 	 */
-	public function setSessionName(string $session_name): bool
+	private function closeSessionCall(): bool
 	{
-		if (!$this->checkValidSessionName($session_name)) {
+		if ($this->auto_write_close) {
-			return false;
+			return $this->writeClose();
 		}
-		session_name($session_name);
+		return false;
 		return true;
 	}
 	/**
@@ -93,16 +97,18 @@ class Session
 		return true;
 	}
 	// MARK: init session (on class start)
 	/**
-	 * start session with given session name if set
+	 * stinitart session with given session name if set
 	 * aborts on command line or if sessions are not enabled
 	 * also aborts if session cannot be started
 	 * On sucess returns the session id
 	 *
-	 * @param string|null $session_name
+	 * @param string $session_name
-	 * @return string|bool
+	 * @return void
 	 */
-	public function startSession(?string $session_name = null): string|bool
+	private function initSession(string $session_name): void
 	{
 		// we can't start sessions on command line
 		if ($this->checkCliStatus()) {
@@ -115,39 +121,82 @@ class Session
 		// session_status
 		// initial the session if there is no session running already
 		if (!$this->checkActiveSession()) {
-			// if session name is emtpy, check if there is a global set
+			// invalid session name, abort
-			// this is a deprecated fallback
+			if (!$this->checkValidSessionName($session_name)) {
-			$session_name = $session_name ?? $GLOBALS['SET_SESSION_NAME'] ?? '';
+				throw new \UnexpectedValueException('[SESSION] Invalid session name: ' . $this->session_name, 3);
 			// DEPRECTED: constant SET_SESSION_NAME is no longer used
 			// if set, set special session name
 			if (!empty($session_name)) {
 				// invalid session name, abort
 				if (!$this->checkValidSessionName($session_name)) {
 					throw new \UnexpectedValueException('[SESSION] Invalid session name: ' . $session_name, 3);
 				}
 				$this->setSessionName($session_name);
 			}
 			// set session name
 			$this->session_name = $session_name;
 			session_name($this->session_name);
 			// start session
 			$this->startSessionCall();
 			// if we faild to start the session
 			if (!$this->checkActiveSession()) {
 				throw new \RuntimeException('[SESSION] Failed to activate session', 5);
 			}
 		} elseif ($session_name != $this->getSessionName()) {
 			throw new \UnexpectedValueException(
 				'[SESSION] Another session exists with a different name: ' . $this->getSessionName(),
 				4
 			);
 		}
-		// if we still have no active session
+		// check session id
 		if (false === ($session_id = $this->getSessionIdCall())) {
 			throw new \UnexpectedValueException('[SESSION] getSessionId did not return a session id', 6);
 		}
 		// set session id
 		$this->session_id = $session_id;
 		// if flagged auto close, write close session
 		if ($this->auto_write_close) {
 			$this->writeClose();
 		}
 	}
 	// MARK: public set/get status
 	/**
 	 * start session, will only run after initSession
 	 *
 	 * @return bool True if started, False if alrady running
 	 */
 	public function restartSession(): bool
 	{
 		if (!$this->checkActiveSession()) {
-			throw new \RuntimeException('[SESSION] Failed to activate session', 4);
+			$this->startSessionCall();
 			return true;
 		}
-		if (false === ($session_id = $this->getSessionId())) {
+		return false;
 			throw new \UnexpectedValueException('[SESSION] getSessionId did not return a session id', 5);
 		}
 		return $session_id;
 	}
 	/**
-	 * get current set session id or false if none started
+	 * current set session id
 	 *
-	 * @return string|bool
+	 * @return string
 	 */
-	public function getSessionId(): string|bool
+	public function getSessionId(): string
 	{
-		return session_id();
+		return $this->session_id;
 	}
 	/**
 	 * set the auto write close flag
 	 *
 	 * @param  bool $flag
 	 * @return void
 	 */
 	public function setAutoWriteClose(bool $flag): void
 	{
 		$this->auto_write_close = $flag;
 	}
 	/**
 	 * return the auto write close flag
 	 *
 	 * @return bool
 	 */
 	public function checkAutoWriteClose(): bool
 	{
 		return $this->auto_write_close;
 	}
 	/**
@@ -175,6 +224,19 @@ class Session
 		}
 	}
 	/**
 	 * check if we are in CLI, we set this, so we can mock this
 	 * Not this is just a wrapper for the static System::checkCLI call
 	 *
 	 * @return bool True if we are in a CLI enviroment, or false for everything else
 	 */
 	public function checkCliStatus(): bool
 	{
 		return \CoreLibs\Get\System::checkCLI();
 	}
 	// MARK: write close session
 	/**
 	 * unlock the session file, so concurrent AJAX requests can be done
 	 * NOTE: after this has been called, no changes in _SESSION will be stored
@@ -188,6 +250,8 @@ class Session
 		return session_write_close();
 	}
 	// MARK: session close and clean up
 	/**
 	 * Proper destroy a session
 	 * - unset the _SESSION array
@@ -236,18 +300,20 @@ class Session
 		return session_status();
 	}
-	// _SESSION set/unset methods
+	// MARK: _SESSION set/unset methods
 	/**
 	 * unset all _SESSION entries
 	 *
 	 * @return void
 	 */
-	public function unsetAllS(): void
+	public function unsetAll(): void
 	{
 		$this->restartSession();
 		foreach (array_keys($_SESSION ?? []) as $name) {
 			unset($_SESSION[$name]);
 		}
 		$this->closeSessionCall();
 	}
 	/**
@@ -257,9 +323,11 @@ class Session
 	 * @param  mixed      $value value to set (can be anything)
 	 * @return void
 	 */
-	public function setS(string|int $name, mixed $value): void
+	public function set(string|int $name, mixed $value): void
 	{
 		$this->restartSession();
 		$_SESSION[$name] = $value;
 		$this->closeSessionCall();
 	}
 	/**
@@ -268,9 +336,9 @@ class Session
 	 * @param  string|int $name value key to get from _SESSION
 	 * @return mixed            value stored in _SESSION
 	 */
-	public function getS(string|int $name): mixed
+	public function get(string|int $name): mixed
 	{
-		return $_SESSION[$name] ?? '';
+		return $_SESSION[$name] ?? null;
 	}
 	/**
@@ -279,7 +347,7 @@ class Session
 	 * @param  string|int $name Name to check for
 	 * @return bool             True for set, False fornot set
 	 */
-	public function issetS(string|int $name): bool
+	public function isset(string|int $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}
@@ -290,14 +358,17 @@ class Session
 	 * @param  string|int $name _SESSION key name to remove
 	 * @return void
 	 */
-	public function unsetS(string|int $name): void
+	public function unset(string|int $name): void
 	{
-		if (isset($_SESSION[$name])) {
+		if (!isset($_SESSION[$name])) {
-			unset($_SESSION[$name]);
+			return;
 		}
 		$this->restartSession();
 		unset($_SESSION[$name]);
 		$this->closeSessionCall();
 	}
-	// set/get below
+	// MARK: [DEPRECATED] __set/__get magic methods
 	// ->var = value;
 	/**
@@ -306,10 +377,13 @@ class Session
 	 * @param  string|int $name
 	 * @param  mixed      $value
 	 * @return void
 	 * @deprecated use ->set()
 	 */
 	public function __set(string|int $name, mixed $value): void
 	{
 		$this->restartSession();
 		$_SESSION[$name] = $value;
 		$this->closeSessionCall();
 	}
 	/**
@@ -317,6 +391,7 @@ class Session
 	 *
 	 * @param  string|int $name
 	 * @return mixed            If name is not found, it will return null
 	 * @deprecated use ->get()
 	 */
 	public function __get(string|int $name): mixed
 	{
@@ -331,6 +406,7 @@ class Session
 	 *
 	 * @param  string|int $name
 	 * @return bool
 	 * @deprecated use ->isset()
 	 */
 	public function __isset(string|int $name): bool
 	{
@@ -342,12 +418,16 @@ class Session
 	 *
 	 * @param  string|int $name
 	 * @return void
 	 * @deprecated use ->unset()
 	 */
 	public function __unset(string|int $name): void
 	{
-		if (isset($_SESSION[$name])) {
+		if (!isset($_SESSION[$name])) {
-			unset($_SESSION[$name]);
+			return;
 		}
 		$this->restartSession();
 		unset($_SESSION[$name]);
 		$this->closeSessionCall();
 	}
 }
Author	SHA1	Message	Date
Clemens Schwaighofer	f78c67c378	Fix ACL Login phpunit test	2024-12-04 14:17:16 +09:00
Clemens Schwaighofer	75e69932fc	Session class rewrite create new session on class call, there is no need to delay that at all new option to auto write close a session session_id and session_name are stored as class vars deprecate the __set/__get part because we do not want to set via ->session_var_name but use the set()/get() methods. They have been renamed from setS/getS... to set/get alone	2024-12-04 14:10:36 +09:00
Clemens Schwaighofer	7354632479	ACL Login update with cuuid and cuid add/update and move write log to login class Add a UUIDv4 column to edit_generic as cuuid, add the cuid column to all reads with the cuuid too The cuuid will replace the cuid and remove the EUID as the session login var Moved the adbEditLog to login class as writeLog and renamed the current private writeLog to writeEditLog which is only for internal logging in the class The Backend log class is deprecated and a new get all action var method has been added to get the action vars into the edit log	2024-12-03 13:16:47 +09:00
Clemens Schwaighofer	5a21d22c7b	Add edit user cuid to session and ACL read This is for phasing out the EUID and replace it with an UUIDv4 for any user settings	2024-12-02 17:09:02 +09:00