Add PHPCS ignore for errors in class debug test file

Use the correct log->prAr call for debug array prints

.phan/config.php

@@ -56,6 +56,7 @@ return [
 		"./www/configs/config.db.php",
 		"./www/configs/config.host.php",
 		"./www/configs/config.path.php",
+		"./www/configs/config.other.php",
 		"./www/configs/config.master.php",
 		"./www/includes/admin_header.php",
 	],
@@ -83,7 +84,7 @@ return [
 	// to parse, but not analyze
 	"exclude_analysis_directory_list" => [
 		'www/vendor',
-		'www/lib/FileUpload',
+		// 'www/lib/FileUpload',
 		'www/lib/pChart',
 		'www/lib/pChart2.1.4',
 		'www/lib/Smarty',
@@ -108,6 +109,9 @@ return [
 		// ignore the old qq tests
 		'www/admin/qq_file_upload_front.php',
 		'www/admin/qq_file_upload_ajax.php',
+		// symlink ignore
+		'www/lib/smarty-3.1.30/SmartyBC.class.php',
+		'www/lib/htmlMimeMail-2.5.1/HtmlMimeMailCreate.php',
 	],
 
 	// what not to show as problem

4dev/database/ORDER

@@ -1,7 +1,10 @@
 # functions
-function/update_function.sql
+function/set_uid.sql
+function/set_generic.sql
 function/random_string.sql
+function/set_edit_generic.sql
 function/edit_set_access_uid.sql
+function/edit_log_partition_insert.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -19,6 +22,7 @@ table/edit_page_access.sql
 table/edit_page_content.sql
 table/edit_user.sql
 table/edit_log.sql
+table/edit_log_overflow.sql
 table/edit_access.sql
 table/edit_access_user.sql
 table/edit_access_data.sql
@@ -27,9 +31,9 @@ trigger/trg_edit_access_right.sql
 trigger/trg_edit_access.sql
 trigger/trg_edit_access_data.sql
 trigger/trg_edit_access_user.sql
-trigger/trg_edit_generic.sql
 trigger/trg_edit_group.sql
 trigger/trg_edit_language.sql
+trigger/trg_edit_log_overflow.sql
 trigger/trg_edit_log.sql
 trigger/trg_edit_page_access.sql
 trigger/trg_edit_page_content.sql
@@ -39,6 +43,5 @@ trigger/trg_edit_scheme.sql
 trigger/trg_edit_user.sql
 trigger/trg_edit_visible_group.sql
 trigger/trg_edit_menu_group.sql
-trigger/trg_set_edit_access_uid.sql
 # insert data
 data/edit_tables.sql

4dev/database/bin/create_default_trigger.sh

@@ -15,22 +15,20 @@ function_name="set_generic";
 #sql_path_prep=`echo $sql_path | sed -e "s/\///g"`;
 
 # goes for each file and strips headers and endings, and creates trigger name
-for name in $sql_path*;
-do
+for name in $sql_path*; do
 	echo "Wokring on $name";
 	# strip ending
 #	t_name=`echo $name | sed -e 's/.sql$//g' | sed -e "s/^$sql_path_prep//g" | sed -e 's/\///g'`;
 	t_name=`echo $name | sed -e 's/^.*\///g' | sed -e 's/.sql$//g'`;
 	# clean all beginnings
-	for prefix in $file_prefix;
-	do
+	for prefix in $file_prefix; do
 		prefix=$prefix"_";
 		t_name=`echo $t_name | sed -e "s/\$prefix//g"`;
 	done;
 
-# those tables don't need a trigger
-# edit_generic
-# generic
+	# those tables don't need a trigger
+	# edit_generic
+	# generic
 
 	# copy the trigger template to the target
 	trg_filename=$trigger_path$trigger_prefix"_"$t_name".sql";

4dev/database/bin/drop_data.sh

@@ -14,17 +14,14 @@ file_prefix="trg";
 trigger_prefix="trg";
 index_prefix="idx";
 
-for file in `cat ORDER`;
-do
-	if [ -f $file ];
-	then
+for file in `cat ORDER`; do
+	if [ -f $file ]; then
 		# write them into a var, so we can re order them in the other way
 		new_order=$file" "$new_order;
 	fi;
 done;
 
-for file in $new_order;
-do
+for file in $new_order; do
 	sqltype=`echo $file | egrep "table/"`;
 	trgtype=`echo $file | egrep "trigger/"`;
 	idxtype=`echo $file | egrep "index/"`;
@@ -32,43 +29,34 @@ do
 	datatype=`echo $file | egrep "data/"`;
 	# remove all around to get table name
 	t_file=`echo $file | sed -e 's/^.*\///g' | sed -e 's/.sql$//g'`;
-	for prefix in $file_prefix;
-	do
+	for prefix in $file_prefix; do
 		prefix=$prefix"_";
 		t_file=`echo $t_file | sed -e "s/\$prefix//g"`;
 	done;
 	# copy the trigger template to the target
 
-	for path in $schema;
-	do
-		if [ $sqltype ];
-		then
+	for path in $schemas; do
+		if [ $sqltype ]; then
 			echo "SQL "$path"."$t_file;
 			echo "DROP TABLE "$path"."$t_file" CASCADE;" | psql -U $user -h $host $db
 		fi;
-		if [ $trgtype ];
-		then
+		if [ $trgtype ]; then
 			trigger=$trigger_prefix"_"$t_file;
 			echo "TRG $trigger TBL "$path".$t_file";
 			echo "DROP TRIGGER "$path".$trigger ON "$t_file" CASCADE;" | psql -U $user -h $host $db
 		fi;
-		if [ $fcttype ];
-		then
+		if [ $fcttype ]; then
 			echo "FCT "$path"."$t_file;
 			echo "DROP FUNCTION "$path"."$t_file"();" | psql -U $user -h $host $db
 		fi;
-		if [ $idxtype ];
-		then
+		if [ $idxtype ]; then
 			index=$index_prefix"_"$t_file;
-	#		echo "IDX "$t_file;
-	#		echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
+			# echo "IDX "$t_file;
+			# echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
 		fi;
-		if [ $datatype ];
-		then
+		if [ $datatype ]; then
 			echo "DATA "$t_file;
-	#		echo "DROP FUNCTION "$t_file"();" | psql -U $user -h $host $db
+			# echo "DROP FUNCTION "$t_file"();" | psql -U $user -h $host $db
 		fi;
-
-	#	psql -U cms_user -h 192.168.12.14 -f $file CMSv2
 	done;
 done;

4dev/database/function/edit_log_partition_insert.sql

@@ -1,3 +1,10 @@
+-- AUTHOR: Clemens Schwaighofer
+-- DATE: 2018-07-17
+-- DESCRIPTION:
+-- partition the edit_log table by year
+-- auto creates table if missing, if failure writes to overflow table
+-- HISTORY:
+
 CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
@@ -6,18 +13,23 @@ DECLARE
 	end_date DATE;
 	timeformat TEXT := 'YYYY';
 	selector TEXT := 'year';
-	_interval INTERVAL;
+	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
-	-- get year and month from edit_log date so we can build the target edit_log table
-
-	-- move interval
-	_interval := '1 ' || selector;
-	-- current table name
-	table_name := 'edit_log_' || to_char(NEW.event_date, timeformat);
-
 	-- 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
@@ -25,17 +37,45 @@ BEGIN
 		WHEN undefined_table THEN
 			-- another block, so in case the creation fails here too
 			BEGIN
-				-- create new talbe here + all indexes
+				-- 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 'CREATE TABLE IF NOT EXISTS ' || quote_ident(table_name) || ' ( CHECK ( event_date >= ' || quote_literal(start_date) || ' AND event_date < ' || quote_literal(end_date) || ' ) ) INHERITS (edit_log)';
+				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 'ALTER TABLE ' || quote_ident(table_name) || ' ADD PRIMARY KEY (edit_log_id)';
+				EXECUTE format(REPLACE(
+					REPLACE(
+						command_create_primary_key,
+						'{TABLE_NAME}',
+						table_name
+					),
+					'{BASE_TABLE}',
+					base_table
+				));
 				-- FK constraints
-				EXECUTE 'ALTER TABLE ' || quote_ident(table_name) || ' ADD CONSTRAINT fk_' || quote_ident(table_name) || '_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE CASCADE';
+				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
 				-- generic trigger
-				EXECUTE 'CREATE TRIGGER trg_' || quote_ident(table_name) || ' BEFORE INSERT OR UPDATE ON ' || quote_ident(table_name) || ' FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+				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;
@@ -49,6 +89,57 @@ BEGIN
 			-- 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.*);

4dev/database/function/edit_set_group_uid.sql

@@ -0,0 +1,28 @@
+-- add uid add for edit_group table
+
+CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
+$$
+	DECLARE
+		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;
+	END;
+$$
+	LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -2,7 +2,7 @@
 
 CREATE OR REPLACE FUNCTION set_uid() RETURNS TRIGGER AS '
 	DECLARE
-		random_length INT = 12; -- 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);

4dev/database/function/update_function.sql

@@ -1,14 +1,16 @@
 -- adds the created or updated date tags
 
-CREATE OR REPLACE FUNCTION set_generic() 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;
-	END;
-' LANGUAGE 'plpgsql';
+-- OLD, DEPRECATED, use set_generic.sql
+
+-- CREATE OR REPLACE FUNCTION set_generic() 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;
+-- 	END;
+-- ' LANGUAGE 'plpgsql';

4dev/database/log/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

4dev/database/table/edit_access.sql

@@ -8,12 +8,12 @@
 -- 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,
-	uid	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	protected INT,
-	deleted	SMALLINT DEFAULT 0,
 	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_data.sql

