Move includes/table_arrays to class Output\Form\TableArrays

also remove the legacy edit_base.LEGACY.php file

All previous includes/table_arrays load via include are now moved to a
class system so we have all implemented in one folder and can easy update
and add unit tests to it.

.phan/config.php

@@ -26,6 +26,7 @@
 use Phan\Config;
 
 return [
+	// "target_php_version" => "8.2",
 	// turn color on (-C)
 	"color_issue_messages_if_supported" => true,
 	// If true, missing properties will be created when
@@ -95,7 +96,7 @@ return [
 		'www/vendor',
 		'www/tests',
 		'www/lib/Smarty',
-		'www/lib/smarty-4.1.0',
+		'www/lib/smarty-4.3.0',
 		'www/templates_c',
 		'www/log',
 		'www/tmp',
@@ -117,7 +118,9 @@ return [
 		'www/admin/qq_file_upload_front.php',
 		'www/admin/qq_file_upload_ajax.php',
 		// symlink ignore
-		'www/lib/smarty-4.1.0/libs/Smarty.class.php'
+		'www/lib/smarty-4.3.0/libs/Smarty.class.php',
+		// legacy edit base (until removal)
+		'www/includes/edit_base.LEGACY.php'
 	],
 
 	// what not to show as problem

4dev/bin/create_mo.sh

@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
-base_folder='/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/';
+BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+# Assume script is in 4dev/bin
+base_folder="${BASE_FOLDER}../../www/";
 
 # locale gettext po to mo translator master
 for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
 	file=$(basename $file .po);
-	echo "Translate language ${file}";
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
+	echo "- Translate language file '${file}' for locale '${locale}' and domain '${domain}':";
 	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
 		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
 	fi;

4dev/bin/mo_to_js.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+# read source mo files and writes target js files in object form
+
+# check for ARG 1 is "mv"
+# then move the files directly and don't do manual check (don't create temp files)
+FILE_MOVE=0;
+if [ "${1}" = "mv" ]; then
+	echo "*** Direct write ***";
+	FILE_MOVE=1;
+fi;
+
+target='';
+BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+# Assume script is in 4dev/bin
+base_folder="${BASE_FOLDER}../../www/";
+po_folder='../4dev/locale/'
+mo_folder='includes/locale/';
+target_folder='';
+template_file_stump='##SUFFIX##translate-##LANGUAGE##.TMP.js';
+# for output file names
+source_list=(iw);
+language_list=(en ja);
+# set target names
+if [ "${target}" == '' ]; then
+	echo "*** Non smarty ***";
+	TEXTDOMAINDIR=${base_folder}${mo_folder}.
+	# default is admin
+	TEXTDOMAIN=admin;
+fi;
+js_folder="layout/${TEXTDOMAIN}/javascript/";
+
+error=0;
+# this checks if the TEXTDOMAIN target actually exists
+if [ ! -d "${base_folder}${js_folder}" ]; then
+	echo "Cannot find target javascript folder ${base_folder}${js_folder}";
+	error=1;
+else
+	target_folder="${base_folder}${js_folder}";
+fi;
+
+if [ ${error} -eq 1 ]; then
+	exit;
+fi;
+
+# locale gettext po to mo translator master
+for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
+	file=$(basename $file .po);
+	echo "Translate language ${file}";
+	locale=$(echo "${file}" | cut -d "-" -f 1);
+	domain=$(echo "${file}" | cut -d "-" -f 2);
+	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
+		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
+	fi;
+	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}${po_folder}${locale}-${domain}.po;
+done;
+
+rx_msgid_empty="^msgid \"\"";
+rx_msgid="^msgid \"";
+rx_msgstr="^msgstr \""
+
+# quick copy string at the end
+quick_copy='';
+
+for language in ${language_list[*]}; do
+	# I don't know which one must be set, but I think at least LANGUAGE
+	case ${language} in
+		ja)
+			LANG=ja_JP.UTF-8;
+			ENCODING=UTF-8;
+			LANGUAGE=ja;
+			;;
+		en)
+			# was en_JP.UTF-8
+			LANG=en_US.UTF-8;
+			ENCODING=UTF-8;
+			LANGUAGE=en;
+			;;
+	esac;
+	# write only one for language and then symlink files
+	template_file=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##//" | sed -e "s/##LANGUAGE##/${LANG}/");
+	original_file=$(echo ${template_file} | sed -e 's/\.TMP//g');
+	if [ "${FILE_MOVE}" -eq 0 ]; then
+		file=${target_folder}${template_file};
+	else
+		file=${target_folder}${original_file};
+	fi;
+	echo "===> Write translation file ${file}";
+	echo ". = normal, : = escape, x = skip";
+	# init line [aka don't touch this file]
+	echo "// AUTO FILL, changes will be overwritten" > $file;
+	echo "// source: ${suffix}, language: ${language}" >> $file;
+	echo "// Translation strings in the format" >> $file;
+	echo "// \"Original\":\"Translated\""$'\n' >> $file;
+	echo "var i18n = {" >> $file;
+	# translations stuff
+	# read the po file
+	pos=0; # do we add a , for the next line
+	cat "${base_folder}${po_folder}${language}-${TEXTDOMAIN}.po" |
+	while read str; do
+		# echo "S: ${str}";
+		# skip empty
+		if [[ "${str}" =~ ${rx_msgid_empty} ]]; then
+			# skip on empty
+			echo -n "x";
+		# msgid is left, msgstr is right
+		elif [[ "${str}" =~ ${rx_msgid} ]]; then
+			echo -n ".";
+			# open left side
+			# TODO: how to handle multi line strings: or don't use them
+			# extract from between ""
+			str_source=$(echo "${str}" | sed -e "s/^msgid \"//" | sed -e "s/\"$//");
+			# close right side, if not last add ,
+			if [ "${pos}" -eq 1 ]; then
+				echo -n "," >> $file;
+			fi;
+			# all " inside string need to be escaped
+			str_source=$(echo "${str_source}" | sed -e 's/"/\\"/g');
+			# fix with proper layout
+			echo -n "\"$str_source\":\"$(TEXTDOMAINDIR=${TEXTDOMAINDIR} LANGUAGE=${language} LANG=${LANG} gettext ${TEXTDOMAIN} "${str_source}")\"" >> $file;
+			pos=1;
+		elif [[ "${str}" =~ ${rx_msgstr} ]]; then
+			# open right side (ignore)
+			echo -n "";
+		else
+			# general ignore (anything between or comments)
+			echo -n "";
+		fi;
+	done;
+
+	echo "" >> $file;
+	echo "};" >> $file;
+	echo " [DONE]";
+
+	# on no move
+	if [ "${FILE_MOVE}" -eq 0 ]; then
+		echo "===> Confirm all changes in ${file} and then move data to original";
+		echo "";
+		quick_copy=${quick_copy}"mv ${template_file} ${original_file}"$'\n';
+	fi;
+
+	# symlink to master file
+	for suffix in ${source_list[*]}; do
+		# symlink with full lang name
+		symlink_file[0]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANG}/" | sed -e 's/\.TMP//g');
+		# create second one with lang (no country) + encoding
+		symlink_file[1]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANGUAGE}\.${ENCODING}/" | sed -e 's/\.TMP//g');
+		for template_file in ${symlink_file[@]}; do
+		# if this is not symlink, create them
+			if [ ! -h "${template_file}" ]; then
+				echo "Create symlink: ${template_file}";
+				# symlik to original
+				cd "${target_folder}";
+				ln -sf "${original_file}" "${template_file}";
+				cd - >/dev/null;
+			fi;
+		done;
+	done;
+done;
+
+if [ "${FILE_MOVE}" -eq 0 ]; then
+	echo "";
+	echo "-- IN FOLDER: ${target_folder}";
+	echo "-- START: copy lines below to copy created over original --";
+	echo "${quick_copy}";
+	echo "-- END ----------------------------------------------------";
+fi;
+
+# __END__

4dev/checking/phpunit.sh

@@ -3,7 +3,7 @@ base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
 # --testdox
 # call with "t" to give verbose testdox output
 # SUPPORTED: https://www.php.net/supported-versions.php
-# call with 7.3, 7.4, 8.0, 8.1 to force a certain php version
+# call with 7.4, 8.0, 8.1 to force a certain php version
 
 opt_testdox="";
 if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
@@ -16,6 +16,7 @@ if [ ! -z "${1}" ]; then
 		"7.4") php_bin="/usr/bin/php7.4 "; ;;
 		"8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
 	esac;
 fi;
@@ -25,6 +26,7 @@ if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
 		"7.4") php_bin="/usr/bin/php7.4 "; ;;
 		"8.0") php_bin="/usr/bin/php8.0 "; ;;
 		"8.1") php_bin="/usr/bin/php8.1 "; ;;
+		"8.2") php_bin="/usr/bin/php8.2 "; ;;
 		*) echo "Not support PHP: ${1}"; exit; ;;
 	esac;
 fi;

4dev/database/function/edit_access_set_uid.sql

@@ -3,26 +3,26 @@
 CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
-	v_uid VARCHAR;
+    myrec RECORD;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
-			-- always set
-			NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
-			IF FOUND THEN
-				NEW.uid := v_uid;
-			END IF;
-		END IF;
-	END IF;
-	RETURN NEW;
+    -- skip if NEW.name is not set
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+        -- use NEW.name as base, remove all spaces
+        -- name data is already unique, so we do not need to worry about this here
+        v_uid := REPLACE(NEW.name, ' ', '');
+        IF TG_OP = 'INSERT' THEN
+            -- always set
+            NEW.uid := v_uid;
+        ELSIF TG_OP = 'UPDATE' THEN
+            -- check if not set, then set
+            SELECT INTO myrec t.* FROM edit_access t WHERE edit_access_id = NEW.edit_access_id;
+            IF FOUND THEN
+                NEW.uid := v_uid;
+            END IF;
+        END IF;
+    END IF;
+    RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+LANGUAGE 'plpgsql';

4dev/database/function/edit_group_set_uid.sql

@@ -3,26 +3,26 @@
 CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
 $$
 DECLARE
-	myrec RECORD;
-	v_uid VARCHAR;
+    myrec RECORD;
+    v_uid VARCHAR;
 BEGIN
-	-- skip if NEW.name is not set
-	IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
-		-- use NEW.name as base, remove all spaces
-		-- name data is already unique, so we do not need to worry about this here
-		v_uid := REPLACE(NEW.name, ' ', '');
-		IF TG_OP = 'INSERT' THEN
-			-- always set
-			NEW.uid := v_uid;
-		ELSIF TG_OP = 'UPDATE' THEN
-			-- check if not set, then set
-			SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
-			IF FOUND THEN
-				NEW.uid := v_uid;
-			END IF;
-		END IF;
-	END IF;
-	RETURN NEW;
+    -- skip if NEW.name is not set
+    IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+        -- use NEW.name as base, remove all spaces
+        -- name data is already unique, so we do not need to worry about this here
+        v_uid := REPLACE(NEW.name, ' ', '');
+        IF TG_OP = 'INSERT' THEN
+            -- always set
+            NEW.uid := v_uid;
+        ELSIF TG_OP = 'UPDATE' THEN
+            -- check if not set, then set
+            SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
+            IF FOUND THEN
+                NEW.uid := v_uid;
+            END IF;
+        END IF;
+    END IF;
+    RETURN NEW;
 END;
 $$
-	LANGUAGE 'plpgsql';
+LANGUAGE 'plpgsql';

4dev/database/function/edit_log_partition_insert.sql

@@ -9,142 +9,142 @@ CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	start_date DATE := '2010-01-01';
-	end_date DATE;
-	timeformat TEXT := 'YYYY';
-	selector TEXT := 'year';
-	base_table TEXT := 'edit_log';
-	_interval INTERVAL := '1 ' || selector;
-	_interval_next INTERVAL := '2 ' || selector;
-	table_name TEXT;
-	-- compare date column
-	compare_date DATE := NEW.event_date;
-	compare_date_name TEXT := 'event_date';
-	-- 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_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_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+    start_date DATE := '2010-01-01';
+    end_date DATE;
+    timeformat TEXT := 'YYYY';
+    selector TEXT := 'year';
+    base_table TEXT := 'edit_log';
+    _interval INTERVAL := '1 ' || selector;
+    _interval_next INTERVAL := '2 ' || selector;
+    table_name TEXT;
+    -- compare date column
+    compare_date DATE := NEW.event_date;
+    compare_date_name TEXT := 'event_date';
+    -- 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_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_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
-	IF (NEW.event_date >= start_date) THEN
-		-- current table name
-		table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
-		BEGIN
-			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-		-- if insert failed because of missing table, create new below
-		EXCEPTION
-		WHEN undefined_table THEN
-			-- another block, so in case the creation fails here too
-			BEGIN
-				-- create new table here + all indexes
-				start_date := date_trunc(selector, NEW.event_date);
-				end_date := date_trunc(selector, NEW.event_date + _interval);
-				-- creat table
-				EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
-						REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
-								REPLACE( -- table name
-									command_create_table,
-									'{TABLE_NAME}',
-									table_name
-								),
-								'{BASE_NAME}',
-								base_table
-							),
-							'{COMPARE_DATE_NAME}',
-							compare_date_name
-						),
-						'{START_DATE}',
-						quote_literal(start_date)
-					),
-					'{END_DATE}',
-					quote_literal(end_date)
-				));
-				-- create all indexes and triggers
-				EXECUTE format(REPLACE(
-					REPLACE(
-						command_create_primary_key,
-						'{TABLE_NAME}',
-						table_name
-					),
-					'{BASE_TABLE}',
-					base_table
-				));
-				-- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+    -- we are in valid start time area
+    IF (NEW.event_date >= start_date) THEN
+        -- current table name
+        table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
+        BEGIN
+            EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+        -- if insert failed because of missing table, create new below
+        EXCEPTION
+        WHEN undefined_table THEN
+            -- another block, so in case the creation fails here too
+            BEGIN
+                -- create new table here + all indexes
+                start_date := date_trunc(selector, NEW.event_date);
+                end_date := date_trunc(selector, NEW.event_date + _interval);
+                -- creat table
+                EXECUTE format(REPLACE( -- end date
+                    REPLACE( -- start date
+                        REPLACE( -- compare date name
+                            REPLACE( -- base name (inherit)
+                                REPLACE( -- table name
+                                    command_create_table,
+                                    '{TABLE_NAME}',
+                                    table_name
+                                ),
+                                '{BASE_NAME}',
+                                base_table
+                            ),
+                            '{COMPARE_DATE_NAME}',
+                            compare_date_name
+                        ),
+                        '{START_DATE}',
+                        quote_literal(start_date)
+                    ),
+                    '{END_DATE}',
+                    quote_literal(end_date)
+                ));
+                -- create all indexes and triggers
+                EXECUTE format(REPLACE(
+                    REPLACE(
+                        command_create_primary_key,
+                        '{TABLE_NAME}',
+                        table_name
+                    ),
+                    '{BASE_TABLE}',
+                    base_table
+                ));
+                -- FK constraints
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                -- generic trigger
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
 
