PHPstan check for level 5

Fix various issues for phpstan level 5

Start initial settings for level 6 (needs type declarations for all
vars)

.phan/config.php

@@ -1,7 +1,5 @@
 <?php
 
-use Phan\Config;
-
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -24,6 +22,9 @@ use Phan\Config;
  * of the phan executable or a path passed in via the CLI
  * '-d' flag.
  */
+
+use Phan\Config;
+
 return [
 	// If true, missing properties will be created when
 	// they are first seen. If false, we'll report an
@@ -56,6 +57,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 +85,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 +110,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*;
+for name in $sql_path*; do
-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;
+	for prefix in $file_prefix; do
-	do
 		prefix=$prefix"_";
 		t_name=`echo $t_name | sed -e "s/\$prefix//g"`;
 	done;
 
-# those tables don't need a trigger
+	# those tables don't need a trigger
-# edit_generic
+	# edit_generic
-# 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`;
+for file in `cat ORDER`; do
-do
+	if [ -f $file ]; then
-	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;
+for file in $new_order; do
-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;
+	for prefix in $file_prefix; do
-	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;
+	for path in $schemas; do
-	do
+		if [ $sqltype ]; then
-		if [ $sqltype ];
-		then
 			echo "SQL "$path"."$t_file;
 			echo "DROP TABLE "$path"."$t_file" CASCADE;" | psql -U $user -h $host $db
 		fi;
-		if [ $trgtype ];
+		if [ $trgtype ]; then
-		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 ];
+		if [ $fcttype ]; then
-		then
 			echo "FCT "$path"."$t_file;
 			echo "DROP FUNCTION "$path"."$t_file"();" | psql -U $user -h $host $db
 		fi;
-		if [ $idxtype ];
+		if [ $idxtype ]; then
-		then
 			index=$index_prefix"_"$t_file;
-	#		echo "IDX "$t_file;
+			# echo "IDX "$t_file;
-	#		echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
+			# echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
 		fi;
-		if [ $datatype ];
+		if [ $datatype ]; then
-		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.*);
@@ -56,4 +147,4 @@ BEGIN
 	RETURN NULL;
 END
 $$
-LANGUAGE 'plpgsql'
+LANGUAGE 'plpgsql';

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 '
+-- OLD, DEPRECATED, use set_generic.sql
-	BEGIN
+
-		IF TG_OP = ''INSERT'' THEN
+-- CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
-			NEW.date_created := clock_timestamp();
+-- 	BEGIN
-			NEW.user_created := current_user;
+-- 		IF TG_OP = ''INSERT'' THEN
-		ELSIF TG_OP = ''UPDATE'' THEN
+-- 			NEW.date_created := clock_timestamp();
-			NEW.date_updated := clock_timestamp();
+-- 			NEW.user_created := current_user;
-			NEW.user_updated := current_user;
+-- 		ELSIF TG_OP = ''UPDATE'' THEN
-		END IF;
+-- 			NEW.date_updated := clock_timestamp();
-		RETURN NEW;
+-- 			NEW.user_updated := current_user;
-	END;
+-- 		END IF;
-' LANGUAGE 'plpgsql';
+-- 		RETURN NEW;
+-- 	END;
+-- ' LANGUAGE 'plpgsql';

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,
+	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-	value	VARCHAR,
 	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,
+	uid	VARCHAR,
-	edit_access_right_id INT NOT NULL,
+	name	VARCHAR,
-	additional_acl	JSONB,
+	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
 ) 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,
+	session_id	VARCHAR
-	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE
 ) 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
-	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
 ) 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,
+	last_login	TIMESTAMP WITHOUT TIME ZONE,
-	edit_group_id INT NOT NULL,
+	login_error_count	INT DEFAULT 0,
-	edit_scheme_id INT,
-	edit_access_right_id INT NOT NULL,
-	login_error_count	INT,
 	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)
+	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	password_reset_uid	VARCHAR, -- the uid to access the password reset page
-	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
-	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
 ) 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 temp_files ADD folder VARCHAR;
-ALTER TABLE edit_page ADD hostname varchar;
+ALTER TABLE edit_page ADD hostname VARCHAR;
 
 ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;

4dev/lang/admin/messages_en_utf8.po

@@ -27,3 +27,9 @@ msgstr "Month"
 
 msgid "INPUT TEST"
 msgstr "OUTPUT TEST EN"
+
+msgid "I should be translated"
+msgstr "I should be translated: I WAS TRANSLATED"
+
+msgid "Are we translated?"
+msgstr "Are we translated? Yes, we are!"

README.md

@@ -1,5 +1,13 @@
 # PHP Core Library
 
+## Code Standard
+
+ * Uses PSR-12
+ * tab indent instead of 4 spaces indent
+ * Warning at 120 character length, error at 240 character length
+
+## General information
+
 Base PHP class files to setup any project
   * login
   * database wrapper
@@ -25,3 +33,13 @@ last tested PHP 5.6 and PHP 7.0
 ### namespace
 
 The new namespace branch. This is the development area for the master branch
+
+## Static checks
+
+With phpstan
+`phpstan`
+
+With phan
+`phan --progress-bar -C --analyze-twice`
+
+pslam is setup but not configured

phpstan-bootstrap.php

@@ -1,6 +1,9 @@
 <?php
+
 // Boostrap file for PHPstand
 // sets the _SERVER['HTTP_HOST'] var so we can have DB detection
 $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
+// so www/includes/edit_base.php works
+require_once('www/lib/Smarty/SmartyBC.class.php');
 
 // __END__

phpstan.neon

@@ -2,21 +2,26 @@
 
 parameters:
 	tmpDir: /tmp/phpstan-corelibs
-	level: 1
+	level: 5
 	paths:
 		- %currentWorkingDirectory%/www
-	#bootstrap: %currentWorkingDirectory%/phpstan-bootstrap.php
+	bootstrapFiles:
-	#bootstrap: phpstan-bootstrap.php
-	autoload_directories:
-	autoload_files:
 		- %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
 		- www/admin/qq_file_upload_ajax.php
+		- www/admin/class_test*php
+		- www/admin/error_test.php
 		# admin synlink files
 		- www/admin/edit_access.php
 		- www/admin/edit_groups.php
@@ -40,12 +45,17 @@ parameters:
 		- www/tmp
 		- www/lib/pChart
 		- www/lib/pChart2.1.4
-		- www/lib/Smarty/
+		- www/lib/Smarty
-		- www/lib/smarty-3.1.30/
+		- www/lib/smarty-3.1.30
 		# ignore composer
 		- www/vendor
+		# ignore the smartyextend
+		- www/lib/CoreLibs/Template/SmartyExtend.php
 	# ignore errores with
-	# ignoreErrors:
+	ignoreErrors:
+		# -
+		# 	message: '#Reflection error: [a-zA-Z0-9\\_]+ not found.#'
+		# 	path: www/includes/edit_base.php
 		#- 'error regex'
 		#-
 		#	message: 'error regex'

www/admin/class_test.admin.backend.php

@@ -0,0 +1,54 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=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);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-admin';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$backend = new CoreLibs\Admin\Backend(DB_CONFIG);
+
+print "<html><head><title>TEST CLASS: ADMIN BACKEND</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// set acl, from eg login acl
+print "SETACL[]: " . $backend->setACL([]) . "<br>";
+print "ADBEDITLOG: " . $backend->adbEditLog('CLASSTEST-ADMIN', 'Some info stirng') . "<br>";
+print "ADBTOPMENU(0): " . \CoreLibs\Debug\Support::printAr($backend->adbTopMenu()) . "<br>";
+print "ADBMSG: " . $backend->adbMsg('info', 'Message: %1$d', [1]) . "<br>";
+print "Messaes: " . \CoreLibs\Debug\Support::printAr($this->messages) . "<br>";
+print "ADBPRINTDATETIME:<br>" . $backend->adbPrintDateTime(2021, 6, 21, 6, 38, '_test') . "<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.array.php