@@ -9,8 +9,8 @@
 CREATE TABLE edit_access_data (
 	edit_access_data_id	SERIAL PRIMARY KEY,
 	edit_access_id INT NOT NULL,
-	name	VARCHAR,
-	value	VARCHAR,
+	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,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	name	VARCHAR,
+	value	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_user.sql

@@ -8,12 +8,12 @@
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
 	edit_access_user_id	SERIAL PRIMARY KEY,
-	edit_default	SMALLINT DEFAULT 0,
 	edit_access_id	INT NOT NULL,
-	edit_user_id	INT NOT NULL,
-	edit_access_right_id	INT NOT NULL,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
 	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,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_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_group.sql

@@ -8,12 +8,13 @@
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
 	edit_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
+	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,
-	edit_scheme_id INT,
-	edit_access_right_id INT NOT NULL,
-	additional_acl	JSONB,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	uid	VARCHAR,
+	name	VARCHAR,
+	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_language.sql

@@ -9,10 +9,10 @@
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
 	edit_language_id SERIAL PRIMARY KEY,
-	short_name VARCHAR,
-	long_name VARCHAR,
-	iso_name VARCHAR,
-	order_number INT,
 	enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0
+	lang_default SMALLINT NOT NULL DEFAULT 0,
+	long_name VARCHAR,
+	short_name VARCHAR,
+	iso_name VARCHAR,
+	order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log.sql

@@ -8,6 +8,8 @@
 -- 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,
@@ -26,7 +28,6 @@ CREATE TABLE edit_log (
 	action_value	VARCHAR,
 	action_type	VARCHAR,
 	action_error	VARCHAR,
-	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
 	user_agent	VARCHAR,
 	referer	VARCHAR,
 	script_name	VARCHAR,
@@ -36,6 +37,5 @@ CREATE TABLE edit_log (
 	http_accept	VARCHAR,
 	http_accept_charset	VARCHAR,
 	http_accept_encoding	VARCHAR,
-	session_id	VARCHAR,
-	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE
+	session_id	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log_overflow.sql

@@ -0,0 +1,12 @@
+-- AUTHOR: Clemens Schwaighofer
+-- DATE: 2020/1/28
+-- DESCRIPTION:
+-- edit log overflow table
+-- this is the overflow table for partition
+-- TABLE: edit_log_overflow
+-- HISTORY:
+
+-- DROP TABLE edit_log_overflow;
+CREATE TABLE IF NOT EXISTS edit_log_overflow () INHERITS (edit_log);
+ALTER TABLE edit_log_overflow ADD PRIMARY KEY (edit_log_id);
+ALTER TABLE edit_log_overflow ADD CONSTRAINT edit_log_overflow_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL;

4dev/database/table/edit_page.sql

@@ -9,6 +9,7 @@
 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,
@@ -17,5 +18,5 @@ CREATE TABLE edit_page (
 	popup	SMALLINT NOT NULL DEFAULT 0,
 	popup_x	SMALLINT,
 	popup_y SMALLINT,
-	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+	hostname	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_access.sql

@@ -8,13 +8,13 @@
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
 	edit_page_access_id	SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
 	edit_group_id	INT NOT NULL,
-	edit_page_id	INT NOT NULL,
-	edit_access_right_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,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_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

@@ -10,11 +10,11 @@
 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,
-	name	VARCHAR,
-	uid	VARCHAR UNIQUE,
-	order_number INT NOT NULL,
-	online	SMALLINT NOT NULL DEFAULT 0,
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_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

@@ -8,7 +8,7 @@
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
 	edit_page_id INT NOT NULL,
-	edit_menu_group_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

@@ -8,7 +8,7 @@
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
 	edit_page_id INT NOT NULL,
-	edit_visible_group_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

@@ -8,10 +8,10 @@
 -- 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,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	dynamic	SMALLINT NOT NULL DEFAULT 0,
-	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
+	dynamic	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_temp_files.sql

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

4dev/database/table/edit_user.sql

@@ -9,34 +9,40 @@
 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,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	deleted	SMALLINT NOT NULL DEFAULT 0,
 	username	VARCHAR UNIQUE,
 	password	VARCHAR,
 	first_name	VARCHAR,
 	last_name	VARCHAR,
 	first_name_furigana	VARCHAR,
 	last_name_furigana	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT NOT NULL DEFAULT 0,
 	debug	SMALLINT NOT NULL DEFAULT 0,
 	db_debug	SMALLINT NOT NULL DEFAULT 0,
 	email	VARCHAR,
 	protected SMALLINT NOT NULL DEFAULT 0,
 	admin	SMALLINT NOT NULL DEFAULT 0,
-	edit_language_id INT NOT NULL,
-	edit_group_id INT NOT NULL,
-	edit_scheme_id INT,
-	edit_access_right_id INT NOT NULL,
-	login_error_count	INT,
+	last_login	TIMESTAMP WITHOUT TIME ZONE,
+	login_error_count	INT DEFAULT 0,
 	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
 	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
 	strict	SMALLINT DEFAULT 0,
 	locked	SMALLINT DEFAULT 0,
 	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
 	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
-	additional_acl	JSONB, -- additional ACL as JSON string (can be set by other pages)
-	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	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
+	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+COMMENT ON COLUMN edit_user.password_reset_time IS 'When the password reset was requested. For reset page uid valid check';
+COMMENT ON COLUMN edit_user.password_reset_uid IS 'Password reset page uid';

4dev/database/table/edit_visible_group.sql

@@ -11,7 +11,3 @@ CREATE TABLE edit_visible_group (
 	name	VARCHAR,
 	flag	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
-
-DELETE FROM edit_visible_group;
-INSERT INTO edit_visible_group (name, flag) VALUES ('Main Menu', 'main');
-INSERT INTO edit_visible_group (name, flag) VALUES ('Data popup Menu', 'datapopup');

4dev/database/trigger/trg_edit_access.sql

@@ -1,9 +1,9 @@
-DROP TRIGGER trg_edit_access ON edit_access;
+DROP TRIGGER IF EXISTS trg_edit_access ON edit_access;
 CREATE TRIGGER trg_edit_access
 BEFORE INSERT OR UPDATE ON edit_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
 
-DROP TRIGGER trg_set_edit_access_uid ON edit_access;
+DROP TRIGGER IF EXISTS trg_set_edit_access_uid ON edit_access;
 CREATE TRIGGER trg_set_edit_access_uid
 BEFORE INSERT OR UPDATE ON edit_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid();

4dev/database/trigger/trg_edit_access_data.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_data ON edit_access_data;
+DROP TRIGGER IF EXISTS trg_edit_access_data ON edit_access_data;
 CREATE TRIGGER trg_edit_access_data
 BEFORE INSERT OR UPDATE ON edit_access_data
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_right.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_right ON edit_access_right;
+DROP TRIGGER IF EXISTS trg_edit_access_right ON edit_access_right;
 CREATE TRIGGER trg_edit_access_right
 BEFORE INSERT OR UPDATE ON edit_access_right
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_user.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_user ON edit_access_user;
+DROP TRIGGER IF EXISTS trg_edit_access_user ON edit_access_user;
 CREATE TRIGGER trg_edit_access_user
 BEFORE INSERT OR UPDATE ON edit_access_user
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_group.sql

@@ -1,4 +1,9 @@
-DROP TRIGGER trg_edit_group ON edit_group;
+DROP TRIGGER IF EXISTS trg_edit_group ON edit_group;
 CREATE TRIGGER trg_edit_group
 BEFORE INSERT OR UPDATE ON edit_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
+
+DROP TRIGGER IF EXISTS trg_set_edit_group_uid ON edit_group;
+CREATE TRIGGER trg_set_edit_group_uid
+BEFORE INSERT OR UPDATE ON edit_group
+FOR EACH ROW EXECUTE PROCEDURE set_edit_group_uid();

4dev/database/trigger/trg_edit_language.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_language ON edit_language;
+DROP TRIGGER IF EXISTS trg_edit_language ON edit_language;
 CREATE TRIGGER trg_edit_language
 BEFORE INSERT OR UPDATE ON edit_language
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_log.sql

@@ -1,9 +1,9 @@
-DROP TRIGGER trg_edit_log ON edit_log;
+DROP TRIGGER IF EXISTS trg_edit_log ON edit_log;
 CREATE TRIGGER trg_edit_log
 BEFORE INSERT OR UPDATE ON edit_log
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
 
-DROP TRIGGER trg_edit_log_insert_partition ON edit_log;
+DROP TRIGGER IF EXISTS trg_edit_log_insert_partition ON edit_log;
 CREATE TRIGGER trg_edit_log_insert_partition
 BEFORE INSERT OR UPDATE ON edit_log
 FOR EACH ROW EXECUTE PROCEDURE edit_log_insert_trigger();

4dev/database/trigger/trg_edit_log_overflow.sql

@@ -0,0 +1,4 @@
+DROP TRIGGER IF EXISTS trg_edit_log_overflow ON edit_log_overflow;
+CREATE TRIGGER trg_edit_log_overflow
+BEFORE INSERT OR UPDATE ON edit_log_overflow
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_menu_group.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_menu_group ON edit_menu_group;
+DROP TRIGGER IF EXISTS trg_edit_menu_group ON edit_menu_group;
 CREATE TRIGGER trg_edit_menu_group
 BEFORE INSERT OR UPDATE ON edit_menu_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page ON edit_page;
+DROP TRIGGER IF EXISTS trg_edit_page ON edit_page;
 CREATE TRIGGER trg_edit_page
 BEFORE INSERT OR UPDATE ON edit_page
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page_access.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page_access ON edit_page_access;
+DROP TRIGGER IF EXISTS trg_edit_page_access ON edit_page_access;
 CREATE TRIGGER trg_edit_page_access
 BEFORE INSERT OR UPDATE ON edit_page_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page_content.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page_content ON edit_page_content;
+DROP TRIGGER IF EXISTS trg_edit_page_content ON edit_page_content;
 CREATE TRIGGER trg_edit_page_content
 BEFORE INSERT OR UPDATE ON edit_page_content
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_query_string.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_query_string ON edit_query_string;
+DROP TRIGGER IF EXISTS trg_edit_query_string ON edit_query_string;
 CREATE TRIGGER trg_edit_query_string
 BEFORE INSERT OR UPDATE ON edit_query_string
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_scheme.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_scheme ON edit_scheme;
+DROP TRIGGER IF EXISTS trg_edit_scheme ON edit_scheme;
 CREATE TRIGGER trg_edit_scheme
 BEFORE INSERT OR UPDATE ON edit_scheme
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_user.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_user ON edit_user;
+DROP TRIGGER IF EXISTS trg_edit_user ON edit_user;
 CREATE TRIGGER trg_edit_user
 BEFORE INSERT OR UPDATE ON edit_user
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_visible_group.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_visible_group ON edit_visible_group;
+DROP TRIGGER IF EXISTS trg_edit_visible_group ON edit_visible_group;
 CREATE TRIGGER trg_edit_visible_group
 BEFORE INSERT OR UPDATE ON edit_visible_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/update/edit_tables_missing_columns.sql

@@ -8,7 +8,7 @@ ALTER TABLE edit_access ADD protected SMALLINT DEFAULT 0;
 ALTER TABLE edit_group ADD uid VARCHAR;
 ALTER TABLE edit_group ADD deleted SMALLINT DEFAULT 0;
 
-ALTER TABLE temp_files ADD folder varchar;
-ALTER TABLE edit_page ADD hostname varchar;
+ALTER TABLE temp_files ADD folder VARCHAR;
+ALTER TABLE edit_page ADD hostname VARCHAR;
 
 ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;

phpstan.neon

@@ -5,14 +5,17 @@ parameters:
 	level: 1
 	paths:
 		- %currentWorkingDirectory%/www
-	#bootstrap: %currentWorkingDirectory%/phpstan-bootstrap.php
-	#bootstrap: phpstan-bootstrap.php
-	autoload_directories:
-	autoload_files:
+	bootstrapFiles:
 		- %currentWorkingDirectory%/phpstan-bootstrap.php
+	scanDirectories:
+		- www/lib/Smarty
+	scanFiles:
+		- www/configs/config.php
 		- www/configs/config.master.php
 		- www/lib/autoloader.php
 		- www/vendor/autoload.php
+		- www/lib/Smarty/Autoloader.php
+		- www/lib/CoreLibs/Template/SmartyExtend.php
 	excludes_analyse:
 		# no check admin
 		- www/admin/qq_file_upload_front.php
@@ -40,10 +43,12 @@ parameters:
 		- www/tmp
 		- www/lib/pChart
 		- www/lib/pChart2.1.4
-		- www/lib/Smarty/
-		- www/lib/smarty-3.1.30/
+		- www/lib/Smarty
+		- www/lib/smarty-3.1.30
 		# ignore composer
 		- www/vendor
+		# ignore the smartyextend
+		- www/lib/CoreLibs/Template/SmartyExtend.php
 	# ignore errores with
 	# ignoreErrors:
 		#- 'error regex'

www/admin/class_test.array.php

@@ -0,0 +1,105 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-array';
+ob_end_flush();
+
+use CoreLibs\Combined\ArrayHandler;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+// $_array= new CoreLibs\Combined\ArrayHandler();
+// $array_class = 'CoreLibs\Combination\ArrayHandler';
+
+print "<html><head><title>TEST CLASS: ARRAY HANDLER</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// recursive array search
+$test_array = [
+	'foo' => 'bar',
+	'input' => [
+		'element_a' => [
+			'type' => 'text'
+		],
+		'element_b' => [
+			'type' => 'email'
+		],
+		'element_c' => [
+			'type' => 'email'
+		],
+	],
+];
+
+echo "SOURCE ARRAY: ".DgS::printAr($test_array)."<br>";
+// frist return
+echo "ARRAYSEARCHRECURSIVE(email, [array], type): ".DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array, 'type'))."<br>";
+echo "ARRAYSEARCHRECURSIVE(email, [array]['input'], type): ".DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array['input'], 'type'))."<br>";
+// all return
+echo "ARRAYSEARCHRECURSIVEALL(email, [array], type): ".Dgs::printAr((array)ArrayHandler::arraySearchRecursiveAll('email', $test_array, 'type'))."<br>";
+
+// simple search
+echo "ARRAYSEARCHSIMPLE([array], type, email): ".(string)ArrayHandler::arraySearchSimple($test_array, 'type', 'email')."<br>";
+
+$array_1 = [
+	'foo' => 'bar'
+];
+$array_2 = [
+	1, 2, 3
+];
+$array_3 = [
+	'alpha' => [
+		'beta' => 4
+	]
+];
+// recusrice merge
+print "ARRAYMERGERECURSIVE: ".DgS::printAr(ArrayHandler::arrayMergeRecursive($array_1, $array_2, $array_3))."<br>";
+// array difference
+$array_left = [
+	'same' => 'data',
+	'left' => 'Has L'
+];
+$array_right = [
+	'same' => 'data',
+	'right' => 'has R'
+];
+print "ARRAYDIFF: ".DgS::printAr(ArrayHandler::arrayDiff($array_left, $array_right))."<br>";
+// in array check
+print "INARRAYANY([1,3], [array]): ".DgS::printAr(ArrayHandler::inArrayAny([1, 3], $array_2))."<br>";
+// flatten array
+print "FLATTENARRAY: ".DgS::printAr(ArrayHandler::flattenArray($test_array))."<br>";
+print "FLATTENARRAYKEY: ".DgS::printAr(ArrayHandler::flattenArrayKey($test_array))."<br>";
+// flatten for key set
+print "ARRAYFLATFORKEY: ".DgS::printAr(ArrayHandler::arrayFlatForKey($test_array, 'type'))."<br>";
+
+// DEPRECATED
+// print "ARRAYMERGERECURSIVE: ".DgS::printAr($basic->arrayMergeRecursive($array_1, $array_2, $array_3))."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.byte.php

@@ -0,0 +1,95 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-byte';
+ob_end_flush();
+
+use CoreLibs\Convert\Byte;
+
+$basic = new CoreLibs\Basic();
+$byte_class = 'CoreLibs\Convert\Byte';
+
+print "<html><head><title>TEST CLASS: BYTE CONVERT</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// class
+$byte = 254779258;
+$string = '242.98 MB';
+// static
+print "S::BYTE TO: $byte: ".$byte_class::humanReadableByteFormat($byte)."<br>";
+print "S::BYTE FROM: $string: ".$byte_class::stringByteFormat($string)."<br>";
+
+// *** BYTES TEST ***
+$bytes = array(
+	-123123123,
+	999999, // KB-1
+	999999999, // MB-1
+	254779258, // MB-n
+	999999999999999, // TB-1
+	588795544887632, // TB-n
+	999999999999999999, // PB-1
+	9223372036854775807, // MAX INT
+	999999999999999999999, // EB-1
+);
+print "<b>BYTE FORMAT TESTS</b><br>";
+foreach ($bytes as $byte) {
+	print '<div style="display: flex; border-bottom: 1px dashed gray;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "(".number_format($byte)."/".$byte.") bytes :";
+	$_bytes = Byte::humanReadableByteFormat($byte);
+	print '</div><div style="width: 10%;">'.$_bytes;
+	print '</div><div style="width: 10%;">';
+	print Byte::stringByteFormat($_bytes);
+	print "</div>";
+	//
+	print "</div>";
+	//
+	print '<div style="display: flex; border-bottom: 1px dotted red;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "bytes [si]:";
+	$_bytes = Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI);
+	print '</div><div style="width: 10%;">'.$_bytes;
+	print '</div><div style="width: 10%;">';
+	print Byte::stringByteFormat($_bytes);
+	print "</div>";
+	//
+	print "</div>";
+}
+
+// DEPRECATED
+/* $byte = 254779258;
+$string = '242.98 MB';
+print "BYTE TO: $byte: ".$basic->humanReadableByteFormat($byte)."<br>";
+print "BYTE FROM: $string: ".$basic->stringByteFormat($string)."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.colors.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-colors';
+ob_end_flush();
+
+use CoreLibs\Convert\Colors;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+$color_class = 'CoreLibs\Convert\Colors';
+
+print "<html><head><title>TEST CLASS: COLORS</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// define a list of from to color sets for conversion test
+
+// A(out of bounds)
+print "C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: ".CoreLibs\Convert\Colors::rgb2hex(-1, -1, -1)."<br>";
+print "\$C::S/COLOR invalid rgb->hex (gary 125): -1, -1, -1: ".$color_class::rgb2hex(-1, -1, -1)."<br>";
+// B(valid)
+$rgb = [10, 20, 30];
+$hex = '#0a141e';
+$hsb = [210, 67, 12];
+$hsl = [210, 50, 7.8];
+print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: ".Colors::rgb2hex($rgb[0], $rgb[1], $rgb[2])."<br>";
+print "S::COLOR hex->rgb: $hex: ".DgS::printAr(Colors::hex2rgb($hex))."<br>";
+print "C::S/COLOR rgb->hext: $hex: ".DgS::printAr(CoreLibs\Convert\Colors::hex2rgb($hex))."<br>";
+// C(to hsb/hsl)
+print "S::COLOR rgb->hsb: $rgb[0], $rgb[1], $rgb[2]: ".DgS::printAr(Colors::rgb2hsb($rgb[0], $rgb[1], $rgb[2]))."<br>";
+print "S::COLOR rgb->hsl: $rgb[0], $rgb[1], $rgb[2]: ".DgS::printAr(Colors::rgb2hsl($rgb[0], $rgb[1], $rgb[2]))."<br>";
+// D(from hsb/hsl) Note that param 2 + 3 is always 0-100 divided
+print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: ".DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2]))."<br>";
+print "S::COLOR hsl->rgb: $hsl[0], $hsl[1], $hsl[2]: ".DgS::printAr(Colors::hsl2rgb($hsl[0], $hsl[1], $hsl[2]))."<br>";
+
+// TODO: run compare check input must match output
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.datetime.php

@@ -0,0 +1,149 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-datetime';
+ob_end_flush();
+
+use CoreLibs\Combined\DateTime;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+$datetime_class = 'CoreLibs\Combination\DateTime';
+
+print "<html><head><title>TEST CLASS: DATE/TIME</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// class
+$timestamp = 1622788315.123456;
+// static
+print "S::DATESTRINGFORMAT(sm:0): $timestamp: ".$datetime_class::dateStringFormat($timestamp)."<br>";
+
+// time string thest
+$timestamp = 5887998.33445;
+$time_string = DateTime::timeStringFormat($timestamp);
+print "PLANE TIME STRING: ".$timestamp."<br>";
+print "TIME STRING TEST: ".$time_string."<br>";
+print "REVERSE TIME STRING: ".DateTime::stringToTime($time_string)."<br>";
+if (round($timestamp, 4) == DateTime::stringToTime($time_string)) {
+	print "REVERSE TIME STRING MATCH<br>";
+} else {
+	print "REVERSE TRIME STRING DO NOT MATCH<br>";
+}
+print "ZERO TIME STRING: ".DateTime::timeStringFormat(0, true)."<br>";
+print "ZERO TIME STRING: ".DateTime::timeStringFormat(0.0, true)."<br>";
+print "ZERO TIME STRING: ".DateTime::timeStringFormat(1.005, true)."<br>";
+
+$timestamps = [
+	1622788315.123456,
+	-1622788315.456789
+];
+foreach ($timestamps as $timestamp) {
+	print "DATESTRINGFORMAT(sm:0): $timestamp: ".DateTime::dateStringFormat($timestamp)."<br>";
+	print "DATESTRINGFORMAT(sm:1): $timestamp: ".DateTime::dateStringFormat($timestamp, true)."<br>";
+}
+$intervals = [
+	788315.123456,
+	-123.456
+];
+foreach ($intervals as $interval) {
+	print "TIMESTRINGFORMAT(sm:0): $interval: ".DateTime::timeStringFormat($interval, false)."<br>";
+	$reverse_interval = DateTime::timeStringFormat($interval);
+	print "TIMESTRINGFORMAT(sm:1): $interval: ".$reverse_interval."<br>";
+	print "STRINGTOTIME: $reverse_interval: ".DateTime::stringToTime($reverse_interval)."<br>";
+}
+$check_dates = [
+	'2021-05-01',
+	'2021-05-40'
+];
+foreach ($check_dates as $check_date) {
+	print "CHECKDATE: $check_date: ".(string)DateTime::checkDate($check_date)."<br>";
+}
+$check_datetimes = [
+	'2021-05-01',
+	'2021-05-40',
+	'2021-05-01 12:13:14',
+	'2021-05-40 12:13:14',
+	'2021-05-01 25:13:14',
+];
+foreach ($check_datetimes as $check_datetime) {
+	print "CHECKDATETIME: $check_datetime: ".(string)DateTime::checkDateTime($check_datetime)."<br>";
+}
+$compare_dates = [
+	[ '2021-05-01', '2021-05-02', ],
+	[ '2021-05-02', '2021-05-01', ],
+	[ '2021-05-02', '2021-05-02', ],
+	[ '2017/1/5', '2017-01-05', ],
+];
+// compareDate
+foreach ($compare_dates as $compare_date) {
+	print "COMPAREDATE: $compare_date[0] = $compare_date[1]: ".(string)DateTime::compareDate($compare_date[0], $compare_date[1])."<br>";
+}
+$compare_datetimes = [
+	[ '2021-05-01', '2021-05-02', ],
+	[ '2021-05-02', '2021-05-01', ],
+	[ '2021-05-02', '2021-05-02', ],
+	[ '2021-05-01 10:00:00', '2021-05-01 11:00:00', ],
+	[ '2021-05-01 11:00:00', '2021-05-01 10:00:00', ],
+	[ '2021-05-01 10:00:00', '2021-05-01 10:00:00', ],
+];
+foreach ($compare_datetimes as $compare_datetime) {
+	print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: ".(string)DateTime::compareDateTime($compare_datetime[0], $compare_datetime[1])."<br>";
+}
+$compare_dates = [
+	[ '2021-05-01', '2021-05-10', ],
+	[ '2021-05-10', '2021-05-01', ],
+	[ '2021-05-02', '2021-05-01', ],
+	[ '2021-05-02', '2021-05-02', ],
+];
+foreach ($compare_dates as $compare_date) {
+	print "CALCDAYSINTERVAL: $compare_date[0] = $compare_date[1]: ".DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1]))."<br>";
+	print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: ".DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true))."<br>";
+}
+
+// DEPRECATED
+/* $timestamp = 1622788315.123456;
+print "C->DATESTRINGFORMAT(sm:0): $timestamp: ".$basic->dateStringFormat($timestamp)."<br>";
+$interval = 788315.123456;
+$reverse_interval = $basic->timeStringFormat($interval);
+print "TIMESTRINGFORMAT(sm:1): $interval: ".$reverse_interval."<br>";
+print "STRINGTOTIME: $reverse_interval: ".$basic->stringToTime($reverse_interval)."<br>";
+$check_date = '2021-05-01';
+print "CHECKDATE: $check_date: ".(string)$basic->checkDate($check_date)."<br>";
+$check_datetime = '2021-05-01 12:13:14';
+print "CHECKDATETIME: $check_datetime: ".(string)$basic->checkDateTime($check_datetime)."<br>";
+$compare_date = ['2021-05-01', '2021-05-02'];
+print "COMPAREDATE: $compare_date[0] = $compare_date[1]: ".(string)$basic->compareDate($compare_date[0], $compare_date[1])."<br>";
+$compare_datetime = ['2021-05-01 10:00:00', '2021-05-01 11:00:00'];
+print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: ".(string)$basic->compareDateTime($compare_datetime[0], $compare_datetime[1])."<br>";
+$compare_date = ['2021-05-01', '2021-05-10'];
+print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: ".DgS::printAr($basic->calcDaysInterval($compare_date[0], $compare_date[1], true))."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.db.php

@@ -0,0 +1,209 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;
+
+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', true);
+// sample config
+require 'config.php';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-db';
+ob_end_flush();
+
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
+
+print "<html><head><title>TEST CLASS: DB</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+print "DBINFO: ".$basic->dbInfo()."<br>";
+echo "DB_CONFIG_SET constant: <pre>".print_r(DB_CONFIG, true)."</pre><br>";
+
+// DB client encoding
+print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
+
+while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
+	print "TIME: ".$res['time']."<br>";
+}
+print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
+while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
+	print "[CACHED] TIME: ".$res['time']."<br>";
+}
+
+print "<pre>";
+$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+print "DIRECT INSERT STATUS: $status | "
+	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
+	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
+	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+
+// should throw deprecated error
+// $basic->getReturningExt();
+print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->dbGetInsertPK()), true)."<br>";
+$basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
+print "PREPARE INSERT STATUS: $status | "
+	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
+	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
+	."RETURNING RETURN: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+
+print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->dbGetInsertPK()), true)."<br>";
+// returning test with multiple entries
+//	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
+$status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+print "DIRECT MULTIPLE INSERT STATUS: $status | "
+	."PRIMARY KEYS: ".print_r($basic->dbGetInsertPK(), true)." | "
+	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
+	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+
+// no returning, but not needed ;
+$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+print "DIRECT INSERT STATUS: $status | "
+	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
+	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
+	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+
+// UPDATE WITH RETURNING
+$status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
+print "UPDATE STATUS: $status | "
+	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
+	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+print "</pre>";
+
+// REEAD PREPARE
+if ($basic->dbPrepare('sel_foo', "SELECT foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time FROM foo ORDER BY foo_id DESC LIMIT 5") === false) {
+	print "Error in sel_foo prepare<br>";
+} else {
+	$max_rows = 6;
+	// do not run this in dbFetchArray directly as
+	// dbFetchArray(dbExecute(...))
+	// this will end in an endless loop
+	$cursor = $basic->dbExecute('sel_foo', []);
+	$i = 1;
+	while (($res = $basic->dbFetchArray($cursor, true)) !== false) {
+		print "DB PREP EXEC FETCH ARR: ".$i.": <pre>".print_r($res, true)."</pre><br>";
+		$i ++;
+	}
+}
+
+
+# db write class test
+$table = 'foo';
+print "TABLE META DATA: ".DgS::printAr($basic->dbShowTableMetaData($table))."<br>";
+$primary_key = ''; # unset
+$db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
+//	$db_write_table = array('test');
+$object_fields_not_touch = array();
+$object_fields_not_update = array();
+$data = array('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array('test' => 'BOOL TEST UNSET '.time());
+$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+
+// return Array Test
+$query = "SELECT type, sdate, integer FROM foobar";
+$data = $basic->dbReturnArray($query, true);
+print "Full foobar list: <br><pre>".print_r($data, true)."</pre><br>";
+
+# async test queries
+/*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
+echo "WAITING FOR ASYNC: ";
+$chars = array('|', '/', '-', '\\');
+while (($ret = $basic->dbCheckAsync()) === true)
+{
+	if ((list($_, $char) = each($chars)) === FALSE)
+	{
+		reset($chars);
+		list($_, $char) = each($chars);
+	}
+	print $char;
+	sleep(1);
+	flush();
+}
+print "<br>END STATUS: ".$ret."<br>";
+//	while ($res = $basic->dbFetchArray($ret))
+while ($res = $basic->dbFetchArray())
+{
+	echo "RES: ".$res['test']."<br>";
+}
+# test async insert
+$basic->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+echo "WAITING FOR ASYNC INSERT: ";
+while (($ret = $basic->dbCheckAsync()) === true)
+{
+	print ".";
+	sleep(1);
+	flush();
+}
+print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
+print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>"; */
+
+$to_db_version = '9.1.9';
+print "VERSION DB: ".$basic->dbVersion()."<br>";
+print "DB Version smaller $to_db_version: ".$basic->dbCompareVersion('<'.$to_db_version)."<br>";
+print "DB Version smaller than $to_db_version: ".$basic->dbCompareVersion('<='.$to_db_version)."<br>";
+print "DB Version equal $to_db_version: ".$basic->dbCompareVersion('='.$to_db_version)."<br>";
+print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$to_db_version)."<br>";
+print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
+
+/*	$q = "SELECT FOO FRO BAR";
+// $q = "Select * from foo";
+$foo = $basic->dbExecAsync($q);
+print "[ERR] Query: ".$q."<br>";
+print "[ERR] RESOURCE: $foo<br>";
+while (($ret = $basic->dbCheckAsync()) === true)
+{
+	print "[ERR]: $ret<br>";
+	sleep(5);
+} */
+
+// search path check
+$q = "SHOW search_path";
+$cursor = $basic->dbExec($q);
+$data = $basic->dbFetchArray($cursor)['search_path'];
+print "RETURN DATA FOR search_path: ".$data."<br>";
+//	print "RETURN DATA FOR search_path: ".DgS::printAr($data)."<br>";
+// insert something into test.schema_test and see if we get the PK back
+$status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
+print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
+
+print "<b>NULL TEST DB READ</b><br>";
+$q = "SELECT uid, null_varchar, null_int FROM test_null_data WHERE uid = 'A'";
+$res = $basic->dbReturnRow($q);
+var_dump($res);
+print "RES: ".DgS::printAr($res)."<br>";
+print "ISSET: ".isset($res['null_varchar'])."<br>";
+print "EMPTY: ".empty($res['null_varchar'])."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.debug.php