-				-- insert try again
-				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-			EXCEPTION
-			WHEN OTHERS THEN
-				-- if this faled, throw it into the overflow table (so we don't loose anything)
-				INSERT INTO edit_log_overflow VALUES (NEW.*);
-			END;
-		-- other errors, insert into overlow
-		WHEN OTHERS THEN
-			-- if this faled, throw it into the overflow table (so we don't loose anything)
-			INSERT INTO edit_log_overflow VALUES (NEW.*);
-		END;
-		-- main insert run done, check if we have to create next months table
-		BEGIN
-			-- check if next month table exists
-			table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
-			-- RAISE NOTICE 'SEARCH NEXT: %', table_name;
-			IF  (SELECT to_regclass(table_name)) IS NULL THEN
-				-- move inner interval same
-				start_date := date_trunc(selector, NEW.event_date + _interval);
-				end_date := date_trunc(selector, NEW.event_date + _interval_next);
-				-- RAISE NOTICE 'CREATE NEXT: %', table_name;
-				-- create table
-				EXECUTE format(REPLACE( -- end date
-					REPLACE( -- start date
-						REPLACE( -- compare date name
-							REPLACE( -- base name (inherit)
-								REPLACE( -- table name
-									command_create_table,
-									'{TABLE_NAME}',
-									table_name
-								),
-								'{BASE_NAME}',
-								base_table
-							),
-							'{COMPARE_DATE_NAME}',
-							compare_date_name
-						),
-						'{START_DATE}',
-						quote_literal(start_date)
-					),
-					'{END_DATE}',
-					quote_literal(end_date)
-				));
-				-- create all indexes and triggers
-				EXECUTE format(REPLACE(
-					REPLACE(
-						command_create_primary_key,
-						'{TABLE_NAME}',
-						table_name
-					),
-					'{BASE_TABLE}',
-					base_table
-				));
-				-- FK constraints
-				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
-				-- generic trigger
-				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
-			END IF;
-		EXCEPTION
-		WHEN OTHERS THEN
-			RAISE NOTICE 'Failed to create next table: %', table_name;
-		END;
-	ELSE
-		-- if outside valid date, insert into overflow
-		INSERT INTO edit_log_overflow VALUES (NEW.*);
-	END IF;
-	RETURN NULL;
+                -- insert try again
+                EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
+            EXCEPTION
+            WHEN OTHERS THEN
+                -- if this faled, throw it into the overflow table (so we don't loose anything)
+                INSERT INTO edit_log_overflow VALUES (NEW.*);
+            END;
+        -- other errors, insert into overlow
+        WHEN OTHERS THEN
+            -- if this faled, throw it into the overflow table (so we don't loose anything)
+            INSERT INTO edit_log_overflow VALUES (NEW.*);
+        END;
+        -- main insert run done, check if we have to create next months table
+        BEGIN
+            -- check if next month table exists
+            table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
+            -- RAISE NOTICE 'SEARCH NEXT: %', table_name;
+            IF  (SELECT to_regclass(table_name)) IS NULL THEN
+                -- move inner interval same
+                start_date := date_trunc(selector, NEW.event_date + _interval);
+                end_date := date_trunc(selector, NEW.event_date + _interval_next);
+                -- RAISE NOTICE 'CREATE NEXT: %', table_name;
+                -- create table
+                EXECUTE format(REPLACE( -- end date
+                    REPLACE( -- start date
+                        REPLACE( -- compare date name
+                            REPLACE( -- base name (inherit)
+                                REPLACE( -- table name
+                                    command_create_table,
+                                    '{TABLE_NAME}',
+                                    table_name
+                                ),
+                                '{BASE_NAME}',
+                                base_table
+                            ),
+                            '{COMPARE_DATE_NAME}',
+                            compare_date_name
+                        ),
+                        '{START_DATE}',
+                        quote_literal(start_date)
+                    ),
+                    '{END_DATE}',
+                    quote_literal(end_date)
+                ));
+                -- create all indexes and triggers
+                EXECUTE format(REPLACE(
+                    REPLACE(
+                        command_create_primary_key,
+                        '{TABLE_NAME}',
+                        table_name
+                    ),
+                    '{BASE_TABLE}',
+                    base_table
+                ));
+                -- FK constraints
+                EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+                -- generic trigger
+                EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+            END IF;
+        EXCEPTION
+        WHEN OTHERS THEN
+            RAISE NOTICE 'Failed to create next table: %', table_name;
+        END;
+    ELSE
+        -- if outside valid date, insert into overflow
+        INSERT INTO edit_log_overflow VALUES (NEW.*);
+    END IF;
+    RETURN NULL;
 END
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/edit_user_set_login_user_id_set_date.sql

@@ -5,22 +5,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	-- if new is not null/empty
-	-- and old one is null or old one different new one
-	-- set NOW()
-	-- if new one is NULL
-	-- set NULL
-	IF
-		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
-		(OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-	THEN
-		NEW.login_user_id_set_date = NOW();
-		NEW.login_user_id_last_revalidate = NOW();
-	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-		NEW.login_user_id_set_date = NULL;
-		NEW.login_user_id_last_revalidate = NULL;
-	END IF;
-	RETURN NEW;
+    -- if new is not null/empty
+    -- and old one is null or old one different new one
+    -- set NOW()
+    -- if new one is NULL
+    -- set NULL
+    IF
+        NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
+    THEN
+        NEW.login_user_id_set_date = NOW();
+        NEW.login_user_id_last_revalidate = NOW();
+    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+        NEW.login_user_id_set_date = NULL;
+        NEW.login_user_id_last_revalidate = NULL;
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/random_string.sql

@@ -4,15 +4,15 @@ CREATE FUNCTION random_string(randomLength int)
 RETURNS text AS
 $$
 SELECT array_to_string(
-	ARRAY(
-		SELECT substring(
-			'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-			trunc(random() * 62)::int + 1,
-			1
-		)
-		FROM generate_series(1, randomLength) AS gs(x)
-	),
-	''
+    ARRAY(
+        SELECT substring(
+            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+            trunc(random() * 62)::int + 1,
+            1
+        )
+        FROM generate_series(1, randomLength) AS gs(x)
+    ),
+    ''
 )
 $$
 LANGUAGE SQL

4dev/database/function/set_date.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE FUNCTION set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
-	ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
-	END IF;
-	RETURN NEW;
+    IF TG_OP = 'INSERT' THEN
+        NEW.date_created := 'now';
+    ELSIF TG_OP = 'UPDATE' THEN
+        NEW.date_updated := 'now';
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_edit_generic.sql

@@ -4,15 +4,15 @@ CREATE OR REPLACE FUNCTION set_edit_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 12; -- that should be long enough
+    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);
-	ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
-	END IF;
-	RETURN NEW;
+    IF TG_OP = 'INSERT' THEN
+        NEW.date_created := 'now';
+        NEW.cuid := random_string(random_length);
+    ELSIF TG_OP = 'UPDATE' THEN
+        NEW.date_updated := 'now';
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_generic_uid.sql

@@ -5,17 +5,17 @@ CREATE OR REPLACE FUNCTION set_generic()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 32; -- long for massive data
+    random_length INT = 32; -- long for massive data
 BEGIN
-	IF TG_OP = 'INSERT' THEN
-		NEW.date_created := 'now';
-		IF NEW.uid IS NULL THEN
-			NEW.uid := random_string(random_length);
-		END IF;
-	ELSIF TG_OP = 'UPDATE' THEN
-		NEW.date_updated := 'now';
-	END IF;
-	RETURN NEW;
+    IF TG_OP = 'INSERT' THEN
+        NEW.date_created := 'now';
+        IF NEW.uid IS NULL THEN
+            NEW.uid := random_string(random_length);
+        END IF;
+    ELSIF TG_OP = 'UPDATE' THEN
+        NEW.date_updated := 'now';
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE FUNCTION set_uid()
 RETURNS TRIGGER AS
 $$
 DECLARE
-	random_length INT = 32; -- that should be long enough
+    random_length INT = 32; -- that should be long enough
 BEGIN
-	IF TG_OP = 'INSERT' THEN
-		NEW.uid := random_string(random_length);
-	END IF;
-	RETURN NEW;
+    IF TG_OP = 'INSERT' THEN
+        NEW.uid := random_string(random_length);
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/database/function/update_function.sql

@@ -6,14 +6,14 @@
 -- RETURNS TRIGGER AS
 -- $$
 -- BEGIN
--- 	IF TG_OP = 'INSERT' THEN
--- 		NEW.date_created := clock_timestamp();
--- 		NEW.user_created := current_user;
--- 	ELSIF TG_OP = 'UPDATE' THEN
--- 		NEW.date_updated := clock_timestamp();
--- 		NEW.user_updated := current_user;
--- 	END IF;
--- 	RETURN NEW;
+--     IF TG_OP = 'INSERT' THEN
+--         NEW.date_created := clock_timestamp();
+--         NEW.user_created := current_user;
+--     ELSIF TG_OP = 'UPDATE' THEN
+--         NEW.date_updated := clock_timestamp();
+--         NEW.user_updated := current_user;
+--     END IF;
+--     RETURN NEW;
 -- END;
 -- $$
 -- LANGUAGE 'plpgsql';

4dev/database/table/edit_access.sql

@@ -7,13 +7,13 @@
 
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-	edit_access_id	SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	protected SMALLINT DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
-	uid	VARCHAR,
-	name	VARCHAR UNIQUE,
-	description	VARCHAR,
-	color	VARCHAR,
-	additional_acl	JSONB
+    edit_access_id SERIAL PRIMARY KEY,
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    protected SMALLINT DEFAULT 0,
+    deleted SMALLINT DEFAULT 0,
+    uid VARCHAR,
+    name VARCHAR UNIQUE,
+    description VARCHAR,
+    color VARCHAR,
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_data.sql

@@ -7,12 +7,12 @@
 
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-	edit_access_data_id	SERIAL PRIMARY KEY,
-	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,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
-	value	VARCHAR
+    edit_access_data_id SERIAL PRIMARY KEY,
+    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,
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    name VARCHAR,
+    value VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create a unique index for each attached data block for each edit access can

4dev/database/table/edit_access_right.sql

@@ -8,9 +8,9 @@
 
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-	edit_access_right_id SERIAL PRIMARY KEY,
-	name VARCHAR,
-	level SMALLINT,
-	type VARCHAR,
-	UNIQUE (level,type)
+    edit_access_right_id SERIAL PRIMARY KEY,
+    name VARCHAR,
+    level SMALLINT,
+    type VARCHAR,
+    UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_user.sql

@@ -7,13 +7,13 @@
 
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-	edit_access_user_id	SERIAL PRIMARY KEY,
-	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,
-	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,
-	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,
-	edit_default	SMALLINT DEFAULT 0,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    edit_access_user_id SERIAL PRIMARY KEY,
+    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,
+    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,
+    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,
+    edit_default SMALLINT DEFAULT 0,
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_generic.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
-	cuid	VARCHAR,
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-	date_updated	TIMESTAMP WITHOUT TIME ZONE
+    cuid VARCHAR,
+    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+    date_updated TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

@@ -7,14 +7,14 @@
 
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-	edit_group_id	SERIAL PRIMARY KEY,
-	edit_scheme_id INT,
-	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,
-	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,
-	deleted	SMALLINT DEFAULT 0,
-	uid	VARCHAR,
-	name	VARCHAR,
-	additional_acl	JSONB
+    edit_group_id SERIAL PRIMARY KEY,
+    edit_scheme_id INT,
+    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,
+    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,
+    deleted SMALLINT DEFAULT 0,
+    uid VARCHAR,
+    name VARCHAR,
+    additional_acl JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_language.sql

@@ -8,11 +8,11 @@
 
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-	edit_language_id SERIAL PRIMARY KEY,
-	enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0,
-	long_name VARCHAR,
-	short_name VARCHAR, -- en_US, en or en_US@latin without encoding
-	iso_name VARCHAR, -- should actually be encoding
-	order_number INT
+    edit_language_id SERIAL PRIMARY KEY,
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    lang_default SMALLINT NOT NULL DEFAULT 0,
+    long_name VARCHAR,
+    short_name VARCHAR, -- en_US, en or en_US@latin without encoding
+    iso_name VARCHAR, -- should actually be encoding
+    order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log.sql

@@ -7,35 +7,35 @@
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-	edit_log_id	SERIAL PRIMARY KEY,
-	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,
-	username	VARCHAR,
-	password	VARCHAR,
-	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-	ip	VARCHAR,
-	error	TEXT,
-	event	TEXT,
-	data_binary	BYTEA,
-	data	TEXT,
-	page	VARCHAR,
-	action	VARCHAR,
-	action_id	VARCHAR,
-	action_yes	VARCHAR,
-	action_flag	VARCHAR,
-	action_menu	VARCHAR,
-	action_loaded	VARCHAR,
-	action_value	VARCHAR,
-	action_type	VARCHAR,
-	action_error	VARCHAR,
-	user_agent	VARCHAR,
-	referer	VARCHAR,
-	script_name	VARCHAR,
-	query_string	VARCHAR,
-	server_name	VARCHAR,
-	http_host	VARCHAR,
-	http_accept	VARCHAR,
-	http_accept_charset	VARCHAR,
-	http_accept_encoding	VARCHAR,
-	session_id	VARCHAR
+    edit_log_id SERIAL PRIMARY KEY,
+    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,
+    username VARCHAR,
+    password VARCHAR,
+    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ip VARCHAR,
+    error TEXT,
+    event TEXT,
+    data_binary BYTEA,
+    data TEXT,
+    page VARCHAR,
+    action VARCHAR,
+    action_id VARCHAR,
+    action_yes VARCHAR,
+    action_flag VARCHAR,
+    action_menu VARCHAR,
+    action_loaded VARCHAR,
+    action_value VARCHAR,
+    action_type VARCHAR,
+    action_error VARCHAR,
+    user_agent VARCHAR,
+    referer VARCHAR,
+    script_name VARCHAR,
+    query_string VARCHAR,
+    server_name VARCHAR,
+    http_host VARCHAR,
+    http_accept VARCHAR,
+    http_accept_charset VARCHAR,
+    http_accept_encoding VARCHAR,
+    session_id VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_menu_group.sql

@@ -7,10 +7,10 @@
 
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-	edit_menu_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR,
-	order_number	INT NOT NULL
+    edit_menu_group_id SERIAL PRIMARY KEY,
+    name VARCHAR,
+    flag VARCHAR,
+    order_number INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 

4dev/database/table/edit_page.sql

@@ -7,16 +7,16 @@
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-	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
-	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-	filename	VARCHAR,
-	name	VARCHAR UNIQUE,
-	order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0,
-	menu	SMALLINT NOT NULL DEFAULT 0,
-	popup	SMALLINT NOT NULL DEFAULT 0,
-	popup_x	SMALLINT,
-	popup_y SMALLINT,
-	hostname	VARCHAR
+    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
+    FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+    filename VARCHAR,
+    name VARCHAR UNIQUE,
+    order_number INT NOT NULL,
+    online SMALLINT NOT NULL DEFAULT 0,
+    menu SMALLINT NOT NULL DEFAULT 0,
+    popup SMALLINT NOT NULL DEFAULT 0,
+    popup_x SMALLINT,
+    popup_y SMALLINT,
+    hostname VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_access.sql

@@ -7,14 +7,14 @@
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-	edit_page_access_id	SERIAL PRIMARY KEY,
-	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,
-	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,
-	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,
-	enabled	SMALLINT NOT NULL DEFAULT 0
+    edit_page_access_id SERIAL PRIMARY KEY,
+    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,
+    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,
+    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,
+    enabled SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 

4dev/database/table/edit_page_content.sql

@@ -8,13 +8,13 @@
 
 -- DROP TABLE edit_page_content;
 CREATE TABLE edit_page_content (
-	edit_page_content_id	SERIAL PRIMARY KEY,
-	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,
-	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,
-	uid	VARCHAR UNIQUE,
-	name	VARCHAR,
-	order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0
+    edit_page_content_id SERIAL PRIMARY KEY,
+    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,
+    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,
+    uid VARCHAR UNIQUE,
+    name VARCHAR,
+    order_number INT NOT NULL,
+    online SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_menu_group.sql

@@ -7,8 +7,8 @@
 
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
-	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,
-	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
+    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,
+    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
 );

4dev/database/table/edit_page_visible_group.sql

@@ -7,8 +7,8 @@
 
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
-	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,
-	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
+    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,
+    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
 );

4dev/database/table/edit_query_string.sql

@@ -7,11 +7,11 @@
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-	edit_query_string_id	SERIAL PRIMARY KEY,
-	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,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
-	value	VARCHAR,
-	dynamic	SMALLINT NOT NULL DEFAULT 0
+    edit_query_string_id SERIAL PRIMARY KEY,
+    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,
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    name VARCHAR,
+    value VARCHAR,
+    dynamic SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_scheme.sql

@@ -7,10 +7,10 @@
 
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-	edit_scheme_id	SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
-	header_color	VARCHAR,
-	css_file	VARCHAR,
-	template	VARCHAR
+    edit_scheme_id SERIAL PRIMARY KEY,
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    name VARCHAR,
+    header_color VARCHAR,
+    css_file VARCHAR,
+    template VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_temp_files.sql

@@ -7,6 +7,6 @@
 
 -- DROP TABLE temp_files;
 CREATE TABLE temp_files (
-	filename	VARCHAR,
-	folder	VARCHAR
+    filename VARCHAR,
+    folder VARCHAR
 );

4dev/database/table/edit_user.sql

@@ -7,63 +7,63 @@
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-	edit_user_id	SERIAL PRIMARY KEY,
-	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,
-	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,
-	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,
-	edit_scheme_id INT,
-	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,
-	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	VARCHAR UNIQUE,
-	password	VARCHAR,
-	-- name block
-	first_name	VARCHAR,
-	last_name	VARCHAR,
-	first_name_furigana	VARCHAR,
-	last_name_furigana	VARCHAR,
-	-- email
-	email	VARCHAR,
-	-- eanbled/deleted flag
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT NOT NULL DEFAULT 0,
-	-- general flags
-	strict	SMALLINT DEFAULT 0,
-	locked	SMALLINT DEFAULT 0,
-	protected SMALLINT NOT NULL DEFAULT 0,
-	-- legacy, debug flags
-	debug	SMALLINT NOT NULL DEFAULT 0,
-	db_debug	SMALLINT NOT NULL DEFAULT 0,
-	-- is admin user
-	admin	SMALLINT NOT NULL DEFAULT 0,
-	-- last login log
-	last_login	TIMESTAMP WITHOUT TIME ZONE,
-	-- login error
-	login_error_count	INT DEFAULT 0,
-	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
-	-- time locked
-	lock_until	TIMESTAMP WITHOUT TIME ZONE,
-	lock_after	TIMESTAMP WITHOUT TIME ZONE,
-	-- password change
-	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_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-	password_reset_uid	VARCHAR, -- the uid to access the password reset page
-	-- _GET login id for direct login
-	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_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_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_locked	SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
-	-- additional ACL json block
-	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
+    edit_user_id SERIAL PRIMARY KEY,
+    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,
+    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,
+    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,
+    edit_scheme_id INT,
+    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,
+    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 VARCHAR UNIQUE,
+    password VARCHAR,
+    -- name block
+    first_name VARCHAR,
+    last_name VARCHAR,
+    first_name_furigana VARCHAR,
+    last_name_furigana VARCHAR,
+    -- email
+    email VARCHAR,
+    -- eanbled/deleted flag
+    enabled SMALLINT NOT NULL DEFAULT 0,
+    deleted SMALLINT NOT NULL DEFAULT 0,
+    -- general flags
+    strict SMALLINT DEFAULT 0,
+    locked SMALLINT DEFAULT 0,
+    protected SMALLINT NOT NULL DEFAULT 0,
+    -- legacy, debug flags
+    debug SMALLINT NOT NULL DEFAULT 0,
+    db_debug SMALLINT NOT NULL DEFAULT 0,
+    -- is admin user
+    admin SMALLINT NOT NULL DEFAULT 0,
+    -- last login log
+    last_login TIMESTAMP WITHOUT TIME ZONE,
+    -- login error
+    login_error_count INT DEFAULT 0,
+    login_error_date_last TIMESTAMP WITHOUT TIME ZONE,
+    login_error_date_first TIMESTAMP WITHOUT TIME ZONE,
+    -- time locked
+    lock_until TIMESTAMP WITHOUT TIME ZONE,
+    lock_after TIMESTAMP WITHOUT TIME ZONE,
+    -- password change
+    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_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
+    password_reset_uid VARCHAR, -- the uid to access the password reset page
+    -- _GET login id for direct login
+    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_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_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_locked SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
+    -- additional ACL json block
+    additional_acl JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 -- create unique index

4dev/database/table/edit_visible_group.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-	edit_visible_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR
+    edit_visible_group_id SERIAL PRIMARY KEY,
+    name VARCHAR,
+    flag VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/generic.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE generic;
 CREATE TABLE generic (
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-	date_updated	TIMESTAMP WITHOUT TIME ZONE,
-	uid	VARCHAR
+    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+    date_updated TIMESTAMP WITHOUT TIME ZONE,
+    uid VARCHAR
 );

4dev/sync/sync_template.sh

@@ -18,6 +18,7 @@ rm -f $tmpf_web;
 echo ".*.swp" >> $tmpf_web;
 echo "._*" >> $tmpf_web;
 echo ".DS_Store" >> $tmpf_web;
+echo ".user.ini" >> $tmpf_web;
 echo ".svn" >> $tmpf_web;
 echo ".svnignore" >> $tmpf_web;
 echo ".git" >> $tmpf_web;

4dev/tests/CoreLibsACLLoginTest.php

@@ -1477,7 +1477,7 @@ final class CoreLibsACLLoginTest extends TestCase
 				);
 				// - loginGetLoginHTML
 				$this->assertStringContainsString(
-					'<html>',
+					'<html lang="',
 					$login_mock->loginGetLoginHTML(),
 					'Assert login html string exits'
 				);
@@ -1529,7 +1529,7 @@ final class CoreLibsACLLoginTest extends TestCase
 					// html login basic check only, content is the same as when
 					// read from loginGetLoginHTML()
 					$this->assertStringContainsString(
-						'<html>',
+						'<html lang="',
 						$_POST['login_html'],
 						'Assert ajax _POST html string exits'
 					);

4dev/tests/CoreLibsAdminEditPageTest.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Admin\EditPage
+ * @coversDefaultClass \CoreLibs\Admin\EditPage
+ * @testdox \CoreLibs\Admin\EditPage method tests
+ */
+final class CoreLibsAdminEditPageTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return void
+	 */
+	protected function setUp(): void
+	{
+		if (!extension_loaded('pgsql')) {
+			$this->markTestSkipped(
+				'The PgSQL extension is not available.'
+			);
+		}
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @testdox Admin\EditPage Class tests
+	 *
+	 * @return void
+	 */
+	public function testAdminEditPage()
+	{
+		/* $this->assertTrue(true, 'ACL Login Tests not implemented');
+		$this->markTestIncomplete(
+			'ACL\Login Tests have not yet been implemented'
+		); */
+		$this->markTestSkipped('No implementation for Admin\EditPage at the moment');
+	}
+}
+
+// __END__

4dev/tests/CoreLibsCheckColorsTest.php

@@ -0,0 +1,329 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Check\Colors
+ * @coversDefaultClass \CoreLibs\Check\Colors
+ * @testdox \CoreLibs\Check\Colors method tests
+ */
+final class CoreLibsCheckColorsTest extends TestCase
+{
+	public function validateColorProvider(): array
+	{
+		/*
+		0: input color string
+		1: flag (or flags to set)
+		2: expected result (bool)
+		*/
+		return [
+			// * hex
+			'valid hex rgb, flag ALL (default)' => [
+				'#ab12cd',
+				null,
+				true,
+			],
+			'valid hex rgb, flag ALL' => [
+				'#ab12cd',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid hex rgb, flag HEX_RGB' => [
+				'#ab12cd',
+				\CoreLibs\Check\Colors::HEX_RGB,
+				true,
+			],
+			'valid hex rgb, wrong flag' => [
+				'#ab12cd',
+				\CoreLibs\Check\Colors::RGB,
+				false,
+			],
+			// error
+			'invalid hex rgb A' => [
+				'#ab12zz',
+				null,
+				false,
+			],
+			'invalid hex rgb B' => [
+				'#ZyQfo',
+				null,
+				false,
+			],
+			// other valid hex checks
+			'valid hex rgb, alt　A' => [
+				'#AB12cd',
+				null,
+				true,
+			],
+			// * hax alpha
+			'valid hex rgb alpha, flag ALL (default)' => [
+				'#ab12cd12',
+				null,
+				true,
+			],
+			'valid hex rgb alpha, flag ALL' => [
+				'#ab12cd12',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid hex rgb alpha, flag HEX_RGBA' => [
+				'#ab12cd12',
+				\CoreLibs\Check\Colors::HEX_RGBA,
+				true,
+			],
+			'valid hex rgb alpha, wrong flag' => [
+				'#ab12cd12',
+				\CoreLibs\Check\Colors::RGB,
+				false,
+			],
+			// error
+			'invalid hex rgb alpha A' => [
+				'#ab12dd1',
+				null,
+				false,
+			],
+			'invalid hex rgb alpha B' => [
+				'#ab12ddzz',
+				null,
+				false,
+			],
+			'valid hex rgb alpha, alt A' => [
+				'#ab12cdEE',
+				null,
+				true,
+			],
+			// * rgb
+			'valid rgb, flag ALL (default)' => [
+				'rgb(255, 10, 20)',
+				null,
+				true,
+			],
+			'valid rgb, flag ALL' => [
+				'rgb(255, 10, 20)',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid rgb, flag RGB' => [
+				'rgb(255, 10, 20)',
+				\CoreLibs\Check\Colors::RGB,
+				true,
+			],
+			'valid rgb, wrong flag' => [
+				'rgb(255, 10, 20)',
+				\CoreLibs\Check\Colors::HEX_RGB,
+				false,
+			],
+			// error
+			'invalid rgb A' => [
+				'rgb(356, 10, 20)',
+				null,
+				false,
+			],
+			// other valid rgb conbinations
+			'valid rgb, alt A (percent)' => [
+				'rgb(100%, 10%, 20%)',
+				null,
+				true,
+			],
+			// TODO check all % and non percent combinations
+			'valid rgb, alt B (percent, mix)' => [
+				'rgb(100%, 10, 40)',
+				null,
+				true,
+			],
+			// * rgb alpha
+			'valid rgba, flag ALL (default)' => [
+				'rgba(255, 10, 20, 0.5)',
+				null,
+				true,
+			],
+			'valid rgba, flag ALL' => [
+				'rgba(255, 10, 20, 0.5)',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid rgba, flag RGB' => [
+				'rgba(255, 10, 20, 0.5)',
+				\CoreLibs\Check\Colors::RGBA,
+				true,
+			],
+			'valid rgba, wrong flag' => [
+				'rgba(255, 10, 20, 0.5)',
+				\CoreLibs\Check\Colors::HEX_RGB,
+				false,
+			],
+			// error
+			'invalid rgba A' => [
+				'rgba(356, 10, 20, 0.5)',
+				null,
+				false,
+			],
+			// other valid rgba combinations
+			'valid rgba, alt A (percent)' => [
+				'rgba(100%, 10%, 20%, 0.5)',
+				null,
+				true,
+			],
+			// TODO check all % and non percent combinations
+			'valid rgba, alt B (percent, mix)' => [
+				'rgba(100%, 10, 40, 0.5)',
+				null,
+				true,
+			],
+			// TODO check all % and non percent combinations with percent transparent
+			'valid rgba, alt C (percent transparent)' => [
+				'rgba(100%, 10%, 20%, 50%)',
+				null,
+				true,
+			],
+					/*
+	// hsl
+	'hsl(100, 50%, 60%)',
+	'hsl(100, 50.5%, 60.5%)',
+	'hsla(100, 50%, 60%)',
+	'hsla(100, 50.5%, 60.5%)',
+	'hsla(100, 50%, 60%, 0.5)',
+	'hsla(100, 50.5%, 60.5%, 0.5)',
+	'hsla(100, 50%, 60%, 50%)',
+	'hsla(100, 50.5%, 60.5%, 50%)',
+		*/
+			// * hsl
+			'valid hsl, flag ALL (default)' => [
+				'hsl(100, 50%, 60%)',
+				null,
+				true,
+			],
+			'valid hsl, flag ALL' => [
+				'hsl(100, 50%, 60%)',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid hsl, flag RGB' => [
+				'hsl(100, 50%, 60%)',
+				\CoreLibs\Check\Colors::HSL,
+				true,
+			],
+			'valid hsl, wrong flag' => [
+				'hsl(100, 50%, 60%)',
+				\CoreLibs\Check\Colors::HEX_RGB,
+				false,
+			],
+			'invalid hsl A' => [
+				'hsl(500, 50%, 60%)',
+				null,
+				false,
+			],
+			'valid hsl, alt A' => [
+				'hsl(100, 50.5%, 60.5%)',
+				null,
+				true,
+			],
+			// * hsl alpha
+			'valid hsla, flag ALL (default)' => [
+				'hsla(100, 50%, 60%, 0.5)',
+				null,
+				true,
+			],
+			'valid hsla, flag ALL' => [
+				'hsla(100, 50%, 60%, 0.5)',
+				\CoreLibs\Check\Colors::ALL,
+				true,
+			],
+			'valid hsla, flag RGB' => [
+				'hsla(100, 50%, 60%, 0.5)',
+				\CoreLibs\Check\Colors::HSLA,
+				true,
+			],
+			'valid hsla, wrong flag' => [
+				'hsla(100, 50%, 60%, 0.5)',
+				\CoreLibs\Check\Colors::HEX_RGB,
+				false,
+			],
+			'invalid hsla A' => [
+				'hsla(500, 50%, 60%, 0.5)',
+				null,
+				false,
+			],
+			'valid hsla, alt A (percent alpha' => [
+				'hsla(100, 50%, 60%, 50%)',
+				null,
+				true,
+			],
+			'valid hsla, alt A (percent alpha' => [
+				'hsla(100, 50.5%, 60.5%, 50%)',
+				null,
+				true,
+			],
+			// * combined flag checks
+			'valid rgb, flag RGB|RGBA' => [
+				'rgb(100%, 10%, 20%)',
+				\CoreLibs\Check\Colors::RGB | \CoreLibs\Check\Colors::RGBA,
+				true,
+			],
+			// TODO other combined flag checks all combinations
+			// * invalid string
+			'invalid string A' => [
+				'invalid string',
+				null,
+				false,
+			],
+			'invalid string B' => [
+				'(hsla(100, 100, 100))',
+				null,
+				false,
+			],
+			'invalid string C' => [
+				'hsla(100, 100, 100',
+				null,
+				false,
+			],
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::validateColor
+	 * @dataProvider validateColorProvider
+	 * @testdox validateColor $input with flags $flags be $expected [$_dataName]
+	 *
+	 * @param  string   $input
+	 * @param  int|null $flags
+	 * @param  bool     $expected
+	 * @return void
+	 */
+	public function testValidateColor(string $input, ?int $flags, bool $expected)
+	{
+		if ($flags === null) {
+			$result = \CoreLibs\Check\Colors::validateColor($input);
+		} else {
+			$result = \CoreLibs\Check\Colors::validateColor($input, $flags);
+		}
+		$this->assertEquals(
+			$expected,
+			$result
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::validateColor
+	 * @testWith [99]
+	 * @testdox Check Exception throw for $flag
+	 *
+	 * @param  int   $flag
+	 * @return void
+	 */
+	public function testValidateColorException(int $flag): void
+	{
+		$this->expectException(\Exception::class);
+		\CoreLibs\Check\Colors::validateColor('#ffffff', $flag);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsCheckEncodingTest.php

@@ -92,6 +92,7 @@ final class CoreLibsCheckEncodingTest extends TestCase
 		$error_char,
 		$expected
 	): void {
+		$current_subsitute_character = mb_substitute_character();
 		if ($error_char !== null) {
 			\CoreLibs\Check\Encoding::setErrorChar($error_char);
 			if (!in_array($error_char, ['none', 'long', 'entity'])) {
@@ -111,6 +112,8 @@ final class CoreLibsCheckEncodingTest extends TestCase
 			$expected,
 			$return
 		);
+		// reset after test
+		mb_substitute_character($current_subsitute_character);
 	}
 }
 

4dev/tests/CoreLibsCombinedDateTimeTest.php

@@ -13,7 +13,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsCombinedDateTimeTest extends TestCase
 {
-
 	/**
 	 * timestamps
 	 *
@@ -618,13 +617,169 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 	 * @param array $expected
 	 * @return void
 	 */
-	public function testCalcDaysInterval(string $input_a, string $input_b, bool $flag, $expected): void
-	{
+	public function testCalcDaysInterval(
+		string $input_a,
+		string $input_b,
+		bool $flag,
+		$expected
+	): void {
 		$this->assertEquals(
 			$expected,
 			\CoreLibs\Combined\DateTime::calcDaysInterval($input_a, $input_b, $flag)
 		);
 	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayNumberProvider(): array
+	{
+		return [
+			'0 invalid' => [0, null, 'Inv',],
+			'0 invalid long' => [0, true, 'Invalid',],
+			'1 short' => [1, null, 'Mon',],
+			'1 long' => [1, true, 'Monday',],
+			'2 short' => [2, null, 'Tue',],
+			'2 long' => [2, true, 'Tuesday',],
+			'3 short' => [3, null, 'Wed',],
+			'3 long' => [3, true, 'Wednesday',],
+			'4 short' => [4, null, 'Thu',],
+			'4 long' => [4, true, 'Thursday',],
+			'5 short' => [5, null, 'Fri',],
+			'5 long' => [5, true, 'Friday',],
+			'6 short' => [6, null, 'Sat',],
+			'6 long' => [6, true, 'Saturday',],
+			'7 short' => [7, null, 'Sun',],
+			'7 long' => [7, true, 'Sunday',],
+			'8 invalid' => [8, null, 'Inv',],
+			'8 invalid long' => [8, true, 'Invalid',],
+		];
+	}
+
+	/**
+	 * int weekday number to string weekday
+	 *
+	 * @covers ::setWeekdayNameFromIsoDow
+	 * @dataProvider weekdayNumberProvider
+	 * @testdox weekdayListProvider $input (short $flag) will be $expected [$_dataName]
+	 *
+	 * @param  int       $input
+	 * @param  bool|null $flag
+	 * @param  string    $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNameFromIsoDow(
+		int $input,
+		?bool $flag,
+		string $expected
+	): void {
+		if ($flag === null) {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromIsoDow($input);
+		} else {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromIsoDow($input, $flag);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayDateProvider(): array
+	{
+		return [
+			'invalid date' => ['2022-02-31', -1],
+			'1: monday' => ['2022-07-25', 1],
+			'2: tuesday' => ['2022-07-26', 2],
+			'3: wednesday' => ['2022-07-27', 3],
+			'4: thursday' => ['2022-07-28', 4],
+			'5: friday' => ['2022-07-29', 5],
+			'6: saturday' => ['2022-07-30', 6],
+			'7: sunday' => ['2022-07-31', 7],
+		];
+	}
+
+	/**
+	 * date to weekday number
+	 *
+	 * @covers ::setWeekdayNumberFromDate
+	 * @dataProvider weekdayDateProvider
+	 * @testdox setWeekdayNumberFromDate $input will be $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  int    $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNumberFromDate(
+		string $input,
+		int $expected
+	): void {
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Combined\DateTime::setWeekdayNumberFromDate($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function weekdayDateNameProvider(): array
+	{
+		return [
+			'invalid date short' => ['2022-02-31', null, 'Inv'],
+			'invalid date long' => ['2022-02-31', true, 'Invalid'],
+			'Mon short' => ['2022-07-25', null, 'Mon'],
+			'Monday long' => ['2022-07-25', true, 'Monday'],
+			'Tue short' => ['2022-07-26', null, 'Tue'],
+			'Tuesday long' => ['2022-07-26', true, 'Tuesday'],
+			'Wed short' => ['2022-07-27', null, 'Wed'],
+			'Wednesday long' => ['2022-07-27', true, 'Wednesday'],
+			'Thu short' => ['2022-07-28', null, 'Thu'],
+			'Thursday long' => ['2022-07-28', true, 'Thursday'],
+			'Fri short' => ['2022-07-29', null, 'Fri'],
+			'Friday long' => ['2022-07-29', true, 'Friday'],
+			'Sat short' => ['2022-07-30', null, 'Sat'],
+			'Saturday long' => ['2022-07-30', true, 'Saturday'],
+			'Sun short' => ['2022-07-31', null, 'Sun'],
+			'Sunday long' => ['2022-07-31', true, 'Sunday'],
+		];
+	}
+
+	/**
+	 * date to weekday name
+	 *
+	 * @covers ::setWeekdayNameFromDate
+	 * @dataProvider weekdayDateNameProvider
+	 * @testdox setWeekdayNameFromDate $input (short $flag) will be $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  bool|null $flag
+	 * @param  string $expected
+	 * @return void
+	 */
+	public function testSetWeekdayNameFromDate(
+		string $input,
+		?bool $flag,
+		string $expected
+	): void {
+		if ($flag === null) {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromDate($input);
+		} else {
+			$output = \CoreLibs\Combined\DateTime::setWeekdayNameFromDate($input, $flag);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
 }
 
 // __END__

4dev/tests/CoreLibsConvertByteTest.php

@@ -16,7 +16,6 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertByteTest extends TestCase
 {
-
 	/**
 	 * Undocumented function
 	 *
@@ -24,7 +23,31 @@ final class CoreLibsConvertByteTest extends TestCase
 	 */
 	public function byteProvider(): array
 	{
+		/*
+		 * 0: input string
+		 * 1: default flags
+		 * 2: BYTE_FORMAT_SI
+		 * 3: BYTE_FORMAT_NOSPACE
+		 * 4: BYTE_FORMAT_ADJUST
+		 * 5: BYTE_FORMAT_SI | BYTE_FORMAT_NOSPACE
+		 */
 		return [
+			'string number' => [
+				0 => '1024',
+				1 => '1 KB',
+				2 => '1.02 KiB',
+				3 => '1KB',
+				4 => '1.00 KB',
+				5 => '1.02KiB',
+			],
+			'invalud string number' => [
+				0 => '1024 MB',
+				1 => '1024 MB',
+				2 => '1024 MB',
+				3 => '1024 MB',
+				4 => '1024 MB',
+				5 => '1024 MB',
+			],
 			'negative number' => [
 				0 => -123123123,
 				1 => '-117.42 MB',
@@ -217,6 +240,41 @@ final class CoreLibsConvertByteTest extends TestCase
 			\CoreLibs\Convert\Byte::stringByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_SI)
 		);
 	}
+
+	/**
+	 * Exceptions tests
+	 *
+	 * @covers ::humanReadableByteFormat
+	 * @testWith [99]
+	 * @testdox Test exception for humanReadableByteFormat with flag $flag
+	 *
+	 * @param  int  $flag
+	 * @return void
+	 */
+	public function testHumanReadableByteFormatException(int $flag): void
+	{
+		$this->expectException(\Exception::class);
+		\CoreLibs\Convert\Byte::humanReadableByteFormat(12, $flag);
+	}
+
+	/**
+	 * Exceptions tests
+	 * can only be 4, try 1,2 and over
+	 *
+	 * @covers ::stringByteFormat
+	 * @testWith [1]
+	 *           [2]
+	 *           [99]
+	 * @testdox Test exception for stringByteFormat with flag $flag
+	 *
+	 * @param  int  $flag
+	 * @return void
+	 */
+	public function testStringByteFormatException(int $flag): void
+	{
+		$this->expectException(\Exception::class);
+		\CoreLibs\Convert\Byte::stringByteFormat(12, $flag);
+	}
 }
 
 // __END__

4dev/tests/CoreLibsConvertColorsTest.php

@@ -122,6 +122,8 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 */
 	public function rgb2hslAndhsbList(): array
 	{
+		// if hsb_from or hsl_from is set, this will be used in hsb/hsl convert
+		// hsb_rgb is used for adjusted rgb valus due to round error to in
 		return [
 			'valid gray' => [
 				'rgb' => [12, 12, 12],
@@ -137,6 +139,16 @@ final class CoreLibsConvertColorsTest extends TestCase
 				'hsl' => [211.6, 90.5, 41.2],
 				'valid' => true,
 			],
+			// hsg/hsl with 360 which is seen as 0
+			'valid color hue 360' => [
+				'rgb' => [200, 10, 10],
+				'hsb' => [0, 95, 78.0],
+				'hsb_from' => [360, 95, 78.0],
+				'hsb_rgb' => [199, 10, 10], // should be rgb, but rounding error
+				'hsl' => [0.0, 90.5, 41.2],
+				'hsl_from' => [360.0, 90.5, 41.2],
+				'valid' => true,
+			],
 			// invalid values
 			'invalid color' => [
 				'rgb' => [-12, 300, 12],
@@ -176,9 +188,9 @@ final class CoreLibsConvertColorsTest extends TestCase
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
 			$list[$name . ', hsb to rgb'] = [
-				0 => $values['hsb'][0],
-				1 => $values['hsb'][1],
-				2 => $values['hsb'][2],
+				0 => $values['hsb_from'][0] ?? $values['hsb'][0],
+				1 => $values['hsb_from'][1] ?? $values['hsb'][1],
+				2 => $values['hsb_from'][2] ?? $values['hsb'][2],
 				3 => $values['valid'] ? $values['hsb_rgb'] : false
 			];
 		}
@@ -214,9 +226,9 @@ final class CoreLibsConvertColorsTest extends TestCase
 		$list = [];
 		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
 			$list[$name . ', hsl to rgb'] = [
-				0 => $values['hsl'][0],
-				1 => $values['hsl'][1],
-				2 => $values['hsl'][2],
+				0 => $values['hsl_from'][0] ?? $values['hsl'][0],
+				1 => $values['hsl_from'][1] ?? $values['hsl'][1],
+				2 => $values['hsl_from'][2] ?? $values['hsl'][2],
 				3 => $values['valid'] ? $values['rgb'] : false
 			];
 		}
@@ -382,6 +394,27 @@ final class CoreLibsConvertColorsTest extends TestCase
 			\CoreLibs\Convert\Colors::hsl2rgb($input_h, $input_s, $input_l)
 		);
 	}
+
+	/**
+	 * edge case check hsl/hsb and hue 360 (= 0)
+	 *
+	 * @covers ::hsl2rgb
+	 * @covers ::hsb2rgb
+	 * @testdox hsl2rgb/hsb2rgb hue 360 valid check
+	 *
+	 * @return void
+	 */
+	public function testHslHsb360hue(): void
+	{
+		$this->assertNotFalse(
+			\CoreLibs\Convert\Colors::hsl2rgb(360.0, 90.5, 41.2),
+			'HSL to RGB with 360 hue'
+		);
+		$this->assertNotFalse(
+			\CoreLibs\Convert\Colors::hsb2rgb(360, 95, 78.0),
+			'HSB to RGB with 360 hue'
+		);
+	}
 }
 
 // __END__

4dev/tests/CoreLibsConvertStringsTest.php

@@ -0,0 +1,261 @@
+<?php // phpcs:disable Generic.Files.LineLength
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Convert\Strings
+ * @coversDefaultClass \CoreLibs\Convert\Strings
+ * @testdox \CoreLibs\Convert\Strings method tests
+ */
+final class CoreLibsConvertStringsTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function splitFormatStringProvider(): array
+	{
+		// 0: input
+		// 1: format
+		// 2: split characters as string, null for default
+		// 3: expected
+		return [
+			'all empty string' => [
+				'',
+				'',
+				null,
+				''
+			],
+			'empty input string' => [
+				'',
+				'2-2',
+				null,
+				''
+			],
+			'empty format string string' => [
+				'1234',
+				'',
+				null,
+				'1234'
+			],
+			'string format match' => [
+				'1234',
+				'2-2',
+				null,
+				'12-34'
+			],
+			'string format trailing match' => [
+				'1234',
+				'2-2-',
+				null,
+				'12-34'
+			],
+			'string format leading match' => [
+				'1234',
+				'-2-2',
+				null,
+				'12-34'
+			],
+			'string format double inside match' => [
+				'1234',
+				'2--2',
+				null,
+				'12--34',
+			],
+			'string format short first' => [
+				'1',
+				'2-2',
+				null,
+				'1'
+			],
+			'string format match first' => [
+				'12',
+				'2-2',
+				null,
+				'12'
+			],
+			'string format short second' => [
+				'123',
+				'2-2',
+				null,
+				'12-3'
+			],
+			'string format too long' => [
+				'1234567',
+				'2-2',
+				null,
+				'12-34-567'
+			],
+			'string format invalid format string' => [
+				'1234',
+				'2_2',
+				null,
+				'1234'
+			],
+			'different split character' => [
+				'1234',
+				'2_2',
+				'_',
+				'12_34'
+			],
+			'mixed split characters' => [
+				'123456',
+				'2-2_2',
+				'-_',
+				'12-34_56'
+			],
+			'length mixed' => [
+				'ABCD12345568ABC13',
+				'2-4_5-2#4',
+				'-_#',
+				'AB-CD12_34556-8A#BC13'
+			],
+			'split with split chars in string' => [
+				'12-34',
+				'2-2',
+				null,
+				'12--3-4'
+			],
+			'mutltibyte string' => [
+				'あいうえ',
+				'2-2',
+				null,
+				'あいうえ'
+			],
+			'mutltibyte split string' => [
+				'1234',
+				'２-２',
+				null,
+				'1234'
+			],
+		];
+	}
+
+	/**
+	 * split format string
+	 *
+	 * @covers ::splitFormatString
+	 * @dataProvider splitFormatStringProvider
+	 * @testdox splitFormatString $input with format $format and splitters $split_characters will be $expected [$_dataName]
+	 *
+	 * @param  string      $input
+	 * @param  string      $format
+	 * @param  string|null $split_characters
+	 * @param  string      $expected
+	 * @return void
+	 */
+	public function testSplitFormatString(
+		string $input,
+		string $format,
+		?string $split_characters,
+		string $expected
+	): void {
+		if ($split_characters === null) {
+			$output = \CoreLibs\Convert\Strings::splitFormatString(
+				$input,
+				$format
+			);
+		} else {
+			$output = \CoreLibs\Convert\Strings::splitFormatString(
+				$input,
+				$format,
+				$split_characters
+			);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function countSplitPartsProvider(): array
+	{
+		return [
+			'0 elements' => [
+				'',
+				null,
+				0
+			],
+			'1 element' => [
+				'1',
+				null,
+				1,
+			],
+			'2 elements, trailing' => [
+				'1-2-',
+				null,
+				2
+			],
+			'2 elements, leading' => [
+				'-1-2',
+				null,
+				2
+			],
+			'2 elements, midde double' => [
+				'1--2',
+				null,
+				2
+			],
+			'4 elements' => [
+				'1-2-3-4',
+				null,
+				4
+			],
+			'3 elemenst, other splitter' => [
+				'2-3_3',
+				'-_',
+				3
+			],
+			'illegal splitter' => [
+				'あsdf',
+				null,
+				0
+			]
+		];
+	}
+
+	/**
+	 * count split parts
+	 *
+	 * @covers ::countSplitParts
+	 * @dataProvider countSplitPartsProvider
+	 * @testdox countSplitParts $input with splitters $split_characters will be $expected [$_dataName]
+	 *
+	 * @param  string      $input
+	 * @param  string|null $split_characters
+	 * @param  int         $expected
+	 * @return void
+	 */
+	public function testCountSplitParts(
+		string $input,
+		?string $split_characters,
+		int $expected
+	): void {
+		if ($split_characters === null) {
+			$output = \CoreLibs\Convert\Strings::countSplitParts(
+				$input
+			);
+		} else {
+			$output = \CoreLibs\Convert\Strings::countSplitParts(
+				$input,
+				$split_characters
+			);
+		}
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsCreateEmailTest.php

@@ -41,36 +41,56 @@ final class CoreLibsCreateEmailTest extends TestCase
 		// 0: email
 		// 1: name
 		// 2: encoding
-		// 3: expected
+		// 3: kv_folding
+		// 4: expected
 		return [
 			'all empty' => [
 				'',
 				null,
 				null,
+				null,
 				''
 			],
 			'email only' => [
 				'test@test.com',
 				null,
 				null,
+				null,
 				'test@test.com'
 			],
 			'email and name' => [
 				'test@test.com',
 				'Test Name',
 				null,
+				null,
 				'"Test Name" <test@test.com>'
 			],
 			'name in mime encoded, default UTF-8' => [
 				'test@test.com',
 				'日本語',
 				null,
+				null,
 				'"=?UTF-8?B?5pel5pys6Kqe?=" <test@test.com>'
 			],
+			'name in mime encoded with half width Katakana, default UTF-8' => [
+				'test@test.com',
+				'日本語ｶﾀｶﾅﾊﾟ',
+				null,
+				null,
+				'"=?UTF-8?B?5pel5pys6Kqe7722776A7722776F776K776f?=" <test@test.com>'
+			],
+			'name in mime encoded with half width Katakana, folding on, default UTF-8' => [
+				'test@test.com',
+				'日本語ｶﾀｶﾅﾊﾟ',
+				'UTF-8',
+				true,
+				'"=?UTF-8?B?5pel5pys6Kqe44Kr44K/44Kr44OK44OR?=" <test@test.com>'
+			],
 			'name in mime encoded, UTF-8 parameter' => [
 				'test@test.com',
 				'日本語',
 				'UTF-8',
+				null,
 				'"=?UTF-8?B?5pel5pys6Kqe?=" <test@test.com>'
 			],
 			// does internal UTF-8 to ISO-2022-JP convert
@@ -78,7 +98,25 @@ final class CoreLibsCreateEmailTest extends TestCase
 				'test@test.com',
 				'日本語',
 				'ISO-2022-JP',
-				'"=?ISO-2022-JP?B?GyRCRnxLXA==?=" <test@test.com>'
+				null,
+				'"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhC?=" <test@test.com>'
+			],
+			'encoding with half width Katakana in ISO-2022-JP' => [
+				'test@test.com',
+				'日本語ｶﾀｶﾅﾊﾟ',
+				'ISO-2022-JP',
+				null,
+				'"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8/?=" <test@test.com>'
+			],
+			'encoding with half width Katakana, folding on in ISO-2022-JP' => [
+				'test@test.com',
+				'日本語ｶﾀｶﾅﾊﾟ',
+				'ISO-2022-JP',
+				true,
+				// was ok php 8.1
+				// '"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8=?=" <test@test.com>'
+				// below ok php 8.1.12, 2022/12/9
+				'"=?ISO-2022-JP?B?GyRCRnxLXDhsGyhCPz8/Pz8/?=" <test@test.com>'
 			]
 		];
 	}
@@ -87,22 +125,30 @@ final class CoreLibsCreateEmailTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @dataProvider encodeEmailNameProvider
-	 * @testdox encode email $email, name $name, encoding $encoding will be $expected [$_dataName]
+	 * @testdox encode email $email, name $name, encoding $encoding, folding $kv_folding will be $expected [$_dataName]
 	 *
+	 * @param  string      $email
+	 * @param  string|null $name
+	 * @param  string|null $encoding
+	 * @param  bool|null   $kv_folding
+	 * @param  string      $expected
 	 * @return void
 	 */
 	public function testEncodeEmailName(
 		string $email,
 		?string $name,
 		?string $encoding,
+		?bool $kv_folding,
 		string $expected
 	): void {
-		if ($name === null && $encoding === null) {
+		if ($name === null && $encoding === null && $kv_folding === null) {
 			$encoded_email = \CoreLibs\Create\Email::encodeEmailName($email);
-		} elseif ($encoding === null) {
+		} elseif ($encoding === null && $kv_folding === null) {
 			$encoded_email = \CoreLibs\Create\Email::encodeEmailName($email, $name);
-		} else {
+		} elseif ($kv_folding === null) {
 			$encoded_email = \CoreLibs\Create\Email::encodeEmailName($email, $name, $encoding);
+		} else {
+			$encoded_email = \CoreLibs\Create\Email::encodeEmailName($email, $name, $encoding, $kv_folding);
 		}
 		$this->assertEquals(
 			$expected,
@@ -119,6 +165,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 		// 4: array for to email
 		// 5: replace content ([]/null)
 		// 6: encoding (UTF-8/null)
+		// 7: kv_folding
 		// 8: return status
 		// 9: expected content
 		return [
@@ -130,6 +177,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 				'to_email' => [],
 				'replace' => null,
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => -1,
 				'expected_content' => [],
 			],
@@ -141,9 +189,22 @@ final class CoreLibsCreateEmailTest extends TestCase
 				'to_email' => [],
 				'replace' => null,
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => -2,
 				'expected_content' => [],
 			],
+			'bad encoding, fail -3' => [
+				'subject' => 'SUBJECT',
+				'body' => 'BODY',
+				'from_email' => 'test@test.com',
+				'from_name' => '',
+				'to_email' => ['to@test.com'],
+				'replace' => null,
+				'encoding' => 'IDONTEXISTENCODING',
+				'kv_folding' => null,
+				'expected_status' => -3,
+				'expected_content' => [],
+			],
 			'sending email 1' => [
 				'subject' => 'SUBJECT',
 				'body' => 'BODY',
@@ -154,6 +215,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 				],
 				'replace' => null,
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -176,6 +238,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 				],
 				'replace' => null,
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -188,6 +251,52 @@ final class CoreLibsCreateEmailTest extends TestCase
 					]
 				],
 			],
+			'sending email 1, encoded, with half width katakanata' => [
+				'subject' => 'SUBJECT 日本語ｶﾀｶﾅﾊﾟ',
+				'body' => 'BODY 日本語',
+				'from_email' => 'test@test.com',
+				'from_name' => '',
+				'to_email' => [
+					'test@test.com'
+				],
+				'replace' => null,
+				'encoding' => 'UTF-8',
+				'kv_folding' => null,
+				'expected_status' => 2,
+				'expected_content' => [
+					[
+						'header' => [
+							'From' => 'test@test.com'
+						],
+						'to' => 'test@test.com',
+						'subject' => 'SUBJECT =?UTF-8?B?5pel5pys6Kqe7722776A7722776F776K776f?=',
+						'body' => 'BODY 日本語',
+					]
+				],
+			],
+			'sending email 1, encoded, with half width katakanata, folding on' => [
+				'subject' => 'SUBJECT 日本語ｶﾀｶﾅﾊﾟ',
+				'body' => 'BODY 日本語',
+				'from_email' => 'test@test.com',
+				'from_name' => '',
+				'to_email' => [
+					'test@test.com'
+				],
+				'replace' => null,
+				'encoding' => 'UTF-8',
+				'kv_folding' => true,
+				'expected_status' => 2,
+				'expected_content' => [
+					[
+						'header' => [
+							'From' => 'test@test.com'
+						],
+						'to' => 'test@test.com',
+						'subject' => 'SUBJECT =?UTF-8?B?5pel5pys6Kqe44Kr44K/44Kr44OK44OR?=',
+						'body' => 'BODY 日本語',
+					]
+				],
+			],
 			'sending email 1, encoded subject ISO-2022-JP' => [
 				'subject' => 'SUBJECT 日本語',
 				'body' => 'BODY 日本語',
@@ -198,6 +307,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 				],
 				'replace' => null,
 				'encoding' => 'ISO-2022-JP',
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -222,6 +332,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 				],
 				'replace' => null,
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -255,6 +366,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -280,6 +392,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -310,6 +423,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -340,6 +454,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -379,6 +494,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -434,6 +550,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 					'VAR' => 'bar',
 				],
 				'encoding' => null,
+				'kv_folding' => null,
 				'expected_status' => 2,
 				'expected_content' => [
 					[
@@ -478,6 +595,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 	 * @param  array       $to_email
 	 * @param  array|null  $replace
 	 * @param  string|null $encoding
+	 * @param  bool|null   $kv_folding
 	 * @param  int         $expected_status
 	 * @param  array       $expected_content
 	 * @return void
@@ -490,6 +608,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 		array $to_email,
 		?array $replace,
 		?string $encoding,
+		?bool $kv_folding,
 		int $expected_status,
 		array $expected_content
 	): void {
@@ -499,6 +618,9 @@ final class CoreLibsCreateEmailTest extends TestCase
 		if ($encoding === null) {
 			$encoding = 'UTF-8';
 		}
+		if ($kv_folding === null) {
+			$kv_folding = false;
+		}
 		// force new set for each run
 		self::$log->setLogUniqueId(true);
 		// set on of unique log id
@@ -512,6 +634,7 @@ final class CoreLibsCreateEmailTest extends TestCase
 			$to_email,
 			$replace,
 			$encoding,
+			$kv_folding,
 			true,
 			self::$log
 		);
@@ -567,12 +690,6 @@ final class CoreLibsCreateEmailTest extends TestCase
 								$email['body'] ?? '',
 							'Email check: assert body'
 						);
-						/*
-						[header] [From] => test@test.com
-						[to] => test@test.com
-						[subject] => SUBJECT
-						[body] => BODY
-						*/
 					}
 				}
 			}

4dev/tests/CoreLibsCreateSessionTest.php

@@ -181,7 +181,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 		string $type,
 		array $mock_data,
 		string $expected,
-		string $expected_error,
+		string $expected_error
 	): void {
 		// override expected
 		if ($type == 'd') {

4dev/tests/CoreLibsDBIOTest.php

@@ -1189,7 +1189,13 @@ final class CoreLibsDBIOTest extends TestCase
 
 		$this->assertEquals(
 			$expected,
-			$db->dbEscapeBytea($input)
+			$db->dbEscapeBytea($input),
+			'Assert error to bytea'
+		);
+		$this->assertEquals(
+			$input,
+			$db->dbUnescapeBytea($expected),
+			'Assert error from bytes'
 		);
 
 		$db->dbClose();
@@ -1570,6 +1576,13 @@ final class CoreLibsDBIOTest extends TestCase
 		// clear any current query
 		// $db->dbResetQuery();
 
+		// assert never called query is 0
+		$this->assertEquals(
+			0,
+			$db->dbGetQueryCalled($query),
+			'Assert never called query is null'
+		);
+
 		// if expected result is not a bool
 		// for PHP 8.1 or higher it has to be an object
 		// for anything before PHP 8.1 this has to be a resource
@@ -2536,7 +2549,7 @@ final class CoreLibsDBIOTest extends TestCase
 	private function subAssertCursorExtTestDbReturnFunction(
 		\CoreLibs\DB\IO $db,
 		string $query,
-		array $cursor_ext_checks,
+		array $cursor_ext_checks
 	): void {
 		// cursor check
 		if (
@@ -2757,7 +2770,7 @@ final class CoreLibsDBIOTest extends TestCase
 	}
 
 	// - prepared query execute
-	//   dbPrepare, dbExecute, dbFetchArray
+	//   dbPrepare, dbExecute, dbFetchArray, dbGetPrepareCursorValue
 
 	/**
 	 * Undocumented function
@@ -2782,6 +2795,7 @@ final class CoreLibsDBIOTest extends TestCase
 		// 11: read query (if insert/update)
 		// 11: execute data to check (array)
 		// 12: insert data
+		// 13: prepated cursor array data match values
 		return [
 			// insert
 			'prepare query insert' => [
@@ -2805,6 +2819,14 @@ final class CoreLibsDBIOTest extends TestCase
 				],
 				// insert data (for select)
 				'',
+				// get prepared data
+				[
+					'pk_name' => 'table_with_primary_key_id',
+					'count' => 2,
+					'query' =>  'INSERT INTO table_with_primary_key (row_int, uid) '
+						. 'VALUES ($1, $2) RETURNING table_with_primary_key_id',
+					'returning_id' => true,
+				],
 			],
 			// update
 			'prepare query update' => [
@@ -2831,6 +2853,14 @@ final class CoreLibsDBIOTest extends TestCase
 				//
 				"INSERT INTO table_with_primary_key (row_int, uid) VALUES "
 					. "(111, 'TEST A')",
+				//
+				[
+					'pk_name' => '',
+					'count' => 3,
+					'query' => 'UPDATE table_with_primary_key SET row_int = $1, '
+						. 'row_varchar = $2 WHERE uid = $3',
+					'returning_id' => false,
+				],
 			],
 			// select
 			'prepare select query' => [
@@ -2852,7 +2882,14 @@ final class CoreLibsDBIOTest extends TestCase
 					],
 				],
 				//
-				$insert_query
+				$insert_query,
+				//
+				[
+					'pk_name' => '',
+					'count' => 1,
+					'query' => 'SELECT row_int, uid FROM table_with_primary_key WHERE uid = $1',
+					'returning_id' => false,
+				],
 			],
 			// any query but with no parameters
 			'prepare select query no parameter' => [
@@ -2877,7 +2914,14 @@ final class CoreLibsDBIOTest extends TestCase
 					],
 				],
 				//
-				$insert_query
+				$insert_query,
+				//
+				[
+					'pk_name' => '',
+					'count' => 0,
+					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
+					'returning_id' => false,
+				],
 			],
 			// no statement name (25)
 			'empty statement' => [
@@ -2894,6 +2938,13 @@ final class CoreLibsDBIOTest extends TestCase
 				[],
 				//
 				'',
+				//
+				[
+					'pk_name' => '',
+					'count' => 0,
+					'query' => '',
+					'returning_id' => false,
+				],
 			],
 			// no query (prepare 11)
 			// no prepared cursor found with statement name (execute 24)
@@ -2911,6 +2962,13 @@ final class CoreLibsDBIOTest extends TestCase
 				[],
 				//
 				'',
+				//
+				[
+					'pk_name' => '',
+					'count' => 0,
+					'query' => '',
+					'returning_id' => false,
+				],
 			],
 			// no db connection (prepare/execute 16)
 			// TODO no db connection test
@@ -2931,8 +2989,15 @@ final class CoreLibsDBIOTest extends TestCase
 				// no query but data for data only compare
 				'',
 				[],
-				//,
-				$insert_query
+				//
+				$insert_query,
+				//
+				[
+					'pk_name' => '',
+					'count' => 0,
+					'query' => 'SELECT row_int, uid FROM table_with_primary_key',
+					'returning_id' => false,
+				],
 			],
 			// insert wrong data count compared to needed (execute 23)
 			'wrong parmeter count' => [
@@ -2949,7 +3014,15 @@ final class CoreLibsDBIOTest extends TestCase
 				'',
 				[],
 				//
-				''
+				'',
+				//
+				[
+					'pk_name' => 'table_with_primary_key_id',
+					'count' => 2,
+					'query' => 'INSERT INTO table_with_primary_key (row_int, uid) VALUES '
+						. '($1, $2) RETURNING table_with_primary_key_id',
+					'returning_id' => true,
+				],
 			],
 			// execute does not return a result (22)
 			// TODO execute does not return a result
@@ -2962,6 +3035,7 @@ final class CoreLibsDBIOTest extends TestCase
 	 * @covers ::dbPrepare
 	 * @covers ::dbExecute
 	 * @covers ::dbFetchArray
+	 * @covers ::dbGetPrepareCursorValue
 	 * @dataProvider preparedProvider
 	 * @testdox prepared query $stm_name with $expected_prepare (warning $warning_prepare/error $error_prepare) and $expected_execute (warning $warning_execute/error $error_execute) [$_dataName]
 	 *
@@ -2978,6 +3052,7 @@ final class CoreLibsDBIOTest extends TestCase
 	 * @param string $expected_data_query
 	 * @param array $expected_data
 	 * @param string $insert_data
+	 * @param array $prepare_cursor
 	 * @return void
 	 */
 	public function testDbPrepared(
@@ -2993,7 +3068,8 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error_execute,
 		string $expected_data_query,
 		array $expected_data,
-		string $insert_data
+		string $insert_data,
+		array $prepare_cursor,
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);
@@ -3103,6 +3179,15 @@ final class CoreLibsDBIOTest extends TestCase
 			);
 		}
 
+		// check dbGetPrepareCursorValue
+		foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
+			$this->assertEquals(
+				$prepare_cursor[$key],
+				$db->dbGetPrepareCursorValue($stm_name, $key),
+				'Prepared cursor: ' . $key . ': failed assertion'
+			);
+		}
+
 		// reset all data
 		$db->dbExec("TRUNCATE table_with_primary_key");
 		$db->dbExec("TRUNCATE table_without_primary_key");
@@ -3110,6 +3195,90 @@ final class CoreLibsDBIOTest extends TestCase
 		$db->dbClose();
 	}
 
+	// dedicated error checks for prepare cursor return
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function preparedProviderValue(): array
+	{
+		// 1: query (can be empty for do not set)
+		// 2: stm name
+		// 3: key
+		// 4: expected error return
+		return [
+			'no error' => [
+				"SELECT row_int, uid FROM table_with_primary_key",
+				'read',
+				'pk_name',
+				''
+			],
+			'statement name empty' => [
+				'',
+				'',
+				'',
+				'101',
+			],
+			'key empty' => [
+				'',
+				'read',
+				'',
+				'102',
+			],
+			'key invalid' => [
+				'',
+				'read',
+				'invalid',
+				'102',
+			],
+			'statement name not found' => [
+				'',
+				'invalid',
+				'pk_name',
+				'103',
+			],
+		];
+	}
+
+	/**
+	 * test return prepare cursor errors
+	 *
+	 * @covers ::dbGetPrepareCursorValue
+	 * @dataProvider preparedProviderValue
+	 * @testdox prepared query $stm_name with $key expect error id $error_id [$_dataName]
+	 *
+	 * @param string $query
+	 * @param string $stm_name
+	 * @param string $key
+	 * @param string $error_id
+	 * @return void
+	 */
+	public function testDbGetPrepareCursorValue(
+		string $query,
+		string $stm_name,
+		string $key,
+		$error_id
+	): void {
+		$db = new \CoreLibs\DB\IO(
+			self::$db_config['valid'],
+			self::$log
+		);
+		if (!empty($query)) {
+			$db->dbPrepare($stm_name, $query);
+			$db->dbExecute($stm_name);
+		}
+		$db->dbGetPrepareCursorValue($stm_name, $key);
+		// match check error
+		$last_error = $db->dbGetLastError();
+		$this->assertEquals(
+			$error_id,
+			$last_error,
+			'get prepare cursor value error check'
+		);
+	}
+
 	// - schema set/get tests
 	//   dbGetSchema, dbSetSchema
 

4dev/update/20220617_edit_user_login_update/20220617-edit_user_login_user_id_add.sql

@@ -1,5 +1,7 @@
 -- 2022/6/17 update edit_user with login uid
 
+-- !!! COPY TABLE ARRAY FOLDER !!!
+
 -- the login uid, at least 32 chars
 ALTER TABLE edit_user ADD login_user_id VARCHAR UNIQUE;
 -- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL;
@@ -24,22 +26,22 @@ CREATE OR REPLACE FUNCTION set_login_user_id_set_date()
 RETURNS TRIGGER AS
 $$
 BEGIN
-	-- if new is not null/empty
-	-- and old one is null or old one different new one
-	-- set NOW()
-	-- if new one is NULL
-	-- set NULL
-	IF
-		NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
-		(OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
-	THEN
-		NEW.login_user_id_set_date = NOW();
-		NEW.login_user_id_last_revalidate = NOW();
-	ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
-		NEW.login_user_id_set_date = NULL;
-		NEW.login_user_id_last_revalidate = NULL;
-	END IF;
-	RETURN NEW;
+    -- if new is not null/empty
+    -- and old one is null or old one different new one
+    -- set NOW()
+    -- if new one is NULL
+    -- set NULL
+    IF
+        NEW.login_user_id IS NOT NULL AND NEW.login_user_id <> '' AND
+        (OLD.login_user_id IS NULL OR NEW.login_user_id <> OLD.login_user_id)
+    THEN
+        NEW.login_user_id_set_date = NOW();
+        NEW.login_user_id_last_revalidate = NOW();
+    ELSIF NEW.login_user_id IS NULL OR NEW.login_user_id = '' THEN
+        NEW.login_user_id_set_date = NULL;
+        NEW.login_user_id_last_revalidate = NULL;
+    END IF;
+    RETURN NEW;
 END;
 $$
 LANGUAGE 'plpgsql';

4dev/update/20220906_edit_acl_update/20220906_readme.md

@@ -0,0 +1,22 @@
+# Files to be changed
+
+Change: Update Generate\Form to use ACL for form creation (basic)
+Date: 2022/9/6
+
+## File List
+
+```sh
+includes/table_arrays/array_edit_pages.php
+includes/table_arrays/array_edit_users.php
+includes/templates/admin/edit_body.tpl
+includes/templates/admin/edit_elements.tpl
+includes/templates/admin/edit_load.tpl
+includes/templates/admin/edit_new.tpl
+includes/templates/admin/edit_save_delete.tpl
+includes/edit_base.php
+lib/CoreLibs/ACL/Login.php
+lib/CoreLibs/DB/Extended/ArrayIO.php
+lib/CoreLibs/Convert/MimeEncode.php
+lib/CoreLibs/Create/Email.php
+lib/CoreLibs/Output/Form/Generate.php
+```

4dev/update/20230106_edit_page_update/20230106_edit_page_update.md

@@ -0,0 +1,20 @@
+# Files to be changed
+
+Change: Update edit_page and template/css
+Date: 2023/1/6
+
+## Detail
+
+* add stripes to sub table entries (edit.css)
+* fix cellspacing and cellpadding in sub tables (edit_element.tpl)
+* doctype added (edit_order.tpl)
+* code clean up in edit base, move to class system (edit_base.php)
+
+## File List
+
+```sh
+includes/templates/admin/edit_elements.tpl
+includes/templates/admin/edit_order.tpl
+includes/edit_base.php
+layout/admin/css/edit.css
+```

4dev/update/20230106_edit_page_update/20230110_edit_table_column_fix.sql

@@ -0,0 +1,25 @@
+-- Fixes for column types
+
+-- edit group
+ALTER TABLE edit_group ALTER name TYPE VARCHAR;
+-- edit language
+ALTER TABLE edit_language ALTER short_name TYPE VARCHAR;
+ALTER TABLE edit_language ALTER long_name TYPE VARCHAR;
+ALTER TABLE edit_language ALTER iso_name TYPE VARCHAR;
+-- edit menu group
+ALTER TABLE edit_menu_group ALTER name TYPE VARCHAR;
+ALTER TABLE edit_menu_group ALTER flag TYPE VARCHAR;
+-- edit page
+ALTER TABLE edit_page ALTER filename TYPE VARCHAR;
+ALTER TABLE edit_page ALTER name TYPE VARCHAR;
+-- edit query string
+ALTER TABLE edit_query_string ALTER name TYPE VARCHAR;
+ALTER TABLE edit_query_string ALTER value TYPE VARCHAR;
+-- edit scheme
+ALTER TABLE edit_scheme ALTER name TYPE VARCHAR;
+ALTER TABLE edit_scheme ALTER header_color TYPE VARCHAR;
+ALTER TABLE edit_scheme ALTER css_file TYPE VARCHAR;
+ALTER TABLE edit_scheme ALTER template TYPE VARCHAR;
+-- edit visible group
+ALTER TABLE edit_visible_group ALTER name TYPE VARCHAR;
+ALTER TABLE edit_visible_group ALTER flag TYPE VARCHAR;

phpstan-baseline.neon

@@ -1,72 +1,47 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_connection_busy expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 3
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_connection_status expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_bytea expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_get_result expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_meta_data expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_identifier expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_send_query expects PgSql\\\\Connection, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$connection of function pg_socket expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_literal expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$connection of function pg_version expects PgSql\\\\Connection\\|null, object\\|resource given\\.$#"
-			count: 2
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$result of function pg_affected_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_escape_string expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_fetch_all expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_execute expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_fetch_array expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_parameter_status expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_field_name expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_prepare expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_num_fields expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_query expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_num_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
-			count: 1
-			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
-
-		-
-			message: "#^Parameter \\#1 \\$result of function pg_result_error expects PgSql\\\\Result, object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_query_params expects PgSql\\\\Connection\\|string, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 

phpstan.neon

@@ -36,6 +36,7 @@ parameters:
 		# deprecated files
 		- www/includes/admin_set_paths.php # ignore the admin include stuff
 		- www/includes/admin_smarty.php # ignore the admin include stuff
+		- www/includes/edit_base.LEGACY.php # old style
 		# folders with data no check needed
 		- www/templates_c
 		- www/cache
@@ -49,11 +50,11 @@ parameters:
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*, only for 8.0 or lower
-			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects resource(\\|null)?, object\\|resource(\\|bool)? given\\.$#"
-			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
+		#- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*, only for 8.0 or lower
+			# message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects resource(\\|null)?, object\\|resource(\\|bool)? given\\.$#"
+			# path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
 		- # this is for 8.1 or newer
-			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|null)?), object\\|resource given\\.$#"
+			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|string)?(\\|null)?), object\\|resource given\\.$#"
 			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
 		# this is ignored for now
 		# - '#Expression in empty\(\) is always falsy.#'