@@ -0,0 +1,203 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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>";
+
+/**
+ * attach key/value to an array so it becomes nested
+ *
+ * @param string $pre  Attach to new (empty for new root node)
+ * @param string $cur  New node
+ * @param array  $node Previous created array
+ * @return array       Updated array
+ */
+function rec(string $pre, string $cur, array $node = [])
+{
+	if (!is_array($node)) {
+		$node = [];
+	}
+	print "<div style='color: green;'>#### PRE: " . $pre . ", CUR: " . $cur . ", N-c: "
+		. count($node) . " [" . join('|', array_keys($node)) . "]</div>";
+	if (!$pre) {
+		print "** <span style='color: red;'>NEW</span><br>";
+		$node[$cur] = [];
+	} else {
+		if (array_key_exists($pre, $node)) {
+			print "+ <span style='color: orange;'>KEY FOUND:</span> " . $pre . ", add: " . $cur . "<br>";
+			$node[$pre][$cur] = [];
+		} else {
+			print "- NOT FOUND: loop<br>";
+			foreach ($node as $_pre => $_cur) {
+				print "> TRY: " . $_pre . " => " . count($_cur) . " [" . join('|', array_keys($_cur)) . "]<br>";
+				if (count($_cur) > 0) {
+					$node[$_pre] = rec($pre, $cur, $_cur);
+				}
+			}
+		}
+	}
+	return $node;
+}
+
+/**
+ * flatten array down to own level
+ *
+ * @param array $array
+ * @param array $return
+ * @return array
+ */
+function flattenArrayKey(array $array, array $return = [])
+{
+	foreach ($array as $key => $sub) {
+		$return[] = $key;
+		if (count($sub) > 0) {
+			$return = flattenArrayKey($sub, $return);
+		}
+	}
+	return $return;
+}
+
+// $test = [
+// 	'A' => [
+// 		'B' => [],
+// 		'C' => [
+// 			'D' => [],
+// 			'E' => [
+// 				'F' => []
+// 			]
+// 		]
+// 	],
+// 	'1' => [],
+// 	'2' => [],
+// 	'3' => [
+// 		'G' => []
+// 	]
+// ];
+
+// build a tested array for flatten
+$test = [];
+// core
+$test = rec('', 'A', $test);
+$test = rec('', '1', $test);
+$test = rec('', '2', $test);
+$test = rec('', '3', $test);
+$test = rec('3', 'G', $test);
+$test = rec('A', 'B', $test);
+$test = rec('A', 'C', $test);
+$test = rec('C', 'D', $test);
+$test = rec('C', 'E', $test);
+$test = rec('E', 'F', $test);
+// new
+$test = rec('C', 'U', $test);
+$test = rec('F', 'U', $test);
+$test = rec('', 'Al', $test);
+$test = rec('B', 'B1', $test);
+print "ORIGINAL: " . \CoreLibs\Debug\Support::printAr($test) . "<br>";
+print "FLATTEN: " . \CoreLibs\Debug\Support::printAr(flattenArrayKey($test)) . "<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.byte.php