@@ -0,0 +1,138 @@
+<?php // phpcs:ignore warning
+declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+// all the settings are overruled by config
+$DEBUG_ALL_OVERRIDE = true; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = true;
+$PRINT_ALL = false;
+$ECHO_ALL = true;
+$DB_DEBUG = true;
+
+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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-debug';
+ob_end_flush();
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+
+use CoreLibs\Debug\Support as DebugSupport;
+use CoreLibs\Debug\FileWriter;
+
+$basic = new CoreLibs\Basic();
+$debug = new CoreLibs\Debug\Logging();
+$debug_support_class = 'CoreLibs\Debug\Support';
+$debug_logging_class = 'CoreLibs\Debug\Logging';
+
+print "<html><head><title>TEST CLASS: DEBUG</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+function test()
+{
+	return DebugSupport::getCallerMethod(1);
+}
+
+print "S::GETCALLERMETHOD: ".DebugSupport::getCallerMethod(0)."<br>";
+print "S::GETCALLERMETHOD: ".test()."<br>";
+print "S::PRINTAR: ".DebugSupport::printAr(['Foo', 'Bar'])."<br>";
+print "V-S::PRINTAR: ".$debug_support_class::printAr(['Foo', 'Bar'])."<br>";
+
+// debug
+print "C->DEBUG: ".$debug->debug('CLASS-TEST-DEBUG', 'Class Test Debug')."<br>";
+print "C->DEBUG(html): ".$debug->debug('CLASS-TEST-DEBUG', 'HTML TAG<br><b>BOLD</b>')."<br>";
+print "C->DEBUG(html,strip): ".$debug->debug('CLASS-TEST-DEBUG', 'HTML TAG<br><b>BOLD</b>', true)."<br>";
+print "C->PRINTERRORMSG: <br>".$debug->printErrorMsg()."<br>";
+echo "<b>CLASS DEBUG CALL</b><br>";
+
+// @codingStandardsIgnoreLine
+class TestL
+{
+	public $log;
+	public function __construct()
+	{
+		$this->log = new CoreLibs\Debug\Logging();
+	}
+	public function test(string $ts = null)
+	{
+		print "* GETCALLERCLASS(INSIDE CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."<br>";
+		$this->log->debug('TESTL', 'Logging in class testL'.($ts !== null ? ': '.$ts : ''));
+		$this->log->debug('TESTL', 'Some other message');
+		return true;
+	}
+}
+// @codingStandardsIgnoreLine
+class TestR extends TestL
+{
+	public $foo;
+	public function __construct()
+	{
+		parent::__construct();
+	}
+	public function subTest()
+	{
+		print "** GETCALLERCLASS(INSIDE EXTND CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."<br>";
+		$this->log->debug('TESTR', 'Logging in class testR (extends testL)');
+		$this->test('TESTR INSIDE');
+		$this->log->debug('TESTR', 'Array: '.$this->log->prAr(['a', 'b']).', Other: '.$this->log->prAr(['a', 'b']));
+		return true;
+	}
+}
+$tl = new TestL();
+print "CLASS: LOG ECHO: ".(string)$tl->log->getLogLevelAll('echo')."<br>";
+print "CLASS: DEBUG: ".$tl->test()."<br>";
+print "CLASS: PRINTERRORMSG: <br>".$tl->log->printErrorMsg()."<br>";
+$tr = new TestR();
+print "CLASS: LOG ECHO: ".(string)$tr->log->getLogLevelAll('echo')."<br>";
+print "CLASS EXTEND: DEBUG/tl: ".$tr->test('TESTR OUTSIDE')."<br>";
+print "CLASS EXTEND: DEBUG/tr: ".$tr->subTest()."<br>";
+print "CLASS EXTEND: PRINTERRORMSG: <br>".$tr->log->printErrorMsg()."<br>";
+
+// test attaching a logger from outside
+// @codingStandardsIgnoreLine
+class AttachOutside
+{
+	public $log;
+	public function __construct(object $logger_class)
+	{
+		$this->log = $logger_class;
+	}
+	public function test()
+	{
+		$this->log->debug('ATTACHOUTSIDE', 'A test');
+		return get_class($this);
+	}
+}
+$ao = new AttachOutside($basic->log);
+print "AO-CLASS: DEBUG: ".$ao->test()."<br>";
+
+print "GETCALLERCLASS(NON CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."<br>";
+
+// fdebug
+print "S::FSETFILENAME: ".FileWriter::fsetFilename('class_test_debug_file.log')."<br>";
+print "S::FDEBUG: ".FileWriter::fdebug('CLASS TEST DEBUG FILE: '.date('Y-m-d H:i:s'))."<br>";
+
+// error message
+// future DEPRECATED
+// $basic->debug('BASIC CLASS', 'Debug test');
+$basic->log->debug('BASIC CLASS', 'Debug test');
+print "BASIC PRINTERRORMSG:<br>".$basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.email.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-email';
+ob_end_flush();
+
+use CoreLibs\Check\Email;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+
+print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// regex get
+print "S::GETEMAILREGEX(0): ".Email::getEmailRegex(0)."<br>";
+print "S::GETEMAILREGEX(2): ".Email::getEmailRegex(2)."<br>";
+print "S::GETEMAILREGEX(7): ".Email::getEmailRegex(7)."<br>";
+print "S::GETEMAILREGEX(8 invalid): ".Email::getEmailRegex(8)."<br>";
+print "S::GETEMAILREGEXCHECK: ".DgS::printAr(Email::getEmailRegexCheck())."<br>";
+
+$email = [
+	'foo@bar.org',
+	'foo@i.softbank.ne.jp'
+];
+foreach ($email as $s_email) {
+	print "S::EMAIL: $s_email: ".Email::getEmailType($s_email)."<br>";
+	print "S::EMAIL SHORT: $s_email: ".Email::getEmailType($s_email, true)."<br>";
+}
+// DEPRECATED
+/* foreach ($email as $s_email) {
+	print "D/S-EMAIL: $s_email: ".$basic->getEmailType($s_email)."<br>";
+	print "D/S-EMAIL SHORT: $s_email: ".$basic->getEmailType($s_email, true)."<br>";
+} */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.encoding.php

@@ -0,0 +1,94 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-encoding';
+ob_end_flush();
+
+use CoreLibs\Language\Encoding;
+
+$basic = new CoreLibs\Basic();
+$_encoding = new CoreLibs\Language\Encoding();
+$encoding_class = 'CoreLibs\Language\Encoding';
+
+print "<html><head><title>TEST CLASS: ENCODING</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// print "Valid encoding: ".$basic->printAr(mb_list_encodings())."<br>";
+
+$mime_encodes = [
+	['Simple string UTF8', 'UTF-8'],
+	['Simple string ISO-2022-JP-MS', 'ISO-2022-JP-MS'],
+	['日本語ながい', 'UTF-8'],
+	['日本語ながい', 'ISO-2022-JP-MS'],
+	['日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい', 'ISO-2022-JP-MS'],
+];
+foreach ($mime_encodes as $mime_encode) {
+	print "__MBMIMEENCODE: $mime_encode[0]: ".Encoding::__mbMimeEncode($mime_encode[0], $mime_encode[1])."<br>";
+}
+
+$enc_strings = [
+	'Normal Text',
+	'日本語',
+	// unworkable
+	''
+];
+// class
+$_encoding->setErrorChar('∴');
+foreach ($enc_strings as $_string) {
+	$string = $_encoding->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+	print "ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."<br>";
+	print "CONV ENCODING: $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP')."<br>";
+	print "CONV ENCODING (s): $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8')."<br>";
+	print "CONV ENCODING (s,a-false): $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false)."<br>";
+}
+print "ERROR CHAR: ".$_encoding->getErrorChar()."<br>";
+// static
+$encoding_class::setErrorChar('∴');
+foreach ($enc_strings as $_string) {
+	$string = $encoding_class::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+	print "S::ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."<br>";
+	print "S::CONV ENCODING: $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP')."<br>";
+	print "S::CONV ENCODING (s): $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8')."<br>";
+	print "S::CONV ENCODING (s,a-false): $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false)."<br>";
+}
+print "S::ERROR CHAR: ".$encoding_class::getErrorChar()."<br>";
+// static use
+$_string = $enc_strings[1];
+$string = Encoding::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+print "S::ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."<br>";
+
+// DEPRECATED
+/* $string = $basic->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+print "ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."<br>";
+print "CONV ENCODING: $_string: ".$basic->convertEncoding($_string, 'ISO-2022-JP')."<br>";
+print "D/__MBMIMEENCODE: ".$basic->__mbMimeEncode('Some Text', 'UTF-8')."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.file.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-datetime';
+ob_end_flush();
+
+use CoreLibs\Check\File;
+
+$basic = new CoreLibs\Basic();
+
+print "<html><head><title>TEST CLASS: FILE</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$file = '/some/path/to/some/file.txt';
+print "GETFILENAMEENDING: $file: ".File::getFilenameEnding($file)."<br>";
+$file = getcwd().DIRECTORY_SEPARATOR.'class_test.file.php';
+print "GETLINESFROMFILE: $file: ".File::getLinesFromFile($file)."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.hash.php

@@ -0,0 +1,62 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-hash';
+ob_end_flush();
+
+use CoreLibs\Create\Hash;
+
+$basic = new CoreLibs\Basic();
+$hash_class = 'CoreLibs\Create\Hash';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: HASH</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$to_crc = 'Some text block';
+// static
+print "S::__CRC32B: $to_crc: ".$hash_class::__crc32b($to_crc)."<br>";
+print "S::__SHA1SHORT(off): $to_crc: ".$hash_class::__sha1short($to_crc)."<br>";
+print "S::__SHA1SHORT(on): $to_crc: ".$hash_class::__sha1short($to_crc, true)."<br>";
+print "S::__hash(d): $to_crc: ".$hash_class::__hash($to_crc)."<br>";
+foreach (['adler32', 'fnv132', 'fnv1a32', 'joaat'] as $__hash_c) {
+	print "S::__hash($__hash_c): $to_crc: ".$hash_class::__hash($to_crc, $__hash_c)."<br>";
+}
+// static use
+print "U-S::__CRC32B: $to_crc: ".Hash::__crc32b($to_crc)."<br>";
+
+// DEPRECATED
+/* print "D/__CRC32B: $to_crc: ".$basic->__crc32b($to_crc)."<br>";
+print "D/__SHA1SHORT(off): $to_crc: ".$basic->__sha1short($to_crc)."<br>";
+print "D/__hash(d): $to_crc: ".$basic->__hash($to_crc)."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.html.php

@@ -0,0 +1,102 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-html';
+ob_end_flush();
+
+use CoreLibs\Convert\Html;
+use CoreLibs\Output\Form\Elements;
+
+$basic = new CoreLibs\Basic();
+$_html = new CoreLibs\Convert\Html();
+$_elements = new CoreLibs\Output\Form\Elements();
+$html_class = 'CoreLibs\Convert\Html';
+$elements_class = 'CoreLibs\Output\Form\Elements';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$string = "Something < = > Other <br> Next line";
+print "HTMLENT: ".Html::htmlent($string).": ".$_html->htmlent($string)."<br>";
+print "REMOVELB: ".Html::htmlent($string).": ".$_html->removeLB($string)."<br>";
+$date_str = [2021, 5, 1, 11, 10];
+print "PRINTDATETIME: ".$_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."<br>";
+// STATIC
+$string = "Something < = > Other <br> Next line";
+print "S::HTMLENT: ".Html::htmlent($string).": ".$html_class::htmlent($string)."<br>";
+print "S::REMOVELB: ".Html::htmlent($string).": ".$html_class::removeLB($string)."<br>";
+$date_str = [2021, 5, 1, 11, 10];
+print "S::PRINTDATETIME: ".$elements_class::printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."<br>";
+
+// STATIC use
+echo "U-S::HTML ENT INT: ".Html::htmlent(5)."<br>";
+echo "U-S::HTML ENT STRING: ".Html::htmlent('5<<>')."<br>";
+echo "U-S::HTML ENT NULL: ".Html::htmlent(null)."<br>";
+
+// check convert
+$checked_list = [
+	['foo', 'foo'],
+	['foo', 'bar'],
+	['foo', ['foo', 'bar']],
+	['foo', ['bar']],
+];
+foreach ($checked_list as $check) {
+	print "CHECKED(0): $check[0]: ".Html::checked($check[1], $check[0])."<br>";
+	print "CHECKED(1): $check[0]: ".Html::checked($check[1], $check[0], 1)."<br>";
+}
+
+// magic link creation test
+$magic_links = [
+	'mailto:user@bubu.at',
+	'user@bubu.at',
+	'user@bubu.at|Send me email|',
+	'http://www.somelink.com/?with=1234',
+	'http://www.somelink.com/?with=1234|Some Title|',
+	'http://www.somelink.com/?with=1234 <br>Some Title',
+];
+foreach ($magic_links as $magic_link) {
+	print "MAGICLINK: ".Html::htmlent($magic_link).": ".Html::htmlent(Elements::magicLinks($magic_link))."<br>";
+}
+
+// DEPREACTED
+/* $string = "Deprecated Something < = > Other <br> Deprecated Next line";
+print "D/HTMLENT: $string: ".$basic->htmlent($string)."<br>";
+print "D/REMOVELB: $string: ".$basic->removeLB($string)."<br>";
+$date_str = [2021, 5, 1, 11, 10];
+print "D/PRINTDATETIME: ".$basic->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."<br>";
+$magic_link = 'http://www.somelink.com/?with=1234|Some Title|';
+print "D/MAGICLINK: ".Html::htmlent($basic->magicLinks($magic_link))."<Br>";
+*/
+
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.image.php