www/admin/class_test.byte.php

@@ -50,21 +50,22 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 $byte = 254779258;
 $string = '242.98 MB';
 // static
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
-print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "<br>";
+print "S::BYTE TO (calls as var): $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE FROM: $string: " . Byte::stringByteFormat($string) . "<br>";
 //
 $byte = 314572800;
 $string = '300 MB';
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST) . "<br>";
 print "S::BYTE TO: $byte: "
-	. $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST | Byte::BYTE_FORMAT_NOSPACE) . "<br>";
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
-print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "<br>";
+	. Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_ADJUST | Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE TO: $byte: " . Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_NOSPACE) . "<br>";
+print "S::BYTE FROM: $string: " . Byte::stringByteFormat($string) . "<br>";
 
 // *** BYTES TEST ***
 $bytes = [

www/admin/class_test.check.colors.php

@@ -0,0 +1,123 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-check-colors';
+ob_end_flush();
+
+use CoreLibs\Check\Colors;
+// use CoreLibs\Debug\Support as DgS;
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+
+$PAGE_NAME = 'TEST CLASS: CHECK COLORS';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+// list of colors to check
+$css_colors = [
+	// base hex
+	'#ab12cd',
+	'#ab12cd12',
+	// rgb
+	'rgb(255, 10, 20)',
+	'rgb(100%, 10%, 20%)',
+	'rgba(255, 10, 20)',
+	'rgba(100%, 10%, 20%)',
+	'rgba(255, 10, 20, 0.5)',
+	'rgba(100%, 10%, 20%, 0.5)',
+	'rgba(255, 10, 20, 50%)',
+	'rgba(100%, 10%, 20%, 50%)',
+	// hsl
+	'hsl(100, 50%, 60%)',
+	'hsl(100, 50.5%, 60.5%)',
+	'hsla(100, 50%, 60%)',
+	'hsla(100, 50.5%, 60.5%)',
+	'hsla(100, 50%, 60%, 0.5)',
+	'hsla(100, 50.5%, 60.5%, 0.5)',
+	'hsla(100, 50%, 60%, 50%)',
+	'hsla(100, 50.5%, 60.5%, 50%)',
+	// invalid here
+	'invalid string',
+	'(hsla(100, 100, 100))',
+	'hsla(100, 100, 100',
+	// invalid numbers
+	'#zzab99',
+	'#abcdef0',
+	'rgb(255%, 100, 100)',
+	'rgb(255%, 100, -10)',
+	'rgb(100%, 100, -10)',
+	'hsl(370, 100, 10)',
+	'hsl(200, 100%, 160%)',
+];
+
+foreach ($css_colors as $color) {
+	$check = Colors::validateColor($color);
+	print "Color check: $color with (" . Colors::ALL . "): ";
+	if ($check) {
+		print '<span style="color: green;">OK</span>';
+	} else {
+		print '<span style="color: red;">ERROR</span>';
+	}
+	print "<br>";
+}
+
+echo "<hr>";
+
+// valid rgb/hsl checks
+$color = 'hsla(360, 100%, 60%, 0.556)';
+$check = Colors::validateColor($color);
+print "Color check: $color with (" . Colors::ALL . "): ";
+if ($check) {
+	print '<span style="color: green;">OK</span>';
+} else {
+	print '<span style="color: red;">ERROR</span>';
+}
+
+// invalid flag
+echo "<hr>";
+try {
+	$check = Colors::validateColor('#ab12cd', 99);
+	print "No Exception";
+} catch (\Exception $e) {
+	print "ERROR: " . $e->getCode() . ": " . $e->getMessage() . "<br>";
+}
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.convert.colors.php

@@ -22,7 +22,7 @@ define('USE_DATABASE', false);
 // sample config
 require 'config.php';
 // define log file id
-$LOG_FILE_ID = 'classTest-colors';
+$LOG_FILE_ID = 'classTest-convert-colors';
 ob_end_flush();
 
 use CoreLibs\Convert\Colors;
@@ -40,7 +40,7 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $color_class = 'CoreLibs\Convert\Colors';
 
-$PAGE_NAME = 'TEST CLASS: COLORS';
+$PAGE_NAME = 'TEST CLASS: CONVERT COLORS';
 print "<!DOCTYPE html>";
 print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";

www/admin/class_test.create_email.php

@@ -70,10 +70,11 @@ $status = Email::sendEmail(
 	],
 	[],
 	'UTF-8',
+	false,
 	true,
 	$log
 );