@@ -0,0 +1,98 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,73 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,159 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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\Combined\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,274 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=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);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// 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;
+
+$db = $basic = new CoreLibs\Admin\Backend(DB_CONFIG);
+
+// NEXT STEP
+// $basic = new CoreLibs\Basic();
+// change __construct
+// add object $logger
+// add $this->log = $logger;
+// $db = new CoreLibs\DB\IO(DB_CONFIG, $basic->log);
+
+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: " . $db->dbInfo() . "<br>";
+echo "DB_CONFIG_SET constant: <pre>" . print_r(DB_CONFIG, true) . "</pre><br>";
+
+// DB client encoding
+print "DB Client encoding: " . $db->dbGetEncoding() . "<br>";
+
+while ($res = $db->dbReturn("SELECT * FROM max_test", 0, true)) {
+	print "TIME: " . $res['time'] . "<br>";
+}
+print "CACHED DATA: <pre>" . print_r($db->cursor_ext, true) . "</pre><br>";
+while ($res = $db->dbReturn("SELECT * FROM max_test")) {
+	print "[CACHED] TIME: " . $res['time'] . "<br>";
+}
+
+print "<pre>";
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST " . time() . "') RETURNING test");
+print "DIRECT INSERT STATUS: $status | "
+	. "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";
+
+// should throw deprecated error
+// $db->getReturningExt();
+print "DIRECT INSERT PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "<br>";
+$db->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $db->dbExecute("ins_foo", array('BAR TEST ' . time()));
+print "PREPARE INSERT STATUS: $status | "
+	. "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
+
+print "PREPARE INSERT PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "<br>";
+// returning test with multiple entries
+// $status = $db->db_exec(
+// 	"INSERT INTO foo (test) VALUES "
+// 	. "('BAR 1 " . time() . "'), "
+// 	. "('BAR 2 " . time() . "'), "
+// 	. "('BAR 3 " . time() . "') "
+// 	. "RETURNING foo_id"
+// );
+$status = $db->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($db->dbGetInsertPK(), true) . " | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";
+
+// no returning, but not needed ;
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST " . time() . "');");
+print "DIRECT INSERT STATUS: $status | "
+	. "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";
+
+// UPDATE WITH RETURNING
+$status = $db->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
+print "UPDATE STATUS: $status | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";
+print "</pre>";
+
+// REEAD PREPARE
+if (
+	$db->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 = $db->dbExecute('sel_foo', []);
+	$i = 1;
+	while (($res = $db->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($db->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 = $db->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 = $db->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 = $db->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 = $db->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 = $db->dbReturnArray($query, true);
+print "Full foobar list: <br><pre>" . print_r($data, true) . "</pre><br>";
+
+# async test queries
+/*	$db->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 = $db->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 = $db->dbFetchArray($ret))
+while ($res = $db->dbFetchArray())
+{
+	echo "RES: " . $res['test'] . "<br>";
+}
+# test async insert
+$db->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST " . time() . "')");
+echo "WAITING FOR ASYNC INSERT: ";
+while (($ret = $db->dbCheckAsync()) === true)
+{
+	print " . ";
+	sleep(1);
+	flush();
+}
+print "<br>END STATUS: " . $ret . " | PK: " . $db->insert_id . "<br>";
+print "ASYNC PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->insert_id), true) . "<br>"; */
+
+$to_db_version = '9.1.9';
+print "VERSION DB: " . $db->dbVersion() . "<br>";
+print "DB Version smaller $to_db_version: " . $db->dbCompareVersion('<' . $to_db_version) . "<br>";
+print "DB Version smaller than $to_db_version: " . $db->dbCompareVersion('<=' . $to_db_version) . "<br>";
+print "DB Version equal $to_db_version: " . $db->dbCompareVersion('=' . $to_db_version) . "<br>";
+print "DB Version bigger than $to_db_version: " . $db->dbCompareVersion('>=' . $to_db_version) . "<br>";
+print "DB Version bigger $to_db_version: " . $db->dbCompareVersion('>' . $to_db_version) . "<br>";
+
+/*	$q = "SELECT FOO FRO BAR";
+// $q = "Select * from foo";
+$foo = $db->dbExecAsync($q);
+print "[ERR] Query: " . $q . "<br>";
+print "[ERR] RESOURCE: $foo<br>";
+while (($ret = $db->dbCheckAsync()) === true)
+{
+	print "[ERR]: $ret<br>";
+	sleep(5);
+} */
+
+// search path check
+$q = "SHOW search_path";
+$cursor = $db->dbExec($q);
+$data = $db->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 = $db->dbExec(
+	"INSERT INTO test.schema_test (contents, id) VALUES "
+	. "('TIME: " . time() . "', " . rand(1, 10) . ")"
+);
+print "OTHER SCHEMA INSERT STATUS: "
+	. $status . " | PK NAME: " . $db->pk_name . ", PRIMARY KEY: " . $db->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 = $db->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,164 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+// 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>";
+print "S::DEBUSTRING(s): " . DebugSupport::debugString('SET') . "<br>";
+print "S::DEBUSTRING(''): " . DebugSupport::debugString('') . "<br>";
+print "S::DEBUSTRING(,s): " . DebugSupport::debugString(null, '{-}') . "<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>";
+
+// @codingStandardsIgnoreLine
+class AttachFull
+{
+	public $main;
+	public function __construct(object $class)
+	{
+		$this->main = $class;
+	}
+	public function test()
+	{
+		// should trigger deprecated
+		return $this->main->rgb2hex(2, 3, 4);
+	}
+}
+
+$af = new AttachFull($basic);
+// should trigger deprecated
+print "DEPREACTEDTEST: " . $af->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,67 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,100 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,50 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,65 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,116 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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>";
+*/
+
+$text = 'I am some text
+with some
+line breaks
+in there. Theis 
+is sucky';
+
+print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text) . "<br>";
+print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text, '##BR##') . "<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.image.php

@@ -0,0 +1,119 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,76 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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.lang.php

@@ -0,0 +1,57 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// init language
+$lang = 'en_utf8';
+// 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-lang';
+
+$l = new CoreLibs\Language\L10n($lang);
+ob_end_flush();
+
+print "<html><head><title>TEST CLASS: LANG</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$string = 'INPUT TEST';
+
+echo "LANGUAGE SET: " . $l->__getLang() . "<br>";
+echo "LANGUAGE FILE: " . $l->__getMoFile() . "<br>";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "<br>";
+
+// switch to other language
+$lang = 'ja_utf8';
+$l->l10nReloadMOfile($lang);
+
+echo "LANGUAGE SET: " . $l->__getLang() . "<br>";
+echo "LANGUAGE FILE: " . $l->__getMoFile() . "<br>";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "<br>";
+// TODO: run compare check input must match output
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.math.php

@@ -0,0 +1,60 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,68 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+ declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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.output.form.php

@@ -0,0 +1,77 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=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);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-form';
+ob_end_flush();
+
+// define an array for page use
+$table_arrays = [];
+$table_arrays[\CoreLibs\Get\System::getPageName(1)] = [
+	// form fields mtaching up with db fields
+	'table_array' => [
+	],
+	// laod query
+	'load_query' => '',
+	// database table to load from
+	'table_name' => '',
+	// for load dro pdown, format output
+	'show_fields' => [
+		[
+			'name' => 'name'
+		],
+		[
+			'name' => 'enabled',
+			'binary' => ['Yes', 'No'],
+			'before_value' => 'Enabled: '
+		],
+	],
+	// a multi reference entry
+	'element_list' => [
+	]
+];
+
+$basic = new CoreLibs\Basic();
+$form = new CoreLibs\Output\Form\Generate(DB_CONFIG);
+// $db = new CoreLibs\DB\IO(DB_CONFIG, $basic->log);
+
+print "<html><head><title>TEST CLASS: FORM GENERATE</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+print "MOBILE PHONE: " . $form->mobile_phone . "<br>";
+// sets table array to include
+print "MY PAGE NAME: " . $form->my_page_name . "<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.password.php

@@ -0,0 +1,70 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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

@@ -1,12 +1,15 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore warning
+
 /**
  * @phan-file-suppress PhanTypeSuspiciousStringExpression
  */
 
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+declare(strict_types=1);
-$DEBUG_ALL = 1;
+
-$PRINT_ALL = 1;
+$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
-$DB_DEBUG = 1;
+$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,27 +34,45 @@ $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();
+print '<div><a href="class_test.db.php">Class Test: DB</a></div>';
-$basic->runningTime();
+print '<div><a href="class_test.colors.php">Class Test: Colors</a></div>';
-echo "RANDOM KEY [50]: ".$basic->randomKeyGen(50)."<br>";
+print '<div><a href="class_test.mime.php">Class Test: MIME</a></div>';
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
+print '<div><a href="class_test.json.php">Class Test: Json</a></div>';
-echo "TIMED [def]: ".$basic->runningTime()."<br>";
+print '<div><a href="class_test.token.php">Class Test: Form Token</a></div>';
-echo "TIMED [string]: ".$basic->runningtime_string."<br>";
+print '<div><a href="class_test.password.php">Class Test: Password</a></div>';
-$basic->hrRunningTime();
+print '<div><a href="class_test.math.php">Class Test: Math</a></div>';
-echo "RANDOM KEY [default]: ".$basic->randomKeyGen()."<br>";
+print '<div><a href="class_test.html.php">Class Test: HTML/ELEMENTS</a></div>';
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
+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>';
-// color
+print '<div><a href="class_test.phpv.php">Class Test: PHP VERSION</a></div>';
-print "COLOR: -1, -1, -1: ".$basic->rgb2hex(-1, -1, -1)."<br>";
+print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
-print "COLOR: 10, 20, 30: ".$basic->rgb2hex(10, 20, 30)."<br>";
+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>';
+print '<div><a href="class_test.form.php">Class Test: FORM</a></div>';
+print '<div><a href="class_test.backend.php">Class Test: BACKEND ADMIN CLASS</a></div>';
+print '<div><a href="class_test.lang.php">Class Test: LANG/L10n</a></div>';
+print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';
 
+print "<hr>";
+// print all _ENV vars set
+print "<div>READ _ENV ARRAY:</div>";
+print "<pre>" . print_r(array_map('htmlentities', $_ENV), true) . "</pre>";
 // set + check edit access id
 $edit_access_id = 3;
 if (is_object($login) && isset($login->acl['unit'])) {
-	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), true)."<br>";
+	print "ACL UNIT: " . print_r(array_keys($login->acl['unit']), true) . "<br>";
-	print "ACCESS CHECK: ".(string)$login->loginCheckEditAccess($edit_access_id)."<br>";
+	print "ACCESS CHECK: " . (string)$login->loginCheckEditAccess($edit_access_id) . "<br>";
 	if ($login->loginCheckEditAccess($edit_access_id)) {
 		$basic->edit_access_id = $edit_access_id;
 	} else {
@@ -61,278 +82,64 @@ 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 '<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>";
+foreach (['on', 'off'] as $flag) {
-print "ECHO OUT: ".$basic->echo_output."<br>";
+	foreach (['debug', 'echo', 'print'] as $type) {
-print "PRINT OUT: ".$basic->print_output."<br>";
+		$prefix = $flag == 'off' ? 'NOT ' : '';
-print "NOT DEBUG OUT: ".$basic->debug_output_not."<br>";
+		print $prefix . strtoupper($type) . ' OUT: '
-print "NOT ECHO OUT: ".$basic->echo_output_not."<br>";
+			. \CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)) . '<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>";
+foreach (['debug', 'echo', 'print'] as $type) {
-print "PRINT OUT ALL: ".$basic->print_output_all."<br>";
+	print strtoupper($type) . ' OUT ALL: ' . $basic->log->getLogLevelAll($type) . '<br>';
+}
 
-print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
+$basic->log->debug('SOME MARK', 'Some error output');
-$basic->debug('SOME MARK', 'Some error output');
 
-print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
+// 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; }));
+	// $result = array_flip(
+	// 	array_filter(
+	// 		array_flip($login->default_acl_list),
+	// 		function ($key) {
+	// 			if (is_numeric($key)) {
+	// 				return $key;
+	// 			}
+	// 		}
+	// 	)
+	// );
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
 	// DEPRICATED CALL
 	//	$basic->adbSetACL($login->acl);
 }
 