@@ -0,0 +1,106 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-image';
+ob_end_flush();
+
+use CoreLibs\Output\Image;
+
+$basic = new CoreLibs\Basic();
+$_image = new CoreLibs\Output\Image();
+$image_class = 'CoreLibs\Output\Image';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: IMAGE</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// thumb sizes
+$thumb_width = 250;
+$thumb_height = 300;
+// class
+$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_square.jpg';
+// rotate image first
+$_image->correctImageOrientation($image);
+// thumbnail tests
+echo "<div>CLASS->CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width<br><img src=".$_image->createThumbnailSimple($image, $thumb_width)."></div>";
+// static
+$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture.jpg';
+// rotate image first
+$image_class::correctImageOrientation($image);
+// thumbnail tests
+echo "<div>S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width<br><img src=".$image_class::createThumbnailSimple($image, $thumb_width)."></div>";
+
+echo "U-STATIC VARIOUS:<br>";
+// image thumbnail
+$images = array(
+	// height bigger
+	// 'no_picture.jpg',
+	// 'no_picture.png',
+	// width bigger
+	// 'no_picture_width_bigger.jpg',
+	// 'no_picture_width_bigger.png',
+	// square
+	// 'no_picture_square.jpg',
+	// 'no_picture_square.png',
+	// other sample images
+	// '5c501af48da6c.jpg',
+	// Apple HEIC files
+	// 'img_2145.heic',
+	// Photoshop
+	'photoshop_test.psd',
+);
+// return mime type ala mimetype
+$finfo = new finfo(FILEINFO_MIME_TYPE);
+foreach ($images as $image) {
+	$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.$image;
+	list ($height, $width, $img_type) = getimagesize($image);
+	echo "<div><b>IMAGE INFO</b>: ".$height."x".$width.", TYPE: ".$img_type." [".$finfo->file($image)."]</div>";
+	// rotate image first
+	Image::correctImageOrientation($image);
+	// thumbnail tests
+	echo "<div>".basename($image).": WIDTH: $thumb_width<br><img src=".Image::createThumbnailSimple($image, $thumb_width)."></div>";
+	echo "<div>".basename($image).": HEIGHT: $thumb_height<br><img src=".Image::createThumbnailSimple($image, 0, $thumb_height)."></div>";
+	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height<br><img src=".Image::createThumbnailSimple($image, $thumb_width, $thumb_height)."></div>";
+	// test with dummy
+	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)<br><img src=".Image::createThumbnailSimple($image, $thumb_width, $thumb_height, null, true, false)."></div>";
+	echo "<hr>";
+}
+
+// DEPRECATED
+// static
+/* $image = BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture.jpg';
+// rotate image first
+$basic->correctImageOrientation($image);
+// thumbnail tests
+echo "<div>S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width<br><img src=".$basic->createThumbnailSimple($image, $thumb_width)."></div>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.json.php

@@ -0,0 +1,73 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-json';
+ob_end_flush();
+
+use CoreLibs\Check\Jason;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+$json_class = 'CoreLibs\Check\Jason';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: JSON</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$json = '{"foo": "bar"}';
+$output = Jason::jsonConvertToArray($json);
+print "S::JSON: $json: ".DgS::printAr($output)."<br>";
+print "S::JSON ERROR: ".Jason::jsonGetLastError().": ".Jason::jsonGetLastError(true)."<br>";
+
+$json = '["f: {b"""ar}]';
+$output = Jason::jsonConvertToArray($json);
+print "S::E-JSON: $json: ".DgS::printAr($output)."<br>";
+print "S::E-JSON ERROR: ".Jason::jsonGetLastError().": ".Jason::jsonGetLastError(true)."<br>";
+
+// direct
+$json = '{"direct": "static function call"}';
+$output = $json_class::jsonConvertToArray($json);
+print "J/S::JSON: $json: ".DgS::printAr($output)."<br>";
+print "J/S::JSON ERROR: ".$json_class::jsonGetLastError().": ".$json_class::jsonGetLastError(true)."<br>";
+
+$json = '["f: {b"""ar}]';
+$output = $json_class::jsonConvertToArray($json);
+print "J/S::E-JSON: $json: ".DgS::printAr($output)."<br>";
+print "J/S::E-JSON ERROR: ".$json_class::jsonGetLastError().": ".$json_class::jsonGetLastError(true)."<br>";
+
+// DEPRECATE TEST
+/* $json = '["f: {b"""ar}]';
+$output = $basic->jsonConvertToArray($json);
+print "E-JSON: $json: ".DgS::printAr($output)."<br>";
+print "E-JSON ERROR: ".$basic->jsonGetLastError().": ".$basic->jsonGetLastError(true)."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.math.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-math';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$_math = new CoreLibs\Convert\Math();
+$math_class = 'CoreLibs\Convert\Math';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: MATH</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+print "FCEIL: ".$_math->fceil(5.1234567890, 5)."<br>";
+print "FLOORP: ".$_math->floorp(5123456, -3)."<br>";
+print "INITNUMERIC: ".$_math->initNumeric('123')."<br>";
+
+print "S-FCEIL: ".$math_class::fceil(5.1234567890, 5)."<br>";
+print "S-FLOORP: ".$math_class::floorp(5123456, -3)."<br>";
+print "S-INITNUMERIC: ".$math_class::initNumeric('123')."<br>";
+
+// DEPRECATED
+/* print "FCEIL: ".$basic->fceil(5.1234567890, 5)."<br>";
+print "FLOORP: ".$basic->floorp(5123456, -3)."<br>";
+print "INITNUMERIC: ".$basic->initNumeric('123')."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.mime.php

@@ -0,0 +1,65 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-mime';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$_mime = new CoreLibs\Convert\MimeAppName();
+
+print "<html><head><title>TEST CLASS: MIME</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$mime = 'application/illustrator';
+print "MIME $mime: ".$_mime->mimeGetAppName($mime)."<br>";
+$mime = 'fake/mime';
+$_mime->mimeSetAppName($mime, 'This is a fake mime');
+print "MIME $mime: ".$_mime->mimeGetAppName($mime)."<br>";
+
+// mime test
+$mime = 'application/vnd.ms-excel';
+print "App for mime $mime: ".$_mime->mimeGetAppName($mime)."<br>";
+$_mime->mimeSetAppName($mime, 'Microsoft (better) Excel');
+print "App for mime changed $mime: ".$_mime->mimeGetAppName($mime)."<br>";
+
+// static call test
+$mime = 'application/x-indesign';
+print "S::App for mime $mime: ".\CoreLibs\Convert\MimeAppName::mimeGetAppName($mime)."<br>";
+$mime = 'application/vnd.ms-excel';
+print "S::App for mime $mime: ".\CoreLibs\Convert\MimeAppName::mimeGetAppName($mime)."<br>";
+
+// DEPRECATED
+/* $mime = 'application/illustrator';
+print "MIME $mime: ".$basic->mimeGetAppName($mime)."<br>";
+$mime = 'fake/mime';
+$basic->mimeSetAppName($mime, 'This is a fake mime');
+print "MIME $mime: ".$basic->mimeGetAppName($mime)."<br>"; */
+
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.password.php

@@ -0,0 +1,67 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-pass';
+ob_end_flush();
+
+use CoreLibs\Check\Password as PwdChk;
+
+$basic = new CoreLibs\Basic();
+$_password = new CoreLibs\Check\Password();
+$password_class = 'CoreLibs\Check\Password';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: PASSWORD</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$password = 'something1234';
+$enc_password = $_password->passwordSet($password);
+print "PASSWORD: $password: ".$enc_password."<br>";
+print "PASSWORD VERIFY: ".(string)$_password->passwordVerify($password, $enc_password)."<br>";
+print "PASSWORD REHASH: ".(string)$_password->passwordRehashCheck($enc_password)."<br>";
+// static verify
+$password = 'othername7890';
+$enc_password = $password_class::passwordSet($password);
+print "PASSWORD: $password: ".$enc_password."<br>";
+print "S-PASSWORD VERIFY: ".(string)$password_class::passwordVerify($password, $enc_password)."<br>";
+print "PASSWORD REHASH: ".(string)$password_class::passwordRehashCheck($enc_password)."<br>";
+// direct static
+print "S::PASSWORD VERFIY: ".(string)PwdChk::passwordVerify($password, $enc_password)."<br>";
+
+// DEPRECATED
+/* $password = 'deprecated4567';
+$enc_password = $basic->passwordSet($password);
+print "PASSWORD: $password: ".$enc_password."<br>";
+print "PASSWORD VERIFY: ".(string)$basic->passwordVerify($password, $enc_password)."<br>";
+print "PASSWORD REHASH: ".(string)$basic->passwordRehashCheck($enc_password)."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.php

@@ -3,10 +3,10 @@
  * @phan-file-suppress PhanTypeSuspiciousStringExpression
  */
 
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
+$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;
 
 if ($DEBUG_ALL) {
 	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
@@ -31,21 +31,31 @@ $basic = new CoreLibs\Admin\Backend(DB_CONFIG);
 $basic->dbInfo(true);
 ob_end_flush();
 
-echo "DB_CONFIG_SET constant: <pre>".print_r(DB_CONFIG, true)."</pre><br>";
+print "<html><head><title>TEST CLASS</title><head>";
+print "<body>";
 
-$basic->hrRunningTime();
-$basic->runningTime();
-echo "RANDOM KEY [50]: ".$basic->randomKeyGen(50)."<br>";
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
-echo "TIMED [def]: ".$basic->runningTime()."<br>";
-echo "TIMED [string]: ".$basic->runningtime_string."<br>";
-$basic->hrRunningTime();
-echo "RANDOM KEY [default]: ".$basic->randomKeyGen()."<br>";
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
-
-// color
-print "COLOR: -1, -1, -1: ".$basic->rgb2hex(-1, -1, -1)."<br>";
-print "COLOR: 10, 20, 30: ".$basic->rgb2hex(10, 20, 30)."<br>";
+print '<div><a href="class_test.db.php">Class Test: DB</a></div>';
+print '<div><a href="class_test.colors.php">Class Test: 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>';
+print '<div><a href="class_test.password.php">Class Test: Password</a></div>';
+print '<div><a href="class_test.math.php">Class Test: Math</a></div>';
+print '<div><a href="class_test.html.php">Class Test: HTML/ELEMENTS</a></div>';
+print '<div><a href="class_test.email.php">Class Test: EMAIL</a></div>';
+print '<div><a href="class_test.uids.php">Class Test: UIDS</a></div>';
+print '<div><a href="class_test.phpv.php">Class Test: PHP VERSION</a></div>';
+print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
+print '<div><a href="class_test.encoding.php">Class Test: ENCODING</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.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>';
+print '<div><a href="class_test.randomkey.php">Class Test: RANDOM KEY</a></div>';
+print '<div><a href="class_test.system.php">Class Test: SYSTEM</a></div>';
+print '<div><a href="class_test.runningtime.php">Class Test: RUNNING TIME</a></div>';
+print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
 
 // set + check edit access id
 $edit_access_id = 3;
@@ -61,33 +71,31 @@ if (is_object($login) && isset($login->acl['unit'])) {
 	print "Something went wrong with the login<br>";
 }
 
-//	$basic->debug('SESSION', $basic->print_ar($_SESSION));
+//	$basic->log->debug('SESSION', \CoreLibs\Debug\Support::printAr($_SESSION));
 
-print "<html><head><title>TEST CLASS</title><head>";
-print "<body>";
 print '<form method="post" name="loginlogout">';
 print '<a href="javascript:document.loginlogout.login_logout.value=\'Logou\';document.loginlogout.submit();">Logout</a>';
 print '<input type="hidden" name="login_logout" value="">';
 print '</form>';
 
 // print the debug core vars
-print "DEBUG OUT: ".$basic->debug_output."<br>";
-print "ECHO OUT: ".$basic->echo_output."<br>";
-print "PRINT OUT: ".$basic->print_output."<br>";
-print "NOT DEBUG OUT: ".$basic->debug_output_not."<br>";
-print "NOT ECHO OUT: ".$basic->echo_output_not."<br>";
-print "NOT PRINT OUT: ".$basic->print_output_not."<br>";
-print "DEBUG OUT ALL: ".$basic->debug_output_all."<br>";
-print "ECHO OUT ALL: ".$basic->echo_output_all."<br>";
-print "PRINT OUT ALL: ".$basic->print_output_all."<br>";
+foreach (['on', 'off'] as $flag) {
+	foreach (['debug', 'echo', 'print'] as $type) {
+		$prefix = $flag == 'off' ? 'NOT ' : '';
+		print $prefix.strtoupper($type).' OUT: '.\CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)).'<br>';
+	}
+}
+foreach (['debug', 'echo', 'print'] as $type) {
+	print strtoupper($type).' OUT ALL: '.$basic->log->getLogLevelAll($type).'<br>';
+}
 
-print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
-$basic->debug('SOME MARK', 'Some error output');
+$basic->log->debug('SOME MARK', 'Some error output');
 
+// INTERNAL SET
 print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
 if (is_object($login)) {
 	//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
-	$basic->debug('ACL', "ACL: ".$basic->printAr($login->acl));
+	$basic->log->debug('ACL', "ACL: ".\CoreLibs\Debug\Support::printAr($login->acl));
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
 	//	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
@@ -96,243 +104,9 @@ if (is_object($login)) {
 	//	$basic->adbSetACL($login->acl);
 }
 
-// DB client encoding
-print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
-
-while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
-	print "TIME: ".$res['time']."<br>";
-}
-print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
-while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
-	print "[CACHED] TIME: ".$res['time']."<br>";
-}
-
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
-$basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
-$status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
-print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
-// returning test with multiple entries
-//	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
-$status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
-print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, true)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-// no returning, but not needed ;
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-// UPDATE WITH RETURNING
-$status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
-print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-
-# db write class test
-$table = 'foo';
-print "TABLE META DATA: ".$basic->printAr($basic->dbShowTableMetaData($table))."<br>";
-$primary_key = ''; # unset
-$db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
-//	$db_write_table = array('test');
-$object_fields_not_touch = array();
-$object_fields_not_update = array();
-$data = array('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
-print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
-print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
-print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array('test' => 'BOOL TEST UNSET '.time());
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
-print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-
-// return Array Test
-$query = "SELECT type, sdate, integer FROM foobar";
-$data = $basic->dbReturnArray($query, true);
-print "Full foobar list: <br><pre>".print_r($data, true)."</pre><br>";
-
-# async test queries
-/*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
-echo "WAITING FOR ASYNC: ";
-$chars = array('|', '/', '-', '\\');
-while (($ret = $basic->dbCheckAsync()) === true)
-{
-	if ((list($_, $char) = each($chars)) === FALSE)
-	{
-		reset($chars);
-		list($_, $char) = each($chars);
-	}
-	print $char;
-	sleep(1);
-	flush();
-}
-print "<br>END STATUS: ".$ret."<br>";
-//	while ($res = $basic->dbFetchArray($ret))
-while ($res = $basic->dbFetchArray())
-{
-	echo "RES: ".$res['test']."<br>";
-}
-# test async insert
-$basic->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
-echo "WAITING FOR ASYNC INSERT: ";
-while (($ret = $basic->dbCheckAsync()) === true)
-{
-	print ".";
-	sleep(1);
-	flush();
-}
-print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
-print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>"; */
-
-$to_db_version = '9.1.9';
-print "VERSION DB: ".$basic->dbVersion()."<br>";
-print "DB Version smaller $to_db_version: ".$basic->dbCompareVersion('<'.$to_db_version)."<br>";
-print "DB Version smaller than $to_db_version: ".$basic->dbCompareVersion('<='.$to_db_version)."<br>";
-print "DB Version equal $to_db_version: ".$basic->dbCompareVersion('='.$to_db_version)."<br>";
-print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$to_db_version)."<br>";
-print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
-
-/*	$q = "SELECT FOO FRO BAR";
-// $q = "Select * from foo";
-$foo = $basic->dbExecAsync($q);
-print "[ERR] Query: ".$q."<br>";
-print "[ERR] RESOURCE: $foo<br>";
-while (($ret = $basic->dbCheckAsync()) === true)
-{
-	print "[ERR]: $ret<br>";
-	sleep(5);
-} */
-
-// search path check
-$q = "SHOW search_path";
-$cursor = $basic->dbExec($q);
-$data = $basic->dbFetchArray($cursor)['search_path'];
-print "RETURN DATA FOR search_path: ".$data."<br>";
-//	print "RETURN DATA FOR search_path: ".$basic->printAr($data)."<br>";
-// insert something into test.schema_test and see if we get the PK back
-$status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
-print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
-
-// time string thest
-$timestamp = 5887998.33445;
-$time_string = $basic->timeStringFormat($timestamp);
-print "PLANE TIME STRING: ".$timestamp."<br>";
-print "TIME STRING TEST: ".$time_string."<br>";
-print "REVERSE TIME STRING: ".$basic->stringToTime($time_string)."<br>";
-if (round($timestamp, 4) == $basic->stringToTime($time_string)) {
-	print "REVERSE TIME STRING MATCH<br>";
-} else {
-	print "REVERSE TRIME STRING DO NOT MATCH<br>";
-}
-
-// magic links test
-print $basic->magicLinks('user@bubu.at').'<br>';
-print $basic->magicLinks('http://test.com/foo/bar.php?foo=1').'<br>';
-
-// compare date
-$date_1 = '2017/1/5';
-$date_2 = '2017-01-05';
-print "COMPARE DATE: ".$basic->compareDate($date_1, $date_2)."<br>";
-
-// recursive array search
-$test_array = array(
-	'foo' => 'bar',
-	'input' => array(
-		'element_a' => array(
-			'type' => 'text'
-		),
-		'element_b' => array(
-			'type' => 'email'
-		),
-		'element_c' => array(
-			'type' => 'email'
-		)
-	)
-);
-
-echo "SOURCE ARRAY: ".$basic->printAr($test_array)."<br>";
-echo "FOUND ELEMENTS [base]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array, 'type'))."<br>";
-echo "FOUND ELEMENTS [input]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array['input'], 'type'))."<br>";
-
-// *** BYTES TEST ***
-$bytes = array(
-	-123123123,
-	999999, // KB-1
-	999999999, // MB-1
-	254779258, // MB-n
-	999999999999999, // TB-1
-	588795544887632, // TB-n
-	999999999999999999, // PB-1
-	9223372036854775807, // MAX INT
-	999999999999999999999, // EB-1
-);
-print "<b>BYTE FORMAT TESTS</b><br>";
-foreach ($bytes as $byte) {
-	print '<div style="display: flex; border-bottom: 1px dashed gray;">';
-	//
-	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
-	print "(".number_format($byte)."/".$byte.") bytes :";
-	print '</div><div style="width: 40%;">';
-	print $basic->humanReadableByteFormat($byte);
-	print "</div>";
-	//
-	print "</div>";
-	//
-	print '<div style="display: flex; border-bottom: 1px dotted red;">';
-	//
-	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
-	print "bytes [si]:";
-	print '</div><div style="width: 40%;">';
-	// print $basic->byteStringFormat($byte, true, false, true);
-	print $basic->humanReadableByteFormat($byte, $basic::BYTE_FORMAT_SI);
-	print "</div>";
-	//
-	print "</div>";
-}
-
-
-// *** IMAGE TESTS ***
-echo "<hr>";
-// image thumbnail
-$images = array(
-	// height bigger
-	// 'no_picture.jpg',
-	// 'no_picture.png',
-	// width bigger
-	// 'no_picture_width_bigger.jpg',
-	// 'no_picture_width_bigger.png',
-	// square
-	// 'no_picture_square.jpg',
-	// 'no_picture_square.png',
-	// other sample images
-	// '5c501af48da6c.jpg',
-	// Apple HEIC files
-	// 'img_2145.heic',
-	// Photoshop
-	'photoshop_test.psd',
-);
-$thumb_width = 250;
-$thumb_height = 300;
-// return mime type ala mimetype
-$finfo = new finfo(FILEINFO_MIME_TYPE);
-foreach ($images as $image) {
-	$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.$image;
-	list ($height, $width, $img_type) = getimagesize($image);
-	echo "<div>IMAGE INFO: ".$height."x".$width.", TYPE: ".$img_type." [".$finfo->file($image)."]</div>";
-	// rotate image first
-	$basic->correctImageOrientation($image);
-	// thumbnail tests
-	echo "<div>".basename($image).": WIDTH: $thumb_width<br><img src=".$basic->createThumbnailSimple($image, $thumb_width)."></div>";
-	echo "<div>".basename($image).": HEIGHT: $thumb_height<br><img src=".$basic->createThumbnailSimple($image, 0, $thumb_height)."></div>";
-	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height<br><img src=".$basic->createThumbnailSimple($image, $thumb_width, $thumb_height)."></div>";
-	// test with dummy
-	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)<br><img src=".$basic->createThumbnailSimple($image, $thumb_width, $thumb_height, null, true, false)."></div>";
-	echo "<hr>";
-}
-
 // print error messages