-print "SENDING: " . $status . "<br>";
+print "SENDING A: " . $status . "<br>";
 $status = Email::sendEmail(
 	'TEST {REPLACE}',
 	'BODY {OTHER}',
@@ -97,10 +98,11 @@ $status = Email::sendEmail(
 		'OTHER' => '**other**'
 	],
 	'UTF-8',
+	false,
 	true,
 	$log
 );
-print "SENDING: " . $status . "<br>";
+print "SENDING B: " . $status . "<br>";
 
 $status = Email::sendEmail(
 	'TEST',
@@ -110,10 +112,29 @@ $status = Email::sendEmail(
 	['a@a.com', 'b@b.com'],
 	[],
 	'UTF-8',
+	false,
 	true,
 	$log
 );
-print "SENDING: " . $status . "<br>";
+print "SENDING C: " . $status . "<br>";
+
+// SUBJECT 日本語ｶﾀｶﾅﾊﾟ
+$status = Email::sendEmail(
+	'TEST 日本語ｶﾀｶﾅﾊﾟカタカナバ',
+	'BODY 日本語ｶﾀｶﾅﾊﾟカタカナバ',
+	'test@test.com',
+	'Test Name 日本語ｶﾀｶﾅﾊﾟ',
+	[
+		['email' => 'a@a.com', 'name' => 'a 日本語ｶﾀｶﾅﾊﾟカタカナバ'],
+		['email' => 'b@b.com', 'name' => 'b 日本語ﾌﾟﾌﾞｶﾞﾊﾞｹブプガバケ'],
+	],
+	[],
+	'UTF-8',
+	false,
+	true,
+	$log
+);
+print "SENDING D: " . $status . "<br>";
 
 // error message
 print $log->printErrorMsg();

www/admin/class_test.datetime.php

@@ -139,6 +139,22 @@ foreach ($compare_dates as $compare_date) {
 		. DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true)) . "<br>";
 }
 
+// test date conversion
+$dow = 2;
+print "DOW[$dow]: " . DateTime::setWeekdayNameFromIsoDow($dow) . "<br>";
+print "DOW[$dow],long: " . DateTime::setWeekdayNameFromIsoDow($dow, true) . "<br>";
+$date = '2022-7-22';
+print "DATE-dow[$date]: " . DateTime::setWeekdayNameFromDate($date) . "<br>";
+print "DATE-dow[$date],long: " . DateTime::setWeekdayNameFromDate($date, true) . "<br>";
+print "DOW-date[$date]: " . DateTime::setWeekdayNumberFromDate($date) . "<br>";
+$dow = 11;
+print "DOW[$dow];invalid: " . DateTime::setWeekdayNameFromIsoDow($dow) . "<br>";
+print "DOW[$dow],long;invalid: " . DateTime::setWeekdayNameFromIsoDow($dow, true) . "<br>";
+$date = '2022-70-242';
+print "DATE-dow[$date];invalid: " . DateTime::setWeekdayNameFromDate($date) . "<br>";
+print "DATE-dow[$date],long;invalid: " . DateTime::setWeekdayNameFromDate($date, true) . "<br>";
+print "DOW-date[$date];invalid: " . DateTime::setWeekdayNumberFromDate($date) . "<br>";
+
 // error message
 print $log->printErrorMsg();
 

www/admin/class_test.db.php

@@ -145,6 +145,11 @@ print "PREPARE INSERT[ins_test_foo] STATUS: " . Support::printToString($status)
 print "PREPARE INSERT PREVIOUS INSERTED: "
 	. print_r($db->dbReturnRow("SELECT test_foo_id, test FROM test_foo "
 	. "WHERE test_foo_id = " . $db->dbGetInsertPK()), true) . "<br>";
+
+print "PREPARE CURSOR RETURN:<br>";
+foreach (['pk_name', 'count', 'query', 'returning_id'] as $key) {
+	print "KEY: " . $key . ': ' . $db->dbGetPrepareCursorValue('ins_test_foo', $key) . "<br>";
+}
 // returning test with multiple entries
 // $status = $db->db_exec(
 // 	"INSERT INTO test_foo (test) VALUES "
@@ -209,13 +214,12 @@ print "INSERT WITH NO PRIMARY KEY WITH RETURNING STATUS: " . Support::printToStr
 print "</pre>";
 
 // READ PREPARE