-// DB client encoding
+print "THIS HOST: " . HOST_NAME . ", with PROTOCOL: " . HOST_PROTOCOL . " is running SSL: " . HOST_SSL . "<br>";
-print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
+print "DIR: " . DIR . "<br>";
+print "BASE: " . BASE . "<br>";
+print "ROOT: " . ROOT . "<br>";
+print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . print_r(DB_CONFIG, true) . "<br>";
 
-while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
+$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-	print "TIME: ".$res['time']."<br>";
+$du = DS ?? DIRECTORY_SEPARATOR;
-}
+print "DS is: " . $ds . "<br>";
-print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
+print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<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 $login->log->printErrorMsg();
-print $basic->printErrorMsg();
+print $basic->log->printErrorMsg();
 
 print "</body></html>";
 

www/admin/class_test.phpv.php

@@ -0,0 +1,70 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,58 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,66 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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.smarty.php

@@ -0,0 +1,97 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=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);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// set language
+$lang = 'en_utf8';
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-smarty';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$smarty = new CoreLibs\Template\SmartyExtend();
+// for testing with or without CMS
+// $cms = new CoreLibs\Admin\Backend(DB_CONFIG);
+$l = new CoreLibs\Language\L10n($lang);
+
+print "<html><head><title>TEST CLASS: SMARTY</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$smarty->DATA['JS_DEBUG'] = DEBUG;
+$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'] = $l->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
+
+// drop down test with optgroups
+$options = [
+	'' => '選択してください',
+	'4/25(木)' => [
+		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
+		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
+	],
+	'4/26(金)' => [
+		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
+		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
+	],
+	'4/27(土)' => [
+		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
+		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
+	],
+];
+
+$smarty->DATA['drop_down_test'] = $options;
+$smarty->DATA['drop_down_test_selected'] = '';
+$smarty->DATA['loop_start'] = 2;
+// require BASE.INCLUDES.'admin_smarty.php';
+$smarty->setSmartyVarsAdmin();
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.system.php

@@ -0,0 +1,54 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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>";
+print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<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,61 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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,59 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// 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

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -11,9 +13,11 @@ if ($DEBUG_ALL) {
 
 // sample config
 require 'config.php';
-echo "FILE: ".BASE.LIB."Error.Handling.php<br>";
+echo "FILE: " . BASE . LIB . "Error.Handling.php<br>";
-require(BASE.LIB."Error.Handling.php");
+require(BASE . LIB . "Error.Handling.php");
 
 if ($var) {
 	echo "OUT<br>";
 }
+// this wll throw an error and also write
+// asdfa(09);

www/admin/l10n_test.php

@@ -1,29 +0,0 @@
-<?php declare(strict_types=1);
-
-// debug for L10n issues in php 7.3
-
-// namespace test
-ob_start();
-
-// init language
-$lang = 'en_utf8';
-// admin class tests
-require 'config.php';
-$l = new CoreLibs\Language\L10n($lang);
-ob_end_flush();
-
-$string = 'INPUT TEST';
-
-echo "LANGUAGE SET: ".$l->__getLang()."<br>";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
-
-// switch to other language
-$lang = 'ja_utf8';
-$l->l10nReloadMOfile($lang);
-
-echo "LANGUAGE SET: ".$l->__getLang()."<br>";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
-
-// __END__

www/admin/namespace_test.php

@@ -1,42 +0,0 @@
-<?php declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// namespace test
-ob_start();
-
-// admin class tests
-require 'config.php';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-
-echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";
-
-$base = new CoreLibs\Admin\Backend(DB_CONFIG);
-ob_end_flush();
-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 "DB Info: ".$base->dbInfo(true)."<br>";
-
-
-print "End Time: ".$base->runningTime()."<br>";
-print "Start Time: ".$base->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>";
-// end error print
-print $base->printErrorMsg();
-
-# __END__

www/admin/other_test.php

@@ -1,34 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Foo;
-
-class FooBar
-{
-	public $foo = '';
-
-	public function __construct()
-	{
-		$this->foo = 'BAR';
-	}
-
-	public function otherBarBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-
-	public function barBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-}
-
-$foo = $bar ?? 'EMPTY';
-echo "BAR: ".$foo."<br>";
-// define('DS', DIRECTORY_SEPARATOR);
-$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-$du = DS ?? DIRECTORY_SEPARATOR;
-echo "DS is: ".$ds."<br>";
-
-echo "SERVER HOST: ".$_SERVER['HTTP_HOST']."<br>";
-
-// __END__

www/admin/phan_test.php

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

www/admin/qq_file_upload_ajax.php

@@ -15,17 +15,19 @@ $MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
 // test for qqFileUploader (AJAX side)
 $allowedExtensions = array ('csv', 'zip', 'jpg', 'pdf', 'bz2');
 $sizeLimit = $MAX_UPLOAD_SIZE; // as set in php ini
-$base->debug('AJAX UPLOAD', 'Size: '.$sizeLimit.', Memory Limit: '.ini_get('memory_limit'));
+$base->debug('AJAX UPLOAD', 'Size: ' . $sizeLimit . ', Memory Limit: ' . ini_get('memory_limit'));
 $uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit);
 // either in post or get
-$_action= $_POST['action'] ? $_POST['action'] : $_GET['action'];
+$_action = $_POST['action'] ? $_POST['action'] : $_GET['action'];
 $_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid'];
 $get_post['start'] = microtime(true);
-$base->debug('AJAX UPLOAD', 'Action: '.$_action.', Task UID: '.$_task_uid.' => '.$base->dateStringFormat($get_post['start']));
+$base->debug('AJAX UPLOAD', 'Action: ' . $_action . ', Task UID: '
+	. $_task_uid . ' => ' . $base->dateStringFormat($get_post['start']));
 
-$upload_path = ROOT.MEDIA.UPLOADS;
+$upload_path = ROOT . MEDIA . UPLOADS;
 $get_post['result'] = $uploader->handleUpload($upload_path, false);
-$base->debug('AJAX UPLOAD', 'Memory peak: '.$base->ByteStringFormat(memory_get_usage()).' | '.$base->ByteStringFormat(memory_get_peak_usage()));
+$base->debug('AJAX UPLOAD', 'Memory peak: ' . $base->ByteStringFormat(memory_get_usage())
+	. ' | ' . $base->ByteStringFormat(memory_get_peak_usage()));
 
 // set file name
 $get_post['filename'] = $uploader->uploadFileName;

www/admin/qq_file_upload_front.php

@@ -10,7 +10,7 @@ require 'config.php';
 $base = new CoreLibs\Basic();
 // set max upload size
 $MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
-$base->debug('UPLOADED FRONT', 'With max size: '.$MAX_UPLOAD_SIZE);
+$base->debug('UPLOADED FRONT', 'With max size: ' . $MAX_UPLOAD_SIZE);
 
 // very basic template output with super basic div for two file upload
 ?>

www/admin/smarty_test.php

@@ -1,55 +0,0 @@
-<?php declare(strict_types=1);
-$ENABLE_ERROR_HANDLING = 0;
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-$LOG_PER_RUN = 1;
-
-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();
-
-// smarty test
-$smarty->DATA['SMARTY_TEST'] = 'Test Data';
-$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
-
-// drop down test with optgroups
-$options = array (
-	'' => '選択してください',
-	'4/25(木)' => array (
-		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
-		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
-	),
-	'4/26(金)' => array (
-		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
-		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
-	),
-	'4/27(土)' => array (
-		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
-		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
-	)
-);
-
-$smarty->DATA['drop_down_test'] = $options;
-
-// require BASE.INCLUDES.'admin_smarty.php';
-$smarty->setSmartyVarsAdmin();
-require BASE.INCLUDES.'admin_footer.php';