-// print $login->printErrorMsg();
-print $basic->printErrorMsg();
+// print $login->log->printErrorMsg();
+print $basic->log->printErrorMsg();
 
 print "</body></html>";
 

www/admin/class_test.phpv.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-phpv';
+ob_end_flush();
+
+use CoreLibs\Check\PhpVersion;
+
+$basic = new CoreLibs\Basic();
+$_phpv = new CoreLibs\Check\PhpVersion();
+$phpv_class = 'CoreLibs\Check\PhpVersion';
+
+// define a list of from to color sets for conversion test
+
+print "<html><head><title>TEST CLASS: PHP VERSION</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$min_version_s = '7';
+$min_version_ss = '7.1';
+$min_version = '7.1.0';
+$max_version = '7.3.1';
+// class
+print "MIN: $min_version: ".(string)$_phpv->checkPHPVersion($min_version)."<br>";
+print "MIN/MAX: $min_version/$max_version: ".(string)$_phpv->checkPHPVersion($min_version, $max_version)."<br>";
+print "MIN/S: $min_version_s: ".(string)$_phpv->checkPHPVersion($min_version_s)."<br>";
+print "MIN/SS: $min_version_ss: ".(string)$_phpv->checkPHPVersion($min_version_ss)."<br>";
+// static
+print "S::MIN: $min_version: ".(string)$phpv_class::checkPHPVersion($min_version)."<br>";
+print "S::MIN/MAX: $min_version/$max_version: ".(string)$phpv_class::checkPHPVersion($min_version, $max_version)."<br>";
+print "S::MIN/S: $min_version_s: ".(string)$phpv_class::checkPHPVersion($min_version_s)."<br>";
+print "S::MIN/SS: $min_version_ss: ".(string)$phpv_class::checkPHPVersion($min_version_ss)."<br>";
+// use stats
+print "U-S::MIN: $min_version: ".(string)PhpVersion::checkPHPVersion($min_version)."<br>";
+
+// DEPRECATED
+// print "MIN: $min_version: ".(string)$basic->checkPHPVersion($min_version)."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.randomkey.php

@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-randomkey';
+ob_end_flush();
+
+use CoreLibs\Create\RandomKey;
+
+$basic = new CoreLibs\Basic();
+$array_class = 'CoreLibs\Create\RandomKey';
+
+print "<html><head><title>TEST CLASS: RANDOM KEY</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$key_length = 10;
+$key_length_b = 5;
+print "S::RANDOMKEYGEN(auto): ".RandomKey::randomKeyGen()."<br>";
+print "S::SETRANDOMKEYLENGTH($key_length): ".RandomKey::setRandomKeyLength($key_length)."<br>";
+print "S::RANDOMKEYGEN($key_length): ".RandomKey::randomKeyGen()."<br>";
+print "S::RANDOMKEYGEN($key_length_b): ".RandomKey::randomKeyGen($key_length_b)."<br>";
+print "S::RANDOMKEYGEN($key_length): ".RandomKey::randomKeyGen()."<br>";
+$_array= new CoreLibs\Create\RandomKey();
+print "C->RANDOMKEYGEN(auto): ".$_array->randomKeyGen()."<br>";
+// DEPRECATED
+// print "D\RANDOMKEYGEN(auto): ".$basic->randomKeyGen()."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.runningtime.php

@@ -0,0 +1,63 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-runningtime';
+ob_end_flush();
+
+use CoreLibs\Debug\RunningTime;
+
+$basic = new CoreLibs\Basic();
+
+print "<html><head><title>TEST CLASS: RUNNING IMTE</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+RunningTime::hrRunningTime();
+RunningTime::runningTime();
+echo "RANDOM KEY [50]: ".\CoreLibs\Create\RandomKey::randomKeyGen(50)."<br>";
+echo "TIMED [hr]: ".RunningTime::hrRunningTime()."<br>";
+echo "TIMED [def]: ".RunningTime::runningTime()."<br>";
+echo "TIMED [string]: ".RunningTime::runningTimeString()."<br>";
+RunningTime::hrRunningTime();
+echo "RANDOM KEY [default]: ".\CoreLibs\Create\RandomKey::randomKeyGen()."<br>";
+echo "TIMED [hr]: ".RunningTime::hrRunningTime()."<br>";
+
+// DEPRECATED
+/* $basic->hrRunningTime();
+$basic->runningTime();
+echo "RANDOM KEY [50]: ".$basic->randomKeyGen(50)."<br>";
+echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
+echo "TIMED [def]: ".$basic->runningTime()."<br>";
+echo "TIMED [string]: ".$basic->runningtime_string."<br>";
+$basic->hrRunningTime();
+echo "RANDOM KEY [default]: ".$basic->randomKeyGen()."<br>";
+echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.system.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-system';
+ob_end_flush();
+
+use CoreLibs\Get\System;
+use CoreLibs\Debug\Support as DgS;
+
+$basic = new CoreLibs\Basic();
+
+print "<html><head><title>TEST CLASS: SYSTEM</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+print "GETHOSTNAME: ".DgS::printAr(System::getHostName())."<br>";
+print "GETPAGENAME(0): ".System::getPageName()."<br>";
+print "GETPAGENAME(1): ".System::getPageName(1)."<br>";
+print "GETPAGENAME(2): ".System::getPageName(2)."<br>";
+// seting errro codes file upload
+print "FILEUPLOADERRORMESSAGE(): ".System::fileUploadErrorMessage(-1)."<br>";
+print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): ".System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE)."<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";

www/admin/class_test.token.php

@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-token';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$_token = new CoreLibs\Output\Form\Token();
+$token_class = 'CoreLibs\Output\Form\Token';
+
+print "<html><head><title>TEST CLASS: FORM TOKEN</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$token = 'test_form_token';
+$token_id = $_token->setFormToken($token);
+print "TOKEN: $token: (ID) ".$token_id." => (S) ".$_SESSION[$token]."<br>";
+print "VALIDATE: $token: ".(string)$_token->validateFormToken($token_id, $token)."<br>";
+
+$token = 'test_form_token_static';
+$token_id = $token_class::setFormToken($token);
+print "S-TOKEN: $token: (ID) ".$token_id." => (S) ".$_SESSION[$token]."<br>";
+print "S-VALIDATE: $token: ".(string)$token_class::validateFormToken($token_id, $token)."<br>";
+
+// DEPRECATED
+/* $token = 'test_form_token_deprecated';
+$token_id = $basic->setFormToken($token);
+print "TOKEN: $token: (ID) ".$token_id." => (S) ".$_SESSION[$token]."<br>";
+print "VALIDATE: $token: ".(string)$basic->validateFormToken($token_id, $token)."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.uids.php

@@ -0,0 +1,56 @@
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+$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';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-uids';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$_uids = new CoreLibs\Create\Uids();
+$uids_class = 'CoreLibs\Create\Uids';
+
+print "<html><head><title>TEST CLASS: UIDS</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// class
+print "UUIDV4: ".$_uids->uuidv4()."<br>";
+print "UNIQID (d): ".$_uids->uniqId()."<br>";
+print "UNIQID (md5): ".$_uids->uniqId('md5')."<br>";
+print "UNIQID (sha256): ".$_uids->uniqId('sha256')."<br>";
+// statc
+print "S::UUIDV4: ".$uids_class::uuidv4()."<br>";
+print "S::UNIQID (d): ".$uids_class::uniqId()."<br>";
+print "S::UNIQID (md5): ".$uids_class::uniqId('md5')."<br>";
+print "S::UNIQID (sha256): ".$uids_class::uniqId('sha256')."<br>";
+// DEPRECATED
+/* print "D/UUIDV4: ".$basic->uuidv4()."<br>";
+print "/DUNIQID (d): ".$basic->uniqId()."<br>"; */
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/error_test.php

@@ -17,3 +17,5 @@ require(BASE.LIB."Error.Handling.php");
 if ($var) {
 	echo "OUT<br>";
 }
+// this wll throw an error and also write
+// asdfa(09);

www/admin/namespace_test.php

@@ -20,23 +20,22 @@ if ($base->getConnectionStatus()) {
 	die("Cannot connect to database");
 }
 
-print "Start time: ".$base->runningTime()."<br>";
-print "HumanReadableByteFormat: ".$base->HumanReadableByteFormat(1234567.12)."<br>";
-print "humanReadableByteFormat: ".$base->humanReadableByteFormat(1234567.12)."<br>";
-// print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
-print "getPageName: ".$base->getPageName()."<br>";
+print "Start time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
+print "HumanReadableByteFormat: ".\CoreLibs\Convert\Byte::HumanReadableByteFormat(1234567.12)."<br>";
+print "humanReadableByteFormat: ".\CoreLibs\Convert\Byte::humanReadableByteFormat(1234567.12)."<br>";
+print "getPageName: ". \CoreLibs\Get\System::getPageName()."<br>";
 
 print "DB Info: ".$base->dbInfo(true)."<br>";
 
 
-print "End Time: ".$base->runningTime()."<br>";
-print "Start Time: ".$base->runningTime()."<br>";
+print "End Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
+print "Start Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
 
 print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
 print "Translate test: Year -> ".$base->l->__('Year')."<br>";
 
-print "End Time: ".$base->runningTime()."<br>";
+print "End Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
 // end error print
-print $base->printErrorMsg();
+print $base->log->printErrorMsg();
 
 # __END__

www/admin/phan_test.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+require 'config.php';
+require BASE.INCLUDES.'admin_header.php';
+
+// $DATA['foo'] = 'bar';
+// $messages['foo'] = 'bar';
+
+// __END__

www/admin/smarty_test.php

@@ -10,26 +10,28 @@ define('USE_DATABASE', true);
 define('USE_HEADER', true);
 require 'config.php';
 require BASE.INCLUDES.'admin_header.php';
-$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
-$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
-$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
-$smarty->USE_PROTOTYPE = false;
-$smarty->USE_JQUERY = true;
-$smarty->JS_DATEPICKR = false;
-if ($smarty->USE_PROTOTYPE) {
-	$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
-	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
-} elseif ($smarty->USE_JQUERY) {
-	$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
-	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
-}
-$smarty->PAGE_WIDTH = "100%";
-// require BASE.INCLUDES.'admin_set_paths.php';
-$smarty->setSmartyPaths();
+if (is_object($smarty)) {
+	$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
+	$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
+	$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
+	$smarty->USE_PROTOTYPE = false;
+	$smarty->USE_JQUERY = true;
+	$smarty->JS_DATEPICKR = false;
+	if ($smarty->USE_PROTOTYPE) {
+		$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
+		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
+	} elseif ($smarty->USE_JQUERY) {
+		$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
+		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
+	}
+	$smarty->PAGE_WIDTH = '100%';
+	// require BASE.INCLUDES.'admin_set_paths.php';
+	$smarty->setSmartyPaths();
 
-// smarty test
-$smarty->DATA['SMARTY_TEST'] = 'Test Data';
-$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
+	// smarty test
+	$smarty->DATA['SMARTY_TEST'] = 'Test Data';
+	$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
+}
 
 // drop down test with optgroups
 $options = array (
@@ -48,8 +50,10 @@ $options = array (
 	)
 );
 
-$smarty->DATA['drop_down_test'] = $options;
-
-// require BASE.INCLUDES.'admin_smarty.php';
-$smarty->setSmartyVarsAdmin();
+if (is_object($smarty)) {
+	$smarty->DATA['drop_down_test'] = $options;
+	$smarty->DATA['loop_start'] = 2;
+	// require BASE.INCLUDES.'admin_smarty.php';
+	$smarty->setSmartyVarsAdmin();
+}
 require BASE.INCLUDES.'admin_footer.php';

www/admin/various_class_test.php

@@ -27,8 +27,8 @@ line breaks
 in there. Theis 
 is sucky';
 
-print "LB remove: ".$base->removeLB($text)."<br>";
-print "LB remove: ".$base->removeLB($text, '##BR##')."<br>";
+print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text)."<br>";
+print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text, '##BR##')."<br>";
 
 // $test = array (
 // 	'A' => array (
@@ -47,7 +47,7 @@ print "LB remove: ".$base->removeLB($text, '##BR##')."<br>";
 // 	)
 // );
 