-if (
-	$db->dbPrepare(
-		'sel_test_foo',
-		"SELECT test_foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time "
-		. "FROM test_foo ORDER BY test_foo_id DESC LIMIT 5"
-	) === false
-) {
+$q_prep = "SELECT test_foo_id, test, some_bool, string_a, number_a, "
+	. "number_a_numeric, some_time "
+	. "FROM test_foo "
+	. "WHERE test = $1 "
+	. "ORDER BY test_foo_id DESC LIMIT 5";
+if ($db->dbPrepare('sel_test_foo', $q_prep) === false) {
 	print "Error in sel_test_foo prepare<br>";
 } else {
 	$max_rows = 6;
@@ -229,6 +233,29 @@ if (
 		$i++;
 	}
 }
+// prepre a second time on normal connection
+if ($db->dbPrepare('sel_test_foo', $q_prep) === false) {
+	print "Error prepareing<br>";
+	print "ERROR (dbPrepare on same query): "
+	. $db->dbGetLastError() . "/" . $db->dbGetLastWarning() . "/"
+	. "<pre>" . print_r($db->dbGetCombinedErrorHistory(), true) . "</pre><br>";
+}
+// NOTE: try to replacate connection still exists if script is run a second time
+// open pg bouncer connection
+$db_pgb = new CoreLibs\DB\IO($DB_CONFIG['test_pgbouncer'], $log);
+print "[PGB] DBINFO: " . $db_pgb->dbInfo() . "<br>";
+if ($db->dbPrepare('pgb_sel_test_foo', $q_prep) === false) {
+	print "[PGB] [1] Error in pgb_sel_test_foo prepare<br>";
+} else {
+	print "[PGB] [1] pgb_sel_test_foo prepare OK<br>";
+}
+// second prepare
+if ($db->dbPrepare('pgb_sel_test_foo', $q_prep) === false) {
+	print "[PGB] [2] Error in pgb_sel_test_foo prepare<br>";
+} else {
+	print "[PGB] [2] pgb_sel_test_foo prepare OK<br>";
+}
+$db_pgb->dbClose();
 
 # db write class test
 $table = 'test_foo';

www/admin/class_test.output.form.php

@@ -27,6 +27,10 @@ $ECHO_ALL = true;
 $LOG_FILE_ID = 'classTest-form';
 ob_end_flush();
 
+// start session, needed for Form\Generate
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
+
 // define an array for page use
 $table_arrays = [];
 $table_arrays[\CoreLibs\Get\System::getPageName(1)] = [

www/admin/class_test.php

@@ -54,8 +54,9 @@ print "<html><head><title>TEST CLASS</title><head>";
 print "<body>";
 
 print '<div><a href="class_test.db.php">Class Test: DB</a></div>';
-print '<div><a href="class_test.db.DbReturn.php">Class Test: DB dbReturn</a></div>';
-print '<div><a href="class_test.colors.php">Class Test: COLORS</a></div>';
+print '<div><a href="class_test.db.dbReturn.php">Class Test: DB dbReturn</a></div>';
+print '<div><a href="class_test.convert.colors.php">Class Test: CONVERT COLORS</a></div>';
+print '<div><a href="class_test.check.colors.php">Class Test: CHECK COLORS</a></div>';
 print '<div><a href="class_test.mime.php">Class Test: MIME</a></div>';
 print '<div><a href="class_test.json.php">Class Test: JSON</a></div>';
 print '<div><a href="class_test.token.php">Class Test: FORM TOKEN</a></div>';
@@ -70,6 +71,7 @@ print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
 print '<div><a href="class_test.encoding.php">Class Test: ENCODING (CHECK/CONVERT/MIME)</a></div>';
 print '<div><a href="class_test.image.php">Class Test: IMAGE</a></div>';
 print '<div><a href="class_test.byte.php">Class Test: BYTE CONVERT</a></div>';
+print '<div><a href="class_test.strings.php">Class Test: STRING CONVERT</a></div>';
 print '<div><a href="class_test.datetime.php">Class Test: DATE/TIME</a></div>';
 print '<div><a href="class_test.array.php">Class Test: ARRAY HANDLER</a></div>';
 print '<div><a href="class_test.file.php">Class Test: FILE</a></div>';
@@ -83,6 +85,7 @@ print '<div><a href="class_test.output.form.php">Class Test: OUTPUT FORM</a></di
 print '<div><a href="class_test.admin.backend.php">Class Test: BACKEND ADMIN CLASS</a></div>';
 print '<div><a href="class_test.lang.php">Class Test: LANG/L10n</a></div>';
 print '<div><a href="class_test.session.php">Class Test: SESSION</a></div>';
+print '<div><a href="class_test.session.read.php">Class Test: SESSION: READ</a></div>';
 print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';
 print '<div><a href="class_test.login.php">Class Test: LOGIN</a></div>';
 print '<div><a href="class_test.autoloader.php">Class Test: AUTOLOADER</a></div>';

www/admin/class_test.strings.php

@@ -0,0 +1,86 @@
+<?php // phpcs:ignore warning
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-string';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+$byte_class = 'CoreLibs\Convert\Strings';
+
+$PAGE_NAME = 'TEST CLASS: STRINGS CONVERT';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+$split = '4-4-4';
+$test_strings = [
+	'13',
+	'1234',
+	'12341',
+	'12341234',
+	'123412341',
+	'123412341234',
+	'1234123412341234512345',
+];
+
+foreach ($test_strings as $string) {
+	print "Convert: $string with $split to: "
+		. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+		. "<br>";
+}
+
+$split = '2_2';
+$string = '1234';
+print "Convert: $string with $split to: "
+	. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+	. "<br>";
+$split = '2-2';
+$string = 'あいうえ';
+print "Convert: $string with $split to: "
+	. \CoreLibs\Convert\Strings::splitFormatString($string, $split)
+	. "<br>";
+
+$test_splits = [
+	'',
+	'2',
+	'2-2',
+	'2-3-4',
+];
+foreach ($test_splits as $split) {
+	print "$split with count: " . \CoreLibs\Convert\Strings::countSplitParts($split) . "<br>";
+}
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/composer.lock

@@ -9,30 +9,30 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpbench/phpbench": "^0.16 || ^1",
                 "phpstan/phpstan": "^1.4",
                 "phpstan/phpstan-phpunit": "^1",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -59,7 +59,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -75,7 +75,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -138,16 +138,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.15.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
                 "shasum": ""
             },
             "require": {
@@ -188,9 +188,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-11-12T15:38:23+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -303,252 +303,25 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
-            },
-            "time": "2022-03-15T21:29:03+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
-        },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -597,7 +370,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
             },
             "funding": [
                 {
@@ -605,7 +378,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-12-28T12:41:10+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -850,16 +623,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.5.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
                 "shasum": ""
             },
             "require": {
@@ -874,7 +647,6 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                 "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
@@ -882,20 +654,16 @@
                 "phpunit/php-timer": "^5.0.2",
                 "sebastian/cli-parser": "^1.0.1",
                 "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
+                "sebastian/comparator": "^4.0.8",
                 "sebastian/diff": "^4.0.3",
                 "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
+                "sebastian/exporter": "^4.0.5",
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.2",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
                 "ext-soap": "*",
                 "ext-xdebug": "*"
@@ -937,7 +705,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
             },
             "funding": [
                 {
@@ -947,9 +715,13 @@
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2022-12-09T07:31:23+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1120,16 +892,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
@@ -1182,7 +954,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -1190,7 +962,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -1380,16 +1152,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
@@ -1445,7 +1217,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1453,7 +1225,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -1808,16 +1580,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                 "shasum": ""
             },
             "require": {
@@ -1829,7 +1601,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -1852,7 +1624,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
             },
             "funding": [
                 {
@@ -1860,7 +1632,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-09-12T14:47:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1915,88 +1687,6 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.1",
@@ -2046,64 +1736,6 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],

www/configs/config.db.php

@@ -17,7 +17,20 @@ $DB_CONFIG = [
 		'db_user' => $_ENV['DB_USER.TEST'] ?? '',
 		'db_pass' => $_ENV['DB_PASS.TEST'] ?? '',
 		'db_host' => $_ENV['DB_HOST.TEST'] ?? '',
-		'db_port' => 5432,
+		'db_port' => $_ENV['DB_PORT.PG'] ?? 5432,
+		'db_schema' => 'public',
+		'db_type' => 'pgsql',
+		'db_encoding' => '',
+		'db_ssl' => 'allow', // allow, disable, require, prefer
+		'db_debug' => true, // turn on logging or not
+	],
+	// same as above, but uses pg bouncer
+	'test_pgbouncer' => [
+		'db_name' => $_ENV['DB_NAME.TEST'] ?? '',
+		'db_user' => $_ENV['DB_USER.TEST'] ?? '',
+		'db_pass' => $_ENV['DB_PASS.TEST'] ?? '',
+		'db_host' => $_ENV['DB_HOST.TEST'] ?? '',
+		'db_port' => $_ENV['DB_PORT.PG_BOUNCER'] ?? 5432,
 		'db_schema' => 'public',
 		'db_type' => 'pgsql',
 		'db_encoding' => '',

www/configs/config.master.php

@@ -249,10 +249,10 @@ if ($is_secure) {
 	define('HOST_PROTOCOL', 'http://');
 }
 // define the db config set name, the db config and the db schema
-define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host'] ?? '');
 define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? []);
 // because we can't change constant, but we want to for db debug flag
-$GLOBALS['DB_CONFIG'] = DB_CONFIG;
+$GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
 // define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
 // define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
 // override for login and global schemas
@@ -268,9 +268,9 @@ define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCO
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
 // paths
-// define('CSV_PATH', $PATHS[TARGET]['csv_path']);
-// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
-// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
+// define('CSV_PATH', $PATHS[TARGET]['csv_path'] ?? '');
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? '');
+// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? '');
 
 // show all errors if debug_all & show_error_handling are enabled
 define('SHOW_ALL_ERRORS', true);

www/includes/admin_footer.php

@@ -2,9 +2,9 @@
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
-* CREATED: 2008/08/14
+* CREATED:
 * SHORT DESCRIPTION:
-* URL redirect header
+*
 * HISTORY:
 *********************************************************************/
 

www/includes/admin_header.php

@@ -2,8 +2,9 @@
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
-* CREATED: 2008/08/01
+* CREATED:
 * SHORT DESCRIPTION:
+*
 * HISTORY:
 *********************************************************************/
 

www/includes/edit_base.php

@@ -23,23 +23,8 @@
 
 declare(strict_types=1);
 
-$DEBUG_ALL = true;
-$PRINT_ALL = true;
-$ECHO_ALL = false;
-$DB_DEBUG = true;
-
-// TODO: only extract _POST data that is needed
-extract($_POST, EXTR_SKIP);
-
 ob_start();
 require 'config.php';
-// overrride debug flags
-if (!DEBUG)	{
-	$DEBUG_ALL = false;
-	$PRINT_ALL = false;
-	$DB_DEBUG = false;
-	$ECHO_ALL = false;
-}
 
 // should be utf8
 header("Content-type: text/html; charset=" . DEFAULT_ENCODING);
@@ -51,14 +36,16 @@ $log = new CoreLibs\Debug\Logging([
 	'file_id' => LOG_FILE_ID . 'EditBase',
 	'print_file_date' => true,
 	'per_class' => true,
-	'debug_all' => $DEBUG_ALL,
-	'echo_all' => $ECHO_ALL,
-	'print_all' => $PRINT_ALL,
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
 ]);
 // db connection
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login page
 $login = new CoreLibs\ACL\Login($db, $log, $session);
+// space for setting special debug flags
+// $login->log->setLogLevelAll('debug', true);
 // lang, path, domain
 // pre auto detect language after login
 $locale = \CoreLibs\Language\GetLocale::setLocale();
@@ -70,490 +57,10 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 // flush and start
 ob_end_flush();
-// turn off set log per class
-$log->setLogPer('class', false);
-// create form class
-$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log, $l10n, $locale);
-if ($form->mobile_phone) {
-	echo "I am sorry, but this page cannot be viewed by a mobile phone";
-	exit;
-}
-// smarty template engine (extended Translation version)
-$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
 
-// $form->log->debug('POST', $form->log->prAr($_POST));
-
-if (TARGET == 'live' || TARGET == 'remote') {
-	// login
-	$login->log->setLogLevelAll('debug', DEBUG ? true : false);
-	$login->log->setLogLevelAll('echo', false);
-	$login->log->setLogLevelAll('print', DEBUG ? true : false);
-	// form
-	$form->log->setLogLevelAll('debug', DEBUG ? true : false);
-	$form->log->setLogLevelAll('echo', false);
-	$form->log->setLogLevelAll('print', DEBUG ? true : false);
-}
-// space for setting special debug flags
-$login->log->setLogLevelAll('debug', true);
-// set smarty arrays
-$HEADER = [];
-$DATA = [];
-$DEBUG_DATA = [];
-// set the template dir
-// WARNING: this has a special check for the mailing tool layout (old layout)
-if (defined('LAYOUT')) {
-	$smarty->setTemplateDir(BASE . INCLUDES . TEMPLATES . CONTENT_PATH);
-	$DATA['css'] = LAYOUT . CSS;
-	$DATA['js'] = LAYOUT . JS;
-} else {
-	$smarty->setTemplateDir(TEMPLATES);
-	$DATA['css'] = CSS;
-	$DATA['js'] = JS;
-}
-// set table width
-$table_width = '100%';
-
-// define all needed smarty stuff for the general HTML/page building
-$HEADER['CSS'] = CSS;
-$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-$HEADER['STYLESHEET'] = $ADMIN_STYLESHEET ?? ADMIN_STYLESHEET;
-
-if ($form->my_page_name == 'edit_order') {
-	// get is for "table_name" and "where" only
-	$table_name = $_GET['table_name'] ?? '';
-	// $where = $_GET['where'] ?? '';
-	// order name is _always_ order_number for the edit interface
-
-	// follwing arrays do exist here:
-	// $position ... has the positions of the [0..max], cause in a <select>
-	//               I can't put an number into the array field, in this array,
-	//               there are the POSITION stored, that should CHANGE there order (up/down)
-	// $row_data_id ... has ALL ids from the sorting part
-	// $row_data_order ... has ALL order positions from the soirting part
-	if (!isset($position)) {
-		$position = [];
-	}
-	$row_data_id = $_POST['row_data_id'] ?? [];
-	$original_id = $row_data_id;
-	if (count($position)) {
-		$row_data_order = $_POST['row_data_order'];
-
-		// FIRST u have to put right sort, then read again ...
-		// hast to be >0 or the first one is selected and then there is no move
-		if (isset($up) && isset($position[0]) && $position[0] > 0) {
-			for ($i = 0; $i < count($position); $i++) {
-				// change position order
-				// this gets temp, id before that, gets actual (moves one "down")
-				// this gets the old before (moves one "up")
-				// is done for every element in row
-				// echo "A: ".$row_data_id[$position[$i]]
-				//	." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]
-				//	." (".$row_data_order[$position[$i]-1].")<br>";
-				$temp_id = $row_data_id[$position[$i]] ?? null;
-				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1] ?? null;
-				$row_data_id[$position[$i] - 1] = $temp_id;
-				// echo "A: ".$row_data_id[$position[$i]]
-				//	." (".$row_data_order[$position[$i]].") -- "
-				//	.$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
-			} // for
-		} // if up
-
-		// the last position id from position array is not to be the count - 1 of
-		// row_data_id array, or it is the last element
-		if (isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
-			for ($i = count($position) - 1; $i >= 0; $i--) {
-				// same as up, just up in other way, starts from bottom (last element) and moves "up"
-				// element before actuel gets temp, this element, becomes element after this,
-				// element after this, gets this
-				$temp_id = $row_data_id[$position[$i] + 1] ?? null;
-				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]] ?? null;
-				$row_data_id[$position[$i]] = $temp_id;
-			} // for
-		} // if down
-
-		// write data ... (which has to be abstrackt ...)
-		if (
-			(isset($up) && $position[0] > 0) ||
-			(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
-		) {
-			for ($i = 0; $i < count($row_data_id); $i++) {
-				if (isset($row_data_order[$i]) && isset($row_data_id[$i])) {
-					$q = "UPDATE " . $table_name
-						. " SET order_number = " . $row_data_order[$i]
-						. " WHERE " . $table_name . "_id = " . $row_data_id[$i];
-					$q = $form->dbExec($q);
-				}
-			} // for all article ids ...
-		} // if write
-	} // if there is something to move
-
-	// get ...
-	$q = "SELECT " . $table_name . "_id, name, order_number FROM " . $table_name . " ";
-	if (!empty($where_string)) {
-		$q .= "WHERE $where_string ";
-	}
-	$q .= "ORDER BY order_number";
-
-	// init arrays
-	$row_data = [];
-	$options_id = [];
-	$options_name = [];
-	$options_selected = [];
-	// DB read data for menu
-	while (is_array($res = $form->dbReturn($q))) {
-		$row_data[] = [
-			"id" => $res[$table_name . "_id"],
-			"name" => $res["name"],
-			"order" => $res["order_number"]
-		];
-	} // while read data ...
-
-	// html title
-	$HEADER['HTML_TITLE'] = $form->l->__('Edit Order');
-
-	$messages = [];
-	// error msg
-	if (isset($error)) {
-		if (!isset($msg)) {
-			$msg = [];
-		}
-		$messages[] = [
-			'msg' => $msg,
-			'class' => 'error',
-			'width' => '100%'
-		];
-	}
-	$DATA['form_error_msg'] = $messages;
-
-	// all the row data
-	for ($i = 0; $i < count($row_data); $i++) {
-		$options_id[] = $i;
-		$options_name[] = $row_data[$i]['name'];
-		// list of points to order
-		for ($j = 0; $j < count($position); $j++) {
-			// if matches, put into select array
-			if (
-				isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
-				$original_id[$position[$j]] == $row_data[$i]['id']
-			) {
-				$options_selected[] = $i;
-			}
-		}
-	}
-	$DATA['options_id'] = $options_id;
-	$DATA['options_name'] = $options_name;
-	$DATA['options_selected'] = $options_selected;
-
-	// hidden list for the data (id, order number)
-	$row_data_id = [];
-	$row_data_order = [];
-	for ($i = 0; $i < count($row_data); $i++) {
-		$row_data_id[] = $row_data[$i]['id'];
-		$row_data_order[] = $row_data[$i]['order'];
-	}
-	$DATA['row_data_id'] = $row_data_id;
-	$DATA['row_data_order'] = $row_data_order;
-
-	// hidden names for the table & where string
-	$DATA['table_name'] = $table_name;
-	$DATA['where_string'] = $where_string ?? '';
-
-	$EDIT_TEMPLATE = 'edit_order.tpl';
-} else {
-	// load call only if id is set
-	if (isset(${$form->archive_pk_name})) {
-		$form->formProcedureLoad(${$form->archive_pk_name});
-	}
-	$form->formProcedureNew();
-	$form->formProcedureSave();
-	$form->formProcedureDelete();
-	// delete call only if those two are set
-	if (isset($element_list) && isset($remove_name)) {
-		$form->formProcedureDeleteFromElementList($element_list, $remove_name);
-	}
-
-	$DATA['table_width'] = $table_width;
-
-	$messages = [];
-	// write out error / status messages
-	$messages[] = $form->formPrintMsg();
-	$DATA['form_error_msg'] = $messages;
-
-	// MENU START
-	// request some session vars
-	if (!isset($HEADER_COLOR)) {
-		$DATA['HEADER_COLOR'] = '#E0E2FF';
-	} else {
-		$DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR'];
-	}
-	$DATA['USER_NAME'] = $_SESSION['USER_NAME'];
-	$DATA['EUID'] = $_SESSION['EUID'];
-	$DATA['GROUP_NAME'] = $_SESSION['GROUP_NAME'];
-	$DATA['GROUP_LEVEL'] = $_SESSION['GROUP_ACL_LEVEL'];
-	$PAGES = $_SESSION['PAGES'];
-
-	//$form->log->debug('menu', $form->log->prAr($PAGES));
-
-	// build nav from $PAGES ...
-	if (!isset($PAGES) || !is_array($PAGES)) {
-		$PAGES = [];
-	}
-	$menuarray = [];
-	foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
-		if ($PAGE_DATA['menu'] && $PAGE_DATA['online']) {
-			$menuarray[] = $PAGE_DATA;
-		}
-	}
-
-	// split point for nav points
-	$COUNT_NAV_POINTS = count($menuarray);
-	$SPLIT_FACTOR = 3;
-	$START_SPLIT_COUNT = 3;
-	// WTF ?? I dunno what I am doing here ...
-	for ($i = 9; $i < $COUNT_NAV_POINTS; $i += $START_SPLIT_COUNT) {
-		if ($COUNT_NAV_POINTS > $i) {
-			$SPLIT_FACTOR += 1;
-		}
-	}
-
-	$position = 0;
-	$menu_data = [];
-	// for ($i = 1; $i <= count($menuarray); $i ++) {
-	foreach ($menuarray as $i => $data) {
-		// do that for new array
-		$j = $i + 1;
-		$menu_data[$i]['pagename'] = htmlentities($data['page_name']);
-		$menu_data[$i]['filename'] =
-			// prefix folder or host name
-			(isset($data['hostname']) && $data['hostname'] ?
-				$data['hostname'] :
-				''
-			)
-			// filename
-			. ($data['filename'] ?? '')
-			// query string
-			. (isset($data['query_string']) && $data['query_string'] ?
-				$data['query_string'] :
-				''
-			);
-		if ($j == 1 || !($i % $SPLIT_FACTOR)) {
-			$menu_data[$i]['splitfactor_in'] = 1;
-		} else {
-			$menu_data[$i]['splitfactor_in'] = 0;
-		}
-		// on matching, we also need to check if we are in the same folder
-		if (
-			isset($data['filename']) &&
-			$data['filename'] == \CoreLibs\Get\System::getPageName() &&
-			(!isset($data['hostname']) || (
-				isset($data['hostname']) &&
-					(!$data['hostname'] || strstr($data['hostname'], CONTENT_PATH) !== false)
-			))
-		) {
-			$position = $i;
-			$menu_data[$i]['position'] = 1;
-			$menu_data[$i]['popup'] = 0;
-		} else {
-			// add query stuff
-			// HAS TO DONE LATER ... set urlencode, etc ...
-			// check if popup needed
-			if (isset($data['popup']) && $data['popup'] == 1) {
-				$menu_data[$i]['popup'] = 1;
-				$menu_data[$i]['rand'] = uniqid((string)rand());
-				$menu_data[$i]['width'] = $data['popup_x'];
-				$menu_data[$i]['height'] = $data['popup_y'];
-			} else {
-				$menu_data[$i]['popup'] = 0;
-			}
-			$menu_data[$i]['position'] = 0;
-		} // highlight or not
-		if (!($j % $SPLIT_FACTOR) || (($j + 1) > count($menuarray))) {
-			$menu_data[$i]['splitfactor_out'] = 1;
-		} else {
-			$menu_data[$i]['splitfactor_out'] = 0;
-		}
-	} // for
-	// $form->log->debug('MENU ARRAY', $form->log->prAr($menu_data));
-	$DATA['menu_data'] = $menu_data;
-	$DATA['page_name'] = $menuarray[$position]['page_name'] ?? '-Undefined [' . $position . '] -';
-	$L_TITLE = $DATA['page_name'];
-	// html title
-	$HEADER['HTML_TITLE'] = $form->l->__($L_TITLE);
-	// END MENU
-	// LOAD AND NEW
-	$DATA['load'] = $form->formCreateLoad();
-	$DATA['new'] = $form->formCreateNew();
-	// SHOW DATA PART
-	if ($form->yes) {
-		$DATA['form_yes'] = $form->yes;
-		$DATA['form_my_page_name'] = $form->my_page_name;
-		$DATA['filename_exist'] = 0;
-		$DATA['drop_down_input'] = 0;
-		$elements = [];
-		// depending on the "getPageName()" I show different stuff
-		switch ($form->my_page_name) {
-			case 'edit_users':
-				$elements[] = $form->formCreateElement('login_error_count');
-				$elements[] = $form->formCreateElement('login_error_date_last');
-				$elements[] = $form->formCreateElement('login_error_date_first');
-				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement('deleted');
-				$elements[] = $form->formCreateElement('protected');
-				$elements[] = $form->formCreateElement('username');
-				$elements[] = $form->formCreateElement('password');
-				$elements[] = $form->formCreateElement('password_change_interval');
-				$elements[] = $form->formCreateElement('login_user_id');
-				$elements[] = $form->formCreateElement('login_user_id_set_date');
-				$elements[] = $form->formCreateElement('login_user_id_last_revalidate');
-				$elements[] = $form->formCreateElement('login_user_id_locked');
-				$elements[] = $form->formCreateElement('login_user_id_revalidate_after');
-				$elements[] = $form->formCreateElement('login_user_id_valid_from');
-				$elements[] = $form->formCreateElement('login_user_id_valid_until');
-				$elements[] = $form->formCreateElement('email');
-				$elements[] = $form->formCreateElement('last_name');
-				$elements[] = $form->formCreateElement('first_name');
-				$elements[] = $form->formCreateElement('edit_group_id');
-				$elements[] = $form->formCreateElement('edit_access_right_id');
-				$elements[] = $form->formCreateElement('strict');
-				$elements[] = $form->formCreateElement('locked');
-				$elements[] = $form->formCreateElement('lock_until');
-				$elements[] = $form->formCreateElement('lock_after');
-				$elements[] = $form->formCreateElement('admin');
-				$elements[] = $form->formCreateElement('debug');
-				$elements[] = $form->formCreateElement('db_debug');
-				$elements[] = $form->formCreateElement('edit_language_id');
-				$elements[] = $form->formCreateElement('edit_scheme_id');
-				$elements[] = $form->formCreateElementListTable('edit_access_user');
-				$elements[] = $form->formCreateElement('additional_acl');
-				break;
-			case 'edit_schemes':
-				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement('header_color');
-				$elements[] = $form->formCreateElement('template');
-				break;
-			case 'edit_pages':
-				if (!isset($form->table_array['edit_page_id']['value'])) {
-					$q = "DELETE FROM temp_files";
-					$form->dbExec($q);
-					// gets all files in the current dir and dirs given ending with .php
-					$folders = ['../admin/', '../frontend/'];
-					$files = ['*.php'];
-					$search_glob = [];
-					foreach ($folders as $folder) {
-						// make sure this folder actually exists
-						if (is_dir(ROOT . $folder)) {
-							foreach ($files as $file) {
-								$search_glob[] = $folder . $file;
-							}
-						}
-					}
-					$crap = exec('ls ' . join(' ', $search_glob), $output, $status);
-					// now get all that are NOT in de DB
-					$q = "INSERT INTO temp_files (folder, filename) VALUES ";
-					$t_q = '';
-					foreach ($output as $output_file) {
-						// split the ouput into folder and file
-						$pathinfo = pathinfo($output_file);
-						if (!empty($pathinfo['dirname'])) {
-							$pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
-						}
-						if ($t_q) {
-							$t_q .= ', ';
-						}
-						$t_q .= "('" . $form->dbEscapeString($pathinfo['dirname']) . "', '"
-							. $form->dbEscapeString($pathinfo['basename']) . "')";
-					}
-					$form->dbExec($q . $t_q, 'NULL');
-					$elements[] = $form->formCreateElement('filename');
-				} else {
-					// show file menu
-					// just show name of file ...
-					$DATA['filename_exist'] = 1;
-					$DATA['filename'] = $form->table_array['filename']['value'];
-				} // File Name View IF
-				$elements[] = $form->formCreateElement('hostname');
-				$elements[] = $form->formCreateElement('name');
-				// $elements[] = $form->formCreateElement('tag');
-				// $elements[] = $form->formCreateElement('min_acl');
-				$elements[] = $form->formCreateElement('order_number');
-				$elements[] = $form->formCreateElement('online');
-				$elements[] = $form->formCreateElement('menu');
-				$elements[] = $form->formCreateElementListTable('edit_query_string');
-				$elements[] = $form->formCreateElement('content_alias_edit_page_id');
-				$elements[] = $form->formCreateElementListTable('edit_page_content');
-				$elements[] = $form->formCreateElement('popup');
-				$elements[] = $form->formCreateElement('popup_x');
-				$elements[] = $form->formCreateElement('popup_y');
-				$elements[] = $form->formCreateElementReferenceTable('edit_visible_group');
-				$elements[] = $form->formCreateElementReferenceTable('edit_menu_group');
-				break;
-			case 'edit_languages':
-				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement('short_name');
-				$elements[] = $form->formCreateElement('long_name');
-				$elements[] = $form->formCreateElement('iso_name');
-				break;
-			case 'edit_groups':
-				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement('edit_access_right_id');
-				$elements[] = $form->formCreateElement('edit_scheme_id');
-				$elements[] = $form->formCreateElementListTable('edit_page_access');
-				$elements[] = $form->formCreateElement('additional_acl');
-				break;
-			case 'edit_visible_group':
-				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement('flag');
-				break;
-			case 'edit_menu_group':
-				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement('flag');
-				$elements[] = $form->formCreateElement('order_number');
-				break;
-			case 'edit_access':
-				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement('protected');
-				$elements[] = $form->formCreateElement('color');
-				$elements[] = $form->formCreateElement('description');
-				// add name/value list here
-				$elements[] = $form->formCreateElementListTable('edit_access_data');
-				$elements[] = $form->formCreateElement('additional_acl');
-				break;
-			default:
-				print '[No valid page definition given]';
-				break;
-		}
-		// $form->log->debug('edit', "Elements: <pre>".$form->log->prAr($elements));
-		$DATA['elements'] = $elements;
-		$DATA['hidden'] = $form->formCreateHiddenFields();
-		$DATA['save_delete'] = $form->formCreateSaveDelete();
-	} else {
-		$DATA['form_yes'] = 0;
-	}
-	$EDIT_TEMPLATE = 'edit_body.tpl';
-}
-
-// debug data, if DEBUG flag is on, this data is print out
-$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL ?? '';
-
-// create main data array
-$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
-// data is 1:1 mapping (all vars, values, etc)
-foreach ($CONTENT_DATA as $key => $value) {
-	$smarty->assign($key, $value);
-}
-if (is_dir(BASE . TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE . TEMPLATES_C);
-}
-if (is_dir(BASE . CACHE)) {
-	$smarty->setCacheDir(BASE . CACHE);
-}
-$smarty->display($EDIT_TEMPLATE, 'editAdmin_' . $smarty->lang, 'editAdmin_' . $smarty->lang);
-
-// debug output
-echo $login->log->printErrorMsg();
-echo $form->log->printErrorMsg();
+// init smarty and form class
+$edit_base = new CoreLibs\Admin\EditBase(DB_CONFIG, $log, $l10n, $locale);
+// creates edit pages and runs actions
+$edit_base->editBaseRun();
 
 // __END__

www/includes/table_arrays/array_edit_access.php