www/admin/various_class_test.php

@@ -1,111 +0,0 @@
-<?php
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-namespace CoreLibs;
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// admin class tests
-require 'config.php';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$base = new Basic();
-
-print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."<br>";
-print "DIR: ".DIR."<br>";
-print "BASE: ".BASE."<br>";
-print "ROOT: ".ROOT."<br>";
-print "HOST: ".HOST_NAME." => DB HOST: ".DB_CONFIG_NAME." => ".print_r(DB_CONFIG, true)."<br>";
-
-$text = 'I am some text
-with some
-line breaks
-in there. Theis 
-is sucky';
-
-print "LB remove: ".$base->removeLB($text)."<br>";
-print "LB remove: ".$base->removeLB($text, '##BR##')."<br>";
-
-// $test = array (
-// 	'A' => array (
-// 		'B' => array (),
-// 		'C' => array (
-// 			'D' => array (),
-// 			'E' => array (
-// 				'F' => array ()
-// 			)
-// 		)
-// 	),
-// 	'1' => array (),
-// 	'2' => array (),
-// 	'3' => array (
-// 		'G' => array ()
-// 	)
-// );
-
-// $base->debug('ARRAY', $base->printAr($test));
-
-function rec($pre, $cur, $node = array ())
-{
-	if (!is_array($node)) {
-		$node = array ();
-	}
-	print "<div style='color: green;'>#### PRE: ".$pre.", CUR: ".$cur.", N-c: ".count($node)." [".join('|', array_keys($node))."]</div>";
-	if (!$pre) {
-		print "** <span style='color: red;'>NEW</span><br>";
-		$node[$cur] = array ();
-	} else {
-		if (array_key_exists($pre, $node)) {
-			print "+ <span style='color: orange;'>KEY FOUND:</span> ".$pre.", add: ".$cur."<br>";
-			$node[$pre][$cur] = array ();
-		} else {
-			print "- NOT FOUND: loop<br>";
-			foreach ($node as $_pre => $_cur) {
-				print "> TRY: ".$_pre." => ".count($_cur)." [".join('|', array_keys($_cur))."]<br>";
-				if (count($_cur) > 0) {
-					$node[$_pre] = rec($pre, $cur, $_cur);
-				}
-			}
-		}
-	}
-	return $node;
-}
-
-function flattenArrayKey(array $array, array $return = array ())
-{
-	foreach ($array as $key => $sub) {
-		$return[] = $key;
-		if (count($sub) > 0) {
-			$return = flattenArrayKey($sub, $return);
-		}
-	}
-	return $return;
-}
-
-$test = array ();
-// core
-$test = rec('', 'A', $test);
-$test = rec('', '1', $test);
-$test = rec('', '2', $test);
-$test = rec('', '3', $test);
-$test = rec('3', 'G', $test);
-$test = rec('A', 'B', $test);
-$test = rec('A', 'C', $test);
-$test = rec('C', 'D', $test);
-$test = rec('C', 'E', $test);
-$test = rec('E', 'F', $test);
-// new
-$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>";
-
-print $base->printErrorMsg();
-
-// __END__

www/configs/.env.example

@@ -0,0 +1,8 @@
+# Master configs
+BASE_NAME=
+G_TITLE=
+# DB configs
+DB_NAME_TEST=
+DB_USER_TEST=
+DB_PASS_TEST=
+DB_HOST_TEST=

www/configs/config.db.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -7,19 +8,21 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 // please be VERY carefull only to change the right side
-$DB_CONFIG = array(
+$DB_CONFIG = [
-	'test' => array(
+	'test' => [
-		'db_name' => 'gullevek',
+		'db_name' => $_ENV['DB_NAME_TEST'] ?? '',
-		'db_user' => 'gullevek',
+		'db_user' => $_ENV['DB_USER_TEST'] ?? '',
-		'db_pass' => 'gullevek',
+		'db_pass' => $_ENV['DB_PASS_TEST'] ?? '',
-		'db_host' => 'db.tokyo.tequila.jp',
+		'db_host' => $_ENV['DB_HOST_TEST'] ?? '',
 		'db_port' => 5432,
 		'db_schema' => 'public',
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
-		'db_ssl' => 'disable' // allow, disable, require, prefer
+		'db_ssl' => 'allow' // allow, disable, require, prefer
-	)
+	],
-);
+];
 
 // __END__

www/configs/config.host.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -11,19 +12,21 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 // 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 +40,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

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore PSR1.Files.SideEffects
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/06/10
@@ -7,186 +8,199 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 /************* 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('LIB', 'lib' .  DS);
-DEFINE('LIBS', '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);
+define('INCLUDES', 'includes' .  DS);
-// data folder (mostly in includes)
+// data folder (mostly in includes, or root for internal data)
-DEFINE('DATA', 'data'.DS);
+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);
+define('ICONS', 'icons' .  DS);
-// media
+// media (accessable from outside)
-DEFINE('MEDIA', 'media'.DS);
+define('MEDIA', 'media' .  DS);
-// flash-root (below media)
+// uploads (anything to keep or data)
-DEFINE('FLASH', 'flash'.DS);
+define('UPLOADS', 'uploads' .  DS);
-// uploads (anything to keep)
+// files (binaries) (below media or data)
-DEFINE('UPLOADS', 'uploads'.DS);
+define('BINARIES', 'binaries' .  DS);
-// files (binaries) (below media)
+// files (videos) (below media or data)
-DEFINE('BINARIES', 'binaries'.DS);
+define('VIDEOS', 'videos' .  DS);
-// files (videos) (below media)
+// files (documents) (below media or data)
-DEFINE('VIDEOS', 'videos'.DS);
+define('DOCUMENTS', 'documents' .  DS);
-// files (documents) (below media)
+// files (pdfs) (below media or data)
-DEFINE('DOCUMENTS', 'documents'.DS);
+define('PDFS', 'documents' .  DS);
-// files (pdfs) (below media)
+// files (general) (below media or data)
-DEFINE('PDFS', 'documents'.DS);
+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', $_ENV['SSL_HOST'] ?? '');
 // 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);
+// define('ERROR_STRICT', 3);
-// allow page caching in general, set to 'FALSE' if you do debugging or development!
+// allow page caching in general, set to 'false' if you do debugging or development!
-// DEFINE('ALLOW_SMARTY_CACHE', false);
+// 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_CHANGE', false);
-DEFINE('PASSWORD_FORGOT', false);
+define('PASSWORD_FORGOT', false);
 // min/max password length
-DEFINE('PASSWORD_MIN_LENGTH', 8);
+define('PASSWORD_MIN_LENGTH', 9);
-DEFINE('PASSWORD_MAX_LENGTH', 255);
+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_PROTOTYPE', false);
-DEFINE('USE_SCRIPTACULOUS', false);
+define('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', true);
+define('USE_JQUERY', true);
 
 /************* LAYOUT WIDTHS *************/
-DEFINE('PAGE_WIDTH', 800);
+define('PAGE_WIDTH', '100%');
-DEFINE('CONTENT_WIDTH', 800);
+define('CONTENT_WIDTH', '100%');
 // 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');
+// only alphanumeric characters, strip all others
+define('BASE_NAME', preg_replace('/[^A-Za-z0-9]/', '', $_ENV['BASE_NAME'] ?? ''));
 
 /************* SESSION NAMES *************/
 // server name HASH