-// $base->debug('ARRAY', $base->printAr($test));
+// $base->log->debug('ARRAY', \CoreLibs\Debug\Support::printAr($test));
 
 function rec($pre, $cur, $node = array ())
 {
@@ -103,9 +103,9 @@ $test = rec('C', 'U', $test);
 $test = rec('F', 'U', $test);
 $test = rec('', 'Al', $test);
 $test = rec('B', 'B1', $test);
-$base->debug('REC', $base->printAr($test));
-print "FLATTEN: ".$base->printAr(flattenArrayKey($test))."<br>";
+$base->log->debug('REC', \CoreLibs\Debug\Support::printAr($test));
+print "FLATTEN: ".\CoreLibs\Debug\Support::printAr(flattenArrayKey($test))."<br>";
 
-print $base->printErrorMsg();
+print $base->log->printErrorMsg();
 
 // __END__

www/configs/config.db.php

@@ -8,8 +8,8 @@
 *********************************************************************/
 
 // please be VERY carefull only to change the right side
-$DB_CONFIG = array(
-	'test' => array(
+$DB_CONFIG = [
+	'test' => [
 		'db_name' => 'gullevek',
 		'db_user' => 'gullevek',
 		'db_pass' => 'gullevek',
@@ -19,7 +19,7 @@ $DB_CONFIG = array(
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
 		'db_ssl' => 'disable' // allow, disable, require, prefer
-	)
-);
+	]
+];
 
 // __END__

www/configs/config.host.php

@@ -12,18 +12,18 @@
 *********************************************************************/
 
 // other master config to attach
-// $__LOCAL_CONFIG = array(
+// $__LOCAL_CONFIG = [
 // 	'db_host' => '',
 // 	'location' => '',
 //	'debug_flag' => true,
 //	'site_lang' => 'en_utf8',
 //	'login_enabled' => true
-// );
+// ];
 
 // each host has a different db_host
-$SITE_CONFIG = array(
+$SITE_CONFIG = [
 	// development host
-	'soba.tokyo.tequila.jp' => array(
+	'soba.tokyo.tequila.jp' => [
 		// db config selection
 		'db_host' => 'test',
 		// other db connections
@@ -37,8 +37,8 @@ $SITE_CONFIG = array(
 		'site_lang' => 'en_utf8',
 		// enable/disable login override
 		'login_enabled' => true
-	),
+	],
 	// 'other.host.com' => $__LOCAL_CONFIG
-);
+];
 
 // __END__

www/configs/config.master.php

@@ -9,180 +9,192 @@
 
 /************* PATHS *********************/
 // directory seperator
-DEFINE('DS', DIRECTORY_SEPARATOR);
+define('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-DEFINE('DIR', __DIR__.DS);
+define('DIR', __DIR__.DS);
 // base dir root folder level
-DEFINE('BASE', str_replace('/configs', '', __DIR__).DS);
+define('BASE', str_replace('/configs', '', __DIR__).DS);
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd().DS);
+define('ROOT', getcwd().DS);
 // libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
+define('LIB', 'lib'.DS);
+define('LIBS', 'lib'.DS);
 // configs folder
-DEFINE('CONFIGS', 'configs'.DS);
+define('CONFIGS', 'configs'.DS);
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
-// data folder (mostly in includes)
-DEFINE('DATA', 'data'.DS);
+define('INCLUDES', 'includes'.DS);
+// data folder (mostly in includes, or root for internal data)
+define('DATA', 'data'.DS);
 // layout base path
-DEFINE('LAYOUT', 'layout'.DS);
+define('LAYOUT', 'layout'.DS);
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', 'images'.DS);
+define('PICTURES', 'images'.DS);
 // images
-DEFINE('IMAGES', 'images'.DS);
+define('IMAGES', 'images'.DS);
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
-// media
-DEFINE('MEDIA', 'media'.DS);
-// flash-root (below media)
-DEFINE('FLASH', 'flash'.DS);
-// uploads (anything to keep)
-DEFINE('UPLOADS', 'uploads'.DS);
-// files (binaries) (below media)
-DEFINE('BINARIES', 'binaries'.DS);
-// files (videos) (below media)
-DEFINE('VIDEOS', 'videos'.DS);
-// files (documents) (below media)
-DEFINE('DOCUMENTS', 'documents'.DS);
-// files (pdfs) (below media)
-DEFINE('PDFS', 'documents'.DS);
+define('ICONS', 'icons'.DS);
+// media (accessable from outside)
+define('MEDIA', 'media'.DS);
+// flash-root (below media or data)
+define('FLASH', 'flash'.DS);
+// uploads (anything to keep or data)
+define('UPLOADS', 'uploads'.DS);
+// files (binaries) (below media or data)
+define('BINARIES', 'binaries'.DS);
+// files (videos) (below media or data)
+define('VIDEOS', 'videos'.DS);
+// files (documents) (below media or data)
+define('DOCUMENTS', 'documents'.DS);
+// files (pdfs) (below media or data)
+define('PDFS', 'documents'.DS);
+// files (general) (below media or data)
+define('FILES', 'files'.DS);
 // CSV
-DEFINE('CSV', 'csv'.DS);
+define('CSV', 'csv'.DS);
 // css
-DEFINE('CSS', 'css'.DS);
+define('CSS', 'css'.DS);
 // font (web)
-DEFINE('FONT', 'font'.DS);
+define('FONT', 'font'.DS);
 // js
-DEFINE('JS', 'javascript'.DS);
+define('JS', 'javascript'.DS);
 // table arrays
-DEFINE('TABLE_ARRAYS', 'table_arrays'.DS);
+define('TABLE_ARRAYS', 'table_arrays'.DS);
 // smarty libs path
-DEFINE('SMARTY', 'Smarty'.DS);
+define('SMARTY', 'Smarty'.DS);
 // po langs
-DEFINE('LANG', 'lang'.DS);
+define('LANG', 'lang'.DS);
 // cache path
-DEFINE('CACHE', 'cache'.DS);
+define('CACHE', 'cache'.DS);
 // temp path
-DEFINE('TMP', 'tmp'.DS);
+define('TMP', 'tmp'.DS);
 // log files
-DEFINE('LOG', 'log'.DS);
+define('LOG', 'log'.DS);
 // compiled template folder
-DEFINE('TEMPLATES_C', 'templates_c'.DS);
+define('TEMPLATES_C', 'templates_c'.DS);
 // template base
-DEFINE('TEMPLATES', 'templates'.DS);
+define('TEMPLATES', 'templates'.DS);
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
-DEFINE('DEFAULT_HASH', 'sha256');
+define('DEFAULT_HASH', 'sha256');
 // default acl level
-DEFINE('DEFAULT_ACL_LEVEL', 80);
+define('DEFAULT_ACL_LEVEL', 80);
 // SSL host name
-// DEFINE('SSL_HOST', 'ssl.host.name');
+// define('SSL_HOST', 'ssl.host.name');
 // error page strictness, Default is 3
 // 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
 // 2: if template not found, do not search, show error template
 // 3: if default template is not found, show error template, do not fall back to default tree
 // 4: very strict, even on normal fixable errors through error
-// DEFINE('ERROR_STRICT', 3);
-// allow page caching in general, set to 'FALSE' if you do debugging or development!
-// DEFINE('ALLOW_SMARTY_CACHE', false);
+// define('ERROR_STRICT', 3);
+// allow page caching in general, set to 'false' if you do debugging or development!
+// define('ALLOW_SMARTY_CACHE', false);
 // cache life time, in second', default here is 2 days (172800s)
 // -1 is never expire cache
-// DEFINE('SMARTY_CACHE_LIFETIME', -1);
+// define('SMARTY_CACHE_LIFETIME', -1);
 
 /************* LOGOUT ********************/
 // logout target
-DEFINE('LOGOUT_TARGET', '');
+define('LOGOUT_TARGET', '');
 // password change allowed
-DEFINE('PASSWORD_CHANGE', false);
-DEFINE('PASSWORD_FORGOT', false);
+define('PASSWORD_CHANGE', false);
+define('PASSWORD_FORGOT', false);
 // min/max password length
-DEFINE('PASSWORD_MIN_LENGTH', 8);
-DEFINE('PASSWORD_MAX_LENGTH', 255);
+define('PASSWORD_MIN_LENGTH', 9);
+define('PASSWORD_MAX_LENGTH', 255);
+// defines allowed special characters
+define('PASSWORD_SPECIAL_RANGE', '@$!%*?&');
+// password must have upper case, lower case, number, special
+// comment out for not mandatory
+define('PASSWORD_LOWER', '(?=.*[a-z])');
+define('PASSWORD_UPPER', '(?=.*[A-Z])');
+define('PASSWORD_NUMBER', '(?=.*\d)');
+define('PASSWORD_SPECIAL', "(?=.*[".PASSWORD_SPECIAL_RANGE."])");
+// define full regex
+define('PASSWORD_REGEX', "/^".
+	(defined('PASSWORD_LOWER') ? PASSWORD_LOWER : '').
+	(defined('PASSWORD_UPPER') ? PASSWORD_UPPER : '').
+	(defined('PASSWORD_NUMBER') ? PASSWORD_NUMBER : '').
+	(defined('PASSWORD_SPECIAL') ? PASSWORD_SPECIAL : '').
+	"[A-Za-z\d".PASSWORD_SPECIAL_RANGE."]{".PASSWORD_MIN_LENGTH.",".PASSWORD_MAX_LENGTH."}$/");
 
 /************* AJAX / ACCESS *************/
 // ajax request type
-DEFINE('AJAX_REQUEST_TYPE', 'POST');
+define('AJAX_REQUEST_TYPE', 'POST');
 // what AJAX type to use
-DEFINE('USE_PROTOTYPE', false);
-DEFINE('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', true);
+define('USE_PROTOTYPE', false);
+define('USE_SCRIPTACULOUS', false);
+define('USE_JQUERY', true);
 
 /************* LAYOUT WIDTHS *************/
-DEFINE('PAGE_WIDTH', 800);
-DEFINE('CONTENT_WIDTH', 800);
+define('PAGE_WIDTH', 800);
+define('CONTENT_WIDTH', 800);
 // the default template name
-DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
+define('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 
 /************* OVERALL CONTROL NAMES *************/
 // BELOW has HAS to be changed
 // base name for all session and log names
-DEFINE('BASE_NAME', 'CoreLibs');
+define('BASE_NAME', 'CoreLibs');
 
 /************* SESSION NAMES *************/
 // server name HASH
-DEFINE('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
-DEFINE('SERVER_PATH_HASH', hash('crc32b', BASE));
+define('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
+define('SERVER_PATH_HASH', hash('crc32b', BASE));
 // backend
-DEFINE('EDIT_SESSION_NAME', BASE_NAME.'Admin'.SERVER_NAME_HASH.SERVER_PATH_HASH);
+define('EDIT_SESSION_NAME', BASE_NAME.'Admin'.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // frontend
-DEFINE('SESSION_NAME', BASE_NAME.SERVER_NAME_HASH.SERVER_PATH_HASH);
+define('SESSION_NAME', BASE_NAME.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // SET_SESSION_NAME should be set in the header if a special session name is needed
-DEFINE('SET_SESSION_NAME', SESSION_NAME);
+define('SET_SESSION_NAME', SESSION_NAME);
 
 /************* CACHE/COMPILE IDS *************/
-DEFINE('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
-DEFINE('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
+define('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
+define('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', 'en_utf8');
+define('DEFAULT_LANG', 'en_utf8');
 // default web page encoding setting
-DEFINE('DEFAULT_ENCODING', 'UTF-8');
+define('DEFAULT_ENCODING', 'UTF-8');
 
 /************* LOGGING *******************/
 // below two can be defined here, but they should be
 // defined in either the header file or the file itself
 // as $LOG_FILE_ID which takes presence over LOG_FILE_ID
 // see Basic class constructor
-DEFINE('LOG_FILE_ID', BASE_NAME);
-
-/************* CLASS ERRORS *******************/
-// 0 = default all OFF
-// 1 = throw notice on unset class var
-// 2 = no notice on unset class var, but do not set undefined class var
-// 3 = throw error and do not set class var
-define('CLASS_VARIABLE_ERROR_MODE', 3);
+define('LOG_FILE_ID', BASE_NAME);
 
 /************* QUEUE TABLE *************/
 // if we have a dev/live system
 // set_live is a per page/per item
 // live_queue is a global queue system
-// DEFINE('QUEUE', 'live_queue');
+// define('QUEUE', 'live_queue');
 
 /************* DB PATHS (PostgreSQL) *****************/
 // schema names, can also be defined per <DB INFO>
-DEFINE('PUBLIC_SCHEMA', 'public');
-DEFINE('DEV_SCHEMA', 'public');
-DEFINE('TEST_SCHEMA', 'public');
-DEFINE('LIVE_SCHEMA', 'public');
+define('PUBLIC_SCHEMA', 'public');
+define('DEV_SCHEMA', 'public');
+define('TEST_SCHEMA', 'public');
+define('LIVE_SCHEMA', 'public');
+define('GLOBAL_DB_SCHEMA', '');
+define('LOGIN_DB_SCHEMA', '');
 
 /************* CORE HOST SETTINGS *****************/
 if (file_exists(BASE.CONFIGS.'config.host.php')) {
 	require BASE.CONFIGS.'config.host.php';
 }
 if (!isset($SITE_CONFIG)) {
-	$SITE_CONFIG = array();
+	$SITE_CONFIG = [];
 }
 /************* DB ACCESS *****************/
 if (file_exists(BASE.CONFIGS.'config.db.php')) {
 	require BASE.CONFIGS.'config.db.php';
 }
 if (!isset($DB_CONFIG)) {
-	$DB_CONFIG = array();
+	$DB_CONFIG = [];
 }
 /************* OTHER PATHS *****************/
 if (file_exists(BASE.CONFIGS.'config.path.php')) {
@@ -195,7 +207,7 @@ if (file_exists(BASE.CONFIGS.'config.path.php')) {
 // get the name without the port
 list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
 // set HOST name
-DEFINE('HOST_NAME', $HOST_NAME);
+define('HOST_NAME', $HOST_NAME);
 // BAIL ON MISSING MASTER SITE CONFIG
 if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
 	echo 'Missing SITE_CONFIG entry for: "'.HOST_NAME.'". Contact Administrator';
@@ -220,41 +232,41 @@ if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 // set SSL on
 if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
 	$_SERVER['SERVER_PORT'] == 443) {
-	DEFINE('HOST_SSL', true);
-	DEFINE('HOST_PROTOCOL', 'https://');
+	define('HOST_SSL', true);
+	define('HOST_PROTOCOL', 'https://');
 } else {
-	DEFINE('HOST_SSL', false);
-	DEFINE('HOST_PROTOCOL', 'http://');
+	define('HOST_SSL', false);
+	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', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
-// DEFINE('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : []);
+// 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
-// DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
-// DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
+// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
 // debug settings, site lang, etc
-DEFINE('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-DEFINE('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-DEFINE('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-DEFINE('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
+define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
+define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
+define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
 // 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);
+define('SHOW_ALL_ERRORS', true);
 
 /************* GENERAL PAGE TITLE ********/
-DEFINE('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
+define('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
 
 /************ STYLE SHEETS / JS **********/
-DEFINE('ADMIN_STYLESHEET', 'edit.css');
-DEFINE('ADMIN_JAVASCRIPT', 'edit.js');
-DEFINE('STYLESHEET', 'frontend.css');
-DEFINE('JAVASCRIPT', 'frontend.js');
+define('ADMIN_STYLESHEET', 'edit.css');
+define('ADMIN_JAVASCRIPT', 'edit.js');
+define('STYLESHEET', 'frontend.css');
+define('JAVASCRIPT', 'frontend.js');
 
 // anything optional
 /************* INTERNAL ******************/

www/configs/config.other.php

@@ -11,16 +11,16 @@
 
 /************* CONVERT *******************/
 // this only needed if the external thumbnail create is used
-$paths = array(
+$paths = [
 	'/bin',
 	'/usr/bin',
 	'/usr/local/bin'
-);
+];
 // find convert
 foreach ($paths as $path) {
 	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
 		// image magick convert location
-		DEFINE('CONVERT', $path.DS.'convert');
+		define('CONVERT', $path.DS.'convert');
 	}
 }
 unset($paths);

www/configs/config.path.php

@@ -10,12 +10,12 @@
 
 // File and Folder paths
 // ID is TARGET (first array element)
-/*$PATHS = array(
-	'test' => array(
+/*$PATHS = [
+	'test' => [
 		'csv_path' => '',
 		'perl_bin' => '',
 		'other_url' => '',
-	)
-)*/
+	]
+];*/
 
 // __END__

www/configs/config.php

@@ -22,7 +22,7 @@ if (!defined('DS')) {
 	exit('Base config unloadable');
 }
 // find trigger name "admin/" or "frontend/" in the getcwd() folder
-foreach (array('admin', 'frontend') as $folder) {
+foreach (['admin', 'frontend'] as $folder) {
 	if (strstr(getcwd(), DS.$folder)) {
 		define('CONTENT_PATH', $folder.DS);
 		break;

www/includes/Date.Vars.php

@@ -7,7 +7,7 @@
 * HISTORY:
 *********************************************************************/
 
-$day_short = array(
+$day_short = [
 	1 => 'Mon',
 	2 => 'Tue',
 	3 => 'Wed',
@@ -15,9 +15,9 @@ $day_short = array(
 	5 => 'Fri',
 	6 => 'Sat',
 	7 => 'Sun'
-);
+];
 
-$day_long = array(
+$day_long = [
 	1 => 'Monday',
 	2 => 'Tuesday',
 	3 => 'Wednesday',
@@ -25,10 +25,10 @@ $day_long = array(
 	5 => 'Friday',
 	6 => 'Saturday',
 	7 => 'Sunday'
-);
+];
 
 // months
-$month_long = array(
+$month_long = [
 	1 => 'January',
 	2 => 'February',
 	3 => 'March',
@@ -41,9 +41,9 @@ $month_long = array(
 	10 => 'October',
 	11 => 'November',
 	12 => 'December'
-);
+];
 
-$month_short = array(
+$month_short = [
 	1 => 'Jan',
 	2 => 'Feb',
 	3 => 'Mar',
@@ -56,6 +56,6 @@ $month_short = array(
 	10 => 'Oct',
 	11 => 'Nov',
 	12 => 'Dec'
-);
+];
 
 // __END__

www/includes/admin_footer.php

@@ -8,7 +8,7 @@
 *********************************************************************/
 
 // print debug messages
-echo $login->printErrorMsg();
-echo $cms->printErrorMsg();
+echo $login->log->printErrorMsg();
+echo $cms->log->printErrorMsg();
 
 // __END__

www/includes/admin_header.php

@@ -14,8 +14,6 @@ if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
 }
 // predefine vars
 $messages = array();
-// import all POST vars
-// extract($_POST, EXTR_SKIP);
 //------------------------------ variable init end
 
 //------------------------------ library include start
@@ -82,12 +80,10 @@ if (!$login->login) {
 // automatic hide for DEBUG messages on live server
 // can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
 if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
-	$login->debug_output_all = false;
-	$login->echo_output_all = false;
-	$login->print_output_all = false;
-	$cms->debug_output_all = false;
-	$cms->echo_output_all = false;
-	$cms->print_output_all = false;
+	foreach (['debug', 'echo', 'print'] as $target) {
+		$login->log->setLogLevelAll($type, false);
+		$cms->log->setLogLevelAll($type, false);
+	}
 }
 $smarty->DATA['JS_DEBUG'] = DEBUG;
 

www/includes/edit_base.php

@@ -50,24 +50,24 @@ if ($form->mobile_phone) {
 // smarty template engine (extended Translation version)
 $smarty = new CoreLibs\Template\SmartyExtend();
 
-// $form->debug('POST', $form->printAr($_POST));
+// $form->log->debug('POST', $form->log->prAr($_POST));
 
 if (TARGET == 'live' || TARGET == 'remote') {
 	// login
-	$login->debug_output_all = DEBUG ? 1 : 0;
-	$login->echo_output_all = 0;
-	$login->print_output_all = DEBUG ? 1 : 0;
+	$login->log->setLogLevelAll('debug', DEBUG ? true : false);
+	$login->log->setLogLevelAll('echo', false);
+	$login->log->setLogLevelAll('print', DEBUG ? true : false);
 	// form
-	$form->debug_output_all = DEBUG ? 1 : 0;
-	$form->echo_output_all = 0;
-	$form->print_output_all = DEBUG ? 1 : 0;
+	$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->debug_output_all = 1;
+$login->log->setLogLevelAll('debug', true);
 // set smarty arrays
-$HEADER = array();
-$DATA = array();
-$DEBUG_DATA = array();
+$HEADER = [];
+$DATA = [];
+$DEBUG_DATA = [];
 // set the template dir
 // WARNING: this has a special check for the mailing tool layout (old layout)
 if (defined('LAYOUT')) {
@@ -85,24 +85,24 @@ $table_width = '100%';
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
 $HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-$HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET;
+$HEADER['STYLESHEET'] = $ADMIN_STYLESHEET ?? ADMIN_STYLESHEET;
 
 if ($form->my_page_name == 'edit_order') {
 	// get is for "table_name" and "where" only
-	$table_name = isset($_GET['table_name']) ? $_GET['table_name'] : '';
-	// $where = isset($_GET['where']) ? $_GET['where'] : '';
+	$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 array(0..max), cause in a <select>
+	// $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 = array();
+		$position = [];
 	}
-	$row_data_id = $_POST['row_data_id'];
+	$row_data_id = $_POST['row_data_id'] ?? [];
 	$original_id = $row_data_id;
 	if (count($position)) {
 		$row_data_order = $_POST['row_data_order'];
@@ -116,8 +116,8 @@ if ($form->my_page_name == 'edit_order') {
 				// 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]];
-				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1];
+				$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
@@ -129,8 +129,8 @@ if ($form->my_page_name == 'edit_order') {
 				// 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];
-				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
+				$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
@@ -140,8 +140,10 @@ if ($form->my_page_name == 'edit_order') {
 			(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
 		) {
 			for ($i = 0; $i < count($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);
+				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
@@ -154,29 +156,33 @@ if ($form->my_page_name == 'edit_order') {
 	$q .= "ORDER BY order_number";
 
 	// init arrays
-	$row_data = array();
-	$options_id = array();
-	$options_name = array();
-	$options_selected = array();
+	$row_data = [];
+	$options_id = [];
+	$options_name = [];
+	$options_selected = [];
 	// DB read data for menu
 	while ($res = $form->dbReturn($q)) {
-		$row_data[] = array(
+		$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 = array();
+	$messages = [];
 	// error msg
 	if (isset($error)) {
 		if (!isset($msg)) {
-			$msg = array();
+			$msg = [];
 		}
-		$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => '100%');
+		$messages[] = [
+			'msg' => $msg,
+			'class' => 'error',
+			'width' => '100%'
+		];
 	}
 	$DATA['form_error_msg'] = $messages;
 
@@ -187,7 +193,9 @@ if ($form->my_page_name == 'edit_order') {
 		// list of points to order
 		for ($j = 0; $j < count($position); $j++) {
 			// if matches, put into select array
-			if ($original_id[$position[$j]] == $row_data[$i]['id']) {
+			if (isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
+				$original_id[$position[$j]] == $row_data[$i]['id']
+			) {
 				$options_selected[] = $i;
 			}
 		}
@@ -197,8 +205,8 @@ if ($form->my_page_name == 'edit_order') {
 	$DATA['options_selected'] = $options_selected;
 
 	// hidden list for the data (id, order number)
-	$row_data_id = array();
-	$row_data_order = array();
+	$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'];
@@ -208,7 +216,7 @@ if ($form->my_page_name == 'edit_order') {
 
 	// hidden names for the table & where string
 	$DATA['table_name'] = $table_name;
-	$DATA['where_string'] = isset($where_string) ? $where_string : '';
+	$DATA['where_string'] = $where_string ?? '';
 
 	$EDIT_TEMPLATE = 'edit_order.tpl';
 } else {
@@ -226,7 +234,7 @@ if ($form->my_page_name == 'edit_order') {
 
 	$DATA['table_width'] = $table_width;
 
-	$messages = array();
+	$messages = [];
 	// write out error / status messages
 	$messages[] = $form->formPrintMsg();
 	$DATA['form_error_msg'] = $messages;
@@ -244,13 +252,13 @@ if ($form->my_page_name == 'edit_order') {
 	$DATA['GROUP_LEVEL'] = $_SESSION['GROUP_ACL_LEVEL'];
 	$PAGES = $_SESSION['PAGES'];
 
-	//$form->debug('menu', $form->printAr($PAGES));
+	//$form->log->debug('menu', $form->log->prAr($PAGES));
 
 	// build nav from $PAGES ...
 	if (!isset($PAGES) || !is_array($PAGES)) {
-		$PAGES = array();
+		$PAGES = [];
 	}
-	$menuarray = array();
+	$menuarray = [];
 	foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
 		if ($PAGE_DATA['menu'] && $PAGE_DATA['online']) {
 			$menuarray[] = $PAGE_DATA;
@@ -269,7 +277,7 @@ if ($form->my_page_name == 'edit_order') {
 	}
 
 	$position = 0;
-	$menu_data = array();
+	$menu_data = [];
 	// for ($i = 1; $i <= count($menuarray); $i ++) {
 	foreach ($menuarray as $i => $data) {
 		// do that for new array
@@ -282,7 +290,7 @@ if ($form->my_page_name == 'edit_order') {
 				''
 			).
 			// filename
-			$data['filename'].
+			($data['filename'] ?? '').
 			// query string
 			(isset($data['query_string']) && $data['query_string'] ?
 				$data['query_string'] :
@@ -294,13 +302,14 @@ if ($form->my_page_name == 'edit_order') {
 			$menu_data[$i]['splitfactor_in'] = 0;
 		}
 		// on matching, we also need to check if we are in the same folder
-		if ($data['filename'] == $form->getPageName() &&
+		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 = $j;
+			$position = $i;
 			$menu_data[$i]['position'] = 1;
 			$menu_data[$i]['popup'] = 0;
 		} else {
@@ -323,9 +332,9 @@ if ($form->my_page_name == 'edit_order') {
 			$menu_data[$i]['splitfactor_out'] = 0;
 		}
 	} // for
-	// $form->debug('MENU ARRAY', $form->printAr($menu_data));
+	// $form->log->debug('MENU ARRAY', $form->log->prAr($menu_data));
 	$DATA['menu_data'] = $menu_data;
-	$DATA['page_name'] = $menuarray[$position]['page_name'];
+	$DATA['page_name'] = $menuarray[$position]['page_name'] ?? '-Undefined ['.$position.'] -';
 	$L_TITLE = $DATA['page_name'];
 	// html title
 	$HEADER['HTML_TITLE'] = $form->l->__($L_TITLE);
@@ -339,7 +348,7 @@ if ($form->my_page_name == 'edit_order') {
 		$DATA['form_my_page_name'] = $form->my_page_name;
 		$DATA['filename_exist'] = 0;
 		$DATA['drop_down_input'] = 0;
-		$elements = array();
+		$elements = [];
 		// depending on the "getPageName()" I show different stuff
 		switch ($form->my_page_name) {
 			case 'edit_users':
@@ -377,9 +386,9 @@ if ($form->my_page_name == 'edit_order') {
 					$q = "DELETE FROM temp_files";
 					$form->dbExec($q);
 					// gets all files in the current dir and dirs given ending with .php
-					$folders = array('../admin/', '../frontend/');
-					$files = array('*.php');
-					$search_glob = array();
+					$folders = ['../admin/', '../frontend/'];
+					$files = ['*.php'];
+					$search_glob = [];
 					foreach ($folders as $folder) {
 						// make sure this folder actually exists
 						if (is_dir(ROOT.$folder)) {
@@ -465,7 +474,7 @@ if ($form->my_page_name == 'edit_order') {
 				print '[No valid page definition given]';
 				break;
 		}
-		// $form->debug('edit', "Elements: <pre>".$form->printAr($elements));
+		// $form->log->debug('edit', "Elements: <pre>".$form->log->prAr($elements));
 		$DATA['elements'] = $elements;
 		$DATA['hidden'] = $form->formCreateHiddenFields();
 		$DATA['save_delete'] = $form->formCreateSaveDelete();
@@ -476,7 +485,7 @@ if ($form->my_page_name == 'edit_order') {
 }
 
 // debug data, if DEBUG flag is on, this data is print out
-$DEBUG_DATA['DEBUG'] = isset($DEBUG_TMPL) ? $DEBUG_TMPL : '';
+$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL ?? '';
 
 // create main data array
 $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
@@ -493,7 +502,7 @@ if (is_dir(BASE.CACHE)) {
 $smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$smarty->lang, 'editAdmin_'.$smarty->lang);
 
 // debug output
-echo $login->printErrorMsg();
-echo $form->printErrorMsg();
+echo $login->log->printErrorMsg();
+echo $form->log->printErrorMsg();
 
 // __END__

www/includes/table_arrays/array_edit_access.php

@@ -1,26 +1,26 @@
 <?php declare(strict_types=1);
 
-$edit_access = array(
-	'table_array' => array(
-		'edit_access_id' => array(
-			'value' => isset($GLOBALS['edit_access_id']) ? $GLOBALS['edit_access_id'] : '',
+$edit_access = [
+	'table_array' => [
+		'edit_access_id' => [
+			'value' => $GLOBALS['edit_access_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1
-		),
-		'name' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Access Group Name',
 			'mandatory' => 1,
 			'type' => 'text',
 			'error_check' => 'alphanumericspace|unique'
-		),
-		'description' => array(
-			'value' => isset($GLOBALS['description']) ? $GLOBALS['description'] : '',
+		],
+		'description' => [
+			'value' => $GLOBALS['description'] ?? '',
 			'output_name' => 'Description',
 			'type' => 'textarea'
-		),
-		'color' => array(
-			'value' => isset($GLOBALS['color']) ? $GLOBALS['color'] : '',
+		],
+		'color' => [
+			'value' => $GLOBALS['color'] ?? '',
 			'output_name' => 'Color',
 			'mandatory' => 0,
 			'type' => 'text',
@@ -29,80 +29,80 @@ $edit_access = array(
 			'error_check' => 'custom',
 			'error_regex' => "/[\dA-Fa-f]{6}/",
 			'error_example' => 'F6A544'
-		),
-		'enabled' => array(
-			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : 0,
+		],
+		'enabled' => [
+			'value' => $GLOBALS['enabled'] ?? 0,
 			'output_name' => 'Enabled',
 			'type' => 'binary',
 			'int' => 1, // OR 'bool' => 1
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'protected' => array(
-			'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : 0,
+			],
+		],
+		'protected' => [
+			'value' => $GLOBALS['protected'] ?? 0,
 			'output_name' => 'Protected',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'additional_acl' => array(
-			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
+			],
+		],
+		'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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		)
-	),
-	'element_list' => array(
-		'edit_access_data' => array(
+		],
+	],
+	'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
+			// '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' => array(
-				'name' => array(
+			'elements' => [
+				'name' => [
 					'type' => 'text',
 					'error_check' => 'alphanumeric|unique',
 					'output_name' => 'Name',
 					'mandatory' => 1
-				),
-				'value' => array(
+				],
+				'value' => [
 					'type' => 'text',
 					'output_name' => 'Value'
-				),
-				'enabled' => array(
+				],
+				'enabled' => [
 					'type' => 'checkbox',
 					'output_name' => 'Activate',
 					'int' => 1,
-					'element_list' => array(1)
-				),
-				/*'edit_access_id' => array(
+					'element_list' => [1]
+				],
+				/*'edit_access_id' => [
 					'int' => 1,
 					'type' => 'hidden',
-					'fk_id' => 1 # reference main key from master table above
-				),*/
-				'edit_access_data_id' => array(
+					'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,109 +1,109 @@
 <?php declare(strict_types=1);
 
-$edit_groups = array(
-	'table_array' => array(
-		'edit_group_id' => array(
-			'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
+$edit_groups = [
+	'table_array' => [
+		'edit_group_id' => [
+			'value' => $GLOBALS['edit_group_id'] ?? '',
 			'pk' => 1,
 			'type' => 'hidden'
-		),
-		'enabled' => array(
-			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+		],
+		'enabled' => [
+			'value' => $GLOBALS['enabled'] ?? '',
 			'output_name' => 'Enabled',
 			'int' => 1,
 			'type' => 'binary',
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'name' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			],
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Group Name',
 			'type' => 'text',
 			'mandatory' => 1
-		),
-		'edit_access_right_id' => array(
-			'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
+		],
+		'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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		),
-		array(
+		],
+		[
 			'name' => 'enabled',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Enabled: '
-		)
-	),
-	'element_list' => array(
-		'edit_page_access' => array(
+		],
+	],
+	'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' => array(
+			'read_data' => [
 				'table_name' => 'edit_page',
 				'pk_id' => 'edit_page_id',
 				'name' => 'name',
 				'order' => 'order_number'
-			),
-			'elements' => array(
-				'edit_page_access_id' => array(
+			],
+			'elements' => [
+				'edit_page_access_id' => [
 					'type' => 'hidden',
 					'int' => 1,
 					'pk_id' => 1
-				),
-				'enabled' => array(
+				],
+				'enabled' => [
 					'type' => 'checkbox',
 					'output_name' => 'Activate',
 					'int' => 1,
-					'element_list' => array(1)
-				),
-				'edit_access_right_id' => array(
+					'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' => array(
+				],
+				'edit_page_id' => [
 					'int' => 1,
 					'type' => 'hidden'
-				)
+				],
 				/*,
-				'edit_default' => array(
+				'edit_default' => [
 					'output_name' => 'Default',
 					'type' => 'radio',
 					'mandatory' => 1
-				)*/
-			)
-		) // edit pages ggroup
-	)
-);
+				],*/
+			],
+		], // edit pages ggroup
+	],
+];
 
 // __END__

www/includes/table_arrays/array_edit_languages.php

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

www/includes/table_arrays/array_edit_menu_group.php

@@ -1,40 +1,40 @@
 <?php declare(strict_types=1);
 
-$edit_menu_group = array(
-	'table_array' => array(
-		'edit_menu_group_id' => array(
-			'value' => isset($GLOBALS['edit_menu_group_id']) ? $GLOBALS['edit_menu_group_id'] : '',
+$edit_menu_group = [
+	'table_array' => [
+		'edit_menu_group_id' => [
+			'value' => $GLOBALS['edit_menu_group_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1
-		),
-		'name' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Group name',
 			'mandatory' => 1,
 			'type' => 'text'
-		),
-		'flag' => array(
-			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
+		],
+		'flag' => [
+			'value' => $GLOBALS['flag'] ?? '',
 			'output_name' => 'Flag',
 			'mandatory' => 1,
 			'type' => 'text',
 			'error_check' => 'alphanumeric|unique'
-		),
-		'order_number' => array(
-			'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
+		],
+		'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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		)
-	)
-);
+		],
+	],
+];
 
 // __END__

www/includes/table_arrays/array_edit_pages.php

@@ -1,101 +1,101 @@
 <?php declare(strict_types=1);
 
-$edit_pages = array(
-	'table_array' => array(
-		'edit_page_id' => array(
-			'value' => isset($GLOBALS['edit_page_id']) ? $GLOBALS['edit_page_id'] : '',
+$edit_pages = [
+	'table_array' => [
+		'edit_page_id' => [
+			'value' => $GLOBALS['edit_page_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1
-		),
-		'filename' => array(
-			'value' => isset($GLOBALS['filename']) ? $GLOBALS['filename'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '',
+			'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' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Page name',
 			'mandatory' => 1,
 			'type' => 'text'
-		),
-		'order_number' => array(
-			'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
+		],
+		'order_number' => [
+			'value' => $GLOBALS['order_number'] ?? '',
 			'output_name' => 'Page order',
 			'type' => 'order',
 			'int' => 1,
 			'order' => 1
-		),
-		/* 'flag' => array(
+		],
+		/* 'flag' => [
 			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
 			'output_name' => 'Page Flag',
 			'type' => 'drop_down_array',
-			'query' => array(
+			'query' => [
 				'0' => '0',
 				'1' => '1',
 				'2' => '2',
 				'3' => '3',
 				'4' => '4',
 				'5' => '5'
-			)
-		),*/
-		'online' => array(
-			'value' => isset($GLOBALS['online']) ? $GLOBALS['online'] : '',
+			],
+		],*/
+		'online' => [
+			'value' => $GLOBALS['online'] ?? '',
 			'output_name' => 'Online',
 			'int' => 1,
 			'type' => 'binary',
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'menu' => array(
-			'value' => isset($GLOBALS['menu']) ? $GLOBALS['menu'] : '',
+			],
+		],
+		'menu' => [
+			'value' => $GLOBALS['menu'] ?? '',
 			'output_name' => 'Menu',
 			'int' => 1,
 			'type' => 'binary',
-			'element_list' => array(
+			'element_list' => [
 				 '1' => 'Yes',
 				 '0' => 'No'
-			)
-		),
-		'popup' => array(
-			'value' => isset($GLOBALS['popup']) ? $GLOBALS['popup'] : '',
+			],
+		],
+		'popup' => [
+			'value' => $GLOBALS['popup'] ?? '',
 			'output_name' => 'Popup',
 			'int' => 1,
 			'type' => 'binary',
-			'element_list' => array(
+			'element_list' => [
 				 '1' => 'Yes',
 				 '0' => 'No'
-			)
-		),
-		'popup_x' => array(
-			'value' => isset($GLOBALS['popup_x']) ? $GLOBALS['popup_x'] : '',
+			],
+		],
+		'popup_x' => [
+			'value' => $GLOBALS['popup_x'] ?? '',
 			'output_name' => 'Popup Width',
 			'int_null' => 1,
 			'type' => 'text',
 			'size' => 4,
 			'length' => 4
-		),
-		'popup_y' => array(
-			'value' => isset($GLOBALS['popup_y']) ? $GLOBALS['popup_y'] : '',
+		],
+		'popup_y' => [
+			'value' => $GLOBALS['popup_y'] ?? '',
 			'output_name' => 'Popup Height',
 			'int_null' =>  1,
 			'type' => 'text',
 			'size' => 4,
 			'length' => 4
-		),
-		'content_alias_edit_page_id' => array(
-			'value' => isset($GLOBALS['content_alias_edit_page_id']) ? $GLOBALS['content_alias_edit_page_id'] : '',
+		],
+		'content_alias_edit_page_id' => [
+			'value' => $GLOBALS['content_alias_edit_page_id'] ?? '',
 			'output_name' => 'Content Alias Source',
 			'int_null' => 1,
 			'type' => 'drop_down_db',
@@ -110,132 +110,132 @@ $edit_pages = array(
 				// "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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		),
-		array(
+		],
+		[
 			'name' => 'filename',
 			'before_value' => 'Filename: '
-		),
-		 array(
+		],
+		 [
 		   'name' => 'online',
-		   'binary' => array('Yes','No'),
+		   'binary' => ['Yes','No'],
 		   'before_value' => 'Online: '
-		 ),
-		 array(
+		 ],
+		 [
 			'name' => 'menu',
-			'binary' => array('Yes','No'),
+			'binary' => ['Yes','No'],
 			'before_value' => 'Menu: '
-		),
-		array(
+		],
+		[
 			'name' => 'popup',
-			'binary' => array('Yes','No'),
+			'binary' => ['Yes','No'],
 			'before_value' => 'Popup: '
-		)
-	),
-	'reference_arrays' => array(
-		'edit_visible_group' => array(
+		],
+	],
+	'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' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
+			'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' => array(
+		],
+		'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' => isset($GLOBALS['edit_menu_group_id']) ? $GLOBALS['edit_menu_group_id'] : '',
+			'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' => array(
-		'edit_query_string' => array(
+	],
+	'element_list' => [
+		'edit_query_string' => [
 			'output_name' => 'Query Strings',
 			'delete_name' => 'remove_query_string',
 			'prefix' => 'eqs',
-			'elements' => array(
-				'name' => array(
+			'elements' => [
+				'name' => [
 					'output_name' => 'Name',
 					'type' => 'text',
 					'error_check' => 'unique|alphanumeric',
 					'mandatory' => 1
-				),
-				'value' => array(
+				],
+				'value' => [
 					'output_name' => 'Value',
 					'type' => 'text'
-				),
-				'enabled' => array(
+				],
+				'enabled' => [
 					'output_name' => 'Enabled',
 					'int' => 1,
 					'type' => 'checkbox',
-					'element_list' => array(1)
-				),
-				'dynamic' => array(
+					'element_list' => [1],
+				],
+				'dynamic' => [
 					'output_name' => 'Dynamic',
 					'int' => 1,
 					'type' => 'checkbox',
-					'element_list' => array(1)
-				),
-				'edit_query_string_id' => array(
+					'element_list' => [1],
+				],
+				'edit_query_string_id' => [
 					'type' => 'hidden',
 					'pk_id' => 1
-				)
-			) // elements
-		), // query_string element list
-		'edit_page_content' => array(
+				],
+			], // elements
+		], // query_string element list
+		'edit_page_content' => [
 			'output_name' => 'Page Content',
 			'delete_name' => 'remove_page_content',
 			'prefix' => 'epc',
-			'elements' => array(
-				'name' => array(
+			'elements' => [
+				'name' => [
 					'output_name' => 'Content',
 					'type' => 'text',
 					'error_check' => 'alphanumeric',
 					'mandatory' => 1
-				),
-				'uid' => array(
+				],
+				'uid' => [
 					'output_name' => 'UID',
 					'type' => 'text',
 					'error_check' => 'unique|alphanumeric',
 					'mandatory' => 1
-				),
-				'order_number' => array(
+				],
+				'order_number' => [
 					'output_name' => 'Order',
 					'type' => 'text',
 					'error_check' => 'int',
 					'mandatory' => 1
-				),
-				'online' => array(
+				],
+				'online' => [
 					'output_name' => 'Online',
 					'int' => 1,
 					'type' => 'checkbox',
-					'element_list' => array(1)
-				),
-				'edit_access_right_id' => array(
+					'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' => array(
+				],
+				'edit_page_content_id' => [
 					'type' => 'hidden',
 					'pk_id' => 1
-				)
-			)
-		)
-	) // element list
-);
+				],
+			],
+		],
+	], // element list
+];
 
 // __END__

www/includes/table_arrays/array_edit_schemes.php

@@ -1,20 +1,20 @@
 <?php declare(strict_types=1);
 
-$edit_schemes = array(
-	'table_array' => array(
-		'edit_scheme_id' => array(
-			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+$edit_schemes = [
+	'table_array' => [
+		'edit_scheme_id' => [
+			'value' => $GLOBALS['edit_scheme_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1
-		),
-		'name' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Scheme Name',
 			'mandatory' => 1,
 			'type' => 'text'
-		),
-		'header_color' => array(
-			'value' => isset($GLOBALS['header_color']) ? $GLOBALS['header_color'] : '',
+		],
+		'header_color' => [
+			'value' => $GLOBALS['header_color'] ?? '',
 			'output_name' => 'Header Color',
 			'mandatory' => 1,
 			'type' => 'text',
@@ -23,35 +23,35 @@ $edit_schemes = array(
 			'error_check' => 'custom',
 			'error_regex' => '/[\dA-Fa-f]{6}/',
 			'error_example' => 'F6A544'
-		),
-		'enabled' => array(
-			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+		],
+		'enabled' => [
+			'value' => $GLOBALS['enabled'] ?? '',
 			'output_name' => 'Enabled',
 			'int' => 1,
 			'type' => 'binary',
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'template' => array(
-			'value' => isset($GLOBALS['template']) ? $GLOBALS['template'] : '',
+			],
+		],
+		'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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		),
-		array(
+		],
+		[
 			'name' => 'enabled',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Enabled: '
-		)
-	)
-); // main array
+		],
+	],
+]; // main array
 
 // __END__

www/includes/table_arrays/array_edit_users.php

@@ -1,270 +1,270 @@
 <?php declare(strict_types=1);
 
-$edit_users = array(
-	'table_array' => array(
-		'edit_user_id' => array(
-			'value' => isset($GLOBALS['edit_user_id']) ? $GLOBALS['edit_user_id'] : '',
+$edit_users = [
+	'table_array' => [
+		'edit_user_id' => [
+			'value' => $GLOBALS['edit_user_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1,
 			'int' => 1
-		),
-		'username' => array(
-			'value' => isset($GLOBALS['username']) ? $GLOBALS['username'] : '',
+		],
+		'username' => [
+			'value' => $GLOBALS['username'] ?? '',
 			'output_name' => 'Username',
 			'mandatory' => 1,
 			'error_check' => 'unique|alphanumericextended',
 			'type' => 'text'
-		),
-		'password' => array(
-			'value' => isset($GLOBALS['password']) ? $GLOBALS['password'] : '',
-			'HIDDEN_value' => isset($GLOBALS['HIDDEN_password']) ? $GLOBALS['HIDDEN_password'] : '',
-			'CONFIRM_value' => isset($GLOBALS['CONFIRM_password']) ? $GLOBALS['CONFIRM_password'] : '',
+		],
+		'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' => array( // connected field updates, and update data
-				'password_change_date' => array( // db row to update
+			'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' => array(
-			'value' => isset($GLOBALS['password_change_interval']) ? $GLOBALS['password_change_interval'] : '',
+		'password_change_interval' => [
+			'value' => $GLOBALS['password_change_interval'] ?? '',
 			'output_name' => 'Password change interval',
 			'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
 			'type' => 'text',
 			'interval' => 1, // interval needs NULL write for empty
 			'size' => 5, // make it 5 chars long
 			'length' => 5
-		),
-		'enabled' => array(
-			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+		],
+		'enabled' => [
+			'value' => $GLOBALS['enabled'] ?? '',
 			'output_name' => 'Enabled',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'strict' => array(
-			'value' => isset($GLOBALS['strict']) ? $GLOBALS['strict'] : '',
+			],
+		],
+		'strict' => [
+			'value' => $GLOBALS['strict'] ?? '',
 			'output_name' => 'Strict (Lock after errors)',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'locked' => array(
-			'value' => isset($GLOBALS['locked']) ? $GLOBALS['locked'] : '',
+			],
+		],
+		'locked' => [
+			'value' => $GLOBALS['locked'] ?? '',
 			'output_name' => 'Locked (auto set if strict with errors)',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'admin' => array(
-			'value' => isset($GLOBALS['admin']) ? $GLOBALS['admin'] : '',
+			],
+		],
+		'admin' => [
+			'value' => $GLOBALS['admin'] ?? '',
 			'output_name' => 'Admin',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'debug' => array(
-			'value' => isset($GLOBALS['debug']) ? $GLOBALS['debug'] : '',
+			],
+		],
+		'debug' => [
+			'value' => $GLOBALS['debug'] ?? '',
 			'output_name' => 'Debug',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'db_debug' => array(
-			'value' => isset($GLOBALS['db_debug']) ? $GLOBALS['db_debug'] : '',
+			],
+		],
+		'db_debug' => [
+			'value' => $GLOBALS['db_debug'] ?? '',
 			'output_name' => 'DB Debug',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'email' => array(
-			'value' => isset($GLOBALS['email']) ? $GLOBALS['email'] : '',
+			],
+		],
+		'email' => [
+			'value' => $GLOBALS['email'] ?? '',
 			'output_name' => 'E-Mail',
 			'type' => 'text',
 			'error_check' => 'email'
-		),
-		'last_name' => array(
-			'value' => isset($GLOBALS['last_name']) ? $GLOBALS['last_name'] : '',
+		],
+		'last_name' => [
+			'value' => $GLOBALS['last_name'] ?? '',
 			'output_name' => 'Last Name',
 			'type' => 'text'
-		),
-		'first_name' => array(
-			'value' => isset($GLOBALS['first_name']) ? $GLOBALS['first_name'] : '',
+		],
+		'first_name' => [
+			'value' => $GLOBALS['first_name'] ?? '',
 			'output_name' => 'First Name',
 			'type' => 'text'
-		),
-		'edit_language_id' => array(
-			'value' => isset($GLOBALS['edit_language_id']) ? $GLOBALS['edit_language_id'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
+		],
+		'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' => array(
-			'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
+		],
+		'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' => array(
+		],
+		'login_error_count' => [
 			'output_name' => 'Login error count',
-			'value' => isset($GLOBALS['login_error_count']) ? $GLOBALS['login_error_count'] : '',
+			'value' => $GLOBALS['login_error_count'] ?? '',
 			'type' => 'view',
 			'empty' => '0'
-		),
-		'login_error_date_last' => array(
+		],
+		'login_error_date_last' => [
 			'output_name' => 'Last login error',
-			'value' => isset($GLOBALS['login_error_date_liast']) ? $GLOBALS['login_error_date_liast'] : '',
+			'value' => $GLOBALS['login_error_date_liast'] ?? '',
 			'type' => 'view',
 			'empty' => '-'
-		),
-		'login_error_date_first' => array(
+		],
+		'login_error_date_first' => [
 			'output_name' => 'First login error',
-			'value' => isset($GLOBALS['login_error_date_first']) ? $GLOBALS['login_error_date_first'] : '',
+			'value' => $GLOBALS['login_error_date_first'] ?? '',
 			'type' => 'view',
 			'empty' => '-'
-		),
-		'protected' => array(
-			'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : '',
+		],
+		'protected' => [
+			'value' => $GLOBALS['protected'] ?? '',
 			'output_name' => 'Protected',
 			'type' => 'binary',
 			'int' => 1,
-			'element_list' => array(
+			'element_list' => [
 				'1' => 'Yes',
 				'0' => 'No'
-			)
-		),
-		'additional_acl' => array(
-			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
+			],
+		],
+		'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, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
 	'table_name' => 'edit_user',
-	'show_fields' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'username'
-		),
-		array(
+		],
+		[
 			'name' => 'enabled',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Enabled: '
-		),
-		array(
+		],
+		[
 			'name' => 'debug',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Debug: '
-		),
-		array(
+		],
+		[
 			'name' => 'db_debug',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'DB Debug: '
-		),
-		array(
+		],
+		[
 			'name' => 'strict',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Strict: '
-		),
-		array(
+		],
+		[
 			'name' => 'locked',
-			'binary' => array('Yes', 'No'),
+			'binary' => ['Yes', 'No'],
 			'before_value' => 'Locked: '
-		),
-		array(
+		],
+		[
 			'name' => 'login_error_count',
 			'before_value' => 'Errors: '
-		)
-	),
-	'element_list' => array(
-		'edit_access_user' => array(
+		],
+	],
+	'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' => array(
+			'read_data' => [
 				'table_name' => 'edit_access',
 				'pk_id' => 'edit_access_id',
 				'name' => 'name',
 				'order' => 'name'
-			),
-			'elements' => array(
-				'edit_access_user_id' => array(
+			],
+			'elements' => [
+				'edit_access_user_id' => [
 					'output_name' => 'Activate',
 					'type' => 'hidden',
 					'int' => 1,
 					'pk_id' => 1
-				),
-				'enabled' => array(
+				],
+				'enabled' => [
 					'type' => 'checkbox',
 					'output_name' => 'Activate',
 					'int' => 1,
-					'element_list' => array(1)
-				),
-				'edit_access_right_id' => array(
+					'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' => array(
+				],
+				'edit_default' => [
 					'type' => 'radio_group',
 					'output_name' => 'Default',
 					'int' => 1,
 					'element_list' => 'radio_group'
-				),
-				'edit_access_id' => array(
+				],
+				'edit_access_id' => [
 					'type' => 'hidden',
 					'int' => 1
-				)
-			)
-		) // edit pages ggroup
-	)
-);
+				],
+			],
+		], // edit pages ggroup
+	],
+];
 
 // __END__

www/includes/table_arrays/array_edit_visible_group.php

@@ -1,33 +1,33 @@
 <?php declare(strict_types=1);
 
-$edit_visible_group = array(
-	'table_array' => array(
-		'edit_visible_group_id' => array(
-			'value' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
+$edit_visible_group = [
+	'table_array' => [
+		'edit_visible_group_id' => [
+			'value' => $GLOBALS['edit_visible_group_id'] ?? '',
 			'type' => 'hidden',
 			'pk' => 1
-		),
-		'name' => array(
-			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+		],
+		'name' => [
+			'value' => $GLOBALS['name'] ?? '',
 			'output_name' => 'Group name',
 			'mandatory' => 1,
 			'type' => 'text'
-		),
-		'flag' => array(
-			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
+		],
+		'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' => array(
-		array(
+	'show_fields' => [
+		[
 			'name' => 'name'
-		)
-	)
-);
+		],
+	],
+];
 
 // __END__

www/includes/templates/admin/smarty_test.tpl

@@ -12,13 +12,19 @@
 <div class="jq-container">
 	<div id="jq-test" class="jp-test">
 		<div id="test-div" class="test-div">
-			Some content ehre or asdfasdfasf
+			Some content here or asdfasdfasf
 		</div>
 		<div id="translate-div">
 			TRANSLATION SMARTY: {t}I should be translated{/t}
 		</div>
 	</div>
 </div>
+<div class="loop-test">
+	<div>LOOP TEST</div>
+{section name=page_list start=1 loop=$loop_start+1}
+	<div>LOOP OUTPUT: {$smarty.section.page_list.index}</div>
+{/section}
+</div>
 {* progresss indicator *}
 <div id="indicator"></div>
 {* the action confirm box *}

www/includes/templates/frontend/main_body.tpl

@@ -16,6 +16,9 @@
 	{if $STYLESHEET}
 	<link rel=stylesheet type="text/css" href="{$css}{$STYLESHEET}">
 	{/if}
+	{if $CSS_CORE_INCLUDE}
+	<link rel=stylesheet type="text/css" href="{$CSS_CORE_INCLUDE}">
+	{/if}
 	{if $CSS_INCLUDE}
 	<link rel=stylesheet type="text/css" href="{$CSS_INCLUDE}">
 	{/if}
@@ -23,9 +26,6 @@
 	<link rel=stylesheet type="text/css" href="{$CSS_SPECIAL_INCLUDE}">
 	{/if}
 	<script language="JavaScript" src="{$js}/firebug.js"></script>
-	{if $JAVASCRIPT}
-	<script language="JavaScript" src="{$js}{$JAVASCRIPT}"></script>
-	{/if}
 	{if $USE_JQUERY}
 	{* JQuery *}
 	<script type="text/javascript" src="{$js}/jquery.min.js"></script>
@@ -37,6 +37,12 @@
 	<script src="{$js}/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 		{/if}
 	{/if}
+	{if $JAVASCRIPT}
+	<script language="JavaScript" src="{$js}{$JAVASCRIPT}"></script>
+	{/if}
+	{if $JS_CORE_INCLUDE}
+	<script language="JavaScript" src="{$JS_CORE_INCLUDE}"></script>
+	{/if}
 	{if $JS_INCLUDE}
 	<script language="JavaScript" src="{$JS_INCLUDE}"></script>
 	{/if}

www/layout/admin/css/edit.css

@@ -382,7 +382,7 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	left: 0;
 	top: 0;
 	position: absolute;
-	z-index: 100;
+	z-index: 1000;
 }
 /* Animation for above progress */
 @keyframes rotate {