@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_access = [
-	'table_array' => [
-		'edit_access_id' => [
-			'value' => $GLOBALS['edit_access_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Access Group Name',
-			'mandatory' => 1,
-			'type' => 'text',
-			'error_check' => 'alphanumericspace|unique'
-		],
-		'description' => [
-			'value' => $GLOBALS['description'] ?? '',
-			'output_name' => 'Description',
-			'type' => 'textarea'
-		],
-		'color' => [
-			'value' => $GLOBALS['color'] ?? '',
-			'output_name' => 'Color',
-			'mandatory' => 0,
-			'type' => 'text',
-			'size' => 6,
-			'length' => 6,
-			'error_check' => 'custom',
-			'error_regex' => "/[\dA-Fa-f]{6}/",
-			'error_example' => 'F6A544'
-		],
-		'enabled' => [
-			'value' => $GLOBALS['enabled'] ?? 0,
-			'output_name' => 'Enabled',
-			'type' => 'binary',
-			'int' => 1, // OR 'bool' => 1
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'protected' => [
-			'value' => $GLOBALS['protected'] ?? 0,
-			'output_name' => 'Protected',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'additional_acl' => [
-			'value' => $GLOBALS['additional_acl'] ?? '',
-			'output_name' => 'Additional ACL (as JSON)',
-			'type' => 'textarea',
-			'error_check' => 'json',
-			'rows' => 10,
-			'cols' => 60
-		],
-	],
-	'table_name' => 'edit_access',
-	"load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name",
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-	],
-	'element_list' => [
-		'edit_access_data' => [
-			'output_name' => 'Edit Access Data',
-			'delete_name' => 'remove_edit_access_data',
-			// 'type' => 'reference_data', // is not a sub table read and connect, but only a sub table with data
-			'max_empty' => 5, // maxium visible if no data is set, if filled add this number to visible
-			'prefix' => 'ead',
-			'elements' => [
-				'name' => [
-					'type' => 'text',
-					'error_check' => 'alphanumeric|unique',
-					'output_name' => 'Name',
-					'mandatory' => 1
-				],
-				'value' => [
-					'type' => 'text',
-					'output_name' => 'Value'
-				],
-				'enabled' => [
-					'type' => 'checkbox',
-					'output_name' => 'Activate',
-					'int' => 1,
-					'element_list' => [1]
-				],
-				/*'edit_access_id' => [
-					'int' => 1,
-					'type' => 'hidden',
-					'fk_id' => 1 // reference main key from master table above
-				],*/
-				'edit_access_data_id' => [
-					'type' => 'hidden',
-					'int' => 1,
-					'pk_id' => 1
-				],
-			],
-		],
-	],
-];
-
-// __END__

www/includes/table_arrays/array_edit_groups.php

@@ -1,111 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_groups = [
-	'table_array' => [
-		'edit_group_id' => [
-			'value' => $GLOBALS['edit_group_id'] ?? '',
-			'pk' => 1,
-			'type' => 'hidden'
-		],
-		'enabled' => [
-			'value' => $GLOBALS['enabled'] ?? '',
-			'output_name' => 'Enabled',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Group Name',
-			'type' => 'text',
-			'mandatory' => 1
-		],
-		'edit_access_right_id' => [
-			'value' => $GLOBALS['edit_access_right_id'] ?? '',
-			'output_name' => 'Group Level',
-			'mandatory' => 1,
-			'int' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-		],
-		'edit_scheme_id' => [
-			'value' => $GLOBALS['edit_scheme_id'] ?? '',
-			'output_name' => 'Group Scheme',
-			'int_null' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
-		],
-		'additional_acl' => [
-			'value' => $GLOBALS['additional_acl'] ?? '',
-			'output_name' => 'Additional ACL (as JSON)',
-			'type' => 'textarea',
-			'error_check' => 'json',
-			'rows' => 10,
-			'cols' => 60
-		],
-	],
-	'load_query' => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
-	'table_name' => 'edit_group',
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-		[
-			'name' => 'enabled',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'Enabled: '
-		],
-	],
-	'element_list' => [
-		'edit_page_access' => [
-			'output_name' => 'Pages',
-			'mandatory' => 1,
-			'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
-			'enable_name' => 'enable_page_access',
-			'prefix' => 'epa',
-			'read_data' => [
-				'table_name' => 'edit_page',
-				'pk_id' => 'edit_page_id',
-				'name' => 'name',
-				'order' => 'order_number'
-			],
-			'elements' => [
-				'edit_page_access_id' => [
-					'type' => 'hidden',
-					'int' => 1,
-					'pk_id' => 1
-				],
-				'enabled' => [
-					'type' => 'checkbox',
-					'output_name' => 'Activate',
-					'int' => 1,
-					'element_list' => [1],
-				],
-				'edit_access_right_id' => [
-					'type' => 'drop_down_db',
-					'output_name' => 'Access Level',
-					'int' => 1,
-					'preset' => 1, // first of the select
-					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-				],
-				'edit_page_id' => [
-					'int' => 1,
-					'type' => 'hidden'
-				],
-				/*,
-				'edit_default' => [
-					'output_name' => 'Default',
-					'type' => 'radio',
-					'mandatory' => 1
-				],*/
-			],
-		], // edit pages ggroup
-	],
-];
-
-// __END__

www/includes/table_arrays/array_edit_languages.php

@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_languages = [
-	'table_array' => [
-		'edit_language_id' => [
-			'value' => $GLOBALS['edit_language_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'short_name' => [
-			'value' => $GLOBALS['short_name'] ?? '',
-			'output_name' => 'Language (short)',
-			'mandatory' => 1,
-			'type' => 'text',
-			'size' => 2,
-			'length' => 2
-		],
-		'long_name' => [
-			'value' => $GLOBALS['long_name'] ?? '',
-			'output_name' => 'Language (long)',
-			'mandatory' => 1,
-			'type' => 'text',
-			'size' => 40
-		],
-		'iso_name' => [
-			'value' => $GLOBALS['iso_name'] ?? '',
-			'output_name' => 'ISO Code',
-			'mandatory' => 1,
-			'type' => 'text'
-		],
-		'order_number' => [
-			'value' => $GLOBALS['order_number'] ?? '',
-			'int' => 1,
-			'order' => 1
-		],
-		'enabled' => [
-			'value' => $GLOBALS['enabled'] ?? '',
-			'output_name' => 'Enabled',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'lang_default' => [
-			'value' => $GLOBALS['lang_default'] ?? '',
-			'output_name' => 'Default Language',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-	],
-	'load_query' => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
-	'show_fields' => [
-		[
-			'name' => 'long_name'
-		],
-		[
-			'name' => 'iso_name',
-			'before_value' => 'ISO: '
-		],
-		[
-			'name' => 'enabled',
-			'before_value' => 'Enabled: ',
-			'binary' => ['Yes','No'],
-		],
-	],
-	'table_name' => 'edit_language'
-];
-
-// __END__

www/includes/table_arrays/array_edit_menu_group.php

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_menu_group = [
-	'table_array' => [
-		'edit_menu_group_id' => [
-			'value' => $GLOBALS['edit_menu_group_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Group name',
-			'mandatory' => 1,
-			'type' => 'text'
-		],
-		'flag' => [
-			'value' => $GLOBALS['flag'] ?? '',
-			'output_name' => 'Flag',
-			'mandatory' => 1,
-			'type' => 'text',
-			'error_check' => 'alphanumeric|unique'
-		],
-		'order_number' => [
-			'value' => $GLOBALS['order_number'] ?? '',
-			'output_name' => 'Group order',
-			'type' => 'order',
-			'int' => 1,
-			'order' => 1
-		],
-	],
-	'table_name' => 'edit_menu_group',
-	'load_query' => "SELECT edit_menu_group_id, name FROM edit_menu_group ORDER BY name",
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-	],
-];
-
-// __END__

www/includes/table_arrays/array_edit_pages.php

@@ -1,249 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_pages = [
-	'table_array' => [
-		'edit_page_id' => [
-			'value' => $GLOBALS['edit_page_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'filename' => [
-			'value' => $GLOBALS['filename'] ?? '',
-			'output_name' => 'Add File ...',
-			'mandatory' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.folder || temp_files.filename AS name "
-				. "FROM temp_files "
-				. "LEFT JOIN edit_page ep ON temp_files.filename = ep.filename "
-				. "WHERE ep.filename IS NULL"
-		],
-		'hostname' => [
-			'value' => $GLOBALS['hostname'] ?? '',
-			'output_name' => 'Hostname or folder',
-			'type' => 'text'
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Page name',
-			'mandatory' => 1,
-			'type' => 'text'
-		],
-		'order_number' => [
-			'value' => $GLOBALS['order_number'] ?? '',
-			'output_name' => 'Page order',
-			'type' => 'order',
-			'int' => 1,
-			'order' => 1
-		],
-		/* 'flag' => [
-			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
-			'output_name' => 'Page Flag',
-			'type' => 'drop_down_array',
-			'query' => [
-				'0' => '0',
-				'1' => '1',
-				'2' => '2',
-				'3' => '3',
-				'4' => '4',
-				'5' => '5'
-			],
-		],*/
-		'online' => [
-			'value' => $GLOBALS['online'] ?? '',
-			'output_name' => 'Online',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'menu' => [
-			'value' => $GLOBALS['menu'] ?? '',
-			'output_name' => 'Menu',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				 '1' => 'Yes',
-				 '0' => 'No'
-			],
-		],
-		'popup' => [
-			'value' => $GLOBALS['popup'] ?? '',
-			'output_name' => 'Popup',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				 '1' => 'Yes',
-				 '0' => 'No'
-			],
-		],
-		'popup_x' => [
-			'value' => $GLOBALS['popup_x'] ?? '',
-			'output_name' => 'Popup Width',
-			'int_null' => 1,
-			'type' => 'text',
-			'size' => 4,
-			'length' => 4
-		],
-		'popup_y' => [
-			'value' => $GLOBALS['popup_y'] ?? '',
-			'output_name' => 'Popup Height',
-			'int_null' =>  1,
-			'type' => 'text',
-			'size' => 4,
-			'length' => 4
-		],
-		'content_alias_edit_page_id' => [
-			'value' => $GLOBALS['content_alias_edit_page_id'] ?? '',
-			'output_name' => 'Content Alias Source',
-			'int_null' => 1,
-			'type' => 'drop_down_db',
-			// query creation
-			'select_distinct' => 0,
-			'pk_name' => 'edit_page_id AS content_alias_edit_page_id',
-			'input_name' => 'name',
-			'table_name' => 'edit_page',
-			'where_not_self' => 1,
-			'order_by' => 'order_number'
-			// 'query' => "SELECT edit_page_id AS content_alias_edit_page_id, name ".
-				// "FROM edit_page ".
-				// (isset($GLOBALS['edit_page_id']) ? " WHERE edit_page_id <> ".$GLOBALS['edit_page_id'] : "")." ".
-				// "ORDER BY order_number"
-		],
-	],
-	'load_query' => "SELECT edit_page_id, "
-		. "CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, "
-		. "name, online, menu, popup "
-		. "FROM edit_page "
-		. "ORDER BY order_number",
-	'table_name' => 'edit_page',
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-		[
-			'name' => 'filename',
-			'before_value' => 'Filename: '
-		],
-		 [
-		   'name' => 'online',
-		   'binary' => ['Yes', 'No'],
-		   'before_value' => 'Online: '
-		 ],
-		 [
-			'name' => 'menu',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'Menu: '
-		],
-		[
-			'name' => 'popup',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'Popup: '
-		],
-	],
-	'reference_arrays' => [
-		'edit_visible_group' => [
-			'table_name' => 'edit_page_visible_group',
-			'other_table_pk' => 'edit_visible_group_id',
-			'output_name' => 'Visible Groups (access)',
-			'mandatory' => 1,
-			'select_size' => 10,
-			'selected' => $GLOBALS['edit_visible_group_id'] ?? '',
-			'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
-				. "FROM edit_visible_group ORDER BY name"
-		],
-		'edit_menu_group' => [
-			'table_name' => 'edit_page_menu_group',
-			'other_table_pk' => 'edit_menu_group_id',
-			'output_name' => 'Menu Groups (grouping)',
-			'mandatory' => 1,
-			'select_size' => 10,
-			'selected' => $GLOBALS['edit_menu_group_id'] ?? '',
-			'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
-				. "FROM edit_menu_group ORDER BY order_number"
-		],
-
-	],
-	'element_list' => [
-		'edit_query_string' => [
-			'output_name' => 'Query Strings',
-			'delete_name' => 'remove_query_string',
-			'prefix' => 'eqs',
-			'elements' => [
-				'name' => [
-					'output_name' => 'Name',
-					'type' => 'text',
-					'error_check' => 'unique|alphanumeric',
-					'mandatory' => 1
-				],
-				'value' => [
-					'output_name' => 'Value',
-					'type' => 'text'
-				],
-				'enabled' => [
-					'output_name' => 'Enabled',
-					'int' => 1,
-					'type' => 'checkbox',
-					'element_list' => [1],
-				],
-				'dynamic' => [
-					'output_name' => 'Dynamic',
-					'int' => 1,
-					'type' => 'checkbox',
-					'element_list' => [1],
-				],
-				'edit_query_string_id' => [
-					'type' => 'hidden',
-					'pk_id' => 1
-				],
-			], // elements
-		], // query_string element list
-		'edit_page_content' => [
-			'output_name' => 'Page Content',
-			'delete_name' => 'remove_page_content',
-			'prefix' => 'epc',
-			'elements' => [
-				'name' => [
-					'output_name' => 'Content',
-					'type' => 'text',
-					'error_check' => 'alphanumeric',
-					'mandatory' => 1
-				],
-				'uid' => [
-					'output_name' => 'UID',
-					'type' => 'text',
-					'error_check' => 'unique|alphanumeric',
-					'mandatory' => 1
-				],
-				'order_number' => [
-					'output_name' => 'Order',
-					'type' => 'text',
-					'error_check' => 'int',
-					'mandatory' => 1
-				],
-				'online' => [
-					'output_name' => 'Online',
-					'int' => 1,
-					'type' => 'checkbox',
-					'element_list' => [1],
-				],
-				'edit_access_right_id' => [
-					'type' => 'drop_down_db',
-					'output_name' => 'Access Level',
-					'int' => 1,
-					'preset' => 1, // first of the select
-					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-				],
-				'edit_page_content_id' => [
-					'type' => 'hidden',
-					'pk_id' => 1
-				],
-			],
-		],
-	], // element list
-];
-
-// __END__

www/includes/table_arrays/array_edit_schemes.php

@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_schemes = [
-	'table_array' => [
-		'edit_scheme_id' => [
-			'value' => $GLOBALS['edit_scheme_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Scheme Name',
-			'mandatory' => 1,
-			'type' => 'text'
-		],
-		'header_color' => [
-			'value' => $GLOBALS['header_color'] ?? '',
-			'output_name' => 'Header Color',
-			'mandatory' => 1,
-			'type' => 'text',
-			'size' => 6,
-			'length' => 6,
-			'error_check' => 'custom',
-			'error_regex' => '/[\dA-Fa-f]{6}/',
-			'error_example' => 'F6A544'
-		],
-		'enabled' => [
-			'value' => $GLOBALS['enabled'] ?? '',
-			'output_name' => 'Enabled',
-			'int' => 1,
-			'type' => 'binary',
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'template' => [
-			'value' => $GLOBALS['template'] ?? '',
-			'output_name' => 'Template',
-			'type' => 'text'
-		],
-	],
-	'table_name' => 'edit_scheme',
-	'load_query' => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-		[
-			'name' => 'enabled',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'Enabled: '
-		],
-	],
-]; // main array
-
-// __END__

www/includes/table_arrays/array_edit_users.php

@@ -1,351 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_users = [
-	'table_array' => [
-		'edit_user_id' => [
-			'value' => $GLOBALS['edit_user_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1,
-			'int' => 1
-		],
-		'username' => [
-			'value' => $GLOBALS['username'] ?? '',
-			'output_name' => 'Username',
-			'mandatory' => 1,
-			'error_check' => 'unique|alphanumericextended',
-			'type' => 'text'
-		],
-		'password' => [
-			'value' => $GLOBALS['password'] ?? '',
-			'HIDDEN_value' => $GLOBALS['HIDDEN_password'] ?? '',
-			'CONFIRM_value' => $GLOBALS['CONFIRM_password'] ?? '',
-			'output_name' => 'Password',
-			'mandatory' => 1,
-			'type' => 'password', // later has to be password for encryption in database
-			'update' => [ // connected field updates, and update data
-				'password_change_date' => [ // db row to update
-					'type' => 'date', // type of field (int/text/date/etc)
-					'value' => 'NOW()' // value [todo: complex reference
-				],
-			],
-		],
-		// password date when first insert and password is set, needs special field with connection to password
-		// password reset force interval, if set, user needs to reset password after X time period
-		'password_change_interval' => [
-			'value' => $GLOBALS['password_change_interval'] ?? '',
-			'output_name' => 'Password change interval',
-			// can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
-			'error_check' => 'intervalshort',
-			'type' => 'text',
-			'interval' => 1, // interval needs NULL write for empty
-			'size' => 5, // make it 5 chars long
-			'length' => 5
-		],
-		'enabled' => [
-			'value' => $GLOBALS['enabled'] ?? '',
-			'output_name' => 'Enabled',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'deleted' => [
-			'value' => $GLOBALS['deleted'] ?? '',
-			'output_name' => 'Deleted',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'strict' => [
-			'value' => $GLOBALS['strict'] ?? '',
-			'output_name' => 'Strict (Lock after errors)',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'locked' => [
-			'value' => $GLOBALS['locked'] ?? '',
-			'output_name' => 'Locked (auto set if strict with errors)',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'admin' => [
-			'value' => $GLOBALS['admin'] ?? '',
-			'output_name' => 'Admin',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'debug' => [
-			'value' => $GLOBALS['debug'] ?? '',
-			'output_name' => 'Debug',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'db_debug' => [
-			'value' => $GLOBALS['db_debug'] ?? '',
-			'output_name' => 'DB Debug',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'email' => [
-			'value' => $GLOBALS['email'] ?? '',
-			'output_name' => 'E-Mail',
-			'type' => 'text',
-			'error_check' => 'email'
-		],
-		'last_name' => [
-			'value' => $GLOBALS['last_name'] ?? '',
-			'output_name' => 'Last Name',
-			'type' => 'text'
-		],
-		'first_name' => [
-			'value' => $GLOBALS['first_name'] ?? '',
-			'output_name' => 'First Name',
-			'type' => 'text'
-		],
-		'lock_until' => [
-			'value' => $GLOBALS['lock_until'] ?? '',
-			'output_name' => 'Lock account until',
-			'type' => 'datetime',
-			'error_check' => 'datetime',
-			'sql_read' => 'YYYY-MM-DD HH24:MI',
-			'datetime' => 1,
-		],
-		'lock_after' => [
-			'value' => $GLOBALS['lock_after'] ?? '',
-			'output_name' => 'Lock account after',
-			'type' => 'datetime',
-			'error_check' => 'datetime',
-			'sql_read' => 'YYYY-MM-DD HH24:MI',
-			'datetime' => 1,
-		],
-		'login_user_id' => [
-			'value' => $GLOBALS['login_user_id'] ?? '',
-			'output_name' => '_GET/_POST loginUserId direct login ID',
-			'type' => 'text',
-			'error_check' => 'unique|custom',
-			'error_regex' => "/^[A-Za-z0-9]+$/",
-			'emptynull' => 1,
-		],
-		'login_user_id_set_date' => [
-			'output_name' => 'loginUserId set date',
-			'value' => $GLOBALS['login_user_id_set_date'] ?? '',
-			'type' => 'view',
-			'empty' => '-'
-		],
-		'login_user_id_last_revalidate' => [
-			'output_name' => 'loginUserId last revalidate date',
-			'value' => $GLOBALS['login_user_id_last_revalidate'] ?? '',
-			'type' => 'view',
-			'empty' => '-'
-		],
-		'login_user_id_locked' => [
-			'value' => $GLOBALS['login_user_id_locked'] ?? '',
-			'output_name' => 'loginUserId usage locked',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'login_user_id_revalidate_after' => [
-			'value' => $GLOBALS['login_user_id_revalidate_after'] ?? '',
-			'output_name' => 'loginUserId, User must login after n days',
-			'type' => 'text',
-			'error_check' => 'intervalshort',
-			'interval' => 1, // interval needs NULL write for empty
-			'size' => 5, // make it 5 chars long
-			'length' => 5
-		],
-		'login_user_id_valid_from' => [
-			'value' => $GLOBALS['login_user_id_valid_from'] ?? '',
-			'output_name' => 'loginUserId valid from',
-			'type' => 'datetime',
-			'error_check' => 'datetime',
-			'sql_read' => 'YYYY-MM-DD HH24:MI',
-			'datetime' => 1,
-		],
-		'login_user_id_valid_until' => [
-			'value' => $GLOBALS['login_user_id_valid_until'] ?? '',
-			'output_name' => 'loginUserId valid until',
-			'type' => 'datetime',
-			'error_check' => 'datetime',
-			'sql_read' => 'YYYY-MM-DD HH24:MI',
-			'datetime' => 1,
-		],
-		'edit_language_id' => [
-			'value' => $GLOBALS['edit_language_id'] ?? '',
-			'output_name' => 'Language',
-			'mandatory' => 1,
-			'int' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number"
-		],
-		'edit_scheme_id' => [
-			'value' => $GLOBALS['edit_scheme_id'] ?? '',
-			'output_name' => 'Scheme',
-			'int_null' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
-		],
-		'edit_group_id' => [
-			'value' => $GLOBALS['edit_group_id'] ?? '',
-			'output_name' => 'Group',
-			'int' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
-			'mandatory' => 1
-		],
-		'edit_access_right_id' => [
-			'value' => $GLOBALS['edit_access_right_id'] ?? '',
-			'output_name' => 'User Level',
-			'mandatory' => 1,
-			'int' => 1,
-			'type' => 'drop_down_db',
-			'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-		],
-		'login_error_count' => [
-			'output_name' => 'Login error count',
-			'value' => $GLOBALS['login_error_count'] ?? '',
-			'type' => 'view',
-			'empty' => '0'
-		],
-		'login_error_date_last' => [
-			'output_name' => 'Last login error',
-			'value' => $GLOBALS['login_error_date_liast'] ?? '',
-			'type' => 'view',
-			'empty' => '-'
-		],
-		'login_error_date_first' => [
-			'output_name' => 'First login error',
-			'value' => $GLOBALS['login_error_date_first'] ?? '',
-			'type' => 'view',
-			'empty' => '-'
-		],
-		'protected' => [
-			'value' => $GLOBALS['protected'] ?? '',
-			'output_name' => 'Protected',
-			'type' => 'binary',
-			'int' => 1,
-			'element_list' => [
-				'1' => 'Yes',
-				'0' => 'No'
-			],
-		],
-		'additional_acl' => [
-			'value' => $GLOBALS['additional_acl'] ?? '',
-			'output_name' => 'Additional ACL (as JSON)',
-			'type' => 'textarea',
-			'error_check' => 'json',
-			'rows' => 10,
-			'cols' => 60
-		],
-	],
-	'load_query' => "SELECT edit_user_id, username, enabled, deleted, "
-		. "strict, locked, login_error_count "
-		. "FROM edit_user ORDER BY username",
-	'table_name' => 'edit_user',
-	'show_fields' => [
-		[
-			'name' => 'username'
-		],
-		[
-			'name' => 'enabled',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'ENBL: '
-		],
-		[
-			'name' => 'deleted',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'DEL: '
-		],
-		[
-			'name' => 'strict',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'STRC: '
-		],
-		[
-			'name' => 'locked',
-			'binary' => ['Yes', 'No'],
-			'before_value' => 'LCK: '
-		],
-		[
-			'name' => 'login_error_count',
-			'before_value' => 'ERR: '
-		],
-	],
-	'element_list' => [
-		'edit_access_user' => [
-			'output_name' => 'Accounts',
-			'mandatory' => 1,
-			'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
-			'prefix' => 'ecu',
-			'read_data' => [
-				'table_name' => 'edit_access',
-				'pk_id' => 'edit_access_id',
-				'name' => 'name',
-				'order' => 'name'
-			],
-			'elements' => [
-				'edit_access_user_id' => [
-					'output_name' => 'Activate',
-					'type' => 'hidden',
-					'int' => 1,
-					'pk_id' => 1
-				],
-				'enabled' => [
-					'type' => 'checkbox',
-					'output_name' => 'Activate',
-					'int' => 1,
-					'element_list' => [1],
-				],
-				'edit_access_right_id' => [
-					'type' => 'drop_down_db',
-					'output_name' => 'Access Level',
-					'preset' => 1, // first of the select
-					'int' => 1,
-					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-				],
-				'edit_default' => [
-					'type' => 'radio_group',
-					'output_name' => 'Default',
-					'int' => 1,
-					'element_list' => 'radio_group'
-				],
-				'edit_access_id' => [
-					'type' => 'hidden',
-					'int' => 1
-				],
-			],
-		], // edit pages ggroup
-	],
-];
-
-// __END__

www/includes/table_arrays/array_edit_visible_group.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$edit_visible_group = [
-	'table_array' => [
-		'edit_visible_group_id' => [
-			'value' => $GLOBALS['edit_visible_group_id'] ?? '',
-			'type' => 'hidden',
-			'pk' => 1
-		],
-		'name' => [
-			'value' => $GLOBALS['name'] ?? '',
-			'output_name' => 'Group name',
-			'mandatory' => 1,
-			'type' => 'text'
-		],
-		'flag' => [
-			'value' => $GLOBALS['flag'] ?? '',
-			'output_name' => 'Flag',
-			'mandatory' => 1,
-			'type' => 'text',
-			'error_check' => 'alphanumeric|unique'
-		],
-	],
-	'table_name' => 'edit_visible_group',
-	'load_query' => "SELECT edit_visible_group_id, name FROM edit_visible_group ORDER BY name",
-	'show_fields' => [
-		[
-			'name' => 'name'
-		],
-	],
-];
-
-// __END__

www/includes/templates/admin/edit_body.tpl

@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 
+<!doctype html>
 <html>
 <head>
 	<title>{$HTML_TITLE}</title>
@@ -83,13 +84,8 @@ function pop(theURL, winName, features) {
 	<td width="{$table_width}" class="edit_bgcolor">
 		<form method="post" name="edit_form" style="margin-block-end: 0em;">
 		<table width="100%" border="0" cellpadding="2" cellspacing="1">
-	 <!-- LOAD START //-->
 	{include file="edit_load.tpl"}
-	 <!-- LOAD END //-->
-	 <!-- NEW START //-->
 	{include file="edit_new.tpl"}
-	{* $form_create_new*}
-	 <!-- NEW END //-->
 	{if $form_yes}
 		{include file="edit_save_delete.tpl"}
 		{if $form_my_page_name == "edit_pages" && $filename_exist}

www/includes/templates/admin/edit_elements.tpl

@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 {foreach from=$elements item=element key=key name=loop}
+{if $element.allow_edit}
 	<tr>
 		<td class="edit_fgcolor" class="normal" valign="top">
 			{$element.output_name}
@@ -50,7 +51,6 @@
 			{* not yet implemented *}
 		{/if}
 		{if $element.type == 'order'}
-{*			<input type="button" name="order" value="{$element.data.output_name}" OnClick="pop('order.php?col_name={$element.data.col_name}&table_name={$element.data.table_name}&where={$element.data.query}','Order','status=no,scrollbars=yes,width=700,height=500');"> *}
 			<input type="button" name="order" value="{$element.data.output_name}" OnClick="pop('edit_order.php?table_name={$element.data.table_name}&where={$element.data.query}','Order','status=no,scrollbars=yes,width=700,height=500');">
 			<input type="hidden" name="{$element.data.name}" value="{$element.data.value}">
 		{/if}
@@ -68,8 +68,20 @@
 			</select>
 		{/if}
 		{if $element.type == 'element_list'}
+			<script language="JavaScript">
+			function deleteElement(delete_name, line_item)
+			{
+				let confirm_val = confirm('{t}Do you want to remove this entry?{/t}');
+				if (confirm_val === false) {
+					return false;
+				}
+				document.getElementById(delete_name).value = line_item;
+				document.getElementById(delete_name + '_flag').value = confirm_val;
+				document.edit_form.submit();
+			}
+			</script>
 			{* each row of data *}
-			<table width="100%" border="0">
+			<table width="100%" border="0" cellspacing="0" cellpadding="2">
 			{foreach from=$element.data.content item=line key=key}
 			<tr>
 				{* now each line of data *}
@@ -106,7 +118,7 @@
 					{/if}
 					{* if there is a hidden key, set delete, but only if we have a delete string *}
 					{if $element.data.type.$line_key == 'hidden' && $line_item && $element.data.delete_name}
-						<input type="submit" name="remove_button" value="{t}Delete{/t}" onClick="document.edit_form.{$element.data.delete_name}.value={$line_item};document.edit_form.{$element.data.delete_name}_flag.value=confirm('{t}Do you want to remove this entry?{/t}');document.edit_form.submit();">
+						<input type="button" name="remove_button" value="{t}Delete{/t}" onClick="deleteElement('{$element.data.delete_name}', '{$line_item}');">
 					{/if}
 					{if $element.data.type.$line_key == 'hidden' && $element.data.enable_name && $element.data.delete && $element.data.output_name.$line_key}
 						<input type="checkbox" name="{$element.data.enable_name}[{$key}]" value="1" {if $line_item}checked{/if}> {$element.data.output_name.$line_key}
@@ -129,4 +141,21 @@
 		{/if}
 		</td>
 	</tr>
+{elseif $element.allow_show}
+	<tr>
+		<td class="edit_fgcolor" class="normal" valign="top">
+			{$element.output_name}
+		</td>
+		<td class="{$element.color}" class="normal">
+			{if $element.type != 'view'}
+			{$element.show_value}
+			<input type="hidden" name="{$element.data.name}" value="{$element.show_value}">
+			{else}
+			{$element.data.value}
+			{/if}
+		</td>
+	</tr>
+{* {else}
+<!-- No {$key} --> *}
+{/if}
 {/foreach}

www/includes/templates/admin/edit_load.tpl

@@ -7,7 +7,7 @@
 	* HISTORY:
 	********************************************************************
 *}
-
+<!-- LOAD START //-->
 <tr>
 	<td class="edit_fgcolor_alt" class="normal">
 		Load:
@@ -20,3 +20,4 @@
 		<input type="submit" name="archive" value="{t}Load{/t}">
 	</td>
 </tr>
+<!-- LOAD END //-->

www/includes/templates/admin/edit_new.tpl

@@ -7,7 +7,8 @@
 	* HISTORY:
 	********************************************************************
 *}
-
+{if $new.seclevel_okay}
+	<!-- NEW START //-->
 	<tr>
 		<td class="edit_fgcolor_alt" class="normal">
 			{t}Create new media:{/t}
@@ -21,3 +22,5 @@
 			<input type="submit" name="new" value="{$new.new_name}">
 		</td>
 	</tr>
+	<!-- NEW END //-->
+{/if}

www/includes/templates/admin/edit_order.tpl

@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 
+<!doctype html>
 <html>
 <head>
 	<title>{$HTML_TITLE}</title>

www/includes/templates/admin/edit_save_delete.tpl

@@ -7,16 +7,18 @@
 	* HISTORY:
 	********************************************************************
 *}
-	<tr>
 	{if $save_delete.seclevel_okay}
+	<tr>
+		<!-- SAVE START //-->
 		<td class="edit_fgcolor_alt" class="normal">
 			<input type="submit" name="save" value="{$save_delete.save}">
 		{if $save_delete.old_school_hidden}
 			<input type="hidden" name="{$save_delete.pk_name}" value="{$save_delete.pk_value}">
 		{/if}
 		</td>
-	{/if}
+		<!-- SAVE END //-->
 	{if $save_delete.show_delete}
+		<!-- DELETE START //-->
 		<td class="edit_fgcolor_delete">
 			{if !$save_delete.hide_delete_checkbox}
 			<input type="checkbox" name="really_delete" value="yes">&nbsp;{t}really{/t}&nbsp;
@@ -24,9 +26,11 @@
 			<input type="hidden" name="really_delete" value="yes">
 			{/if}
 			<input type="submit" name="delete" value="{t}Delete{/t}">
+			<!-- DELETE END //-->
 	{else}
 		<td class="edit_fgcolor_alt" class="normal">
             &nbsp;
 	{/if}
 		</td>
 	</tr>
+	{/if}

www/includes/templates/admin/main_body.tpl

@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 
+<!doctype html>
 <html>
 <head>
 	<title>{$HTML_TITLE}</title>

www/includes/templates/admin/main_body4.tpl

@@ -8,6 +8,7 @@
 	********************************************************************
 *}
 
+<!doctype html>
 <html>
 <head>
 	<title>{$HTML_TITLE}</title>

www/layout/admin/css/edit.css

@@ -19,7 +19,7 @@ body {
 	background-color: white;
 	color: black;
 	font-family: Verdana,Arial,Helvetica,sans-serif;
-	font-size : 8pt;
+	font-size : 9pt;
 }
 
 .large {
@@ -159,9 +159,9 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	text-align: center;
 }
 
-.warning {
-	border: 1px solid #df7700;
-	color: #d57200;
+.warning, .warn {
+	border: 1px solid #ffa947;
+	color: #ffa947;
 	margin: 5px;
 	padding: 2px;
 	text-align: center;
@@ -181,8 +181,8 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	margin-top: 1px;
 }
 
-.div_warning {
-	border: 1px solid #df7700;
+.div_warning, .div_warn {
+	border: 1px solid #ffa947;
 }
 
 /* borders */
@@ -455,4 +455,11 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	background-color: #FFDF6F;
 }
 
+td.edit_fgcolor tr:nth-child(odd) {
+	background-color: #e2e2c5;
+}
+td.edit_fgcolor tr:nth-child(even) {
+	background-color: #ffffcd;
+}
+
 /* ***************************** ADMIN EDIT INTERFACE COLORS ********************************* */

www/layout/admin/javascript/edit.jq.js

@@ -14,9 +14,9 @@ if (!DEBUG) {
 	});
 }*/
 
-// open overlay boxes counter
-var GL_OB_S = 30;
-var GL_OB_BASE = 30;
+// open overlay boxes counter for z-index
+var GL_OB_S = 100;
+var GL_OB_BASE = 100;
 
 /**
  * opens a popup window with winName and given features (string)
@@ -974,7 +974,7 @@ function phfo(tree)
 	if (tree.id) {
 		line += ' id="' + tree.id + '"';
 		// if anything input (input, textarea, select then add name too)
-		if (['input', 'textarea', 'select'].includes(tree.tag)) {
+		if (['input', 'textarea', 'select', 'button'].includes(tree.tag)) {
 			line += ' name="' + (tree.name ? tree.name : tree.id) + '"';
 		}
 	}
@@ -1014,8 +1014,12 @@ function phfo(tree)
 	} else if (tree.content) {
 		content.push(tree.content);
 	}
-	// if not input close
-	if (tree.tag != 'input') {
+	// if not input, image or br, then close
+	if (
+		tree.tag != 'input' ||
+		tree.tag != 'img' ||
+		tree.tag != 'br'
+	) {
 		content.push('</' + tree.tag + '>');
 	}
 	// combine to string
@@ -1329,11 +1333,12 @@ function createLoginRow(login_string, header_id = 'mainHeader') // eslint-disabl
 		}
 		// clear out just in case for first entry
 		// fill with div name & login/logout button
-		$('#loginRow').html(phfo(cel('div', '', login_string)));
+		$('#loginRow').html(phfo(cel('div', 'loginRow-name', login_string)));
+		$('#loginRow').append(phfo(cel('div', 'loginRow-info', '')));
 		$('#loginRow').append(phfo(
 			aelx(
 				// outer div
-				cel('div'),
+				cel('div', 'loginRow-logout'),
 				// inner element
 				cel('input', 'logout', '', [], {
 					value: __('Logout'),
@@ -1386,6 +1391,8 @@ function createNavMenu(nav_menu, header_id = 'mainHeader') // eslint-disable-lin
 			}
 		});
 		$('#menuRow').html(content.join(''));
+	} else {
+		$('#menuRow').hide();
 	}
 }
 

www/layout/admin/javascript/flatpickr/flatpickr.ja.js

@@ -1,13 +1,13 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  (global = global || self, factory(global.ja = {}));
-}(this, function (exports) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ja = {}));
+}(this, (function (exports) { 'use strict';
 
   var fp = typeof window !== "undefined" && window.flatpickr !== undefined
       ? window.flatpickr
       : {
-          l10ns: {}
+          l10ns: {},
       };
   var Japanese = {
       weekdays: {
@@ -20,7 +20,7 @@
               "木曜日",
               "金曜日",
               "土曜日",
-          ]
+          ],
       },
       months: {
           shorthand: [
@@ -50,11 +50,15 @@
               "10月",
               "11月",
               "12月",
-          ]
+          ],
       },
       time_24hr: true,
       rangeSeparator: " から ",
-      firstDayOfWeek: 1
+      monthAriaLabel: "月",
+      amPM: ["午前", "午後"],
+      yearAriaLabel: "年",
+      hourAriaLabel: "時間",
+      minuteAriaLabel: "分",
   };
   fp.l10ns.ja = Japanese;
   var ja = fp.l10ns;
@@ -64,4 +68,4 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-}));
+})));

www/lib/CoreLibs/ACL/Login.php

@@ -677,9 +677,20 @@ class Login
 				$_SESSION['GROUP_ACL_TYPE'] = $res['group_type'];
 				// deprecated TEMPLATE setting
 				$_SESSION['TEMPLATE'] = $res['template'] ? $res['template'] : '';
-				$_SESSION['HEADER_COLOR'] = $res['second_header_color'] ?
+				$_SESSION['HEADER_COLOR'] = !empty($res['second_header_color']) ?
 					$res['second_header_color'] :
 					$res['first_header_color'];
+				// missing # before, this is for legacy data, will be deprecated
+				if (preg_match("/^[\dA-Fa-f]{6,8}$/", $_SESSION['HEADER_COLOR'])) {
+					$_SESSION['HEADER_COLOR'] = '#' . $_SESSION['HEADER_COLOR'];
+				}
+				// TODO: make sure that header color is valid:
+				// # + 6 hex
+				// # + 8 hex (alpha)
+				// rgb(), rgba(), hsl(), hsla()
+				// rgb: nnn.n for each
+				// hsl: nnn.n for first, nnn.n% for 2nd, 3rd
+				// Check\Colors::validateColor()
 				$_SESSION['LANG'] = $res['locale'] ?? 'en';
 				$_SESSION['DEFAULT_CHARSET'] = $res['encoding'] ?? 'UTF-8';
 				$_SESSION['DEFAULT_LOCALE'] = $_SESSION['LANG']
@@ -1131,6 +1142,9 @@ class Login
 
 		$html_string = (string)$this->login_template['template'];
 
+		$locales = $this->l->parseLocale($this->l->getLocale());
+		$this->login_template['strings']['LANGUAGE'] = $locales['lang'] ?? 'en';
+
 		// if password change is okay
 		if ($this->password_change) {
 			$html_string_password_change = $this->login_template['password_change'];
@@ -1287,6 +1301,7 @@ class Login
 					. $strings['PASSWORD_CHANGE_BUTTON_VALUE']
 					. '" OnClick="ShowHideDiv(\'pw_change_div\');">'
 			]);
+			// TODO: submit or JS to set target page as ajax call
 			// NOTE: for the HTML block I ignore line lengths
 			// phpcs:disable
 			$this->login_template['password_change'] = <<<EOM
@@ -1329,9 +1344,11 @@ EOM;
 		}
 
 		// now check templates
+		// TODO: submit or JS to set target page as ajax call
 		if (!$this->login_template['template']) {
 			$this->login_template['template'] = <<<EOM
-<html>
+<!DOCTYPE html>
+<html lang="{LANGUAGE}">
 <head>
 <title>{HTML_TITLE}</title>
 <style type="text/css">
@@ -1485,7 +1502,6 @@ EOM;
 		}
 		// initial the session if there is no session running already
 		// check if session exists and could be created
-		// TODO: move session creation and check to outside?
 		if ($this->session->checkActiveSession() === false) {
 			$this->login_error = 2;
 			echo '<b>No active session found</b>';
@@ -1615,7 +1631,7 @@ EOM;
 		// set the locale
 		if (
 			$this->session->checkActiveSession() === true &&
-			!empty($_SESSION['DEFAULT_LANG'])
+			!empty($_SESSION['DEFAULT_LOCALE'])
 		) {
 			$locale = $_SESSION['DEFAULT_LOCALE'] ?? '';
 		} else {

www/lib/CoreLibs/Admin/EditBase.php

@@ -0,0 +1,588 @@
+<?php
+
+/*********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2023/1/6
+* DESCRIPTION:
+* Original created: 2003/06/10
+* This is the edit_base.php data as is moved into a class so we can
+* more easy update this and also move to a different AJAX style more
+* easy
+*********************************************************************/
+
+declare(strict_types=1);
+
+namespace CoreLibs\Admin;
+
+use Exception;
+use SmartyException;
+
+class EditBase
+{
+	/** @var array<mixed> */
+	private $HEADER = [];
+	/** @var array<mixed> */
+	private $DATA = [];
+	/** @var array<mixed> */
+	private $DEBUG_DATA = [];
+
+	/** @var string the template name */
+	private $EDIT_TEMPLATE = '';
+
+	/** @var \CoreLibs\Template\SmartyExtend smarty system */
+	private $smarty;
+	/** @var \CoreLibs\Output\Form\Generate form generate system */
+	private $form;
+	/** @var \CoreLibs\Debug\Logging */
+	public $log;
+
+	/**
+	 * construct form generator
+	 *
+	 * @param array<mixed>            $db_config db config array, mandatory
+	 * @param \CoreLibs\Debug\Logging $log       Logging class, null auto set
+	 * @param \CoreLibs\Language\L10n $l10n      l10n language class, null auto set
+	 * @param array<string,string>    $locale    locale array from ::setLocale,
+	 *                                           null auto set
+	 */
+	public function __construct(
+		array $db_config,
+		\CoreLibs\Debug\Logging $log,
+		\CoreLibs\Language\L10n $l10n,
+		array $locale
+	) {
+		$this->log = $log;
+		// smarty template engine (extended Translation version)
+		$this->smarty = new \CoreLibs\Template\SmartyExtend($l10n, $locale);
+		// turn off set log per class
+		$log->setLogPer('class', false);
+
+		// create form class
+		$this->form = new \CoreLibs\Output\Form\Generate(
+			$db_config,
+			$log,
+			$l10n,
+			$locale
+		);
+		if ($this->form->mobile_phone) {
+			echo "I am sorry, but this page cannot be viewed by a mobile phone";
+			exit;
+		}
+		// $this->form->log->debug('POST', $this->form->log->prAr($_POST));
+	}
+
+	/**
+	 * edit order page
+	 *
+	 * @return void
+	 */
+	private function editOrderPage(): void
+	{
+		// get is for "table_name" and "where" only
+		$table_name = $_GET['table_name'] ?? $_POST['table_name'] ?? '';
+		// not in use
+		// $where_string = $_GET['where'] ?? $_POST['where'] ?? '';
+		// order name is _always_ order_number for the edit interface
+
+		// follwing arrays do exist here:
+		// $position ... has the positions of the [0..max], cause in a <select>
+		//               I can't put an number into the array field, in this array,
+		//               there are the POSITION stored,
+		//               that should CHANGE there order (up/down)
+		// $row_data_id ... has ALL ids from the sorting part
+		// $row_data_order ... has ALL order positions from the soirting part
+		$position = $_POST['position'] ?? [];
+		$row_data_id = $_POST['row_data_id'] ?? [];
+		$original_id = $row_data_id;
+		$row_data_order = $_POST['row_data_order'] ?? [];
+		// direction
+		$up = $_POST['up'] ?? '';
+		$down = $_POST['down'] ?? '';
+		if (count($position)) {
+			// FIRST u have to put right sort, then read again ...
+			// hast to be >0 or the first one is selected and then there is no move
+			if (!empty($up) && isset($position[0]) && $position[0] > 0) {
+				for ($i = 0; $i < count($position); $i++) {
+					// change position order
+					// this gets temp, id before that, gets actual (moves one "down")
+					// this gets the old before (moves one "up")
+					// is done for every element in row
+					// echo "A: ".$row_data_id[$position[$i]]
+					//	." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]
+					//	." (".$row_data_order[$position[$i]-1].")<br>";
+					$temp_id = $row_data_id[$position[$i]] ?? null;
+					$row_data_id[$position[$i]] = $row_data_id[(int)$position[$i] - 1] ?? null;
+					$row_data_id[(int)$position[$i] - 1] = $temp_id;
+					// echo "A: ".$row_data_id[$position[$i]]
+					//	." (".$row_data_order[$position[$i]].") -- "
+					//	.$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+				} // for
+			} // if up
+
+			// the last position id from position array is not to be the count - 1 of
+			// row_data_id array, or it is the last element
+			if (!empty($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
+				for ($i = count($position) - 1; $i >= 0; $i--) {
+					// same as up, just up in other way, starts from bottom (last element) and moves "up"
+					// element before actuel gets temp, this element, becomes element after this,
+					// element after this, gets this
+					$temp_id = $row_data_id[(int)$position[$i] + 1] ?? null;
+					$row_data_id[(int)$position[$i] + 1] = $row_data_id[$position[$i]] ?? null;
+					$row_data_id[$position[$i]] = $temp_id;
+				} // for
+			} // if down
+
+			// write data ... (which has to be abstrackt ...)
+			if (
+				(!empty($up) && $position[0] > 0) ||
+				(!empty($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
+			) {
+				for ($i = 0; $i < count($row_data_id); $i++) {
+					if (isset($row_data_order[$i]) && isset($row_data_id[$i])) {
+						$q = "UPDATE " . $table_name
+							. " SET order_number = " . $row_data_order[$i]
+							. " WHERE " . $table_name . "_id = " . $row_data_id[$i];
+						$q = $this->form->dbExec($q);
+					}
+				} // for all article ids ...
+			} // if write
+		} // if there is something to move
+
+		// get ...
+		$q = "SELECT " . $table_name . "_id, name, order_number FROM " . $table_name . " ";
+		// /* if (!empty($where_string)) {
+		// 	$q .= "WHERE $where_string ";
+		// } */
+		$q .= "ORDER BY order_number";
+
+		// init arrays
+		$row_data = [];
+		$options_id = [];
+		$options_name = [];
+		$options_selected = [];
+		// DB read data for menu
+		while (is_array($res = $this->form->dbReturn($q))) {
+			$row_data[] = [
+				"id" => $res[$table_name . "_id"],
+				"name" => $res["name"],
+				"order" => $res["order_number"]
+			];
+		} // while read data ...
+
+		// html title
+		$this->HEADER['HTML_TITLE'] = $this->form->l->__('Edit Order');
+
+		$messages = [];
+		$error = $_POST['error'] ?? 0;
+		// error msg
+		if (!empty($error)) {
+			$msg = $_POST['msg'] ?? [];
+			if (!is_array($msg)) {
+				$msg = [];
+			}
+			$messages[] = [
+				'msg' => $msg,
+				'class' => 'error',
+				'width' => '100%'
+			];
+		}
+		$this->DATA['form_error_msg'] = $messages;
+
+		// all the row data
+		for ($i = 0; $i < count($row_data); $i++) {
+			$options_id[] = $i;
+			$options_name[] = $row_data[$i]['name'];
+			// list of points to order
+			for ($j = 0; $j < count($position); $j++) {
+				// if matches, put into select array
+				if (
+					isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
+					$original_id[$position[$j]] == $row_data[$i]['id']
+				) {
+					$options_selected[] = $i;
+				}
+			}
+		}
+		$this->DATA['options_id'] = $options_id;
+		$this->DATA['options_name'] = $options_name;
+		$this->DATA['options_selected'] = $options_selected;
+
+		// hidden list for the data (id, order number)
+		$row_data_id = [];
+		$row_data_order = [];
+		for ($i = 0; $i < count($row_data); $i++) {
+			$row_data_id[] = $row_data[$i]['id'];
+			$row_data_order[] = $row_data[$i]['order'];
+		}
+		$this->DATA['row_data_id'] = $row_data_id;
+		$this->DATA['row_data_order'] = $row_data_order;
+
+		// hidden names for the table & where string
+		$this->DATA['table_name'] = $table_name;
+		$this->DATA['where_string'] = '';
+		// $this->DATA['where_string'] = $where_string ?? '';
+
+		$this->EDIT_TEMPLATE = 'edit_order.tpl';
+	}
+
+	/**
+	 * all edit pages
+	 *
+	 * @return void
+	 */
+	private function editPageFlow(): void
+	{
+		// set table width
+		$table_width = '100%';
+		// load call only if id is set
+		if (!empty($_POST[$this->form->archive_pk_name])) {
+			$this->form->formProcedureLoad($_POST[$this->form->archive_pk_name]);
+		}
+		$this->form->formProcedureNew();
+		$this->form->formProcedureSave();
+		$this->form->formProcedureDelete();
+		// delete call only if those two are set
+		// and we are not in new/save/master delete
+		if (
+			!$this->form->new &&
+			!$this->form->save &&
+			!$this->form->delete &&
+			!empty($_POST['element_list']) &&
+			!empty($_POST['remove_name'])
+		) {
+			$this->form->formProcedureDeleteFromElementList(
+				$_POST['element_list'],
+				$_POST['remove_name']
+			);
+			// run a load post element delete to not end up with empty page
+			$this->form->formLoadTableArray($_POST[$this->form->archive_pk_name]);
+			$this->form->yes = 1;
+		}
+
+		$this->DATA['table_width'] = $table_width;
+
+		$messages = [];
+		// write out error / status messages
+		$messages[] = $this->form->formPrintMsg();
+		$this->DATA['form_error_msg'] = $messages;
+
+		// MENU START
+		// request some session vars
+		if (empty($_SESSION['HEADER_COLOR'])) {
+			$this->DATA['HEADER_COLOR'] = '#E0E2FF';
+		} else {
+			$this->DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR'];
+		}
+		$this->DATA['USER_NAME'] = $_SESSION['USER_NAME'];
+		$this->DATA['EUID'] = $_SESSION['EUID'];
+		$this->DATA['GROUP_NAME'] = $_SESSION['GROUP_NAME'];
+		$this->DATA['GROUP_LEVEL'] = $_SESSION['GROUP_ACL_LEVEL'];
+		$PAGES = $_SESSION['PAGES'];
+
+		//$this->form->log->debug('menu', $this->form->log->prAr($PAGES));
+
+		// build nav from $PAGES ...
+		if (!isset($PAGES) || !is_array($PAGES)) {
+			$PAGES = [];
+		}
+		$menuarray = [];
+		foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
+			if ($PAGE_DATA['menu'] && $PAGE_DATA['online']) {
+				$menuarray[] = $PAGE_DATA;
+			}
+		}
+
+		// split point for nav points
+		$COUNT_NAV_POINTS = count($menuarray);
+		$SPLIT_FACTOR = 3;
+		$START_SPLIT_COUNT = 3;
+		// WTF ?? I dunno what I am doing here ...
+		for ($i = 9; $i < $COUNT_NAV_POINTS; $i += $START_SPLIT_COUNT) {
+			if ($COUNT_NAV_POINTS > $i) {
+				$SPLIT_FACTOR += 1;
+			}
+		}
+
+		$position = 0;
+		$menu_data = [];
+		// for ($i = 1; $i <= count($menuarray); $i ++) {
+		foreach ($menuarray as $i => $menu_element) {
+			// do that for new array
+			$j = $i + 1;
+			$menu_data[$i]['pagename'] = htmlentities($menu_element['page_name']);
+			$menu_data[$i]['filename'] =
+				// prefix folder or host name
+				(isset($menu_element['hostname']) && $menu_element['hostname'] ?
+					$menu_element['hostname'] :
+					''
+				)
+				// filename
+				. ($menu_element['filename'] ?? '')
+				// query string
+				. (isset($menu_element['query_string']) && $menu_element['query_string'] ?
+					$menu_element['query_string'] :
+					''
+				);
+			if ($j == 1 || !($i % $SPLIT_FACTOR)) {
+				$menu_data[$i]['splitfactor_in'] = 1;
+			} else {
+				$menu_data[$i]['splitfactor_in'] = 0;
+			}
+			// on matching, we also need to check if we are in the same folder
+			if (
+				isset($menu_element['filename']) &&
+				$menu_element['filename'] == \CoreLibs\Get\System::getPageName() &&
+				(!isset($menu_element['hostname']) || (
+					isset($menu_element['hostname']) &&
+						(!$menu_element['hostname'] || strstr($menu_element['hostname'], CONTENT_PATH) !== false)
+				))
+			) {
+				$position = $i;
+				$menu_data[$i]['position'] = 1;
+				$menu_data[$i]['popup'] = 0;
+			} else {
+				// add query stuff
+				// HAS TO DONE LATER ... set urlencode, etc ...
+				// check if popup needed
+				if (isset($menu_element['popup']) && $menu_element['popup'] == 1) {
+					$menu_data[$i]['popup'] = 1;
+					$menu_data[$i]['rand'] = uniqid((string)rand());
+					$menu_data[$i]['width'] = $menu_element['popup_x'];
+					$menu_data[$i]['height'] = $menu_element['popup_y'];
+				} else {
+					$menu_data[$i]['popup'] = 0;
+				}
+				$menu_data[$i]['position'] = 0;
+			} // highlight or not
+			if (!($j % $SPLIT_FACTOR) || (($j + 1) > count($menuarray))) {
+				$menu_data[$i]['splitfactor_out'] = 1;
+			} else {
+				$menu_data[$i]['splitfactor_out'] = 0;
+			}
+		} // for
+		// $this->form->log->debug('MENU ARRAY', $this->form->log->prAr($menu_data));
+		$this->DATA['menu_data'] = $menu_data;
+		$this->DATA['page_name'] = $menuarray[$position]['page_name'] ?? '-Undefined [' . $position . '] -';
+		$L_TITLE = $this->DATA['page_name'];
+		// html title
+		$this->HEADER['HTML_TITLE'] = $this->form->l->__($L_TITLE);
+		// END MENU
+		// LOAD AND NEW
+		$this->DATA['load'] = $this->form->formCreateLoad();
+		$this->DATA['new'] = $this->form->formCreateNew();
+		// SHOW DATA PART
+		if ($this->form->yes) {
+			$this->DATA['form_yes'] = $this->form->yes;
+			$this->DATA['form_my_page_name'] = $this->form->my_page_name;
+			$this->DATA['filename_exist'] = 0;
+			$this->DATA['drop_down_input'] = 0;
+			$elements = [];
+			// depending on the "getPageName()" I show different stuff
+			switch ($this->form->my_page_name) {
+				case 'edit_users':
+					$elements[] = $this->form->formCreateElement('login_error_count');
+					$elements[] = $this->form->formCreateElement('login_error_date_last');
+					$elements[] = $this->form->formCreateElement('login_error_date_first');
+					$elements[] = $this->form->formCreateElement('enabled');
+					$elements[] = $this->form->formCreateElement('deleted');
+					$elements[] = $this->form->formCreateElement('protected');
+					$elements[] = $this->form->formCreateElement('username');
+					$elements[] = $this->form->formCreateElement('password');
+					$elements[] = $this->form->formCreateElement('password_change_interval');
+					$elements[] = $this->form->formCreateElement('login_user_id');
+					$elements[] = $this->form->formCreateElement('login_user_id_set_date');
+					$elements[] = $this->form->formCreateElement('login_user_id_last_revalidate');
+					$elements[] = $this->form->formCreateElement('login_user_id_locked');
+					$elements[] = $this->form->formCreateElement('login_user_id_revalidate_after');
+					$elements[] = $this->form->formCreateElement('login_user_id_valid_from');
+					$elements[] = $this->form->formCreateElement('login_user_id_valid_until');
+					$elements[] = $this->form->formCreateElement('email');
+					$elements[] = $this->form->formCreateElement('last_name');
+					$elements[] = $this->form->formCreateElement('first_name');
+					$elements[] = $this->form->formCreateElement('edit_group_id');
+					$elements[] = $this->form->formCreateElement('edit_access_right_id');
+					$elements[] = $this->form->formCreateElement('strict');
+					$elements[] = $this->form->formCreateElement('locked');
+					$elements[] = $this->form->formCreateElement('lock_until');
+					$elements[] = $this->form->formCreateElement('lock_after');
+					$elements[] = $this->form->formCreateElement('admin');
+					$elements[] = $this->form->formCreateElement('debug');
+					$elements[] = $this->form->formCreateElement('db_debug');
+					$elements[] = $this->form->formCreateElement('edit_language_id');
+					$elements[] = $this->form->formCreateElement('edit_scheme_id');
+					$elements[] = $this->form->formCreateElementListTable('edit_access_user');
+					$elements[] = $this->form->formCreateElement('additional_acl');
+					break;
+				case 'edit_schemes':
+					$elements[] = $this->form->formCreateElement('enabled');
+					$elements[] = $this->form->formCreateElement('name');
+					$elements[] = $this->form->formCreateElement('header_color');
+					$elements[] = $this->form->formCreateElement('template');
+					break;
+				case 'edit_pages':
+					if (!isset($this->form->table_array['edit_page_id']['value'])) {
+						$q = "DELETE FROM temp_files";
+						$this->form->dbExec($q);
+						// gets all files in the current dir and dirs given ending with .php
+						$folders = ['../admin/', '../frontend/'];
+						$files = ['*.php'];
+						$search_glob = [];
+						foreach ($folders as $folder) {
+							// make sure this folder actually exists
+							if (is_dir(ROOT . $folder)) {
+								foreach ($files as $file) {
+									$search_glob[] = $folder . $file;
+								}
+							}
+						}
+						$crap = exec('ls ' . join(' ', $search_glob), $output, $status);
+						// now get all that are NOT in de DB
+						$q = "INSERT INTO temp_files (folder, filename) VALUES ";
+						$t_q = '';
+						foreach ($output as $output_file) {
+							// split the ouput into folder and file
+							$pathinfo = pathinfo($output_file);
+							if (!empty($pathinfo['dirname'])) {
+								$pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
+							} else {
+								$pathinfo['dirname'] = '';
+							}
+							if ($t_q) {
+								$t_q .= ', ';
+							}
+							$t_q .= "('" . $this->form->dbEscapeString($pathinfo['dirname']) . "', '"
+								. $this->form->dbEscapeString($pathinfo['basename']) . "')";
+						}
+						$this->form->dbExec($q . $t_q, 'NULL');
+						$elements[] = $this->form->formCreateElement('filename');
+					} else {
+						// show file menu
+						// just show name of file ...
+						$this->DATA['filename_exist'] = 1;
+						$this->DATA['filename'] = $this->form->table_array['filename']['value'];
+					} // File Name View IF
+					$elements[] = $this->form->formCreateElement('hostname');
+					$elements[] = $this->form->formCreateElement('name');
+					// $elements[] = $this->form->formCreateElement('tag');
+					// $elements[] = $this->form->formCreateElement('min_acl');
+					$elements[] = $this->form->formCreateElement('order_number');
+					$elements[] = $this->form->formCreateElement('online');
+					$elements[] = $this->form->formCreateElement('menu');
+					$elements[] = $this->form->formCreateElementListTable('edit_query_string');
+					$elements[] = $this->form->formCreateElement('content_alias_edit_page_id');
+					$elements[] = $this->form->formCreateElementListTable('edit_page_content');
+					$elements[] = $this->form->formCreateElement('popup');
+					$elements[] = $this->form->formCreateElement('popup_x');
+					$elements[] = $this->form->formCreateElement('popup_y');
+					$elements[] = $this->form->formCreateElementReferenceTable('edit_visible_group');
+					$elements[] = $this->form->formCreateElementReferenceTable('edit_menu_group');
+					break;
+				case 'edit_languages':
+					$elements[] = $this->form->formCreateElement('enabled');
+					$elements[] = $this->form->formCreateElement('short_name');
+					$elements[] = $this->form->formCreateElement('long_name');
+					$elements[] = $this->form->formCreateElement('iso_name');
+					break;
+				case 'edit_groups':
+					$elements[] = $this->form->formCreateElement('enabled');
+					$elements[] = $this->form->formCreateElement('name');
+					$elements[] = $this->form->formCreateElement('edit_access_right_id');
+					$elements[] = $this->form->formCreateElement('edit_scheme_id');
+					$elements[] = $this->form->formCreateElementListTable('edit_page_access');
+					$elements[] = $this->form->formCreateElement('additional_acl');
+					break;
+				case 'edit_visible_group':
+					$elements[] = $this->form->formCreateElement('name');
+					$elements[] = $this->form->formCreateElement('flag');
+					break;
+				case 'edit_menu_group':
+					$elements[] = $this->form->formCreateElement('name');
+					$elements[] = $this->form->formCreateElement('flag');
+					$elements[] = $this->form->formCreateElement('order_number');
+					break;
+				case 'edit_access':
+					$elements[] = $this->form->formCreateElement('name');
+					$elements[] = $this->form->formCreateElement('enabled');
+					$elements[] = $this->form->formCreateElement('protected');
+					$elements[] = $this->form->formCreateElement('color');
+					$elements[] = $this->form->formCreateElement('description');
+					// add name/value list here
+					$elements[] = $this->form->formCreateElementListTable('edit_access_data');
+					$elements[] = $this->form->formCreateElement('additional_acl');
+					break;
+				default:
+					print '[No valid page definition given]';
+					break;
+			}
+			// $this->form->log->debug('edit', "Elements: <pre>".$this->form->log->prAr($elements));
+			$this->DATA['elements'] = $elements;
+			$this->DATA['hidden'] = $this->form->formCreateHiddenFields();
+			$this->DATA['save_delete'] = $this->form->formCreateSaveDelete();
+		} else {
+			$this->DATA['form_yes'] = 0;
+		}
+		$this->EDIT_TEMPLATE = 'edit_body.tpl';
+	}
+
+	/**
+	 * main method that either calls edit order page method or general page
+	 * builds the smarty content and runs smarty display output
+	 *
+	 * @return void
+	 * @throws Exception
+	 * @throws SmartyException
+	 */
+	public function editBaseRun()
+	{
+		// set the template dir
+		// WARNING: this has a special check for the mailing tool layout (old layout)
+		if (defined('LAYOUT')) {
+			$this->smarty->setTemplateDir(BASE . INCLUDES . TEMPLATES . CONTENT_PATH);
+			$this->DATA['css'] = LAYOUT . CSS;
+			$this->DATA['js'] = LAYOUT . JS;
+		} else {
+			$this->smarty->setTemplateDir(TEMPLATES);
+			$this->DATA['css'] = CSS;
+			$this->DATA['js'] = JS;
+		}
+		$ADMIN_STYLESHEET = 'edit.css';
+		// define all needed smarty stuff for the general HTML/page building
+		$this->HEADER['CSS'] = CSS;
+		$this->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
+		/** @phpstan-ignore-next-line because ADMIN_STYLESHEET can be null */
+		$this->HEADER['STYLESHEET'] = $ADMIN_STYLESHEET ?? ADMIN_STYLESHEET;
+
+		// main run
+		if ($this->form->my_page_name == 'edit_order') {
+			$this->editOrderPage();
+		} else {
+			$this->editPageFlow();
+		}
+
+		// debug data, if DEBUG flag is on, this data is print out
+		// $this->DEBUG_DATA['DEBUG'] = $DEBUG_TMPL ?? '';
+		$this->DEBUG_DATA['DEBUG'] = '';
+
+		// create main data array
+		$CONTENT_DATA = array_merge($this->HEADER, $this->DATA, $this->DEBUG_DATA);
+		// data is 1:1 mapping (all vars, values, etc)
+		foreach ($CONTENT_DATA as $key => $value) {
+			$this->smarty->assign($key, $value);
+		}
+		if (is_dir(BASE . TEMPLATES_C)) {
+			$this->smarty->setCompileDir(BASE . TEMPLATES_C);
+		}
+		if (is_dir(BASE . CACHE)) {
+			$this->smarty->setCacheDir(BASE . CACHE);
+		}
+		$this->smarty->display(
+			$this->EDIT_TEMPLATE,
+			'editAdmin_' . $this->smarty->lang,
+			'editAdmin_' . $this->smarty->lang
+		);
+
+		$this->form->log->debug('DEBUGEND', '==================================== [Form END]');
+	}
+}
+
+// __END__

www/lib/CoreLibs/Basic.php

@@ -66,7 +66,7 @@ class Basic
 	// logging interface, Debug\Logging class
 	/** @var \CoreLibs\Debug\Logging */
 	public $log;
-	/** @var\CoreLibs\Create\Session */
+	/** @var \CoreLibs\Create\Session */
 	public $session;
 
 	// email valid checks

www/lib/CoreLibs/Check/Colors.php

@@ -0,0 +1,187 @@
+<?php
+
+/*
+ * valid checks for css/html based colors
+ * # hex
+ * # hex + alpha
+ * rgb
+ * rgba
+ * hsl
+ * hsla
+ */
+
+declare(strict_types=1);
+
+namespace CoreLibs\Check;
+
+use Exception;
+
+class Colors
+{
+	/** @var int 1 for HEX rgb */
+	public const HEX_RGB = 1;
+	/** @var int 2 for HEX rgb with alpha */
+	public const HEX_RGBA = 2;
+	/** @var int 4 for rgb() */
+	public const RGB = 4;
+	/** @var int 8 for rgba() */
+	public const RGBA = 8;
+	/** @var int 16 for hsl() */
+	public const HSL = 16;
+	/** @var int 32 for hsla() */
+	public const HSLA = 32;
+	/** @var int 63 for all bits set (sum of above) */
+	public const ALL = 63;
+
+	/**
+	 * check rgb/hsl content values in detail
+	 * will abort and return false on first error found
+	 *
+	 * @param  string    $color    html/css tring to check
+	 * @param  int|false $rgb_flag flag to check for rgb
+	 * @param  int|false $hsl_flag flag to check for hsl type
+	 * @return bool                True if no error, False if error
+	 */
+	private static function rgbHslContentCheck(string $color, $rgb_flag, $hsl_flag): bool
+	{
+		// extract string between () and split into elements
+		preg_match("/\((.*)\)/", $color, $matches);
+		if (
+			!is_array($color_list = preg_split("/,\s*/", $matches[1] ?? ''))
+		) {
+			throw new \Exception("Could not extract color list from rgg/hsl", 3);
+		}
+		// based on rgb/hsl settings check that entries are valid
+		// rgb: either 0-255 OR 0-100%
+		// hsl: first: 0-360
+		foreach ($color_list as $pos => $color_check) {
+			if (empty($color_check)) {
+				return false;
+			}
+			$percent_check = false;
+			if (strrpos($color_check, '%', -1) !== false) {
+				$percent_check = true;
+				$color_check = str_replace('%', '', $color_check);
+			}
+			// first three normal percent or valid number
+			if ($rgb_flag !== false) {
+				if ($percent_check === true) {
+					// for ALL pos
+					if ($color_check  < 0  || $color_check > 100) {
+						return false;
+					}
+				} elseif (
+					$pos < 3 &&
+					($color_check < 0 || $color_check > 255)
+				) {
+						return false;
+				} elseif (
+					// RGBA set pos 3 if not percent
+					$pos == 3 &&
+					($color_check < 0 || $color_check > 1)
+				) {
+					return false;
+				}
+			} elseif ($hsl_flag !== false) {
+				// pos 0: 0-360
+				// pos 1,2: %
+				// pos 3: % or 0-1 (float)
+				if (
+					$pos == 0 &&
+					($color_check < 0 || $color_check > 360)
+				) {
+					return false;
+				} elseif (
+					// if pos 1/2 are not percent
+					($pos == 1 || $pos == 2) &&
+					($percent_check != true ||
+					($color_check  < 0  || $color_check > 100))
+				) {
+					return false;
+				} elseif (
+					// 3 is either percent or 0~1
+					$pos == 3 &&
+					(
+						($percent_check == false &&
+						($color_check < 0 || $color_check > 1)) ||
+						($percent_check === true  &&
+						($color_check  < 0  || $color_check > 100))
+					)
+				) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * check if html/css color string is valid
+	 * @param string $color A color string of any format
+	 * @param int $flags    defaults to ALL, else use | to combined from
+	 *                      HEX_RGB, HEX_RGBA, RGB, RGBA, HSL, HSLA
+	 * @return bool         True if valid, False if not
+	 * @throws Exception    1: no valid flag set
+	 */
+	public static function validateColor(string $color, int $flags = self::ALL): bool
+	{
+		// blocks for each check
+		$regex_blocks = [];
+		// set what to check
+		if ($flags & self::HEX_RGB) {
+			$regex_blocks[] = '#[\dA-Fa-f]{6}';
+		}
+		if ($flags & self::HEX_RGBA) {
+			$regex_blocks[] = '#[\dA-Fa-f]{8}';
+		}
+		if ($flags & self::RGB) {
+			$regex_blocks[] = 'rgb\(\d{1,3}%?,\s*\d{1,3}%?,\s*\d{1,3}%?\)';
+		}
+		if ($flags & self::RGBA) {
+			$regex_blocks[] = 'rgba\(\d{1,3}%?,\s*\d{1,3}%?,\s*\d{1,3}%?(,\s*(0\.\d{1,2}|1(\.0)?|\d{1,3}%))?\)';
+		}
+		if ($flags & self::HSL) {
+			$regex_blocks[] = 'hsl\(\d{1,3},\s*\d{1,3}(\.\d{1})?%,\s*\d{1,3}(\.\d{1})?%\)';
+		}
+		if ($flags & self::HSLA) {
+			$regex_blocks[] = 'hsla\(\d{1,3},\s*\d{1,3}(\.\d{1})?%,\s*\d{1,3}'
+				. '(\.\d{1})?%(,\s*(0\.\d{1,2}|1(\.0)?|\d{1,3}%))?\)';
+		}
+		// wrong flag set
+		if ($flags > self::ALL) {
+			throw new \Exception("Invalid flags parameter: $flags", 1);
+		}
+		if (!count($regex_blocks)) {
+			throw new \Exception("No regex blocks set: $flags", 2);
+		}
+
+		// build regex
+		$regex = '^('
+			. join('|', $regex_blocks)
+			// close regex
+			. ')$';
+		// print "C: $color, F: $flags, R: $regex\n";
+
+		if (preg_match("/$regex/", $color)) {
+			// if valid regex, we now need to check if the content is actually valid
+			// only for rgb/hsl type
+			/** @var int|false */
+			$rgb_flag = strpos($color, 'rgb');
+			/** @var int|false */
+			$hsl_flag = strpos($color, 'hsl');
+			// if both not match, return true
+			if (
+				$rgb_flag === false &&
+				$hsl_flag === false
+			) {
+				return true;
+			}
+			// run detaul rgb/hsl content check
+			return self::rgbHslContentCheck($color, $rgb_flag, $hsl_flag);
+		} else {
+			return false;
+		}
+	}
+}
+
+// __END__

www/lib/CoreLibs/Check/Jason.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * DEPRECATED: Use correct Json:: instead
+ * DEPRECATED: Use correct Convert\Json:: instead
  */
 
 declare(strict_types=1);

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * html convert functions
+ * array search and transform functions
  */
 
 declare(strict_types=1);

www/lib/CoreLibs/Combined/DateTime.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * image thumbnail, rotate, etc
+ * date convert and check functions
  */
 
 declare(strict_types=1);
@@ -193,6 +193,54 @@ class DateTime
 		}
 	}
 
+	/**
+	 * Returns long or short day of week name based on ISO day of week number
+	 * 1: Monday
+	 * ...
+	 * 7: Sunday
+	 *
+	 * @param  int    $isodow 1: Monday, 7: Sunday
+	 * @param  bool   $long   Default false 'Mon', if true 'Monday'
+	 * @return string         Day of week string either short 'Mon' or long 'Monday'
+	 */
+	public static function setWeekdayNameFromIsoDow(int $isodow, bool $long = false): string
+	{
+		// if not valid, set to invalid
+		if ($isodow < 1 || $isodow > 7) {
+			return $long ? 'Invalid' : 'Inv';
+		}
+		return date($long ? 'l' : 'D', strtotime("Sunday +{$isodow} days") ?: null);
+	}
+
+	/**
+	 * Get the day of week Name from date
+	 *
+	 * @param  string $date Any valid date
+	 * @param  bool   $long Default false 'Mon', if true 'Monday'
+	 * @return string       Day of week string either short 'Mon' or long 'Monday'
+	 */
+	public static function setWeekdayNameFromDate(string $date, bool $long = false): string
+	{
+		if (!self::checkDate($date)) {
+			return $long ? 'Invalid' : 'Inv';
+		}
+		return date($long ? 'l' : 'D', strtotime($date) ?: null);
+	}
+
+	/**
+	 * Get the day of week Name from date
+	 *
+	 * @param  string $date  Any valid date
+	 * @return int           ISO Weekday number 1: Monday, 7: Sunday, -1 for invalid date
+	 */
+	public static function setWeekdayNumberFromDate(string $date): int
+	{
+		if (!self::checkDate($date)) {
+			return -1;
+		}
+		return (int)date('N', strtotime($date) ?: null);
+	}
+
 	/**
 	 * splits & checks date, wrap around for check_date function
 	 *
@@ -264,16 +312,17 @@ class DateTime
 	}
 
 	/**
-	 * plits & checks date, wrap around for check_date function
-	 * returns int in:
-	 *     -1 if the first date is smaller the last
-	 *     0 if both are equal
-	 *     1 if the first date is bigger than the last
-	 *     false (bool): error
+	 * compares two dates, tries to convert them via strtotime to timestamps
+	 * returns int/bool in:
+	 * -1 if the first date is smaller the last
+	 * 0 if both are equal
+	 * 1 if the first date is bigger than the last
+	 * false if date validation/conversion failed
 	 *
 	 * @param  string $start_date start date string in YYYY-MM-DD
 	 * @param  string $end_date   end date string in YYYY-MM-DD
-	 * @return int|bool           false on error, or int -1/0/1 as difference
+	 * @return int|bool           false on error
+	 *                            or int -1 (s<e)/0 (s=e)/1 (s>e) as difference
 	 */
 	public static function compareDate($start_date, $end_date)
 	{
@@ -306,16 +355,17 @@ class DateTime
 
 	/**
 	 * compares the two dates + times. if seconds missing in one set,
-	 * add :00, converts / to -
+	 * adds :00, converts date + times via strtotime to timestamps
 	 * returns int/bool in:
-	 *     -1 if the first date is smaller the last
-	 *     0 if both are equal
-	 *     1 if the first date is bigger than the last
-	 *     false if no valid date/times chould be found
+	 * -1 if the first date is smaller the last
+	 * 0 if both are equal
+	 * 1 if the first date is bigger than the last
+	 * false if date/times validation/conversion failed
 	 *
 	 * @param  string $start_datetime start date/time in YYYY-MM-DD HH:mm:ss
 	 * @param  string $end_datetime   end date/time in YYYY-MM-DD HH:mm:ss
-	 * @return int|bool               false for error or -1/0/1 as difference
+	 * @return int|bool               false for error
+	 *                                or -1 (s<e)/0 (s=e)/1 (s>e) as difference
 	 */
 	public static function compareDateTime($start_datetime, $end_datetime)
 	{

www/lib/CoreLibs/Convert/Byte.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * image thumbnail, rotate, etc
+ * byte conversion from and to human readable
  */
 
 declare(strict_types=1);
@@ -26,14 +26,18 @@ class Byte
 	 * Source Idea: SOURCE: https://programming.guide/worlds-most-copied-so-snippet.html
 	 *
 	 * The class itself hast the following defined
-	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and extension
+	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and suffix
 	 * BYTE_FORMAT_ADJUST  [2] use sprintf to always print two decimals
-	 * BYTE_FORMAT_SI      [3] use si standard 1000 instead of bytes 1024
+	 * BYTE_FORMAT_SI      [4] use si standard 1000 instead of bytes 1024
 	 * To use the constant from outside use class::CONSTANT
 	 *
 	 * @param  string|int|float $bytes bytes as string int or pure int
 	 * @param  int              $flags bitwise flag with use space turned on
+	 *                                 BYTE_FORMAT_NOSPACE: no space between number and suffix
+	 *                                 BYTE_FORMAT_ADJUST: sprintf adjusted two 2 decimals
+	 *                                 BYTE_FORMAT_SI: use 1000 instead of 1024
 	 * @return string                  converted byte number (float) with suffix
+	 * @throws \Exception               1: no valid flag set
 	 */
 	public static function humanReadableByteFormat($bytes, int $flags = 0): string
 	{
@@ -58,11 +62,14 @@ class Byte
 			} else {
 				$si = false;
 			}
+			if ($flags > 7) {
+				throw new \Exception("Invalid flags parameter: $flags", 1);
+			}
 
 			// si or normal
 			$unit = $si ? 1000 : 1024;
 			// always positive
-			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs($bytes);
+			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs((float)$bytes);
 			// smaller than unit is always B
 			if ($abs_bytes < $unit) {
 				return $bytes . 'B';
@@ -106,11 +113,13 @@ class Byte
 	 * calculates the bytes based on a string with nnG, nnGB, nnM, etc
 	 * NOTE: large exabyte numbers will overflow
 	 * flag allowed:
-	 * BYTE_FORMAT_SI      [3] use si standard 1000 instead of bytes 1024
+	 * BYTE_FORMAT_SI      [4] use si standard 1000 instead of bytes 1024
 	 *
 	 * @param  string|int|float $number any string or number to convert
 	 * @param  int              $flags  bitwise flag with use space turned on
+	 *                                  BYTE_FORMAT_SI: use 1000 instead of 1024
 	 * @return string|int|float         converted value or original value
+	 * @throws \Exception                1: no valid flag set
 	 */
 	public static function stringByteFormat($number, int $flags = 0)
 	{
@@ -120,6 +129,9 @@ class Byte
 		} else {
 			$si = false;
 		}
+		if ($flags != 0 && $flags != 4) {
+			throw new \Exception("Invalid flags parameter: $flags", 1);
+		}
 		// matches in regex
 		$matches = [];
 		// all valid units
@@ -134,7 +146,7 @@ class Byte
 			// remove all non valid characters from the number
 			$number = preg_replace('/[^0-9\.]/', '', $matches[2]);
 			// final clean up and convert to float
-			$number = (float)trim($number);
+			$number = (float)trim((string)$number);
 			// convert any mb/gb/etc to single m/b
 			$unit = preg_replace('/[^bkmgtpezy]/i', '', $matches[3]);
 			if ($unit) {

www/lib/CoreLibs/Convert/Colors.php

@@ -150,6 +150,9 @@ class Colors
 	{
 		// check that H is 0 to 359, 360 = 0
 		// and S and V are 0 to 1
+		if ($H == 360) {
+			$H = 0;
+		}
 		if ($H < 0 || $H > 359) {
 			return false;
 		}
@@ -287,6 +290,9 @@ class Colors
 		if (!is_numeric($hue)) {
 			return false;
 		}
+		if ($hue == 360) {
+			$hue = 0;
+		}
 		if ($hue < 0 || $hue > 359) {
 			return false;
 		}

www/lib/CoreLibs/Convert/Encoding.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * check if string is valid in target encoding
+ * convert string frmo one encdoing to another with auto detect flags
  */
 
 declare(strict_types=1);