-DEFINE('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
+define('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
-DEFINE('SERVER_PATH_HASH', hash('crc32b', BASE));
+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('CACHE_ID', 'CACHE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
-DEFINE('COMPILE_ID', 'COMPILE_'.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);
+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);
 
 /************* 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('PUBLIC_SCHEMA', 'public');
-DEFINE('DEV_SCHEMA', 'public');
+define('DEV_SCHEMA', 'public');
-DEFINE('TEST_SCHEMA', 'public');
+define('TEST_SCHEMA', 'public');
-DEFINE('LIVE_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')) {
+if (file_exists(BASE . CONFIGS . 'config.host.php')) {
-	require 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')) {
+if (file_exists(BASE . CONFIGS . 'config.db.php')) {
-	require 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')) {
+if (file_exists(BASE . CONFIGS . 'config.path.php')) {
-	require BASE.CONFIGS.'config.path.php';
+	require BASE . CONFIGS . 'config.path.php';
 }
 
 /************* MASTER INIT *****************/
@@ -195,17 +209,18 @@ 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';
+	echo 'Missing SITE_CONFIG entry for: "' . HOST_NAME . '" .  Contact Administrator';
 	exit;
 }
 // BAIL ON MISSING DB CONFIG:
 // we have either no db selction for this host but have db config entries
 // or we have a db selection but no db config as array or empty
 // or we have a selection but no matching db config entry
-if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
+if (
+	(!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 	(isset($SITE_CONFIG[HOST_NAME]['db_host']) &&
 		// missing DB CONFIG
 		((is_array($DB_CONFIG) && !count($DB_CONFIG)) ||
@@ -214,53 +229,57 @@ if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 		(is_array($DB_CONFIG) && count($DB_CONFIG) && !isset($DB_CONFIG[$SITE_CONFIG[HOST_NAME]['db_host']])))
 	)
 ) {
-	echo 'No matching DB config found for: "'.HOST_NAME.'". Contact Administrator';
+	echo 'No matching DB config found for: "' . HOST_NAME . '" .  Contact Administrator';
 	exit;
 }
 // set SSL on
-if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
+if (
-	$_SERVER['SERVER_PORT'] == 443) {
+	(array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
-	DEFINE('HOST_SSL', true);
+	$_SERVER['SERVER_PORT'] == 443
-	DEFINE('HOST_PROTOCOL', 'https://');
+) {
+	define('HOST_SSL', true);
+	define('HOST_PROTOCOL', 'https://');
 } else {
-	DEFINE('HOST_SSL', false);
+	define('HOST_SSL', false);
-	DEFINE('HOST_PROTOCOL', 'http://');
+	define('HOST_PROTOCOL', 'http://');
 }
 // define the db config set name, the db config and the db schema
-DEFINE('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
-DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
+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_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
+// 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
+// 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 global tables are that are used by all schemas (eg queue tables for online, etc)
+// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA);
 // debug settings, site lang, etc
-DEFINE('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
+define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-DEFINE('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
+define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-DEFINE('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
+define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-DEFINE('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
 // paths
-// DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
+// define('CSV_PATH', $PATHS[TARGET]['csv_path']);
-// DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
-// DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
+// 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', $_ENV['G_TITLE'] ?? '');
 
 /************ STYLE SHEETS / JS **********/
-DEFINE('ADMIN_STYLESHEET', 'edit.css');
+define('ADMIN_STYLESHEET', 'edit.css');
-DEFINE('ADMIN_JAVASCRIPT', 'edit.js');
+define('ADMIN_JAVASCRIPT', 'edit.js');
-DEFINE('STYLESHEET', 'frontend.css');
+define('STYLESHEET', 'frontend.css');
-DEFINE('JAVASCRIPT', 'frontend.js');
+define('JAVASCRIPT', 'frontend.js');
 
 // anything optional
 /************* INTERNAL ******************/
 // any other global definitons in the config.other.php
-if (file_exists(BASE.CONFIGS.'config.other.php')) {
+if (file_exists(BASE . CONFIGS . 'config.other.php')) {
-	require BASE.CONFIGS.'config.other.php';
+	require BASE . CONFIGS . 'config.other.php';
 }
 
 /************* DEBUG *******************/
@@ -283,6 +302,6 @@ if (defined('DEBUG') && DEBUG == false) {
 
 /************* AUTO LOADER *******************/
 // read auto loader
-require BASE.LIB.'autoloader.php';
+require BASE . LIB . 'autoloader.php';
 
 // __END__

www/configs/config.other.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore PSR1.Files.SideEffects
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2019/10/28
@@ -7,20 +8,22 @@
 * HISTORY:
 *********************************************************************/
 
-// DEFINE('SOME_ID', <SOME VALUE>);
+declare(strict_types=1);
+
+// define('SOME_ID', <SOME VALUE>);
 
 /************* CONVERT *******************/
 // this only needed if the external thumbnail create is used
-$paths = array(
+$paths = [
 	'/bin',
 	'/usr/bin',
-	'/usr/local/bin'
+	'/usr/local/bin',
-);
+];
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
+	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

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -8,14 +9,16 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 // File and Folder paths
 // ID is TARGET (first array element)
-/*$PATHS = array(
+/*$PATHS = [
-	'test' => array(
+	'test' => [
 		'csv_path' => '',
 		'perl_bin' => '',
 		'other_url' => '',
-	)
+	],
-)*/
+];*/
 
 // __END__

www/configs/config.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore warning
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -7,13 +8,22 @@
 * HISTORY:
 *********************************************************************/
 
-define('CONFIG_PATH', 'configs'.DIRECTORY_SEPARATOR);
+declare(strict_types=1);
+
+define('CONFIG_PATH', 'configs' . DIRECTORY_SEPARATOR);
 // config path prefix search, start with 0, got down each level __DIR__ has, if nothing found -> bail
 $CONFIG_PATH_PREFIX = '';
-for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
+for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos++) {
-	$CONFIG_PATH_PREFIX .= '..'.DIRECTORY_SEPARATOR;
+	$CONFIG_PATH_PREFIX .= '..' . DIRECTORY_SEPARATOR;
-	if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php')) {
+	if (file_exists($CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php')) {
-		require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php';
+		// check if there is an read env file, load it
+		if (file_exists($CONFIG_PATH_PREFIX . CONFIG_PATH . 'read_env_file.php')) {
+			require $CONFIG_PATH_PREFIX . CONFIG_PATH . 'read_env_file.php';
+			// load env variables first
+			readEnvFile($CONFIG_PATH_PREFIX . CONFIG_PATH);
+		}
+		// then load master config file that loads all other config files
+		require $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
 		break;
 	}
 }
@@ -22,9 +32,9 @@ 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)) {
+	if (strstr(getcwd(), DS . $folder)) {
-		define('CONTENT_PATH', $folder.DS);
+		define('CONTENT_PATH', $folder . DS);
 		break;
 	}
 }

www/configs/read_env_file.php

@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * parses .env file
+ *
+ * Rules for .env file
+ * variable is any alphanumeric string followed by = on the same line
+ * content starts with the first non space part
+ * strings can be contained in "
+ * strings MUST be contained in " if they are multiline
+ * if string starts with " it will match until another " is found
+ * anything AFTER " is ignored
+ * if there are two variables with the same name only the first is used
+ * variables are case sensitive
+ *
+ * @param  string $path     Folder to file, default is __DIR__
+ * @param  string $env_file What file to load, default is .env
+ * @return int              -1 other error
+ *                          0 for success full load
+ *                          1 for file loadable, but no data inside
+ *                          2 for file not readable
+ *                          3 for file not found
+ */
+function readEnvFile(string $path = __DIR__, string $env_file = '.env'): int
+{
+	// default -1;
+	$status = -1;
+	$env_file_target = $path . DIRECTORY_SEPARATOR . $env_file;
+	// this is not a file -> abort
+	if (!is_file($env_file_target)) {
+		$status = 3;
+		return $status;
+	}
+	// cannot open file -> abort
+	if (($fp = fopen($env_file_target, 'r')) === false) {
+		$status = 2;
+		return $status;
+	}
+	// set to readable but not yet any data loaded
+	$status = 1;
+	$block = false;
+	$var = '';
+	while ($line = fgets($fp)) {
+		// main match for variable = value part
+		if (preg_match("/^\s*([\w_.]+)\s*=\s*((\"?).*)/", $line, $matches)) {
+			$var = $matches[1];
+			$value = $matches[2];
+			$quotes = $matches[3];
+			// wirte only if env is not set yet, and write only the first time
+			if (empty($_ENV[$var])) {
+				if (!empty($quotes)) {
+					// match greedy for first to last so we move any " if there are
+					if (preg_match('/^"(.*[^\\\])"/U', $value, $matches)) {
+						$value = $matches[1];
+					} else {
+						// this is a multi line
+						$block = true;
+						// first " in string remove
+						// add removed new line back because this is a multi line
+						$value = ltrim($value, '"') . PHP_EOL;
+					}
+				}
+				// if block is set, we strip line of slashes
+				$_ENV[$var] = $block === true ? stripslashes($value) : $value;
+				// set successful load
+				$status = 0;
+			}
+		} elseif ($block === true) {
+			// read line until there is a unescaped "
+			// this also strips everything after the last "
+			if (preg_match("/(.*[^\\\])\"/", $line, $matches)) {
+				$block = false;
+				// strip ending " and EVERYTHING that follows after that
+				$line = $matches[1];
+			}
+			// strip line of slashes
+			$_ENV[$var] .= stripslashes($line);
+		}
+	}
+	fclose($fp);
+	return $status;
+}
+
+// __END__

www/frontend/index.php

@@ -1,3 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 require 'config.php';

www/includes/Date.Vars.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/19
@@ -7,7 +8,9 @@
 * HISTORY:
 *********************************************************************/
 
-$day_short = array(
+declare(strict_types=1);
+
+$day_short = [
 	1 => 'Mon',
 	2 => 'Tue',
 	3 => 'Wed',
@@ -15,9 +18,9 @@ $day_short = array(
 	5 => 'Fri',
 	6 => 'Sat',
 	7 => 'Sun'
-);
+];
 
-$day_long = array(
+$day_long = [
 	1 => 'Monday',
 	2 => 'Tuesday',
 	3 => 'Wednesday',
@@ -25,10 +28,10 @@ $day_long = array(
 	5 => 'Friday',
 	6 => 'Saturday',
 	7 => 'Sunday'
-);
+];
 
 // months
-$month_long = array(
+$month_long = [
 	1 => 'January',
 	2 => 'February',
 	3 => 'March',
@@ -41,9 +44,9 @@ $month_long = array(
 	10 => 'October',
 	11 => 'November',
 	12 => 'December'
-);
+];
 
-$month_short = array(
+$month_short = [
 	1 => 'Jan',
 	2 => 'Feb',
 	3 => 'Mar',
@@ -56,6 +59,6 @@ $month_short = array(
 	10 => 'Oct',
 	11 => 'Nov',
 	12 => 'Dec'
-);
+];
 
 // __END__

www/includes/admin_footer.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/14
@@ -7,8 +8,11 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 // print debug messages
-echo $login->printErrorMsg();
+echo $login->log->printErrorMsg();
-echo $cms->printErrorMsg();
+echo $cms->log->printErrorMsg();
+$cms->log->debug('DEBUGEND', '==================================== [END]');
 
 // __END__

www/includes/admin_header.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -7,15 +8,15 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 //------------------------------ variable init start
 // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log
 if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
-	include BASE.LIBS."Error.Handling.php";
+	include BASE . LIBS . "Error.Handling.php";
 }
 // predefine vars
 $messages = array();
-// import all POST vars
-// extract($_POST, EXTR_SKIP);
 //------------------------------ variable init end
 
 //------------------------------ library include start
@@ -23,7 +24,7 @@ $messages = array();
 ob_start();
 // set the session name
 $SET_SESSION_NAME = EDIT_SESSION_NAME;
-$LOG_FILE_ID = BASE_NAME.'Admin';
+$LOG_FILE_ID = BASE_NAME . 'Admin';
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
@@ -39,7 +40,7 @@ if (!isset($ENCODING) || !$ENCODING) {
 }
 // end the stop of the output flow, but only if we didn't request a csv file download
 if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE) {
-	header("Content-type: text/html; charset=".$ENCODING);
+	header("Content-type: text/html; charset=" . $ENCODING);
 }
 if ($AJAX_PAGE && !$ZIP_STREAM) {
 	header("Content-Type: application/json; charset=UTF-8");
@@ -82,12 +83,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;
+	foreach (['debug', 'echo', 'print'] as $target) {
-	$login->echo_output_all = false;
+		$login->log->setLogLevelAll($target, false);
-	$login->print_output_all = false;
+		$cms->log->setLogLevelAll($target, false);
-	$cms->debug_output_all = false;
+	}
-	$cms->echo_output_all = false;
-	$cms->print_output_all = false;
 }
 $smarty->DATA['JS_DEBUG'] = DEBUG;
 

www/includes/admin_set_paths.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2007/09/03
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 /******
 NOTE THAT THIS INCLUDE IS OBSOLETE
 USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF

www/includes/admin_smarty.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/12
@@ -7,11 +8,16 @@
 * HISTORY:
 *********************************************************************/
 
+declare(strict_types=1);
+
 /******
 NOTE THAT THIS INCLUDE IS OBSOLETE
 USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
 *******/
-trigger_error('admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();', E_USER_DEPRECATED);
+trigger_error(
+	'admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();',
+	E_USER_DEPRECATED
+);
 $smarty->setSmartyVarsAdmin();
 
 // __END__

www/includes/edit_base.php

@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -12,14 +13,19 @@
 *	 - edit_visible_group.php
 * HISTORY:
 * 2005/06/30 (cs) remove color settings, they are in CSS File now
-* 2005/06/22 (cs) moved load of config array into form class, set lang and lang is must set var for form class; removed the page name setting, moved it into the form class, remove all HTML from main page
+* 2005/06/22 (cs) moved load of config array into form class, set lang
+*                 and lang is must set var for form class; removed the
+*                 page name setting, moved it into the form class,
+*                 emove all HTML from main page
 * 2004/09/30 (cs) changed layout to fit default layout & changed LIBS, etc
 * 2003-06-10: creation of this page
 *********************************************************************/
 
-$DEBUG_ALL = 1;
+declare(strict_types=1);
-$PRINT_ALL = 1;
+
-$DB_DEBUG = 1;
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;
 
 // TODO: only extract _POST data that is needed
 extract($_POST, EXTR_SKIP);
@@ -30,14 +36,14 @@ require 'config.php';
 $SET_SESSION_NAME = EDIT_SESSION_NAME;
 // overrride debug flags
 if (!DEBUG)	{
-	$DEBUG_ALL = 0;
+	$DEBUG_ALL = false;
-	$PRINT_ALL = 0;
+	$PRINT_ALL = false;
-	$DB_DEBUG = 0;
+	$DB_DEBUG = false;
-	$ECHO_ALL = 0;
+	$ECHO_ALL = false;
 }
 
 // should be utf8
-header("Content-type: text/html; charset=".DEFAULT_ENCODING);
+header("Content-type: text/html; charset=" . DEFAULT_ENCODING);
 ob_end_flush();
 $login = new CoreLibs\ACL\Login(DB_CONFIG);
 
@@ -50,30 +56,30 @@ 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->log->setLogLevelAll('debug', DEBUG ? true : false);
-	$login->echo_output_all = 0;
+	$login->log->setLogLevelAll('echo', false);
-	$login->print_output_all = DEBUG ? 1 : 0;
+	$login->log->setLogLevelAll('print', DEBUG ? true : false);
 	// form
-	$form->debug_output_all = DEBUG ? 1 : 0;
+	$form->log->setLogLevelAll('debug', DEBUG ? true : false);
-	$form->echo_output_all = 0;
+	$form->log->setLogLevelAll('echo', false);
-	$form->print_output_all = DEBUG ? 1 : 0;
+	$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();
+$HEADER = [];
-$DATA = array();
+$DATA = [];
-$DEBUG_DATA = array();
+$DEBUG_DATA = [];
 // set the template dir
 // WARNING: this has a special check for the mailing tool layout (old layout)
 if (defined('LAYOUT')) {
-	$smarty->setTemplateDir(BASE.INCLUDES.TEMPLATES.CONTENT_PATH);
+	$smarty->setTemplateDir(BASE . INCLUDES . TEMPLATES . CONTENT_PATH);
-	$DATA['css'] = LAYOUT.CSS;
+	$DATA['css'] = LAYOUT . CSS;
-	$DATA['js'] = LAYOUT.JS;
+	$DATA['js'] = LAYOUT . JS;
 } else {
 	$smarty->setTemplateDir(TEMPLATES);
 	$DATA['css'] = CSS;
@@ -85,24 +91,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'] : '';
+	$table_name = $_GET['table_name'] ?? '';
-	// $where = isset($_GET['where']) ? $_GET['where'] : '';
+	// $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'];
@@ -115,79 +121,96 @@ if ($form->my_page_name == 'edit_order') {
 				// this gets temp, id before that, gets actual (moves one "down")
 				// this gets the old before (moves one "up")
 				// is done for every element in row
-				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+				// echo "A: ".$row_data_id[$position[$i]]
-				$temp_id = $row_data_id[$position[$i]];
+				//	." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]
-				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1];
+				//	." (".$row_data_order[$position[$i]-1].")<br>";
+				$temp_id = $row_data_id[$position[$i]] ?? null;
+				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1] ?? null;
 				$row_data_id[$position[$i] - 1] = $temp_id;
-				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+				// echo "A: ".$row_data_id[$position[$i]]
+				//	." (".$row_data_order[$position[$i]].") -- "
+				//	.$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
 			} // for
 		} // if up
 
-		// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+		// the last position id from position array is not to be the count - 1 of
+		// row_data_id array, or it is the last element
 		if (isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
-			for ($i = count($position) - 1; $i >= 0; $i --)	{
+			for ($i = count($position) - 1; $i >= 0; $i--) {
 				// same as up, just up in other way, starts from bottom (last element) and moves "up"
 				// element before actuel gets temp, this element, becomes element after this,
 				// element after this, gets this
-				$temp_id = $row_data_id[$position[$i] + 1];
+				$temp_id = $row_data_id[$position[$i] + 1] ?? null;
-				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
+				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]] ?? null;
 				$row_data_id[$position[$i]] = $temp_id;
 			} // for
 		} // if down
 
 		// write data ... (which has to be abstrackt ...)
-		if ((isset($up) && $position[0] > 0) ||
+		if (
+			(isset($up) && $position[0] > 0) ||
 			(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
 		) {
-			for ($i = 0; $i < count($row_data_id); $i ++) {
+			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];
+				if (isset($row_data_order[$i]) && isset($row_data_id[$i])) {
-				$q = $form->dbExec($q);
+					$q = "UPDATE " . $table_name
+						. " SET order_number = " . $row_data_order[$i]
+						. " WHERE " . $table_name . "_id = " . $row_data_id[$i];
+					$q = $form->dbExec($q);
+				}
 			} // for all article ids ...
 		} // if write
 	} // if there is something to move
 
 	// get ...
-	$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
+	$q = "SELECT " . $table_name . "_id, name, order_number FROM " . $table_name . " ";
 	if (!empty($where_string)) {
 		$q .= "WHERE $where_string ";
 	}
 	$q .= "ORDER BY order_number";
 
 	// init arrays
-	$row_data = array();
+	$row_data = [];
-	$options_id = array();
+	$options_id = [];
-	$options_name = array();
+	$options_name = [];
-	$options_selected = array();
+	$options_selected = [];
 	// DB read data for menu
 	while ($res = $form->dbReturn($q)) {
-		$row_data[] = array(
+		$row_data[] = [
-			"id" => $res[$table_name."_id"],
+			"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;
 
 	// all the row data
-	for ($i = 0; $i < count($row_data); $i ++) {
+	for ($i = 0; $i < count($row_data); $i++) {
 		$options_id[] = $i;
 		$options_name[] = $row_data[$i]['name'];
 		// list of points to order
 		for ($j = 0; $j < count($position); $j++) {
 			// if matches, put into select array
-			if ($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 +220,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_id = [];
-	$row_data_order = array();
+	$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 +231,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 +249,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 +267,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 +292,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
@@ -280,11 +303,11 @@ if ($form->my_page_name == 'edit_order') {
 			(isset($data['hostname']) && $data['hostname'] ?
 				$data['hostname'] :
 				''
-			).
+			)
 			// filename
-			$data['filename'].
+			. ($data['filename'] ?? '')
 			// query string
-			(isset($data['query_string']) && $data['query_string'] ?
+			. (isset($data['query_string']) && $data['query_string'] ?
 				$data['query_string'] :
 				''
 			);
@@ -294,13 +317,15 @@ 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 +348,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 +364,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,18 +402,18 @@ 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/');
+					$folders = ['../admin/', '../frontend/'];
-					$files = array('*.php');
+					$files = ['*.php'];
-					$search_glob = array();
+					$search_glob = [];
 					foreach ($folders as $folder) {
 						// make sure this folder actually exists
-						if (is_dir(ROOT.$folder)) {
+						if (is_dir(ROOT . $folder)) {
 							foreach ($files as $file) {
-								$search_glob[] = $folder.$file;
+								$search_glob[] = $folder . $file;
 							}
 						}
 					}
-					$crap = exec('ls '.join(' ', $search_glob), $output, $status);
+					$crap = exec('ls ' . join(' ', $search_glob), $output, $status);
 					// now get all that are NOT in de DB
 					$q = "INSERT INTO temp_files (folder, filename) VALUES ";
 					$t_q = '';
@@ -401,10 +426,11 @@ if ($form->my_page_name == 'edit_order') {
 							if ($t_q) {
 								$t_q .= ', ';
 							}
-							$t_q .= "('".$form->dbEscapeString($matches[1])."', '".$form->dbEscapeString($matches[2])."')";
+							$t_q .= "('" . $form->dbEscapeString($matches[1]) . "', '"
+								. $form->dbEscapeString($matches[2]) . "')";
 						}
 					}
-					$form->dbExec($q.$t_q, 'NULL');
+					$form->dbExec($q . $t_q, 'NULL');
 					$elements[] = $form->formCreateElement('filename');
 				} else {
 					// show file menu
@@ -465,7 +491,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 +502,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);
@@ -484,16 +510,16 @@ $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
 foreach ($CONTENT_DATA as $key => $value) {
 	$smarty->assign($key, $value);
 }
-if (is_dir(BASE.TEMPLATES_C)) {
+if (is_dir(BASE . TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE.TEMPLATES_C);
+	$smarty->setCompileDir(BASE . TEMPLATES_C);
 }
-if (is_dir(BASE.CACHE)) {
+if (is_dir(BASE . CACHE)) {
-	$smarty->setCacheDir(BASE.CACHE);
+	$smarty->setCacheDir(BASE . CACHE);
 }
-$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$smarty->lang, 'editAdmin_'.$smarty->lang);
+$smarty->display($EDIT_TEMPLATE, 'editAdmin_' . $smarty->lang, 'editAdmin_' . $smarty->lang);
 
 // debug output
-echo $login->printErrorMsg();
+echo $login->log->printErrorMsg();
-echo $form->printErrorMsg();
+echo $form->log->printErrorMsg();
 
 // __END__