Backport Login changes

Password change backport

.gitignore

@@ -1,3 +0,0 @@
-composer.lock
-vendor/
-.env

.htaccess.old

@@ -1,29 +0,0 @@
-# PHP XDEBUG SETTINGS
-# php_value xdebug.profiler_output_dir xdebug/
-# php_value xdebug.profiler_output_name timestamp
-# php_value xdebug.profiler_enable 1
-php_value xdebug.collect_params 2
-php_value xdebug.collect_vars 0
-php_value xdebug.show_local_vars 0
-#php_value xdebug.dump_globals 0
-# allowed COOKIE, FILES, GET, POST, REQUEST, SERVER, SESSION
-#php_value xdebug.dump.GET *
-# PHP ERROR SETTINGS
-php_flag short_open_tag off
-php_flag display_startup_errors on
-php_flag display_errors on
-php_flag html_errors on
-php_flag log_errors on
-php_flag ignore_repeated_errors off
-php_flag ignore_repeated_source off
-php_flag report_memleaks on
-php_flag track_errors on
-php_value docref_root 0
-php_value docref_ext 0
-# Turn this on to redirect log to different folder
-#php_value error_log /var/www/html/developers/clemens/php/php-error/php-errors.log
-# this is E_ALL reporting ON
-php_value error_reporting -1
-# this is E_ALL | ~E_NOTICE
-#php_value error_reporting 2039
-php_value log_errors_max_len 0

.phan/config.php

@@ -1,144 +0,0 @@
-<?php
-
-/**
- * This configuration will be read and overlaid on top of the
- * default configuration. Command line arguments will be applied
- * after this file is read.
- *
- * @see src/Phan/Config.php
- * See Config for all configurable options.
- *
- * A Note About Paths
- * ==================
- *
- * Files referenced from this file should be defined as
- *
- * ```
- *   Config::projectPath('relative_path/to/file')
- * ```
- *
- * where the relative path is relative to the root of the
- * project which is defined as either the working directory
- * of the phan executable or a path passed in via the CLI
- * '-d' flag.
- */
-
-use Phan\Config;
-
-return [
-	// "target_php_version" => "8.2",
-	// turn color on (-C)
-	"color_issue_messages_if_supported" => true,
-	// If true, missing properties will be created when
-	// they are first seen. If false, we'll report an
-	// error message.
-	"allow_missing_properties" => false,
-
-	// Allow null to be cast as any type and for any
-	// type to be cast to null.
-	"null_casts_as_any_type" => false,
-
-	// Backwards Compatibility Checking
-	'backward_compatibility_checks' => false,
-
-	// Run a quick version of checks that takes less
-	// time
-	"quick_mode" => false,
-
-	// Only emit critical issues to start with
-	// (0 is low severity, 5 is normal severity, 10 is critical)
-	"minimum_severity" => 0,
-
-	// enable for dead code check
-	// this will spill out errors for all methods never called
-	// use after all is OK to try to find unused code blocks
-	// ignore recommended: PhanUnreferencedPublicMethod
-	// "dead_code_detection" => true,
-
-	// default false for include path check
-	"enable_include_path_checks" => true,
-	"include_paths" => [
-		'.', '../configs/'
-	],
-	'ignore_undeclared_variables_in_global_scope' => true,
-
-	"file_list" => [
-		"./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",
-	],
-
-	// A list of directories that should be parsed for class and
-	// method information. After excluding the directories
-	// defined in exclude_analysis_directory_list, the remaining
-	// files will be statically analyzed for errors.
-	//
-	// Thus, both first-party and third-party code being used by
-	// your application should be included in this list.
-	'directory_list' => [
-		// Change this to include the folders you wish to analyze
-		// (and the folders of their dependencies)
-		'www',
-		// To speed up analysis, we recommend going back later and
-		// limiting this to only the vendor/ subdirectories your
-		// project depends on.
-		// `phan --init` will generate a list of folders for you
-		//'www/vendor',
-	],
-
-
-	// A list of directories holding code that we want
-	// to parse, but not analyze
-	"exclude_analysis_directory_list" => [
-		'www/vendor',
-		'www/tests',
-		'www/lib/Smarty',
-		'www/lib/smarty-4.3.0',
-		'www/templates_c',
-		'www/log',
-		'www/tmp',
-		'www/cache',
-		'www/media',
-	],
-	'exclude_file_list' => [
-		// ignore all symlink files to edit
-		'www/admin/edit_access.php',
-		'www/admin/edit_groups.php',
-		'www/admin/edit_languages.php',
-		'www/admin/edit_menu_group.php',
-		'www/admin/edit_order.php',
-		'www/admin/edit_pages.php',
-		'www/admin/edit_schemes.php',
-		'www/admin/edit_users.php',
-		'www/admin/edit_visible_group.php',
-		// ignore the old qq tests
-		'www/admin/qq_file_upload_front.php',
-		'www/admin/qq_file_upload_ajax.php',
-		// symlink ignore
-		'www/lib/smarty-4.3.0/libs/Smarty.class.php',
-		// legacy edit base (until removal)
-		'www/includes/edit_base.LEGACY.php'
-	],
-
-	// what not to show as problem
-	'suppress_issue_types' => [
-		// 'PhanUndeclaredMethod',
-		'PhanEmptyFile',
-		// ignore unreferences public methods, etc here (for dead code check)
-		'PhanUnreferencedPublicMethod',
-		'PhanUnreferencedClass',
-		'PhanWriteOnlyPublicProperty',
-		'PhanUnreferencedConstant',
-		'PhanWriteOnlyPublicProperty',
-		'PhanReadOnlyPublicProperty'
-	],
-
-	// Override to hardcode existence and types of (non-builtin) globals in the global scope.
-	// Class names should be prefixed with `\`.
-	//
-	// (E.g. `['_FOO' => '\FooClass', 'page' => '\PageClass', 'userId' => 'int']`)
-	'globals_type_map' => [],
-];

4dev/bin/create_mo.sh

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

4dev/bin/mo_to_js.sh

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

4dev/checking/phan.sh

@@ -1,3 +0,0 @@
-base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# must be run in ${base}www/
-phan --progress-bar -C --analyze-twice

4dev/checking/phpstan.sh

@@ -1,3 +0,0 @@
-base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# must be run in ${base}www/
-phpstan

4dev/checking/phpunit.sh

@@ -1,44 +0,0 @@
-base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# -c phpunit.xml
-# --testdox
-# call with "t" to give verbose testdox output
-# SUPPORTED: https://www.php.net/supported-versions.php
-# call with 7.4, 8.0, 8.1 to force a certain php version
-
-opt_testdox="";
-if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
-	opt_testdox="--testdox";
-fi;
-php_bin="";
-if [ ! -z "${1}" ]; then
-	case "${1}" in
-		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
-		"8.1") php_bin="/usr/bin/php8.1 "; ;;
-		"8.2") php_bin="/usr/bin/php8.2 "; ;;
-		*) echo "Not support PHP: ${1}"; exit; ;;
-	esac;
-fi;
-if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
-	case "${2}" in
-		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
-		"7.4") php_bin="/usr/bin/php7.4 "; ;;
-		"8.0") php_bin="/usr/bin/php8.0 "; ;;
-		"8.1") php_bin="/usr/bin/php8.1 "; ;;
-		"8.2") php_bin="/usr/bin/php8.2 "; ;;
-		*) echo "Not support PHP: ${1}"; exit; ;;
-	esac;
-fi;
-
-phpunit_call="${php_bin}${base}www/vendor/bin/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
-
-${phpunit_call};
-
-if [ ! -z "${php_bin}" ]; then
-	echo "CALLED WITH PHP: ${php_bin}"$(${php_bin} --version);
-else
-	echo "Default PHP used: "$(php --version);
-fi;
-
-# __END__

4dev/composer/install.txt

@@ -1,27 +0,0 @@
-Install composer:
-# old
-curl -sS https://getcomposer.org/installer | /usr/local/php-8.0-httpd-2.4/bin/php
-# new (4 steps) https://getcomposer.org/download/
-/usr/local/php-8.0-httpd-2.4/bin/php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-/usr/local/php-8.0-httpd-2.4/bin/php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-/usr/local/php-8.0-httpd-2.4/bin/php composer-setup.php
-/usr/local/php-8.0-httpd-2.4/bin/php -r "unlink('composer-setup.php');
-
-Update composer phar file
-/usr/local/php-8.0-httpd-2.4/bin/php composer.phar selfupdate
-
-Install something:
-/usr/local/php-8.0-httpd-2.4/bin/php composer.phar require something/something
-
-Update all installed:
-/usr/local/php-8.0-httpd-2.4/bin/php composer.phar update
-
-Or update only one package:
-/usr/local/php-8.0-httpd-2.4/bin/php composer.phar something/something
-
-Install AWS SDK:
-/usr/local/php-8.0-httpd-2.4/bin/php -d memory_limit=-1 composer.phar require aws/aws-sdk-php
-
-Install zipStream:
-/usr/local/php-8.0-httpd-2.4/bin/php composer.phar require maennchen/zipstream-php
-

4dev/database/ORDER

@@ -1,11 +1,5 @@
-# this list only holds edit_* related table data
 # functions
-function/random_string.sql
-function/set_edit_generic.sql
-function/edit_access_set_uid.sql
-function/edit_group_set_uid.sql
-function/edit_log_partition_insert.sql
-function/edit_user_set_login_user_id_set_date.sql
+function/update_function.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -20,29 +14,22 @@ table/edit_scheme.sql
 table/edit_language.sql
 table/edit_group.sql
 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
 # all triggers (after all tables have been created)
 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
 trigger/trg_edit_page.sql
 trigger/trg_edit_query_string.sql
 trigger/trg_edit_scheme.sql
 trigger/trg_edit_user.sql
 trigger/trg_edit_visible_group.sql
 trigger/trg_edit_menu_group.sql
-# insert data
-data/edit_tables.sql

4dev/database/bin/create_default_trigger.sh

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

4dev/database/bin/drop_data.sh

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

4dev/database/bin/import_data.sh

@@ -5,79 +5,19 @@
 #echo "EXIT";
 #exit;
 
-# if flagged 'y' then it will ask after each import to continue
-development='n';
-# do not import anything, just order flow output
-test='n';
-# write to file do not write to DB directly
-write='y';
-# database connection info
 db='<db name>';
 host='<db host>';
 user='<db user>';
-schemas='public';
-export PGPASSWORD='';
-# log files
-error_file='log/error';
-output_file='log/output';
-data_file='database_create_data.sql';
+#schema="publicv";
 
-if [ "$write" = 'y' ]; then
-	rm -f "${data_file}";
-fi;
-if [ ! -f ORDER ]; then
-	echo "Could not find ORDER file";
-	exit;
-fi;
-
-if [ "$test" != "n" ]; then
-	echo "TESTING MODE, NO DATA WILL BE IMPORTED";
-fi;
-if [ "$development" = "y" ]; then
-	echo "STEP BY STEP IMPORT MODE ACTIVATED";
-fi;
-
-while read file <&3; do
-	if [ "$file" = "FINISHED" ]; then
-		echo "Database data is flagged as FINISHED in ORDER file";
-		exit;
+for file in `cat ORDER`;
+do
+	if [ -f $file ];
+	then
+#		for path in $schema;
+#		do
+#			echo "WORK ON "$schema"."$file;
+			psql -U $user -h $host -f $file $db 1>> output 2>> error
+#		done;
 	fi;
-	if [ -f "$file" ]; then
-		for path in "$schemas"; do
-			echo "[+] WORK ON '${file}' @ '${path}'";
-			# skip all on test
-			if [ "$test" = 'n' ]; then
-				# write to file
-				if [ "$write" = 'y' ]; then
-					echo "-- START: ${file}" >> ${data_file};
-					cat "${file}" >> ${data_file};
-					echo "-- END: ${file}" >> ${data_file};
-				else
-					# write to DB
-					echo "=== START [$file] ===>" >> ${error_file};
-					psql -U ${user} -h ${host} -f "${file}" ${db} 1>> ${output_file} 2>> ${error_file}
-					echo "=== END   [$file] ===>" >> ${error_file};
-					# next wait for dev
-					if [ "$development" = "y" ]; then
-						echo "Press 'y' to move to next. Press 'r' to reload last file. ^c to abort";
-					fi;
-					# loop run for reload on failed
-					while [ "$development" = "y" ] && [ "$input" != "y" ]; do
-						read -ep "Continue (y|r|^c): " input;
-						if [ "$input" = "r" ]; then
-							echo "Reload File '${file}' ...";
-							if [ "$test" = 'n' ]; then
-								echo "=== START RELOAD [$file] ===>" >> ${error_file};
-								psql -U ${user} -h ${host} -f "${file}" ${db} 1>> ${output_file} 2>> ${error_file}
-								echo "=== END RELOAD   [$file] ===>" >> ${error_file};
-							fi;
-						fi;
-					done;
-					input='';
-				fi;
-			fi;
-		done;
-	elif [[ ${file::1} != "#" ]]; then
-		echo "[!] COULD NOT FIND FILE: '${file}'";
-	fi;
-done 3<ORDER;
+done;

4dev/database/data/edit_tables.sql

@@ -1,150 +0,0 @@
--- edit tables insert data in order
-
--- edit visible group
-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');
-
--- edit menu group
-DELETE FROM edit_menu_group;
-INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Menu', 'admin', 1);
-INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Data Popup Menu', 'AdminDataPopup', 2);
-
--- edit page
-DELETE FROM edit_page;
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_pages.php', 'Edit Pages', 1, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_users.php', 'Edit Users', 2, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_languages.php', 'Edit Languages', 3, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_schemes.php', 'Edit Schemes', 4, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_groups.php', 'Edit Groups', 5, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_visible_group.php', 'Edit Visible Groups', 6, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_menu_group.php', 'Edit Menu Groups', 7, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_access.php', 'Edit Access', 8, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_order.php', 'Edit Order', 9, 1, 0);
-
--- edit visible group
-DELETE FROM edit_page_visible_group;
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
--- INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-
--- edit page menu group
-DELETE FROM edit_page_menu_group;
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
--- INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-
-
--- edit access right
-DELETE FROM edit_access_right;
-INSERT INTO edit_access_right (name, level, type) VALUES ('Default', -1, 'default');
-INSERT INTO edit_access_right (name, level, type) VALUES ('No Access', 0, 'none');
-INSERT INTO edit_access_right (name, level, type) VALUES ('List', 10, 'list');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Read', 20, 'read');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Translator', 30, 'mod_trans');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Modify', 40, 'mod');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Create/Write', 60, 'write');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Delete', 80, 'del');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Site Admin', 90, 'siteadmin');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Admin', 100, 'admin');
-
--- edit scheme
-DELETE FROM edit_scheme;
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Default Scheme', 'E0E2FF', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Admin', 'CC7E7E', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', 'B0C4B3', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('User', '1E789E', 1);
-
--- edit language
--- short_name = locale without encoding
--- iso_name = encoding
-DELETE FROM edit_language;
-INSERT INTO edit_language (long_name, short_name, iso_name, order_number, enabled, lang_default) VALUES ('English', 'en_US', 'UTF-8', 1, 1, 1);
-INSERT INTO edit_language (long_name, short_name, iso_name, order_number, enabled, lang_default) VALUES ('Japanese', 'ja_JP', 'UTF-8', 2, 1, 0);
-
--- edit group
-DELETE FROM edit_group;
-INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Admin', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin'));
-INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('User', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'User'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'write'));
-
--- edit page access
-DELETE FROM edit_page_access;
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-
--- edit user
--- inserts admin user so basic users can be created
-DELETE FROM edit_user;
-INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1,
-    (SELECT edit_language_id FROM edit_language WHERE short_name = 'en_US'),
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-
--- edit access
-DELETE FROM edit_access;
-INSERT INTO edit_access (name, enabled, protected) VALUES ('Admin Access', 1, 1);
-
--- edit access user
-DELETE FROM edit_access_user;
-INSERT INTO edit_access_user (edit_default, enabled, edit_access_id, edit_user_id, edit_access_right_id) VALUES (1, 1,
-    (SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'),
-    (SELECT edit_user_id FROM edit_user WHERE username = 'admin'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);

4dev/database/function/edit_access_set_uid.sql

@@ -1,28 +0,0 @@
--- add uid add for edit_access table
-
-CREATE OR REPLACE FUNCTION set_edit_access_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_access t WHERE edit_access_id = NEW.edit_access_id;
-            IF FOUND THEN
-                NEW.uid := v_uid;
-            END IF;
-        END IF;
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

4dev/database/function/edit_group_set_uid.sql

@@ -1,28 +0,0 @@
--- 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/edit_log_partition_insert.sql

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

4dev/database/function/edit_set_access_uid.sql

@@ -0,0 +1,28 @@
+-- add uid add for edit_access table
+
+CREATE OR REPLACE FUNCTION set_edit_access_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_access t WHERE edit_access_id = NEW.edit_access_id;
+				IF FOUND THEN
+					NEW.uid := v_uid;
+				END IF;
+			END IF;
+		END IF;
+		RETURN NEW;
+	END;
+$$
+	LANGUAGE 'plpgsql';

4dev/database/function/edit_user_set_login_user_id_set_date.sql

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

4dev/database/function/random_string.sql

@@ -1,20 +0,0 @@
--- create random string with length X
-
-CREATE FUNCTION random_string(randomLength int)
-RETURNS text AS
-$$
-SELECT array_to_string(
-    ARRAY(
-        SELECT substring(
-            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-            trunc(random() * 62)::int + 1,
-            1
-        )
-        FROM generate_series(1, randomLength) AS gs(x)
-    ),
-    ''
-)
-$$
-LANGUAGE SQL
-RETURNS NULL ON NULL INPUT
-VOLATILE; -- LEAKPROOF;

4dev/database/function/set_date.sql

@@ -1,15 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_date()
-RETURNS TRIGGER AS
-$$
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.date_created := 'now';
-    ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := 'now';
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

4dev/database/function/set_edit_generic.sql

@@ -1,18 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_edit_generic()
-RETURNS TRIGGER AS
-$$
-DECLARE
-    random_length INT = 25; -- that should be long enough
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.date_created := 'now';
-        NEW.cuid := random_string(random_length);
-    ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := 'now';
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

4dev/database/function/set_generic.sql

@@ -0,0 +1,12 @@
+-- adds the created or updated date tags
+
+CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
+	BEGIN
+		IF TG_OP = ''INSERT'' THEN
+			NEW.date_created := ''now'';
+		ELSIF TG_OP = ''UPDATE'' THEN
+			NEW.date_updated := ''now'';
+		END IF;
+		RETURN NEW;
+	END;
+' LANGUAGE 'plpgsql';

4dev/database/function/set_generic_uid.sql

@@ -1,21 +0,0 @@
--- set generic with date and uid combined
--- don't use with set_generic/set_uid together
-
-CREATE OR REPLACE FUNCTION set_generic()
-RETURNS TRIGGER AS
-$$
-DECLARE
-    random_length INT = 32; -- long for massive data
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.date_created := 'now';
-        IF NEW.uid IS NULL THEN
-            NEW.uid := random_string(random_length);
-        END IF;
-    ELSIF TG_OP = 'UPDATE' THEN
-        NEW.date_updated := 'now';
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -1,15 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_uid()
-RETURNS TRIGGER AS
-$$
-DECLARE
-    random_length INT = 32; -- that should be long enough
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        NEW.uid := random_string(random_length);
-    END IF;
-    RETURN NEW;
-END;
-$$
-LANGUAGE 'plpgsql';

4dev/database/function/update_function.sql

@@ -1,19 +1,14 @@
 -- adds the created or updated date tags
 
--- OLD, DEPRECATED, use set_generic.sql
-
--- CREATE OR REPLACE FUNCTION set_generic()
--- RETURNS TRIGGER AS
--- $$
--- BEGIN
---     IF TG_OP = 'INSERT' THEN
---         NEW.date_created := clock_timestamp();
---         NEW.user_created := current_user;
---     ELSIF TG_OP = 'UPDATE' THEN
---         NEW.date_updated := clock_timestamp();
---         NEW.user_updated := current_user;
---     END IF;
---     RETURN NEW;
--- END;
--- $$
--- LANGUAGE 'plpgsql';
+CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
+	BEGIN
+		IF TG_OP = ''INSERT'' THEN
+			NEW.date_created := clock_timestamp();
+			NEW.user_created := current_user;
+		ELSIF TG_OP = ''UPDATE'' THEN
+			NEW.date_updated := clock_timestamp();
+			NEW.user_updated := current_user;
+		END IF;
+		RETURN NEW;
+	END;
+' LANGUAGE 'plpgsql';

4dev/database/table/edit_access.sql

@@ -7,13 +7,11 @@
 
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
-    edit_access_id SERIAL PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    protected SMALLINT DEFAULT 0,
-    deleted SMALLINT DEFAULT 0,
-    uid VARCHAR,
-    name VARCHAR UNIQUE,
-    description VARCHAR,
-    color VARCHAR,
-    additional_acl JSONB
+	edit_access_id	SERIAL PRIMARY KEY,
+	name	VARCHAR(255) UNIQUE,
+	description	VARCHAR,
+	COLOR	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access;
+INSERT INTO edit_access (name) VALUES ('Admin Access');

4dev/database/table/edit_access_data.sql

@@ -7,14 +7,10 @@
 
 -- DROP TABLE edit_access_data;
 CREATE TABLE edit_access_data (
-    edit_access_data_id SERIAL PRIMARY KEY,
-    edit_access_id INT NOT NULL,
-    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    name VARCHAR,
-    value VARCHAR
+	edit_access_data_id	SERIAL PRIMARY KEY,
+	edit_access_id INT NOT NULL,
+	name	VARCHAR,
+	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 
 ) INHERITS (edit_generic) WITHOUT OIDS;
-
--- create a unique index for each attached data block for each edit access can
--- only have ONE value;
-CREATE UNIQUE INDEX edit_access_data_edit_access_id_name_ukey ON edit_access_data (edit_access_id, name);

4dev/database/table/edit_access_right.sql

@@ -8,9 +8,20 @@
 
 -- DROP TABLE edit_access_right;
 CREATE TABLE edit_access_right (
-    edit_access_right_id SERIAL PRIMARY KEY,
-    name VARCHAR,
-    level SMALLINT,
-    type VARCHAR,
-    UNIQUE (level,type)
+	edit_access_right_id SERIAL PRIMARY KEY,
+	name VARCHAR,
+	level SMALLINT,
+	type VARCHAR,
+	UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access_right;
+INSERT INTO edit_access_right (name, level, type) VALUES ('Default', -1, 'default');
+INSERT INTO edit_access_right (name, level, type) VALUES ('No Access', 0, 'none');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Read', 20, 'read');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Translator', 30, 'mod_trans');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Modify', 40, 'mod');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Create/Write', 60, 'write');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Delete', 80, 'del');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Site Admin', 90, 'siteadmin');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Admin', 100, 'admin');

4dev/database/table/edit_access_user.sql

@@ -7,13 +7,16 @@
 
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
-    edit_access_user_id SERIAL PRIMARY KEY,
-    edit_access_id INT NOT NULL,
-    FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_user_id INT NOT NULL,
-    FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_default SMALLINT DEFAULT 0,
-    enabled SMALLINT NOT NULL DEFAULT 0
+	edit_access_user_id	SERIAL PRIMARY KEY,
+	edit_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,
+	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
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access_user;
+INSERT INTO edit_access_user (edit_default, edit_access_id, edit_user_id, edit_access_right_id) VALUES (1, 1, 1, 8);

4dev/database/table/edit_generic.sql

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

4dev/database/table/edit_group.sql

@@ -7,14 +7,13 @@
 
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
-    edit_group_id SERIAL PRIMARY KEY,
-    edit_scheme_id INT,
-    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    deleted SMALLINT DEFAULT 0,
-    uid VARCHAR,
-    name VARCHAR,
-    additional_acl JSONB
+	edit_group_id	SERIAL PRIMARY KEY,
+	name	VARCHAR(50),
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	edit_scheme_id INT,
+	edit_access_right_id INT NOT NULL,
+	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;
+
+INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Admin', 1, 2, 8);

4dev/database/table/edit_language.sql

@@ -8,11 +8,13 @@
 
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
-    edit_language_id SERIAL PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    lang_default SMALLINT NOT NULL DEFAULT 0,
-    long_name VARCHAR,
-    short_name VARCHAR, -- en_US, en or en_US@latin without encoding
-    iso_name VARCHAR, -- should actually be encoding
-    order_number INT
+	edit_language_id SERIAL PRIMARY KEY,
+	short_name VARCHAR(2),
+	long_name VARCHAR(70),
+	iso_name VARCHAR(12),
+	order_number INT,
+	enabled SMALLINT NOT NULL DEFAULT 0,
+	lang_default SMALLINT NOT NULL DEFAULT 0 UNIQUE
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1);

4dev/database/table/edit_log.sql

@@ -7,35 +7,35 @@
 
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
-    edit_log_id SERIAL PRIMARY KEY,
-    euid INT, -- this is a foreign key, but I don't nedd to reference to it
-    FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
-    username VARCHAR,
-    password VARCHAR,
-    event_date TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-    ip VARCHAR,
-    error TEXT,
-    event TEXT,
-    data_binary BYTEA,
-    data TEXT,
-    page VARCHAR,
-    action VARCHAR,
-    action_id VARCHAR,
-    action_yes VARCHAR,
-    action_flag VARCHAR,
-    action_menu VARCHAR,
-    action_loaded VARCHAR,
-    action_value VARCHAR,
-    action_type VARCHAR,
-    action_error VARCHAR,
-    user_agent VARCHAR,
-    referer VARCHAR,
-    script_name VARCHAR,
-    query_string VARCHAR,
-    server_name VARCHAR,
-    http_host VARCHAR,
-    http_accept VARCHAR,
-    http_accept_charset VARCHAR,
-    http_accept_encoding VARCHAR,
-    session_id VARCHAR
+	edit_log_id	SERIAL PRIMARY KEY,
+	username	VARCHAR,
+	password	VARCHAR,
+	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+	ip	VARCHAR,
+	error	TEXT,
+	event	TEXT,
+	data_binary	BYTEA,
+	data	TEXT,
+	page	VARCHAR,
+	action	VARCHAR,
+	action_id	VARCHAR,
+	action_yes	VARCHAR,
+	action_flag	VARCHAR,
+	action_menu	VARCHAR,
+	action_loaded	VARCHAR,
+	action_value	VARCHAR,
+	action_type	VARCHAR,
+	action_error	VARCHAR,
+	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
+	user_agent	VARCHAR,
+	referer	VARCHAR,
+	script_name	VARCHAR,
+	query_string	VARCHAR,
+	server_name	VARCHAR,
+	http_host	VARCHAR,
+	http_accept	VARCHAR,
+	http_accept_charset	VARCHAR,
+	http_accept_encoding	VARCHAR,
+	session_id	VARCHAR,
+	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

@@ -1,12 +0,0 @@
--- 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_menu_group.sql

@@ -7,10 +7,12 @@
 
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
-    edit_menu_group_id SERIAL PRIMARY KEY,
-    name VARCHAR,
-    flag VARCHAR,
-    order_number INT NOT NULL
+	edit_menu_group_id	SERIAL PRIMARY KEY,
+	name	VARCHAR(255),
+	flag	VARCHAR(50),
+	order_number	INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
-
+DELETE FROM edit_menu_group;
+INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Menu', 'admin', 1);
+INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Data Popup Menu', 'AdminDataPopup', 2);

4dev/database/table/edit_page.sql

@@ -2,21 +2,29 @@
 -- DATE: 2005/07/05
 -- DESCRIPTION:
 -- edit tables, this table contains all pages in the edit interface and allocates rights + values to it
--- TABLE: edit_page
+-- TABLE: edit_table
 -- HISTORY:
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
-    edit_page_id SERIAL PRIMARY KEY,
-    content_alias_edit_page_id INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
-    FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-    filename VARCHAR,
-    name VARCHAR UNIQUE,
-    order_number INT NOT NULL,
-    online SMALLINT NOT NULL DEFAULT 0,
-    menu SMALLINT NOT NULL DEFAULT 0,
-    popup SMALLINT NOT NULL DEFAULT 0,
-    popup_x SMALLINT,
-    popup_y SMALLINT,
-    hostname VARCHAR
+	edit_page_id	SERIAL PRIMARY KEY,
+	filename	VARCHAR(70),
+	name	VARCHAR(255) UNIQUE,
+	order_number INT NOT NULL,
+	online	SMALLINT NOT NULL DEFAULT 0,
+	menu	SMALLINT NOT NULL DEFAULT 0,
+	popup	SMALLINT NOT NULL DEFAULT 0,
+	popup_x	SMALLINT,
+	popup_y SMALLINT
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_page;
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_pages.php', 'Edit Pages', 1, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_users.php', 'Edit Users', 2, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_languages.php', 'Edit Languages', 3, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_schemes.php', 'Edit Schemes', 4, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_groups.php', 'Edit Groups', 5, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_visible_group.php', 'Edit Visible Groups', 6, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_menu_group.php', 'Edit Menu Groups', 7, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_access.php', 'Edit Access', 8, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_order.php', 'Edit Order', 9, 1, 0);

4dev/database/table/edit_page_access.sql

@@ -7,14 +7,22 @@
 
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
-    edit_page_access_id SERIAL PRIMARY KEY,
-    edit_group_id INT NOT NULL,
-    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_page_id INT NOT NULL,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    enabled SMALLINT NOT NULL DEFAULT 0
+	edit_page_access_id	SERIAL PRIMARY KEY,
+	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,
+	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
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
-
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 1, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 2, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 3, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 4, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 5, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 6, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 7, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 8, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 9, 8);

4dev/database/table/edit_page_content.sql

@@ -1,20 +0,0 @@
--- AUTHOR: Clemens Schwaighofer
--- DATE: 2019/9/9
--- DESCRIPTION:
--- sub content to one page with additional edit access right set
--- can be eg JS content groups on one page
--- TABLE: edit_page_content
--- HISTORY:
-
--- DROP TABLE edit_page_content;
-CREATE TABLE edit_page_content (
-    edit_page_content_id SERIAL PRIMARY KEY,
-    edit_page_id INT NOT NULL,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    uid VARCHAR UNIQUE,
-    name VARCHAR,
-    order_number INT NOT NULL,
-    online SMALLINT NOT NULL DEFAULT 0
-) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_menu_group.sql

@@ -7,8 +7,17 @@
 
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
-    edit_page_id INT NOT NULL,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_menu_group_id INT NOT NULL,
-    FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	edit_page_id INT NOT NULL,
+	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,
+	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
+
+DELETE FROM edit_page_menu_group;
+INSERT INTO edit_page_menu_group VALUES (1, 1);
+INSERT INTO edit_page_menu_group VALUES (2, 1);
+INSERT INTO edit_page_menu_group VALUES (3, 1);
+INSERT INTO edit_page_menu_group VALUES (4, 1);
+INSERT INTO edit_page_menu_group VALUES (5, 1);
+INSERT INTO edit_page_menu_group VALUES (6, 1);
+INSERT INTO edit_page_menu_group VALUES (7, 1);

4dev/database/table/edit_page_visible_group.sql

@@ -7,8 +7,17 @@
 
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
-    edit_page_id INT NOT NULL,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_visible_group_id INT NOT NULL,
-    FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	edit_page_id INT NOT NULL,
+	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,
+	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
+
+DELETE FROM edit_page_visible_group;
+INSERT INTO edit_page_visible_group VALUES (1, 1);
+INSERT INTO edit_page_visible_group VALUES (2, 1);
+INSERT INTO edit_page_visible_group VALUES (3, 1);
+INSERT INTO edit_page_visible_group VALUES (4, 1);
+INSERT INTO edit_page_visible_group VALUES (5, 1);
+INSERT INTO edit_page_visible_group VALUES (6, 1);
+INSERT INTO edit_page_visible_group VALUES (7, 1);

4dev/database/table/edit_query_string.sql

@@ -7,11 +7,11 @@
 
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
-    edit_query_string_id SERIAL PRIMARY KEY,
-    edit_page_id INT NOT NULL,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    name VARCHAR,
-    value VARCHAR,
-    dynamic SMALLINT NOT NULL DEFAULT 0
+	edit_query_string_id	SERIAL PRIMARY KEY,
+	name	VARCHAR(255),
+	value	VARCHAR(255),
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	dynamic	SMALLINT NOT NULL DEFAULT 0,
+	edit_page_id	INT NOT NULL,
+	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_scheme.sql

@@ -7,10 +7,14 @@
 
 -- DROP TABLE edit_scheme;
 CREATE TABLE edit_scheme (
-    edit_scheme_id SERIAL PRIMARY KEY,
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    name VARCHAR,
-    header_color VARCHAR,
-    css_file VARCHAR,
-    template VARCHAR
+	edit_scheme_id	SERIAL PRIMARY KEY,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	name	VARCHAR(50),
+	header_color	VARCHAR(7),
+	css_file	VARCHAR(50),
+	template	VARCHAR(50)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Default Scheme', '#E0E2FF', 1);
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Admin', '#CC7E7E', 1);
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', '#B0C4B3', 1);

4dev/database/table/edit_temp_files.sql

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

4dev/database/table/edit_user.sql

@@ -7,93 +7,32 @@
 
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
-    edit_user_id SERIAL PRIMARY KEY,
-    connect_edit_user_id INT, -- possible reference to other user
-    FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_language_id INT NOT NULL,
-    FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_group_id INT NOT NULL,
-    FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_scheme_id INT,
-    FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    edit_access_right_id INT NOT NULL,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    -- username/password
-    username VARCHAR UNIQUE,
-    password VARCHAR,
-    -- name block
-    first_name VARCHAR,
-    last_name VARCHAR,
-    first_name_furigana VARCHAR,
-    last_name_furigana VARCHAR,
-    -- email
-    email VARCHAR,
-    -- eanbled/deleted flag
-    enabled SMALLINT NOT NULL DEFAULT 0,
-    deleted SMALLINT NOT NULL DEFAULT 0,
-    -- general flags
-    strict SMALLINT DEFAULT 0,
-    locked SMALLINT DEFAULT 0,
-    protected SMALLINT NOT NULL DEFAULT 0,
-    -- legacy, debug flags
-    debug SMALLINT NOT NULL DEFAULT 0,
-    db_debug SMALLINT NOT NULL DEFAULT 0,
-    -- is admin user
-    admin SMALLINT NOT NULL DEFAULT 0,
-    -- last login log
-    last_login TIMESTAMP WITHOUT TIME ZONE,
-    -- login error
-    login_error_count INT DEFAULT 0,
-    login_error_date_last TIMESTAMP WITHOUT TIME ZONE,
-    login_error_date_first TIMESTAMP WITHOUT TIME ZONE,
-    -- time locked
-    lock_until TIMESTAMP WITHOUT TIME ZONE,
-    lock_after TIMESTAMP WITHOUT TIME ZONE,
-    -- password change
-    password_change_date TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
-    password_change_interval INTERVAL, -- null if no change is needed, or d/m/y time interval
-    password_reset_time TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-    password_reset_uid VARCHAR, -- the uid to access the password reset page
-    -- _GET login id for direct login
-    login_user_id VARCHAR UNIQUE, -- the loginUserId, at least 32 chars
-    login_user_id_set_date TIMESTAMP WITHOUT TIME ZONE, -- when above uid was set
-    login_user_id_last_revalidate TIMESTAMP WITHOUT TIME ZONE, -- when the last login was done with user name and password
-    login_user_id_valid_from TIMESTAMP WITHOUT TIME ZONE, -- if set, from when the above uid is valid
-    login_user_id_valid_until TIMESTAMP WITHOUT TIME ZONE, -- if set, until when the above uid is valid
-    login_user_id_revalidate_after INTERVAL, -- user must login to revalidated loginUserId after set days, 0 for forever
-    login_user_id_locked SMALLINT DEFAULT 0, -- lock for loginUserId, but still allow normal login
-    -- additional ACL json block
-    additional_acl JSONB -- additional ACL as JSON string (can be set by other pages)
+	edit_user_id	SERIAL PRIMARY KEY,
+	username	VARCHAR UNIQUE,
+	password	VARCHAR,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	debug	SMALLINT NOT NULL DEFAULT 0,
+	db_debug	SMALLINT NOT NULL DEFAULT 0,
+	email	VARCHAR,
+	protected SMALLINT NOT NULL DEFAULT 0,
+	admin	SMALLINT NOT NULL DEFAULT 0,
+	edit_language_id INT NOT NULL,
+	edit_group_id INT NOT NULL,
+	edit_scheme_id INT,
+	edit_access_right_id INT NOT NULL,
+	login_error_count	INT,
+	login_error_date_last	TIMESTAMP WTIHOUT TIME ZONE,
+	login_error_date_first	TIMESTAMP WTIHOUT 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
+	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
--- create unique index
--- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL;
-
-COMMENT ON COLUMN edit_user.username IS 'Login username, must set';
-COMMENT ON COLUMN edit_user.password IS 'Login password, must set';
-COMMENT ON COLUMN edit_user.enabled IS 'Login is enabled (master switch)';
-COMMENT ON COLUMN edit_user.deleted IS 'Login is deleted (master switch), overrides all other';
-COMMENT ON COLUMN edit_user.strict IS 'If too many failed logins user will be locked, default off';
-COMMENT ON COLUMN edit_user.locked IS 'Locked from too many wrong password logins';
-COMMENT ON COLUMN edit_user.protected IS 'User can only be chnaged by admin user';
-COMMENT ON COLUMN edit_user.debug IS 'Turn debug flag on (legacy)';
-COMMENT ON COLUMN edit_user.db_debug IS 'Turn DB debug flag on (legacy)';
-COMMENT ON COLUMN edit_user.admin IS 'If set, this user is SUPER admin';
-COMMENT ON COLUMN edit_user.last_login IS 'Last succesfull login tiemstamp';
-COMMENT ON COLUMN edit_user.login_error_count IS 'Number of failed logins, reset on successful login';
-COMMENT ON COLUMN edit_user.login_error_date_last IS 'Last login error date';
-COMMENT ON COLUMN edit_user.login_error_date_first IS 'First login error date, reset on successfull login';
-COMMENT ON COLUMN edit_user.lock_until IS 'Account is locked until this date, <';
-COMMENT ON COLUMN edit_user.lock_after IS 'Account is locked after this date, >';
-COMMENT ON COLUMN edit_user.password_change_date IS 'Password was changed on';
-COMMENT ON COLUMN edit_user.password_change_interval IS 'After how many days the password has to be changed';
-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, one time, invalid after reset successful or time out';
-COMMENT ON COLUMN edit_user.login_user_id IS 'Min 32 character UID to be used to login without password. Via GET/POST parameter';
-COMMENT ON COLUMN edit_user.login_user_id_set_date IS 'loginUserId was set at what date';
-COMMENT ON COLUMN edit_user.login_user_id_last_revalidate IS 'set when username/password login is done and loginUserId is set';
-COMMENT ON COLUMN edit_user.login_user_id_valid_from IS 'loginUserId is valid from this date, >=';
-COMMENT ON COLUMN edit_user.login_user_id_valid_until IS 'loginUserId is valid until this date, <=';
-COMMENT ON COLUMN edit_user.login_user_id_revalidate_after IS 'If set to a number greater 0 then user must login after given amount of days to revalidate the loginUserId, set to 0 for valid forver';
-COMMENT ON COLUMN edit_user.login_user_id_locked IS 'A separte lock flag for loginUserId, user can still login normal';
-COMMENT ON COLUMN edit_user.additional_acl IS 'Additional Access Control List stored in JSON format';
+-- inserts admin user so basic users can be created
+DELETE FROM edit_user;
+INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1, 1, 1, 2, 8);

4dev/database/table/edit_visible_group.sql

@@ -7,7 +7,11 @@
 
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
-    edit_visible_group_id SERIAL PRIMARY KEY,
-    name VARCHAR,
-    flag VARCHAR
+	edit_visible_group_id	SERIAL PRIMARY KEY,
+	name	VARCHAR(255),
+	flag	VARCHAR(50)
 ) 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/table/generic.sql

@@ -1,13 +1,12 @@
 -- AUTHOR: Clemens Schwaighofer
 -- DATE: 2005/07/05
 -- DESCRIPTION:
--- generic basic table with date and uid column
+-- cms tables; generic basic table
 -- TABLE: generic
 -- HISTORY:
 
--- DROP TABLE generic;
+-- DROP TABLE edit_generic;
 CREATE TABLE generic (
-    date_created TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
-    date_updated TIMESTAMP WITHOUT TIME ZONE,
-    uid VARCHAR
+	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
+	date_updated	TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/tests/20220622-01.edit_user-table-updates.sql

@@ -1,81 +0,0 @@
---
-SELECT
-eu.cuid, eu.username,
-eu.lock_until, eu.lock_after,
-CASE WHEN (
-(eu.lock_until IS NULL
-OR (eu.lock_until IS NOT NULL AND NOW() >= eu.lock_until))
-AND (eu.lock_after IS NULL
-OR (eu.lock_after IS NOT NULL AND NOW() <= eu.lock_after))
-) THEN 0::INT ELSE 1::INT END locked_period
-FROM edit_user eu
-WHERE eu.username = 'empty';
-
-UPDATE edit_user SET
-lock_until = NOW() + '1 day'::interval
-WHERE username = 'empty';
-UPDATE edit_user SET
-lock_after = NOW() - '1 day'::interval
-WHERE username = 'empty';
-
-
-UPDATE edit_user SET
-lock_until = NOW() - '1 day'::interval
-WHERE username = 'empty';
-UPDATE edit_user SET
-lock_after = NOW() + '1 day'::interval
-WHERE username = 'empty';
-
-UPDATE edit_user SET lock_until = NULL, lock_after = NULL WHERE username = 'empty';
-
---
-SELECT
-eu.cuid, eu.username,
-eu.login_user_id, login_user_id_set_date, eu.login_user_id_last_revalidate,
-(eu.login_user_id_last_revalidate + eu.login_user_id_revalidate_after)::DATE AS reval_date, NOW()::DATE,
-eu.login_user_id_valid_from, eu.login_user_id_valid_until,
-eu.login_user_id_revalidate_after,
-CASE WHEN (
-(eu.login_user_id_valid_from IS NULL
-OR (eu.login_user_id_valid_from IS NOT NULL AND NOW() >= eu.login_user_id_valid_from))
-AND (eu.login_user_id_valid_until IS NULL
-OR (eu.login_user_id_valid_until IS NOT NULL AND NOW() <= eu.login_user_id_valid_until))
-) THEN 1::INT ELSE 0::INT END AS login_user_id_valid_date,
-CASE WHEN eu.login_user_id_revalidate_after IS NOT NULL
-AND eu.login_user_id_revalidate_after > '0 days'::INTERVAL
-AND (eu.login_user_id_last_revalidate + eu.login_user_id_revalidate_after)::DATE <= NOW()::DATE
-THEN 1::INT ELSE 0::INT END AS login_user_id_revalidate
-FROM edit_user eu
-WHERE eu.username = 'empty';
-
--- init
-UPDATE edit_user SET login_user_id = random_string(5) WHERE username = 'empty';
-
--- outside valid
-UPDATE edit_user SET
-login_user_id_valid_from = NOW() - '1 day'::interval
-WHERE username = 'empty';
-UPDATE edit_user SET
-login_user_id_valid_until = NOW() + '1 day'::interval
-WHERE username = 'empty';
--- inside valid
-UPDATE edit_user SET
-login_user_id_valid_from = NOW() + '1 day'::interval
-WHERE username = 'empty';
-UPDATE edit_user SET
-login_user_id_valid_until = NOW() - '1 day'::interval
-WHERE username = 'empty';
-
--- revalidate must
-UPDATE edit_user SET
-login_user_id_last_revalidate = NOW() - '1 day'::interval,
-login_user_id_revalidate_after = '1 day'::interval
-WHERE username = 'empty';
--- revalidate not yet
-UPDATE edit_user SET
-login_user_id_last_revalidate = NOW(),
-login_user_id_revalidate_after = '6 day'::interval
-WHERE username = 'empty';
-
-
-UPDATE edit_user SET login_user_id_set_date = NULL, login_user_id_last_revalidate = NULL, login_user_id_valid_from = NULL, login_user_id_valid_until = NULL, login_user_id_revalidate_after = NULL WHERE username = 'empty';

4dev/database/trigger/trg_edit_access.sql

@@ -1,9 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_access ON edit_access;
+-- DROP TRIGGER trg_edit_access ON edit_access;
 CREATE TRIGGER trg_edit_access
 BEFORE INSERT OR UPDATE ON edit_access
-FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
-
--- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_access_data.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_access_data ON edit_access_data;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_access_right.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_access_right ON edit_access_right;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_access_user.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_access_user ON edit_access_user;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_group.sql

@@ -1,9 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_group ON edit_group;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_language.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_language ON edit_language;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_log.sql

@@ -1,9 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_log ON edit_log;
+-- DROP TRIGGER 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 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_log_overflow.sql

@@ -1,4 +0,0 @@
--- 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 IF EXISTS trg_edit_menu_group ON edit_menu_group;
+-- DROP TRIGGER trg_edit_visible_group ON edit_visible_group;
 CREATE TRIGGER trg_edit_menu_group
 BEFORE INSERT OR UPDATE ON edit_menu_group
-FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_page.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_page ON edit_page;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_page_access.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_page_access ON edit_page_access;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_page_content.sql

@@ -1,4 +0,0 @@
--- 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 IF EXISTS trg_edit_query_string ON edit_query_string;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_scheme.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_scheme ON edit_scheme;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_user.sql

@@ -1,9 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_user ON edit_user;
+-- DROP TRIGGER 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();
-
--- DROP TRIGGER IF EXISTS trg_edit_user_set_login_user_id_set_date ON edit_user;
-CREATE TRIGGER trg_edit_user_set_login_user_id_set_date
-BEFORE INSERT OR UPDATE ON edit_user
-FOR EACH ROW EXECUTE PROCEDURE set_login_user_id_set_date();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_visible_group.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER IF EXISTS trg_edit_visible_group ON edit_visible_group;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_set_edit_access_uid.sql

@@ -0,0 +1,4 @@
+-- DROP TRIGGER trg_set_edit_access_uid ON edit_access;
+CREATE TRIGGER trg_set_edit_access_uid
+BEFORE INSERT OR UPDATE ON edit_access
+FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid();

4dev/deprecated/CoreLibs/Admin/Backend.php

@@ -1,622 +0,0 @@
-<?php
-
-/*********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2006/08/15
-* VERSION: 1.0.0
-* RELEASED LICENSE: GNU GPL 3
-* DESCRIPTION
-* Basic Admin interface backend
-* - sets action flags
-* - menu creation
-* - array vars for smarty
-*
-* CHANGE PLAN:
-* loads DB\IO + Logger and returns one group object
-* also checks all missing CONFIG vars from Basic class
-*
-* PUBLIC VARIABLES
-*
-* PRIVATE VARIABLES
-*
-* PUBLIC METHODS
-*
-* PRIVATE METHODS
-*
-* HISTORY:
-*
-*********************************************************************/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Admin;
-
-class Backend
-{
-	// page name
-	/** @var array<mixed> */
-	public $menu = [];
-	/** @var int|string */
-	public $menu_show_flag = 0; // top menu flag (mostly string)
-	// action ids
-	/** @var array<string> */
-	public $action_list = [
-		'action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag',
-		'action_menu', 'action_value', 'action_error', 'action_loaded'
-	];
-	/** @var string */
-	public $action;
-	/** @var string|int */
-	public $action_id;
-	/** @var string|int */
-	public $action_sub_id;
-	/** @var string|int|bool */
-	public $action_yes;
-	/** @var string */
-	public $action_flag;
-	/** @var string */
-	public $action_menu;
-	/** @var string */
-	public $action_loaded;
-	/** @var string */
-	public $action_value;
-	/** @var string */
-	public $action_error;
-	// ACL array variable if we want to set acl data from outisde
-	/** @var array<mixed> */
-	public $acl = [];
-	/** @var int */
-	public $default_acl;
-	// queue key
-	/** @var string */
-	public $queue_key;
-	// the current active edit access id
-	/** @var int */
-	public $edit_access_id;
-	/** @var string */
-	public $page_name;
-	// error/warning/info messages
-	/** @var array<mixed> */
-	public $messages = [];
-	/** @var bool */
-	public $error = false;
-	/** @var bool */
-	public $warning = false;
-	/** @var bool */
-	public $info = false;
-	// internal lang & encoding vars
-	/** @var string */
-	public $lang_dir = '';
-	/** @var string */
-	public $lang;
-	/** @var string */
-	public $lang_short;
-	/** @var string */
-	public $domain;
-	/** @var string */
-	public $encoding;
-	/** @var \CoreLibs\Debug\Logging logger */
-	public $log;
-	/** @var \CoreLibs\DB\IO database */
-	public $db;
-	/** @var \CoreLibs\Language\L10n language */
-	public $l;
-	/** @var \CoreLibs\Create\Session session class */
-	public $session;
-	// smarty publics [end processing in smarty class]
-	/** @var array<mixed> */
-	public $DATA;
-	/** @var array<mixed> */
-	public $HEADER;
-	/** @var array<mixed> */
-	public $DEBUG_DATA;
-	/** @var array<mixed> */
-	public $CONTENT_DATA;
-
-	// CONSTRUCTOR / DECONSTRUCTOR |====================================>
-	/**
-	 * main class constructor
-	 *
-	 * @param \CoreLibs\DB\IO          $db      Database connection class
-	 * @param \CoreLibs\Debug\Logging  $log     Logging class
-	 * @param \CoreLibs\Create\Session $session Session interface class
-	 * @param \CoreLibs\Language\L10n  $l10n    l10n language class
-	 * @param array<string,string>     $locale  locale data read from setLocale
-	 */
-	public function __construct(
-		\CoreLibs\DB\IO $db,
-		\CoreLibs\Debug\Logging $log,
-		\CoreLibs\Create\Session $session,
-		\CoreLibs\Language\L10n $l10n,
-		array $locale
-	) {
-		// attach db class
-		$this->db = $db;
-		// set to log not per class
-		$log->setLogPer('class', false);
-		// attach logger
-		$this->log = $log;
-		// attach session class
-		$this->session = $session;
-		// get the language sub class & init it
-		$this->l = $l10n;
-		// parse and read, legacy stuff
-		$this->encoding = $locale['encoding'];
-		$this->lang = $locale['lang'];
-		// get first part from lang
-		$this->lang_short = explode('_', $locale['lang'])[0];
-		$this->domain = $this->l->getDomain();
-		$this->lang_dir = $this->l->getBaseLocalePath();
-
-		// set the page name
-		$this->page_name = \CoreLibs\Get\System::getPageName();
-
-		// set the action ids
-		foreach ($this->action_list as $_action) {
-			$this->$_action = $_POST[$_action] ?? '';
-		}
-
-		$this->default_acl = DEFAULT_ACL_LEVEL;
-
-		// queue key
-		if (preg_match("/^(add|save|delete|remove|move|up|down|push_live)$/", $this->action)) {
-			$this->queue_key = \CoreLibs\Create\RandomKey::randomKeyGen(3);
-		}
-	}
-
-	/**
-	 * class deconstructor
-	 */
-	public function __destruct()
-	{
-		// NO OP
-	}
-
-	// PUBLIC METHODS |=================================================>
-
-	/**
-	 * set internal ACL from login ACL
-	 *
-	 * @param array<mixed> $acl login acl array
-	 */
-	public function setACL(array $acl): void
-	{
-		$this->acl = $acl;
-	}
-
-	/**
-	 * writes all action vars plus other info into edit_log table
-	 *
-	 * @param  string              $event      any kind of event description,
-	 * @param  string|array<mixed> $data       any kind of data related to that event
-	 * @param  string              $write_type write type can bei STRING or BINARY
-	 * @return void
-	 */
-	public function adbEditLog(
-		string $event = '',
-		$data = '',
-		string $write_type = 'STRING'
-	): void {
-		$data_binary = '';
-		if ($write_type == 'BINARY') {
-			$data_binary = $this->db->dbEscapeBytea((string)bzcompress(serialize($data)));
-			$data = 'see bzip compressed data_binary field';
-		}
-		if ($write_type == 'STRING') {
-			$data_binary = '';
-			$data = $this->db->dbEscapeString(serialize($data));
-		}
-
-		// check schema
-		$SCHEMA = 'public';
-		/** @phpstan-ignore-next-line */
-		if (defined('LOGIN_DB_SCHEMA') && !empty(LOGIN_DB_SCHEMA)) {
-			$SCHEMA = LOGIN_DB_SCHEMA;
-		} elseif ($this->db->dbGetSchema()) {
-			$SCHEMA = $this->db->dbGetSchema();
-		} elseif (defined('PUBLIC_SCHEMA')) {
-			$SCHEMA = PUBLIC_SCHEMA;
-		}
-		/** @phpstan-ignore-next-line for whatever reason $SCHEMA is seen as possible array */
-		$q = "INSERT INTO " . $SCHEMA . ".edit_log "
-			. "(euid, event_date, event, data, data_binary, page, "
-			. "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
-			. "http_accept, http_accept_charset, http_accept_encoding, session_id, "
-			. "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) "
-			. "VALUES "
-			. "(" . $this->db->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
-				$_SESSION['EUID'] :
-				'NULL')
-			. ", "
-			. "NOW(), "
-			. "'" . $this->db->dbEscapeString((string)$event) . "', '" . $data . "', "
-			. "'" . $data_binary . "', '" . $this->db->dbEscapeString((string)$this->page_name) . "', "
-			. "'" . @$_SERVER["REMOTE_ADDR"] . "', "
-			. "'" . $this->db->dbEscapeString(@$_SERVER['HTTP_USER_AGENT']) . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['QUERY_STRING'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['SERVER_NAME'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_HOST'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '') . "', "
-			. "'" . $this->db->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '') . "', "
-			. ($this->session->getSessionId() === false ?
-				"NULL" :
-				"'" . $this->session->getSessionId() . "'")
-			. ", "
-			. "'" . $this->db->dbEscapeString($this->action) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_id) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_yes) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_flag) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_menu) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_loaded) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_value) . "', "
-			. "'" . $this->db->dbEscapeString($this->action_error) . "')";
-		$this->db->dbExec($q, 'NULL');
-	}
-
-	/**
-	 * Set the menu show flag
-	 *
-	 * @param string|int $menu_show_flag
-	 * @return string|int
-	 */
-	public function adbSetMenuShowFlag($menu_show_flag)
-	{
-		// must be string or int
-		$this->menu_show_flag = $menu_show_flag;
-		return $this->menu_show_flag;
-	}
-
-	/**
-	 * Return the menu show flag
-	 *
-	 * @return string|int
-	 */
-	public function adbGetMenuShowFlag()
-	{
-		return $this->menu_show_flag;
-	}
-
-	/**
-	 * menu creater (from login menu session pages)
-	 *
-	 * @param  int $flag    visible flag trigger
-	 * @return array<mixed> menu array for output on page (smarty)
-	 */
-	public function adbTopMenu(int $flag = 0): array
-	{
-		if ($this->menu_show_flag) {
-			$flag = $this->menu_show_flag;
-		}
-
-		// get the session pages array
-		$PAGES = $_SESSION['PAGES'] ?? null;
-		if (!isset($PAGES) || !is_array($PAGES)) {
-			$PAGES = [];
-		}
-		$pages = [];
-		foreach ($PAGES as $PAGE_DATA) {
-			$pages[] = $PAGE_DATA;
-		}
-		// $this->debug('pages', $this->print_ar($pages));
-		// if flag is 0, then we show all, else, we show only the matching flagges array points
-		// array is already sorted after correct order
-		reset($pages);
-		foreach ($pages as $data) {
-		// for ($i = 0, $iMax = count($pages); $i < $iMax; $i ++) {
-			$show = 0;
-			// is it visible in the menu & is it online
-			if ($data['menu'] && $data['online']) {
-				// check if it falls into our flag if we have a flag
-				if ($flag) {
-					foreach ($data['visible'] as $name => $key) {
-						if ($key == $flag) {
-							$show = 1;
-						}
-					}
-				} else {
-					// if no flag given, show all menu points
-					$show = 1;
-				}
-
-				if ($show) {
-					// if it is popup, write popup arrayound
-					if (isset($data['popup']) && $data['popup']) {
-						$type = 'popup';
-					} else {
-						$type = 'normal';
-						$data['popup'] = 0;
-					}
-					$query_string = '';
-
-					if (
-						isset($data['query']) &&
-						is_array($data['query']) &&
-						count($data['query'])
-					) {
-						// for ($j = 0, $jMax = count($pages[$i]['query']); $j < $jMax; $j ++) {
-						foreach ($data['query'] as $j => $query) {
-							if (
-								!empty($query['name']) &&
-								!empty($query['value'])
-							) {
-								if (strlen($query_string)) {
-									$query_string .= '&';
-								}
-								$query_string .= $query['name'] . '=';
-								if (
-									isset($query['dynamic']) &&
-									$query['dynamic']
-								) {
-									if (isset($_GET[$query['value']])) {
-										$query_string .= urlencode($_GET[$query['value']]);
-									} elseif (isset($_POST[$query['value']])) {
-										$query_string .= urlencode($_POST[$query['value']]);
-									}
-								} else {
-									$query_string .= urlencode($query['value']);
-								}
-							}
-						}
-					}
-					$url = '';
-					if (isset($data['hostname']) && $data['hostname']) {
-						$url .= $data['hostname'];
-					}
-					$url .= $data['filename'] ?? '';
-					if (strlen($query_string)) {
-						$url .= '?' . $query_string;
-					}
-					$name = $data['page_name'] ?? '';
-					// if page name matchs -> set selected flag
-					$selected = 0;
-					if (
-						isset($data['filename']) &&
-						\CoreLibs\Get\System::getPageName() == $data['filename'] &&
-						(!isset($data['hostname']) || (
-							isset($data['hostname']) &&
-								(!$data['hostname'] || strstr($data['hostname'], CONTENT_PATH) !== false)
-						))
-					) {
-						$selected = 1;
-						$this->page_name = $name;
-					}
-					// last check, is this menu point okay to show
-					$enabled = 0;
-					if (
-						isset($data['filename']) &&
-						$this->adbShowMenuPoint($data['filename'])
-					) {
-						$enabled = 1;
-					}
-					// write in to view menu array
-					array_push($this->menu, [
-						'name' => $this->l->__($name),
-						'url' => $url,
-						'selected' => $selected,
-						'enabled' => $enabled,
-						'popup' => $type == 'popup' ? 1 : 0,
-						'type' => $type
-					]);
-				} // show page
-			} // online and in menu
-		} // for each page
-		return $this->menu;
-	}
-
-	/**
-	 * ONLY USED IN adbTopMenu
-	 * checks if this filename is in the current situation (user id, etc) available
-	 *
-	 * @param  string|null $filename filename
-	 * @return bool                  true for visible/accessable menu point, false for not
-	 */
-	private function adbShowMenuPoint(?string $filename): bool
-	{
-		$enabled = false;
-		if ($filename === null) {
-			return $enabled;
-		}
-		/** @phan-suppress-next-line PhanNoopSwitchCases */
-		switch ($filename) {
-			default:
-				$enabled = true;
-				break;
-		};
-		return $enabled;
-	}
-
-	/**
-	 * creates out of a normal db_return array an assoc array
-	 *
-	 * @param  array<mixed>    $db_array input array
-	 * @param  string|int|bool $key      key
-	 * @param  string|int|bool $value    value
-	 * @return array<mixed>              associative array
-	 * @deprecated \CoreLibs\Combined\ArrayHandler::genAssocArray()
-	 */
-	public function adbAssocArray(array $db_array, $key, $value): array
-	{
-		trigger_error(
-			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray',
-			E_USER_DEPRECATED
-		);
-		return \CoreLibs\Combined\ArrayHandler::genAssocArray($db_array, $key, $value);
-	}
-
-	/**
-	 * converts bytes into formated string with KB, MB, etc
-	 *
-	 * @param  string|int|float $number string or int or number
-	 * @return string                   formatted string
-	 * @deprecated \CoreLibs\Convert\Byte::humanReadableByteFormat()
-	 */
-	public function adbByteStringFormat($number): string
-	{
-		trigger_error(
-			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()',
-			E_USER_DEPRECATED
-		);
-		return \CoreLibs\Convert\Byte::humanReadableByteFormat($number);
-	}
-
-	/**
-	 * converts picture to a thumbnail with max x and max y size
-	 *
-	 * @param  string      $pic    source image file with or without path
-	 * @param  int         $size_x maximum size width
-	 * @param  int         $size_y maximum size height
-	 * @param  string      $dummy  empty, or file_type to show an icon
-	 *                             instead of nothing if file is not found
-	 * @param  string      $path   if source start is not ROOT path
-	 *                             if empty ROOT is choosen
-	 * @return string|bool         thumbnail name, or false for error
-	 * @deprecated \CoreLibs\Output\Image::createThumbnail()
-	 */
-	public function adbCreateThumbnail(
-		string $pic,
-		int $size_x,
-		int $size_y,
-		string $dummy = '',
-		string $path = '',
-		string $cache = ''
-	) {
-		trigger_error(
-			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()',
-			E_USER_DEPRECATED
-		);
-		return \CoreLibs\Output\Image::createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
-	}
-
-	/**
-	 * wrapper function to fill up the mssages array
-	 *
-	 * @param  string       $level info/warning/error
-	 * @param  string       $msg   string, can be printf formated
-	 * @param  array<mixed> $vars  optional data for a possible printf formated msg
-	 * @return void                has no return
-	 */
-	public function adbMsg(string $level, string $msg, array $vars = []): void
-	{
-		if (!preg_match("/^info|warning|error$/", $level)) {
-			$level = "info";
-		}
-		$this->messages[] = [
-			'msg' => vsprintf($this->l->__($msg), $vars),
-			'class' => $level
-		];
-		switch ($level) {
-			case 'info':
-				$this->info = true;
-				break;
-			case 'warning':
-				$this->warning = true;
-				break;
-			case 'error':
-				$this->error = true;
-				break;
-		}
-	}
-
-	/**
-	 * writes live queue
-	 *
-	 * @param  string  $queue_key string to identfy the queue
-	 * @param  string  $type      [description]
-	 * @param  string  $target    [description]
-	 * @param  string  $data      [description]
-	 * @param  string  $key_name  [description]
-	 * @param  string  $key_value [description]
-	 * @param  ?string $associate [description]
-	 * @param  ?string $file      [description]
-	 * @return void               has no return
-	 */
-	public function adbLiveQueue(
-		string $queue_key,
-		string $type,
-		string $target,
-		string $data,
-		string $key_name,
-		string $key_value,
-		string $associate = null,
-		string $file = null
-	): void {
-		/** @phpstan-ignore-next-line */
-		if (defined('GLOBAL_DB_SCHEMA') && !empty(GLOBAL_DB_SCHEMA)) {
-			$SCHEMA = GLOBAL_DB_SCHEMA;
-		} elseif ($this->db->dbGetSchema()) {
-			$SCHEMA = $this->db->dbGetSchema();
-		} elseif (defined('PUBLIC_SCHEMA')) {
-			$SCHEMA = PUBLIC_SCHEMA;
-		} else {
-			$SCHEMA = 'public';
-		}
-		$q = "INSERT INTO " . $SCHEMA . ".live_queue ("
-			. "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file"
-			. ") VALUES ("
-			. "'" . $this->db->dbEscapeString($queue_key) . "', '" . $this->db->dbEscapeString($key_value) . "', "
-			. "'" . $this->db->dbEscapeString($key_name) . "', '" . $this->db->dbEscapeString($type) . "', "
-			. "'" . $this->db->dbEscapeString($target) . "', '" . $this->db->dbEscapeString($data) . "', "
-			. "'" . $this->queue_key . "', '" . $this->action . "', "
-			. "'" . $this->db->dbEscapeString((string)$associate) . "', "
-			. "'" . $this->db->dbEscapeString((string)$file) . "')";
-		$this->db->dbExec($q);
-	}
-
-	/**
-	 * Basic class holds exact the same, except the Year/Month/Day/etc strings
-	 * are translated in this call
-	 *
-	 * @param  int    $year          year YYYY
-	 * @param  int    $month         month m
-	 * @param  int    $day           day d
-	 * @param  int    $hour          hour H
-	 * @param  int    $min           min i
-	 * @param  string $suffix        additional info printed after the date time
-	 *                               variable in the drop down
-	 *                               also used for ID in the on change JS call
-	 * @param  int    $min_steps     default is 1 (minute), can set to anything,
-	 *                               is used as sum up from 0
-	 * @param  bool   $name_pos_back default false, if set to true,
-	 *                               the name will be printend
-	 *                               after the drop down and not before the drop down
-	 * @return string                HTML formated strings for drop down lists
-	 *                               of date and time
-	 */
-	public function adbPrintDateTime(
-		$year,
-		$month,
-		$day,
-		$hour,
-		$min,
-		string $suffix = '',
-		int $min_steps = 1,
-		bool $name_pos_back = false
-	) {
-		// get the build layout
-		$html_time = \CoreLibs\Output\Form\Elements::printDateTime(
-			$year,
-			$month,
-			$day,
-			$hour,
-			$min,
-			$suffix,
-			$min_steps,
-			$name_pos_back
-		);
-		// translate the strings inside
-		foreach (['Year ', 'Month ', 'Day ', 'Hour ', 'Minute '] as $_time) {
-			$html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)) . ' ', $html_time);
-		}
-		// replace week days in short
-		foreach (['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] as $_date) {
-			$html_time = str_replace('(' . $_date . ')', '(' . $this->l->__($_date) . ')', $html_time);
-		}
-		// return the datetime select string with strings translated
-		return $html_time;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Admin/EditBase.php

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

4dev/deprecated/CoreLibs/Check/Colors.php

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

4dev/deprecated/CoreLibs/Check/Email.php

@@ -1,265 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-class Email
-{
-	// this is for error check parts in where the email regex failed
-	/** @var array<int,string> */
-	private static $email_regex_check = [
-		0 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-			. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
-		1 => "@(.*)@(.*)", // double @
-		2 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@", // wrong part before @
-		3 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$", // wrong part after @
-		4 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.", // wrong domain name part
-		5 => "\.([a-zA-Z]{2,6}){1}$", // wrong top level part
-		6 => "@(.*)\.{2,}", // double .. in domain name part
-		7 => "@.*\.$" // ends with a dot, top level, domain missing
-	];
-	// for above position, description string below
-	/** @var array<int,string> */
-	private static $email_regex_check_message = [
-		0 => 'Invalid email address',
-		1 => 'Double @ mark in email address',
-		2 => 'Invalid email part before @ sign',
-		3 => 'Invalid domain part after @ sign',
-		4 => 'Invalid domain name part',
-		5 => 'Wrong domain top level part',
-		6 => 'Double consecutive dots in domain name (..)',
-		7 => 'Domain ends with a dot or is missing top level part'
-	];
-	// the array with the mobile types that are valid
-	/** @var array<string,string> */
-	private static $mobile_email_type = [
-		'.*@docomo\.ne\.jp$' => 'keitai_docomo',
-		// correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
-		'.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb',
-		// ez[a-j] or nothing
-		'.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido',
-		// (sky group)
-		'.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka',
-		// (sky group) [tkk,tkc only]
-		'.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky',
-		// dtg (sky group)
-		'.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg',
-		// old vodafone [t,k,d,h,c,r,n,s,q]
-		'.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone',
-		// very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
-		'.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone',
-		// add i for iphone also as keitai, others similar to the vodafone group
-		'.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank',
-		// add iPhone also as keitai and not as pc
-		'.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone',
-		'.*@disney\.ne\.jp$' => 'keitai_softbank_disney', // (kids)
-		'.*@willcom\.ne\.jp$' => 'keitai_willcom',
-		'.*@willcom\.com$' => 'keitai_willcom', // new for pdx.ne.jp address
-		'.*@wcm\.ne\.jp$' => 'keitai_willcom', // old willcom wcm.ne.jp
-		'.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', // old pdx address for willcom
-		'.*@bandai\.jp$' => 'keitai_willcom_bandai', // willcom paipo! (kids)
-		'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', // willcom paipo! (kids)
-		// actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
-		'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx',
-		// ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
-		'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile',
-		// y-mobile techincally not willcom, but I group them there (softbank sub)
-		'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile',
-		'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
-		'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
-		'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
-	];
-	// short list for mobile email types
-	/** @var array<string,string> */
-	private static $mobile_email_type_short = [
-		'keitai_docomo' => 'docomo',
-		'keitai_kddi_ezweb' => 'kddi',
-		'keitai_kddi' => 'kddi',
-		'keitai_kddi_tu-ka' => 'kddi',
-		'keitai_kddi_sky' => 'kddi',
-		'keitai_softbank' => 'softbank',
-		'smartphone_softbank_iphone' => 'iphone',
-		'keitai_softbank_disney' => 'softbank',
-		'keitai_softbank_vodafone' => 'softbank',
-		'keitai_softbank_j-phone' => 'softbank',
-		'keitai_willcom' => 'willcom',
-		'keitai_willcom_pdx' => 'willcom',
-		'keitai_willcom_bandai' => 'willcom',
-		'keitai_willcom_pipopa' => 'willcom',
-		'keitai_willcom_ymobile' => 'willcom',
-		'keitai_willcom_emnet' => 'willcom',
-		'pc_html' => 'pc',
-		// old sets -> to be removed later
-		'docomo' => 'docomo',
-		'kddi_ezweb' => 'kddi',
-		'kddi' => 'kddi',
-		'kddi_tu-ka' => 'kddi',
-		'kddi_sky' => 'kddi',
-		'softbank' => 'softbank',
-		'keitai_softbank_iphone' => 'iphone',
-		'softbank_iphone' => 'iphone',
-		'softbank_disney' => 'softbank',
-		'softbank_vodafone' => 'softbank',
-		'softbank_j-phone' => 'softbank',
-		'willcom' => 'willcom',
-		'willcom_pdx' => 'willcom',
-		'willcom_bandai' => 'willcom',
-		'willcom_pipopa' => 'willcom',
-		'willcom_ymobile' => 'willcom',
-		'willcom_emnet' => 'willcom',
-		'pc' => 'pc'
-	];
-
-	/**
-	 * get one position from the regex check list
-	 *
-	 * @param int     $type Which position in the regex list to get
-	 *                      if not set or not valid get default pos 0
-	 * @return string
-	 */
-	public static function getEmailRegex(int $type = 0): string
-	{
-		// make sure type is in valid range
-		if ($type < 0 || $type >= count(self::$email_regex_check)) {
-			$type = 0;
-		}
-		return self::$email_regex_check[$type];
-	}
-
-	/**
-	 * get the full check array, except position 0, but preserve keys
-	 * Currently used to add per error level type from
-	 * getEmailRegex to error reporting
-	 * Might be deprecated at some point
-	 *
-	 * @return array<mixed>
-	 */
-	public static function getEmailRegexCheck(): array
-	{
-		// return all but the first
-		return array_slice(
-			self::$email_regex_check,
-			1,
-			count(self::$email_regex_check) - 1,
-			true
-		);
-	}
-
-	/**
-	 * Returns error message for email ergex error, or empty string if not set
-	 *
-	 * @param  int $error
-	 * @return array<string,string|int> Error message and regex
-	 */
-	public static function getEmailRegexErrorMessage(int $error): array
-	{
-		// return error message and regex
-		return [
-			'error' => $error,
-			'message' => self::$email_regex_check_message[$error] ?? '',
-			'regex' => self::$email_regex_check[$error] ?? '',
-		];
-	}
-
-	/**
-	 * guesses the email type (mostly for mobile) from the domain
-	 * if second is set to true, it will return short naming scheme (only provider)
-	 *
-	 * @param  string      $email email string
-	 * @param  bool        $short default false, if true,
-	 *                            returns only short type (pc instead of pc_html)
-	 * @return string|bool        email type, eg "pc", "docomo", etc,
-	 *                            false for invalid short type
-	 */
-	public static function getEmailType(string $email, bool $short = false)
-	{
-		// trip if there is no email address
-		if (!$email) {
-			return 'invalid';
-		}
-		// loop until we match a mobile type, return this first found type
-		foreach (self::$mobile_email_type as $email_regex => $email_type) {
-			if (preg_match("/$email_regex/", $email)) {
-				if ($short) {
-					return self::getShortEmailType($email_type);
-				} else {
-					return $email_type;
-				}
-			}
-		}
-		// if no previous return we assume this is a pc address
-		if ($short) {
-			return 'pc';
-		} else {
-			return 'pc_html';
-		}
-	}
-
-	/**
-	 * gets the short email type from a long email type
-	 *
-	 * @param  string $email_type email string
-	 * @return string|bool              short string or false for invalid
-	 */
-	public static function getShortEmailType(string $email_type)
-	{
-		// check if the short email type exists
-		if (isset(self::$mobile_email_type_short[$email_type])) {
-			return self::$mobile_email_type_short[$email_type];
-		} else {
-			// return false on not found
-			return false;
-		}
-	}
-
-	/**
-	 * simple email check with the basic email eregex
-	 *
-	 * @param  string $email Email address, will be checkd as lower
-	 * @return bool          True if email is ok, or false if regex failed
-	 */
-	public static function checkEmail(string $email): bool
-	{
-		$email_regex = self::getEmailRegex();
-		if (!preg_match("/$email_regex/", strtolower($email))) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * check email with all regex checks possible and return errors as array
-	 *
-	 * @param  string $email           Email address, will be checkd as lower
-	 * @param  bool   $error_code_only If this is set to true it will only return
-	 *                                 the error pos, instead of detailed array
-	 * @return array<mixed> Errors as array with message and regex
-	 */
-	public static function checkEmailFull(string $email, bool $error_code_only = false): array
-	{
-		$errors = [];
-		foreach (self::$email_regex_check as $pos => $email_regex) {
-			$match = preg_match("/$email_regex/", strtolower($email));
-			// if the first does not fail, quit as ok
-			if ($pos == 0 && $match) {
-				break;
-			}
-			// else do error storage
-			// not that for 1, 6, 7 the regex is matching
-			if (
-				(!$match && in_array($pos, [0, 2, 3, 4, 5])) ||
-				($match && in_array($pos, [1, 6, 7]))
-			) {
-				if ($error_code_only === true) {
-					$errors[] = $pos;
-				} else {
-					$errors[] = self::getEmailRegexErrorMessage($pos);
-				}
-			}
-		}
-		return $errors;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Check/Encoding.php

@@ -1,117 +0,0 @@
-<?php
-
-/*
- * check if string is valid in target encoding
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-class Encoding
-{
-	/** @var int<min, -1>|int<1, max>|string */
-	private static $mb_error_char = '';
-
-	/**
-	 * set error char
-	 *
-	 * @param  string|int|null $string The character to use to represent
-	 *                                 error chars
-	 *                                 "long" for long, "none" for none
-	 *                                 or a valid code point in int
-	 *                                 like 0x2234 (8756, ∴)
-	 *                                 default character is ? (63)
-	 *                                 if null is set then "none"
-	 * @return void
-	 */
-	public static function setErrorChar($string): void
-	{
-		if (empty($string)) {
-			$string = 'none';
-		}
-		// if not special string or char but code point
-		if (in_array($string, ['none', 'long', 'entity'])) {
-			self::$mb_error_char = $string;
-		} else {
-			// always convert to char for internal use
-			self::$mb_error_char = \IntlChar::chr($string);
-			// if string convert to code point
-			if (is_string($string)) {
-				$string = \IntlChar::ord($string);
-			}
-		}
-		mb_substitute_character($string);
-	}
-
-	/**
-	 * get the current set error character
-	 *
-	 * @param  bool $return_substitute_func if set to true return the set
-	 *                                      character from the php function
-	 *                                      directly
-	 * @return string|int Set error character
-	 */
-	public static function getErrorChar(bool $return_substitute_func = false)
-	{
-		// return mb_substitute_character();
-		if ($return_substitute_func === true) {
-			return mb_substitute_character();
-		} else {
-			return self::$mb_error_char;
-		}
-	}
-
-	/**
-	 * test if a string can be safely convert between encodings.
-	 * mostly utf8 to shift jis
-	 * the default compare has a possibility of failure, especially with windows
-	 * it is recommended to the following in the script which uses this method:
-	 * mb_substitute_character(0x2234);
-	 * $class->mb_error_char = '∴';
-	 * if check to Shift JIS
-	 * if check to ISO-2022-JP
-	 * if check to ISO-2022-JP-MS
-	 * set three dots (∴) as wrong character for correct convert error detect
-	 * (this char is used, because it is one of the least used ones)
-	 *
-	 * @param  string     $string        string to test
-	 * @param  string     $from_encoding encoding of string to test
-	 * @param  string     $to_encoding   target encoding
-	 * @return bool|array<string>        false if no error or
-	 *                                   array with failed characters
-	 */
-	public static function checkConvertEncoding(
-		string $string,
-		string $from_encoding,
-		string $to_encoding
-	) {
-		// convert to target encoding and convert back
-		$temp = mb_convert_encoding($string, $to_encoding, $from_encoding);
-		$compare = mb_convert_encoding($temp, $from_encoding, $to_encoding);
-		// if string does not match anymore we have a convert problem
-		if ($string != $compare) {
-			$failed = [];
-			// go through each character and find the ones that do not match
-			for ($i = 0, $iMax = mb_strlen($string, $from_encoding); $i < $iMax; $i++) {
-				$char = mb_substr($string, $i, 1, $from_encoding);
-				$r_char = mb_substr($compare, $i, 1, $from_encoding);
-				// the ord 194 is a hack to fix the IE7/IE8
-				// bug with line break and illegal character
-				if (
-					(($char != $r_char && (!self::$mb_error_char ||
-					in_array(self::$mb_error_char, ['none', 'long', 'entity']))) ||
-					($char != $r_char && $r_char == self::$mb_error_char && self::$mb_error_char)) &&
-					ord($char) != 194
-				) {
-					$failed[] = $char;
-				}
-			}
-			return $failed;
-		} else {
-			return false;
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Check/File.php

@@ -1,56 +0,0 @@
-<?php
-
-/*
- * various file/file name functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-class File
-{
-	/**
-	 * quick return the extension of the given file name
-	 *
-	 * @param  string $filename file name
-	 * @return string           extension of the file name
-	 */
-	public static function getFilenameEnding(string $filename): string
-	{
-		$page_temp = pathinfo($filename);
-		return $page_temp['extension'] ?? '';
-	}
-
-	/**
-	 * get lines in a file
-	 *
-	 * @param  string $file file for line count read
-	 * @return int          number of lines or -1 for non readable file
-	 */
-	public static function getLinesFromFile(string $file): int
-	{
-		if (
-			is_file($file) &&
-			file_exists($file) &&
-			is_readable($file)
-		) {
-			$f = fopen($file, 'rb');
-			if (!is_resource($f)) {
-				return 0;
-			}
-			$lines = 0;
-			while (!feof($f)) {
-				$lines += substr_count(fread($f, 8192) ?: '', "\n");
-			}
-			fclose($f);
-		} else {
-			// if file does not exist or is not readable, return -1
-			$lines = -1;
-		}
-		// return lines in file
-		return $lines;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Check/Jason.php

@@ -1,41 +0,0 @@
-<?php
-
-/*
- * DEPRECATED: Use correct Convert\Json:: instead
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-use CoreLibs\Convert\Json;
-
-class Jason
-{
-	/**
-	 * @param  string|null $json     a json string, or null data
-	 * @param  bool        $override if set to true, then on json error
-	 *                               set original value as array
-	 * @return array<mixed>          returns an array from the json values
-	 * @deprecated Use Json::jsonConvertToArray()
-	 */
-	public static function jsonConvertToArray(?string $json, bool $override = false): array
-	{
-		return Json::jsonConvertToArray($json, $override);
-	}
-
-	/**
-	 * @param  bool|boolean $return_string [default=false] if set to true
-	 *                                     it will return the message string and not
-	 *                                     the error number
-	 * @return int|string                  Either error number (0 for no error)
-	 *                                     or error string ('' for no error)
-	 * @deprecated Use Json::jsonGetLastError()
-	 */
-	public static function jsonGetLastError(bool $return_string = false)
-	{
-		return Json::jsonGetLastError($return_string);
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Check/Password.php

@@ -1,59 +0,0 @@
-<?php
-
-/*
- * core password set, check and rehash check wrapper functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-class Password
-{
-	/**
-	 * creates the password hash
-	 *
-	 * @param  string $password password
-	 * @return string           hashed password
-	 */
-	public static function passwordSet(string $password): string
-	{
-		// always use the PHP default for the password
-		// password options ca be set in the password init,
-		// but should be kept as default
-		return password_hash($password, PASSWORD_DEFAULT);
-	}
-
-	/**
-	 * checks if the entered password matches the hash
-	 *
-	 * @param  string $password password
-	 * @param  string $hash     password hash
-	 * @return bool             true or false
-	 */
-	public static function passwordVerify(string $password, string $hash): bool
-	{
-		if (password_verify($password, $hash)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * checks if the password needs to be rehashed
-	 *
-	 * @param  string $hash password hash
-	 * @return bool         true or false
-	 */
-	public static function passwordRehashCheck(string $hash): bool
-	{
-		if (password_needs_rehash($hash, PASSWORD_DEFAULT)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Check/PhpVersion.php

@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CoreLibs\Check;
-
-class PhpVersion
-{
-	/**
-	 * checks if running PHP version matches given PHP version (min or max)
-	 * if either is empty or null it will be ignored
-	 * if no min version (null or empty)
-	 *
-	 * @param  string|null $min_version minimum version as string (x, x.y, x.y.x)
-	 * @param  string|null $max_version optional maximum version as string (x, x.y, x.y.x)
-	 * @return bool                true if ok, false if not matching version
-	 */
-	public static function checkPHPVersion(?string $min_version, ?string $max_version = null): bool
-	{
-		// exit with false if the min/max strings are wrong
-		if (
-			!empty($min_version) &&
-			!preg_match("/^\d{1,2}(\.\d{1,2})?(\.\d{1,2})?$/", $min_version)
-		) {
-			return false;
-		}
-		// max is only chcked if it is set
-		if (
-			!empty($max_version) &&
-			!preg_match("/^\d{1,2}(\.\d{1,2})?(\.\d{1,2})?$/", $max_version)
-		) {
-			return false;
-		}
-		// split up the version strings to calc the compare number
-		if (!empty($min_version)) {
-			$version = explode('.', $min_version);
-			$min_version = (int)$version[0] * 10000 + (int)($version[1] ?? 0) * 100 + (int)($version[2] ?? 0);
-		}
-		if (!empty($max_version)) {
-			$version = explode('.', $max_version);
-			$max_version = (int)$version[0] * 10000 + (int)($version[1] ?? 0) * 100 + (int)($version[2] ?? 0);
-			// drop out if min is bigger max, equal size is okay, that would be only THIS
-			if (!empty($min_version) && $min_version > $max_version) {
-				return false;
-			}
-		}
-		// set the php version id
-		if (!defined('PHP_VERSION_ID')) {
-			$version = explode('.', phpversion() ?: '');
-			// creates something like 50107
-			define('PHP_VERSION_ID', (int)$version[0] * 10000 + (int)$version[1] * 100 + (int)$version[2]);
-		}
-		// check if matching for version
-		if (
-			!empty($min_version) && empty($max_version) &&
-			PHP_VERSION_ID >= $min_version
-		) {
-			return true;
-		} elseif (
-			empty($min_version) && !empty($max_version) &&
-			PHP_VERSION_ID <= $max_version
-		) {
-			return true;
-		} elseif (
-			!empty($min_version) && !empty($max_version) &&
-			PHP_VERSION_ID >= $min_version && PHP_VERSION_ID <= $max_version
-		) {
-			return true;
-		}
-		// if no previous return, fail
-		return false;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Combined/ArrayHandler.php

@@ -1,412 +0,0 @@
-<?php
-
-/*
- * array search and transform functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Combined;
-
-class ArrayHandler
-{
-	/**
-	 * searches key = value in an array / array
-	 * only returns the first one found
-	 *
-	 * @param  string|int   $needle         needle (search for)
-	 * @param  array<mixed> $haystack       haystack (search in)
-	 * @param  string|null  $key_search_for the key to look out for, default empty
-	 * @return array<mixed>                 array with the elements where
-	 *                                      the needle can be found in the
-	 *                                      haystack array
-	 */
-	public static function arraySearchRecursive($needle, array $haystack, ?string $key_search_for = null): array
-	{
-		$path = [];
-		if (!is_array($haystack)) {
-			$haystack = [];
-		}
-		if (
-			$key_search_for != null &&
-			array_key_exists($key_search_for, $haystack) &&
-			$needle === $haystack[$key_search_for]
-		) {
-			$path[] = $key_search_for;
-		} else {
-			foreach ($haystack as $key => $val) {
-				if (
-					is_scalar($val) &&
-					$val === $needle &&
-					empty($key_search_for)
-				) {
-					$path[] = $key;
-					break;
-				} elseif (
-					is_scalar($val) &&
-					!empty($key_search_for) &&
-					$key === $key_search_for &&
-					$val === $needle
-				) {
-					$path[] = $key;
-					break;
-				} elseif (
-					is_array($val) &&
-					$path = self::arraySearchRecursive(
-						$needle,
-						(array)$val,
-						// to avoid PhanTypeMismatchArgumentNullable
-						($key_search_for === null ? $key_search_for : (string)$key_search_for)
-					)
-				) {
-					array_unshift($path, $key);
-					break;
-				}
-			}
-		}
-		return $path;
-	}
-
-	/**
-	 * recursive array search function, which returns all found not only the first one
-	 *
-	 * @param  string|int        $needle         needle (search for)
-	 * @param  array<mixed>      $haystack       haystack (search in)
-	 * @param  string|int        $key_search_for the key to look for in
-	 * @param  bool              $old            [true], if set to false will
-	 *                                           return new flat layout
-	 * @param  array<mixed>|null $path           recursive call for previous path
-	 * @return array<mixed>|null                 all array elements paths where
-	 *                                           the element was found
-	 */
-	public static function arraySearchRecursiveAll(
-		$needle,
-		array $haystack,
-		$key_search_for,
-		bool $old = true,
-		?array $path = null
-	): ?array {
-		// init if not set on null
-		if ($path === null) {
-			$path = [
-				'level' => 0,
-				'work' => []
-			];
-		} else {
-			// init sub sets if not set
-			if (!isset($path['level'])) {
-				$path['level'] = 0;
-			}
-			if (!isset($path['work'])) {
-				$path['work'] = [];
-			}
-		}
-		// should not be needed because it would trigger a php mehtod error
-		if (!is_array($haystack)) {
-			$haystack = [];
-		}
-
-		// go through the array,
-		foreach ($haystack as $_key => $_value) {
-			if (
-				is_scalar($_value) &&
-				$_value === $needle &&
-				empty($key_search_for)
-			) {
-				// only value matches
-				$path['work'][$path['level'] ?? 0] = $_key;
-				$path['found'][] = $path['work'];
-			} elseif (
-				is_scalar($_value) &&
-				!empty($key_search_for) &&
-				$_key === $key_search_for &&
-				$_value === $needle
-			) {
-				// key and value matches
-				$path['work'][$path['level'] ?? 0] = $_key;
-				$path['found'][] = $path['work'];
-			} elseif (is_array($_value)) {
-				// add position to working
-				$path['work'][$path['level'] ?? 0] = $_key;
-				// we will up a level
-				$path['level'] += 1;
-				// call recursive
-				$path = self::arraySearchRecursiveAll($needle, $_value, $key_search_for, $old, $path);
-			}
-		}
-		// be 100% sure the array elements are set
-		$path['level'] = $path['level'] ?? 0;
-		$path['work'] = $path['work'] ?? [];
-		// cut all that is >= level
-		array_splice($path['work'], $path['level']);
-		// step back a level
-		$path['level'] -= 1;
-		if ($old === false && $path['level'] == -1) {
-			return $path['found'] ?? [];
-		} else {
-			return $path;
-		}
-	}
-
-	/**
-	 * array search simple. looks for key, value combination, if found, returns true
-	 * on default does not strict check, so string '4' will match int 4 and vica versa
-	 *
-	 * @param  array<mixed> $array search in as array
-	 * @param  string|int  $key    key (key to search in)
-	 * @param  string|int  $value  value (what to find)
-	 * @param  bool        $strict [false], if set to true, will strict check key/value
-	 * @return bool                true on found, false on not found
-	 */
-	public static function arraySearchSimple(array $array, $key, $value, bool $strict = false): bool
-	{
-		if (!is_array($array)) {
-			$array = [];
-		}
-		foreach ($array as $_key => $_value) {
-			// if value is an array, we search
-			if (is_array($_value)) {
-				// call recursive, and return result if it is true, else continue
-				if (($result = self::arraySearchSimple($_value, $key, $value, $strict)) !== false) {
-					return $result;
-				}
-			} elseif ($strict === false && $_key == $key && $_value == $value) {
-				return true;
-			} elseif ($strict === true && $_key === $key && $_value === $value) {
-				return true;
-			}
-		}
-		// no true returned, not found
-		return false;
-	}
-
-	/**
-	 * correctly recursive merges as an array as array_merge_recursive
-	 * just glues things together
-	 *         array first array to merge
-	 *         array second array to merge
-	 *         ...   etc
-	 *         bool  key flag: true: handle keys as string or int
-	 *               default false: all keys are string
-	 *
-	 * @return array<mixed>|bool merged array
-	 */
-	public static function arrayMergeRecursive()
-	{
-		// croak on not enough arguemnts (we need at least two)
-		if (func_num_args() < 2) {
-			trigger_error(__FUNCTION__ . ' needs two or more array arguments', E_USER_WARNING);
-			return false;
-		}
-		// default key is not string
-		$key_is_string = false;
-		$arrays = func_get_args();
-		// if last is not array, then assume it is trigger for key is always string
-		if (!is_array(end($arrays))) {
-			if (array_pop($arrays)) {
-				$key_is_string = true;
-			}
-		}
-		// check that arrays count is at least two, else we don't have enough to do anything
-		if (count($arrays) < 2) {
-			trigger_error(__FUNCTION__ . ' needs two or more array arguments', E_USER_WARNING);
-			return false;
-		}
-		$merged = [];
-		while ($arrays) {
-			$array = array_shift($arrays);
-			if (!is_array($array)) {
-				trigger_error(__FUNCTION__ . ' encountered a non array argument', E_USER_WARNING);
-				return false;
-			}
-			if (!$array) {
-				continue;
-			}
-			foreach ($array as $key => $value) {
-				// if string or if key is assumed to be string do key match
-				// else add new entry
-				if (is_string($key) || $key_is_string === false) {
-					if (is_array($value) && array_key_exists($key, $merged) && is_array($merged[$key])) {
-						// $merged[$key] = call_user_func(__METHOD__, $merged[$key], $value, $key_is_string);
-						$merged[$key] = self::arrayMergeRecursive($merged[$key], $value, $key_is_string);
-					} else {
-						$merged[$key] = $value;
-					}
-				} else {
-					$merged[] = $value;
-				}
-			}
-		}
-		return $merged;
-	}
-
-	/**
-	 * correct array_diff that does an actualy difference between two arrays.
-	 * array_diff only checks elements from A that are not in B, but not the
-	 * other way around.
-	 * Note that like array_diff this only checks first level values not keys
-	 *
-	 * @param  array<mixed>  $a array to compare a
-	 * @param  array<mixed>  $b array to compare b
-	 * @return array<mixed>     array with missing elements from a & b
-	 */
-	public static function arrayDiff(array $a, array $b): array
-	{
-		$intersect = array_intersect($a, $b);
-		return array_merge(array_diff($a, $intersect), array_diff($b, $intersect));
-	}
-
-	/**
-	 * search for the needle array elements in haystack and
-	 * return the ones found as an array,
-	 * is there nothing found, it returns FALSE (boolean)
-	 *
-	 * @param  array<mixed> $needle   elements to search for
-	 * @param  array<mixed> $haystack array where the $needle elements should
-	 *                                be searched int
-	 * @return array<mixed>|bool      either the found elements or
-	 *                                false for nothing found or error
-	 */
-	public static function inArrayAny(array $needle, array $haystack)
-	{
-		$found = [];
-		foreach ($needle as $element) {
-			if (in_array($element, $haystack)) {
-				$found[] = $element;
-			}
-		}
-		if (count($found) == 0) {
-			return false;
-		} else {
-			return $found;
-		}
-	}
-
-	/**
-	 * creates out of a normal db_return array an assoc array
-	 *
-	 * @param  array<mixed>    $db_array return array from the database
-	 * @param  string|int|bool $key      key set, false for not set
-	 * @param  string|int|bool $value    value set, false for not set
-	 * @param  bool            $set_only flag to return all (default), or set only
-	 * @return array<mixed>              associative array
-	 */
-	public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array
-	{
-		$ret_array = [];
-		// do this to only run count once
-		for ($i = 0, $iMax = count($db_array); $i < $iMax; $i++) {
-			// if no key then we make an order reference
-			if (
-				$key !== false &&
-				$value !== false &&
-				(($set_only && !empty($db_array[$i][$value])) ||
-				(!$set_only && isset($db_array[$i][$value]))) &&
-				!empty($db_array[$i][$key])
-			) {
-				$ret_array[$db_array[$i][$key]] = $db_array[$i][$value];
-			} elseif (
-				$key === false && $value !== false &&
-				isset($db_array[$i][$value])
-			) {
-				$ret_array[] = $db_array[$i][$value];
-			} elseif (
-				$key !== false && $value === false &&
-				!empty($db_array[$i][$key])
-			) {
-				$ret_array[$db_array[$i][$key]] = $i;
-			}
-		}
-		return $ret_array;
-	}
-
-	/**
-	 * converts multi dimensional array to a flat array
-	 * does NOT preserve keys
-	 *
-	 * @param  array<mixed> $array multi dimensionial array
-	 * @return array<mixed>        flattened array
-	 */
-	public static function flattenArray(array $array): array
-	{
-		$return = [];
-		array_walk_recursive(
-			$array,
-			function ($value) use (&$return) {
-				$return[] = $value;
-			}
-		);
-		return $return;
-	}
-
-	/**
-	 * will loop through an array recursivly and write the array keys back
-	 *
-	 * @param  array<mixed> $array  multidemnsional array to flatten
-	 * @param  array<mixed> $return recoursive pass on array of keys
-	 * @return array<mixed>         flattened keys array
-	 */
-	public static function flattenArrayKey(array $array, array $return = []): array
-	{
-		foreach ($array as $key => $sub) {
-			$return[] = $key;
-			if (is_array($sub) && count($sub) > 0) {
-				$return = self::flattenArrayKey($sub, $return);
-			}
-		}
-		return $return;
-	}
-
-	/**
-	 * as above will flatten an array, but in this case only the outmost
-	 * leave nodes, all other keyswill be skipped
-	 *
-	 * @param  array<mixed> $array multidemnsional array to flatten
-	 * @return array<mixed>        flattened keys array
-	 */
-	public static function flattenArrayKeyLeavesOnly(array $array): array
-	{
-		$return = [];
-		array_walk_recursive(
-			$array,
-			function ($value, $key) use (&$return) {
-				$return[] = $key;
-			}
-		);
-		return $return;
-	}
-
-	/**
-	 * searches for key -> value in an array tree and writes the value one level up
-	 * this will remove this leaf will all other values
-	 *
-	 * @param  array<mixed> $array  nested array
-	 * @param  string|int   $search key to find that has no sub leaf
-	 *                              and will be pushed up
-	 * @return array<mixed>         modified, flattened array
-	 */
-	public static function arrayFlatForKey(array $array, $search): array
-	{
-		if (!is_array($array)) {
-			$array = [];
-		}
-		foreach ($array as $key => $value) {
-			// if it is not an array do just nothing
-			if (!is_array($value)) {
-				continue;
-			}
-			// probe it has search key
-			if (isset($value[$search])) {
-				// set as current
-				$array[$key] = $value[$search];
-			} else {
-				// call up next node down
-				// $array[$key] = call_user_func(__METHOD__, $value, $search);
-				$array[$key] = self::arrayFlatForKey($value, $search);
-			}
-		}
-		return $array;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Combined/DateTime.php

@@ -1,452 +0,0 @@
-<?php
-
-/*
- * date convert and check functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Combined;
-
-use Exception;
-
-class DateTime
-{
-	/** @var array<int,string> */
-	public const DAY_SHORT = [
-		1 => 'Mon',
-		2 => 'Tue',
-		3 => 'Wed',
-		4 => 'Thu',
-		5 => 'Fri',
-		6 => 'Sat',
-		7 => 'Sun',
-	];
-	/** @var array<int,string> */
-	public const DAY_LONG = [
-		1 => 'Monday',
-		2 => 'Tuesday',
-		3 => 'Wednesday',
-		4 => 'Thursday',
-		5 => 'Friday',
-		6 => 'Saturday',
-		7 => 'Sunday',
-	];
-	/** @var array<int,string> */
-	public const MONTH_LONG = [
-		1 => 'January',
-		2 => 'February',
-		3 => 'March',
-		4 => 'April',
-		5 => 'May',
-		6 => 'June',
-		7 => 'July',
-		8 => 'August',
-		9 => 'September',
-		10 => 'October',
-		11 => 'November',
-		12 => 'December',
-	];
-	/** @var array<int,string> */
-	public const MONTH_SHORT = [
-		1 => 'Jan',
-		2 => 'Feb',
-		3 => 'Mar',
-		4 => 'Apr',
-		5 => 'May',
-		6 => 'Jun',
-		7 => 'Jul',
-		8 => 'Aug',
-		9 => 'Sep',
-		10 => 'Oct',
-		11 => 'Nov',
-		12 => 'Dec',
-	];
-
-	/**
-	 * a simple wrapper for the date format
-	 * if an invalid timestamp is give zero timestamp unix time is used
-	 *
-	 * @param  int|float $timestamp      unix timestamp
-	 * @param  bool      $show_micro     show the micro time (default false)
-	 * @param  bool      $micro_as_float Add the micro time with . instead
-	 *                                   of ms (default false)
-	 * @return string                    formated date+time in Y-M-D h:m:s ms
-	 */
-	public static function dateStringFormat(
-		$timestamp,
-		bool $show_micro = false,
-		bool $micro_as_float = false
-	): string {
-		// split up the timestamp, assume . in timestamp
-		// array pad $ms if no microtime
-		list ($timestamp, $ms) = array_pad(explode('.', (string)round($timestamp, 4)), 2, null);
-		$string = date("Y-m-d H:i:s", (int)$timestamp);
-		if ($show_micro && $ms) {
-			if ($micro_as_float == false) {
-				$string .= ' ' . $ms . 'ms';
-			} else {
-				$string .= '.' . $ms;
-			}
-		}
-		return $string;
-	}
-
-	/**
-	 * formats a timestamp into interval, not into a date
-	 *
-	 * @param  string|int|float $timestamp  interval in seconds and optional
-	 *                                      float micro seconds
-	 * @param  bool             $show_micro show micro seconds, default true
-	 * @return string                       interval formatted string or string as is
-	 */
-	public static function timeStringFormat($timestamp, bool $show_micro = true): string
-	{
-		// check if the timestamp has any h/m/s/ms inside, if yes skip
-		if (!preg_match("/(h|m|s|ms)/", (string)$timestamp)) {
-			list($timestamp, $ms) = array_pad(explode('.', (string)round((float)$timestamp, 4)), 2, null);
-			// if negative remember
-			$negative = false;
-			if ((int)$timestamp < 0) {
-				$negative = true;
-			}
-			$timestamp = abs((float)$timestamp);
-			$timegroups = [86400, 3600, 60, 1];
-			$labels = ['d', 'h', 'm', 's'];
-			$time_string = '';
-			// if timestamp is zero, return zero string
-			if ($timestamp == 0) {
-				$time_string = '0s';
-			} else {
-				for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i++) {
-					$output = floor((float)$timestamp / $timegroups[$i]);
-					$timestamp = (float)$timestamp % $timegroups[$i];
-					// output has days|hours|min|sec
-					if ($output || $time_string) {
-						$time_string .= $output . $labels[$i] . (($i + 1) != count($timegroups) ? ' ' : '');
-					}
-				}
-			}
-			// only add ms if we have an ms value
-			if ($ms !== null) {
-				// if we have ms and it has leading zeros, remove them, but only if it is nut just 0
-				$ms = preg_replace("/^0+(\d+)$/", '${1}', $ms);
-				if (!is_string($ms) || empty($ms)) {
-					$ms = '0';
-				}
-				// add ms if there
-				if ($show_micro) {
-					$time_string .= ' ' . $ms . 'ms';
-				} elseif (!$time_string) {
-					$time_string .= $ms . 'ms';
-				}
-			}
-			if ($negative) {
-				$time_string = '-' . $time_string;
-			}
-		} else {
-			$time_string = $timestamp;
-		}
-		return (string)$time_string;
-	}
-
-	/**
-	 * does a reverse of the timeStringFormat and converts the string from
-	 * xd xh xm xs xms to a timestamp.microtime format
-	 *
-	 * @param  string|int|float $timestring formatted interval
-	 * @return string|int|float             converted float interval, or string as is
-	 */
-	public static function stringToTime($timestring)
-	{
-		$timestamp = 0;
-		if (preg_match("/(d|h|m|s|ms)/", (string)$timestring)) {
-			$timestring = (string)$timestring;
-			// pos for preg match read + multiply factor
-			$timegroups = [2 => 86400, 4 => 3600, 6 => 60, 8 => 1];
-			$matches = [];
-			// if start with -, strip and set negative
-			$negative = false;
-			if (preg_match("/^-/", $timestring)) {
-				$negative = true;
-				$timestring = substr($timestring, 1);
-			}
-			// preg match: 0: full string
-			// 2, 4, 6, 8 are the to need values
-			preg_match("/^((\d+)d ?)?((\d+)h ?)?((\d+)m ?)?((\d+)s ?)?((\d+)ms)?$/", $timestring, $matches);
-			// multiply the returned matches and sum them up. the last one (ms) is added with .
-			foreach ($timegroups as $i => $time_multiply) {
-				if (isset($matches[$i]) && is_numeric($matches[$i])) {
-					$timestamp += (float)$matches[$i] * $time_multiply;
-				}
-			}
-			if (isset($matches[10]) && is_numeric($matches[10])) {
-				$timestamp .= '.' . $matches[10];
-			}
-			if ($negative) {
-				// cast to flaot so we can do a negative multiplication
-				$timestamp = (float)$timestamp * -1;
-			}
-			return $timestamp;
-		} else {
-			return $timestring;
-		}
-	}
-
-	/**
-	 * Returns long or short day of week name based on ISO day of week number
-	 * 1: Monday
-	 * ...
-	 * 7: Sunday
-	 *
-	 * @param  int    $isodow 1: Monday, 7: Sunday
-	 * @param  bool   $long   Default false 'Mon', if true 'Monday'
-	 * @return string         Day of week string either short 'Mon' or long 'Monday'
-	 */
-	public static function setWeekdayNameFromIsoDow(int $isodow, bool $long = false): string
-	{
-		// if not valid, set to invalid
-		if ($isodow < 1 || $isodow > 7) {
-			return $long ? 'Invalid' : 'Inv';
-		}
-		return date($long ? 'l' : 'D', strtotime("Sunday +{$isodow} days") ?: null);
-	}
-
-	/**
-	 * Get the day of week Name from date
-	 *
-	 * @param  string $date Any valid date
-	 * @param  bool   $long Default false 'Mon', if true 'Monday'
-	 * @return string       Day of week string either short 'Mon' or long 'Monday'
-	 */
-	public static function setWeekdayNameFromDate(string $date, bool $long = false): string
-	{
-		if (!self::checkDate($date)) {
-			return $long ? 'Invalid' : 'Inv';
-		}
-		return date($long ? 'l' : 'D', strtotime($date) ?: null);
-	}
-
-	/**
-	 * Get the day of week Name from date
-	 *
-	 * @param  string $date  Any valid date
-	 * @return int           ISO Weekday number 1: Monday, 7: Sunday, -1 for invalid date
-	 */
-	public static function setWeekdayNumberFromDate(string $date): int
-	{
-		if (!self::checkDate($date)) {
-			return -1;
-		}
-		return (int)date('N', strtotime($date) ?: null);
-	}
-
-	/**
-	 * splits & checks date, wrap around for check_date function
-	 *
-	 * @param  string $date a date string in the format YYYY-MM-DD
-	 * @return bool         true if valid date, false if date not valid
-	 */
-	public static function checkDate($date): bool
-	{
-		if (!$date) {
-			return false;
-		}
-		list ($year, $month, $day) = array_pad(
-			preg_split("/[\/-]/", $date) ?: [],
-			3,
-			null
-		);
-		if (!$year || !$month || !$day) {
-			return false;
-		}
-		if (!checkdate((int)$month, (int)$day, (int)$year)) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * splits & checks date, wrap around for check_date function
-	 *
-	 * @param  string $datetime date (YYYY-MM-DD) + time (HH:MM:SS), SS can be dropped
-	 * @return bool             true if valid date, false if date not valid
-	 */
-	public static function checkDateTime(string $datetime): bool
-	{
-		if (!$datetime) {
-			return false;
-		}
-		// catch last overflow if sec has - in front
-		list ($year, $month, $day, $hour, $min, $sec, $sec_overflow) = array_pad(
-			preg_split("/[\/\- :]/", $datetime) ?: [],
-			7,
-			null
-		);
-		if (!$year || !$month || !$day) {
-			return false;
-		}
-		if (!checkdate((int)$month, (int)$day, (int)$year)) {
-			return false;
-		}
-		if (!is_numeric($hour) || !is_numeric($min)) {
-			return false;
-		}
-		if (!empty($sec) && !is_numeric($sec)) {
-			return false;
-		}
-		if (!empty($sec) && ($sec < 0 || $sec > 60)) {
-			return false;
-		};
-		// in case we have - for seconds
-		if (!empty($sec_overflow)) {
-			return false;
-		}
-		if (
-			($hour < 0 || $hour > 24) ||
-			($min < 0 || $min > 60)
-		) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * compares two dates, tries to convert them via strtotime to timestamps
-	 * returns int/bool in:
-	 * -1 if the first date is smaller the last
-	 * 0 if both are equal
-	 * 1 if the first date is bigger than the last
-	 * false if date validation/conversion failed
-	 *
-	 * @param  string $start_date start date string in YYYY-MM-DD
-	 * @param  string $end_date   end date string in YYYY-MM-DD
-	 * @return int|bool           false on error
-	 *                            or int -1 (s<e)/0 (s=e)/1 (s>e) as difference
-	 */
-	public static function compareDate($start_date, $end_date)
-	{
-		// pre check for empty or wrong
-		if ($start_date == '--' || $end_date == '--' || !$start_date || !$end_date) {
-			return false;
-		}
-		// if invalid, quit
-		if (($start_timestamp = strtotime($start_date)) === false) {
-			return false;
-		}
-		if (($end_timestamp = strtotime($end_date)) === false) {
-			return false;
-		}
-		// convert anything to Y-m-d and then to timestamp
-		// this is to remove any time parts
-		$start_timestamp = strtotime(date('Y-m-d', $start_timestamp));
-		$end_timestamp = strtotime(date('Y-m-d', $end_timestamp));
-		// compare, or end with false
-		if ($start_timestamp < $end_timestamp) {
-			return -1;
-		} elseif ($start_timestamp == $end_timestamp) {
-			return 0;
-		} elseif ($start_timestamp > $end_timestamp) {
-			return 1;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * compares the two dates + times. if seconds missing in one set,
-	 * adds :00, converts date + times via strtotime to timestamps
-	 * returns int/bool in:
-	 * -1 if the first date is smaller the last
-	 * 0 if both are equal
-	 * 1 if the first date is bigger than the last
-	 * false if date/times validation/conversion failed
-	 *
-	 * @param  string $start_datetime start date/time in YYYY-MM-DD HH:mm:ss
-	 * @param  string $end_datetime   end date/time in YYYY-MM-DD HH:mm:ss
-	 * @return int|bool               false for error
-	 *                                or -1 (s<e)/0 (s=e)/1 (s>e) as difference
-	 */
-	public static function compareDateTime($start_datetime, $end_datetime)
-	{
-		// pre check for empty or wrong
-		if ($start_datetime == '--' || $end_datetime == '--' || !$start_datetime || !$end_datetime) {
-			return false;
-		}
-		// quit if invalid timestamp
-		if (($start_timestamp = strtotime($start_datetime)) === false) {
-			return false;
-		}
-		if (($end_timestamp = strtotime($end_datetime)) === false) {
-			return false;
-		}
-		// compare, or return false
-		if ($start_timestamp < $end_timestamp) {
-			return -1;
-		} elseif ($start_timestamp == $end_timestamp) {
-			return 0;
-		} elseif ($start_timestamp > $end_timestamp) {
-			return 1;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * calculates the days between two dates
-	 * return: overall days, week days, weekend days as array 0...2 or named
-	 * as overall, weekday and weekend
-	 *
-	 * @param  string $start_date   valid start date (y/m/d)
-	 * @param  string $end_date     valid end date (y/m/d)
-	 * @param  bool   $return_named return array type, false (default), true for named
-	 * @return array<mixed>         0/overall, 1/weekday, 2/weekend
-	 */
-	public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
-	{
-		// pos 0 all, pos 1 weekday, pos 2 weekend
-		$days = [];
-		// if anything invalid, return 0,0,0
-		try {
-			$start = new \DateTime($start_date);
-			$end = new \DateTime($end_date);
-		} catch (Exception $e) {
-			if ($return_named === true) {
-				return [
-					'overall' => 0,
-					'weekday' => 0,
-					'weekend' => 0,
-				];
-			} else {
-				return [0, 0, 0];
-			}
-		}
-		// so we include the last day too, we need to add +1 second in the time
-		$end->setTime(0, 0, 1);
-		// if end date before start date, only this will be filled
-		$days[0] = $end->diff($start)->days;
-		$days[1] = 0;
-		$days[2] = 0;
-		// get period for weekends/weekdays
-		$period = new \DatePeriod($start, new \DateInterval('P1D'), $end);
-		foreach ($period as $dt) {
-			$curr = $dt->format('D');
-			if ($curr == 'Sat' || $curr == 'Sun') {
-				$days[2] ++;
-			} else {
-				$days[1] ++;
-			}
-		}
-		if ($return_named === true) {
-			return [
-				'overall' => $days[0],
-				'weekday' => $days[1],
-				'weekend' => $days[2],
-			];
-		} else {
-			return $days;
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Byte.php

@@ -1,167 +0,0 @@
-<?php
-
-/*
- * byte conversion from and to human readable
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Byte
-{
-	// define byteFormat
-	public const BYTE_FORMAT_NOSPACE = 1;
-	public const BYTE_FORMAT_ADJUST = 2;
-	public const BYTE_FORMAT_SI = 4;
-
-	/**
-	 * This function replaces the old byteStringFormat
-	 *
-	 * Converts any number string to human readable byte format
-	 * Maxium is Exobytes and above that the Exobytes suffix is used for all
-	 * If more are needed only the correct short name for the suffix has to be
-	 * added to the labels array
-	 * On no number string it returns string as is
-	 * Source Idea: SOURCE: https://programming.guide/worlds-most-copied-so-snippet.html
-	 *
-	 * The class itself hast the following defined
-	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and suffix
-	 * BYTE_FORMAT_ADJUST  [2] use sprintf to always print two decimals
-	 * BYTE_FORMAT_SI      [4] use si standard 1000 instead of bytes 1024
-	 * To use the constant from outside use class::CONSTANT
-	 *
-	 * @param  string|int|float $bytes bytes as string int or pure int
-	 * @param  int              $flags bitwise flag with use space turned on
-	 *                                 BYTE_FORMAT_NOSPACE: no space between number and suffix
-	 *                                 BYTE_FORMAT_ADJUST: sprintf adjusted two 2 decimals
-	 *                                 BYTE_FORMAT_SI: use 1000 instead of 1024
-	 * @return string                  converted byte number (float) with suffix
-	 * @throws \Exception               1: no valid flag set
-	 */
-	public static function humanReadableByteFormat($bytes, int $flags = 0): string
-	{
-		// if not numeric, return as is
-		if (is_numeric($bytes)) {
-			// flags bit wise check
-			// remove space between number and suffix
-			if ($flags & self::BYTE_FORMAT_NOSPACE) {
-				$space = false;
-			} else {
-				$space = true;
-			}
-			// use sprintf instead of round
-			if ($flags & self::BYTE_FORMAT_ADJUST) {
-				$adjust = true;
-			} else {
-				$adjust = false;
-			}
-			// use SI 1000 mod and not 1024 mod
-			if ($flags & self::BYTE_FORMAT_SI) {
-				$si = true;
-			} else {
-				$si = false;
-			}
-			if ($flags > 7) {
-				throw new \Exception("Invalid flags parameter: $flags", 1);
-			}
-
-			// si or normal
-			$unit = $si ? 1000 : 1024;
-			// always positive
-			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs((float)$bytes);
-			// smaller than unit is always B
-			if ($abs_bytes < $unit) {
-				return $bytes . 'B';
-			}
-			// labels in order of size [Y, Z]
-			$labels = ['', 'K', 'M', 'G', 'T', 'P', 'E'];
-			// exp position calculation
-			$exp = floor(log($abs_bytes, $unit));
-			// avoid printing out anything larger than max labels
-			if ($exp >= count($labels)) {
-				$exp = count($labels) - 1;
-			}
-			// deviation calculation
-			$dev = pow($unit, $exp) * ($unit - 0.05);
-			// shift the exp +1 for on the border units
-			if (
-				$exp < 6 &&
-				$abs_bytes > ($dev - (((int)$dev & 0xfff) == 0xd00 ? 52 : 0))
-			) {
-				$exp++;
-			}
-			// label name, including leading space if flagged
-			$pre = ($space ? ' ' : '') . ($labels[$exp] ?? '>E') . ($si ? 'i' : '') . 'B';
-			$bytes_calc = $abs_bytes / pow($unit, $exp);
-			// if original is negative, reverse
-			if ($bytes < 0) {
-				$bytes_calc *= -1;
-			}
-			if ($adjust) {
-				return sprintf("%.2f%s", $bytes_calc, $pre);
-			} else {
-				return round($bytes_calc, 2) . $pre;
-			}
-		} else {
-			// if anything other return as string
-			return (string)$bytes;
-		}
-	}
-
-	/**
-	 * calculates the bytes based on a string with nnG, nnGB, nnM, etc
-	 * NOTE: large exabyte numbers will overflow
-	 * flag allowed:
-	 * BYTE_FORMAT_SI      [4] use si standard 1000 instead of bytes 1024
-	 *
-	 * @param  string|int|float $number any string or number to convert
-	 * @param  int              $flags  bitwise flag with use space turned on
-	 *                                  BYTE_FORMAT_SI: use 1000 instead of 1024
-	 * @return string|int|float         converted value or original value
-	 * @throws \Exception                1: no valid flag set
-	 */
-	public static function stringByteFormat($number, int $flags = 0)
-	{
-		// use SI 1000 mod and not 1024 mod
-		if ($flags & self::BYTE_FORMAT_SI) {
-			$si = true;
-		} else {
-			$si = false;
-		}
-		if ($flags != 0 && $flags != 4) {
-			throw new \Exception("Invalid flags parameter: $flags", 1);
-		}
-		// matches in regex
-		$matches = [];
-		// all valid units
-		$valid_units_ = 'bkmgtpezy';
-		// detects up to exo bytes
-		preg_match(
-			"/(-)?([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i",
-			strtolower((string)$number),
-			$matches
-		);
-		if (isset($matches[2]) && isset($matches[3])) {
-			// remove all non valid characters from the number
-			$number = preg_replace('/[^0-9\.]/', '', $matches[2]);
-			// final clean up and convert to float
-			$number = (float)trim((string)$number);
-			// convert any mb/gb/etc to single m/b
-			$unit = preg_replace('/[^bkmgtpezy]/i', '', $matches[3]);
-			if ($unit) {
-				$number = $number * pow($si ? 1000 : 1024, stripos($valid_units_, $unit[0]) ?: 0);
-			}
-			// convert to INT to avoid +E output
-			$number = (int)round($number);
-			// if negative input, keep nnegative
-			if (!empty($matches[1])) {
-				$number *= -1;
-			}
-		}
-		// if not matching return as is
-		return $number;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Colors.php

@@ -1,344 +0,0 @@
-<?php
-
-/*
- * Convert color spaces
- * rgb to hex
- * hex to rgb
- * rgb to hsb
- * hsb to rgb
- * rgb to hsl
- * hsl to rgb
-*/
-
-// TODO: use oklab as base for converting colors
-// https://bottosson.github.io/posts/oklab/
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Colors
-{
-	/**
-	 * converts the rgb values from int data to the valid rgb html hex string
-	 * optional can turn of leading #
-	 * if one value is invalid, will return false
-	 *
-	 * @param  int    $red        red 0-255
-	 * @param  int    $green      green 0-255
-	 * @param  int    $blue       blue 0-255
-	 * @param  bool   $hex_prefix default true, prefix with "#"
-	 * @return string|bool        rgb in hex values with leading # if set,
-	 *                            false for invalid color
-	 */
-	public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true)
-	{
-		$hex_color = '';
-		if ($hex_prefix === true) {
-			$hex_color = '#';
-		}
-		foreach (['red', 'green', 'blue'] as $color) {
-			// if not valid, abort
-			if ($$color < 0 || $$color > 255) {
-				return false;
-			}
-			// pad left with 0
-			$hex_color .= str_pad(dechex($$color), 2, '0', STR_PAD_LEFT);
-		}
-		return $hex_color;
-	}
-
-	/**
-	 * converts a hex RGB color to the int numbers
-	 *
-	 * @param  string $hexStr           RGB hexstring
-	 * @param  bool   $return_as_string flag to return as string
-	 * @param  string $seperator        string seperator: default: ","
-	 * @return string|array<string,float|int>|bool false on error or array with RGB
-	 *                                             or a string with the seperator
-	 */
-	public static function hex2rgb(
-		string $hexStr,
-		bool $return_as_string = false,
-		string $seperator = ','
-	) {
-		$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
-		if (!is_string($hexStr)) {
-			return false;
-		}
-		$rgbArray = [];
-		if (strlen($hexStr) == 6) {
-			// If a proper hex code, convert using bitwise operation.
-			// No overhead... faster
-			$colorVal = hexdec($hexStr);
-			$rgbArray['r'] = 0xFF & ($colorVal >> 0x10);
-			$rgbArray['g'] = 0xFF & ($colorVal >> 0x8);
-			$rgbArray['b'] = 0xFF & $colorVal;
-		} elseif (strlen($hexStr) == 3) {
-			// If shorthand notation, need some string manipulations
-			$rgbArray['r'] = hexdec(str_repeat(substr($hexStr, 0, 1), 2));
-			$rgbArray['g'] = hexdec(str_repeat(substr($hexStr, 1, 1), 2));
-			$rgbArray['b'] = hexdec(str_repeat(substr($hexStr, 2, 1), 2));
-		} else {
-			// Invalid hex color code
-			return false;
-		}
-		// returns the rgb string or the associative array
-		return $return_as_string ? implode($seperator, $rgbArray) : $rgbArray;
-	}
-
-	/**
-	 * rgb2hsb does not clean convert back to rgb in a round trip
-	 * converts RGB to HSB/V values
-	 * returns:
-	 * array with hue (0-360), sat (0-100%), brightness/value (0-100%)
-	 *
-	 * @param  int $red              red 0-255
-	 * @param  int $green            green 0-255
-	 * @param  int $blue             blue 0-255
-	 * @return array<int|float>|bool Hue, Sat, Brightness/Value
-	 *                               false for input value error
-	 */
-	public static function rgb2hsb(int $red, int $green, int $blue)
-	{
-		// check that rgb is from 0 to 255
-		foreach (['red', 'green', 'blue'] as $c) {
-			if ($$c < 0 || $$c > 255) {
-				return false;
-			}
-			$$c = $$c / 255;
-		}
-
-		$MAX = max($red, $green, $blue);
-		$MIN = min($red, $green, $blue);
-		$HUE = 0;
-
-		if ($MAX == $MIN) {
-			return [0, 0, round($MAX * 100)];
-		}
-		if ($red == $MAX) {
-			$HUE = ($green - $blue) / ($MAX - $MIN);
-		} elseif ($green == $MAX) {
-			$HUE = 2 + (($blue - $red) / ($MAX - $MIN));
-		} elseif ($blue == $MAX) {
-			$HUE = 4 + (($red - $green) / ($MAX - $MIN));
-		}
-		$HUE *= 60;
-		if ($HUE < 0) {
-			$HUE += 360;
-		}
-
-		return [
-			(int)round($HUE),
-			(int)round((($MAX - $MIN) / $MAX) * 100),
-			(int)round($MAX * 100)
-		];
-	}
-
-	/**
-	 * hsb2rgb does not clean convert back to hsb in a round trip
-	 * converts HSB/V to RGB values RGB is full INT
-	 * if HSB/V value is invalid, sets this value to 0
-	 *
-	 * @param  float $H          hue 0-360 (int)
-	 * @param  float $S          saturation 0-100 (int)
-	 * @param  float $V          brightness/value 0-100 (int)
-	 * @return array<int>|bool 0 red/1 green/2 blue array as 0-255
-	 *                         false for input value error
-	 */
-	public static function hsb2rgb(float $H, float $S, float $V)
-	{
-		// check that H is 0 to 359, 360 = 0
-		// and S and V are 0 to 1
-		if ($H == 360) {
-			$H = 0;
-		}
-		if ($H < 0 || $H > 359) {
-			return false;
-		}
-		if ($S < 0 || $S > 100) {
-			return false;
-		}
-		if ($V < 0 || $V > 100) {
-			return false;
-		}
-		// convert to internal 0-1 format
-		$S /= 100;
-		$V /= 100;
-
-		if ($S == 0) {
-			$V = (int)round($V * 255);
-			return [$V, $V, $V];
-		}
-
-		$Hi = floor($H / 60);
-		$f = ($H / 60) - $Hi;
-		$p = $V * (1 - $S);
-		$q = $V * (1 - ($S * $f));
-		$t = $V * (1 - ($S * (1 - $f)));
-
-		switch ($Hi) {
-			case 0:
-				$red = $V;
-				$green = $t;
-				$blue = $p;
-				break;
-			case 1:
-				$red = $q;
-				$green = $V;
-				$blue = $p;
-				break;
-			case 2:
-				$red = $p;
-				$green = $V;
-				$blue = $t;
-				break;
-			case 3:
-				$red = $p;
-				$green = $q;
-				$blue = $V;
-				break;
-			case 4:
-				$red = $t;
-				$green = $p;
-				$blue = $V;
-				break;
-			case 5:
-				$red = $V;
-				$green = $p;
-				$blue = $q;
-				break;
-			default:
-				$red = 0;
-				$green = 0;
-				$blue = 0;
-		}
-
-		return [
-			(int)round($red * 255),
-			(int)round($green * 255),
-			(int)round($blue * 255)
-		];
-	}
-
-	/**
-	 * converts a RGB (0-255) to HSL
-	 * return:
-	 * array with hue (0-360), saturation (0-100%) and luminance (0-100%)
-	 *
-	 * @param  int $red          red 0-255
-	 * @param  int $green        green 0-255
-	 * @param  int $blue         blue 0-255
-	 * @return array<float>|bool hue/sat/luminance
-	 *                           false for input value error
-	 */
-	public static function rgb2hsl(int $red, int $green, int $blue)
-	{
-		// check that rgb is from 0 to 255
-		foreach (['red', 'green', 'blue'] as $c) {
-			if ($$c < 0 || $$c > 255) {
-				return false;
-			}
-			$$c = $$c / 255;
-		}
-
-		$min = min($red, $green, $blue);
-		$max = max($red, $green, $blue);
-		$chroma = $max - $min;
-		$sat = 0;
-		$hue = 0;
-		// luminance
-		$lum = ($max + $min) / 2;
-
-		// achromatic
-		if ($chroma == 0) {
-			// H, S, L
-			return [0.0, 0.0, round($lum * 100, 1)];
-		} else {
-			$sat = $chroma / (1 - abs(2 * $lum - 1));
-			if ($max == $red) {
-				$hue = fmod((($green - $blue) / $chroma), 6);
-				if ($hue < 0) {
-					$hue = (6 - fmod(abs($hue), 6));
-				}
-			} elseif ($max == $green) {
-				$hue = ($blue - $red) / $chroma + 2;
-			} elseif ($max == $blue) {
-				$hue = ($red - $green) / $chroma + 4;
-			}
-			$hue = $hue * 60;
-			// $sat = 1 - abs(2 * $lum - 1);
-			return [
-				round($hue, 1),
-				round($sat * 100, 1),
-				round($lum * 100, 1)
-			];
-		}
-	}
-
-	/**
-	 * converts an HSL to RGB
-	 * if HSL value is invalid, set this value to 0
-	 *
-	 * @param  float $hue                hue: 0-360 (degrees)
-	 * @param  float $sat                saturation: 0-100
-	 * @param  float $lum                luminance: 0-100
-	 * @return array<int,float|int>|bool red/blue/green 0-255 each
-	 */
-	public static function hsl2rgb(float $hue, float $sat, float $lum)
-	{
-		if (!is_numeric($hue)) {
-			return false;
-		}
-		if ($hue == 360) {
-			$hue = 0;
-		}
-		if ($hue < 0 || $hue > 359) {
-			return false;
-		}
-		if ($sat < 0 || $sat > 100) {
-			return false;
-		}
-		if ($lum < 0 || $lum > 100) {
-			return false;
-		}
-		// calc to internal convert value for hue
-		$hue = (1 / 360) * $hue;
-		// convert to internal 0-1 format
-		$sat /= 100;
-		$lum /= 100;
-		// if saturation is 0
-		if ($sat == 0) {
-			$lum = (int)round($lum * 255);
-			return [$lum, $lum, $lum];
-		} else {
-			$m2 = $lum < 0.5 ? $lum * ($sat + 1) : ($lum + $sat) - ($lum * $sat);
-			$m1 = $lum * 2 - $m2;
-			$hueue = function ($base) use ($m1, $m2) {
-				// base = hue, hue > 360 (1) - 360 (1), else < 0 + 360 (1)
-				$base = $base < 0 ? $base + 1 : ($base > 1 ? $base - 1 : $base);
-				// 6: 60, 2: 180, 3: 240
-				// 2/3 = 240
-				// 1/3 = 120 (all from 360)
-				if ($base * 6 < 1) {
-					return $m1 + ($m2 - $m1) * $base * 6;
-				}
-				if ($base * 2 < 1) {
-					return $m2;
-				}
-				if ($base * 3 < 2) {
-					return $m1 + ($m2 - $m1) * ((2 / 3) - $base) * 6;
-				}
-				return $m1;
-			};
-
-			return [
-				(int)round(255 * $hueue($hue + (1 / 3))),
-				(int)round(255 * $hueue($hue)),
-				(int)round(255 * $hueue($hue - (1 / 3)))
-			];
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Encoding.php

@@ -1,60 +0,0 @@
-<?php
-
-/*
- * convert string frmo one encdoing to another with auto detect flags
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Encoding
-{
-	/**
-	 * detects the source encoding of the string and if doesn't match
-	 * to the given target encoding it convert is
-	 * if source encoding is set and auto check is true (default) a second
-	 * check is done so that the source string encoding actually matches
-	 * will be skipped if source encoding detection is ascii
-	 *
-	 * @param  string $string          string to convert
-	 * @param  string $to_encoding     target encoding
-	 * @param  string $source_encoding optional source encoding, will try to auto detect
-	 * @param  bool   $auto_check      default true, if source encoding is set
-	 *                                 check that the source is actually matching
-	 *                                 to what we sav the source is
-	 * @return string                  encoding converted string
-	 */
-	public static function convertEncoding(
-		string $string,
-		string $to_encoding,
-		string $source_encoding = '',
-		bool $auto_check = true
-	): string {
-		// set if not given
-		if (!$source_encoding) {
-			$source_encoding = mb_detect_encoding($string);
-		} else {
-			$_source_encoding = mb_detect_encoding($string);
-		}
-		if (
-			$auto_check === true &&
-			isset($_source_encoding) &&
-			$_source_encoding == $source_encoding
-		) {
-			// trigger check if we have override source encoding.
-			// if different (_source is all but not ascii) then trigger
-			// skip if matching
-		}
-		if ($source_encoding != $to_encoding) {
-			if ($source_encoding) {
-				$string = mb_convert_encoding($string, $to_encoding, $source_encoding);
-			} else {
-				$string = mb_convert_encoding($string, $to_encoding);
-			}
-		}
-		return $string;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Extends/VarSetTypeMain.php

@@ -1,256 +0,0 @@
-<?php
-
-/*
- * Run is_<type> checks and return default value if not this type
- * This will return default null on invalid entries
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert\Extends;
-
-class VarSetTypeMain
-{
-	/**
-	 * If input variable is string then returns it, else returns default set
-	 * if not null is true, then null as return is allowed, else return is
-	 * converted to string
-	 *
-	 * @param  mixed       $val     Input variable
-	 * @param  string|null $default Default value
-	 * @param  bool        $to_null Convert to null (default no)
-	 * @return string|null          Input var or default value
-	 */
-	protected static function setStrMain(
-		mixed $val,
-		?string $default = null,
-		bool $to_null = false
-	): ?string {
-		if (is_string($val)) {
-			return $val;
-		}
-		if ($to_null === false) {
-			return (string)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * Will convert input data to string if possible.
-	 * Runs for string/int/float/bool/null
-	 * Will skip array/object/resource/callable/etc and use default for that
-	 *
-	 * @param  mixed       $val     Input variable
-	 * @param  string|null $default Default value
-	 * @param  bool        $to_null Convert to null (default no)
-	 * @return string|null          Converted input data to string/null
-	 */
-	protected static function makeStrMain(
-		mixed $val,
-		string $default = null,
-		bool $to_null = false
-	): ?string {
-		// int/float/string/bool/null, everything else is ignored
-		// no: array/object/resource/callable
-		if (
-			is_int($val) ||
-			is_float($val) ||
-			is_string($val) ||
-			is_bool($val) ||
-			is_null($val)
-		) {
-			return (string)$val;
-		}
-		if ($to_null === false) {
-			return (string)$default;
-		}
-		return $default;
-	}
-
-
-	/**
-	 * If input variable is int, return it, else return default value. If to_null
-	 * is true then null as return is allowed, else only int is returned
-	 *
-	 * @param  mixed    $val     Input variable
-	 * @param  int|null $default Default value
-	 * @param  bool     $to_null Convert to null (default no)
-	 * @return int|null          Input var or default value
-	 */
-	protected static function setIntMain(
-		mixed $val,
-		?int $default = null,
-		bool $to_null = false
-	): ?int {
-		if (is_int($val)) {
-			return $val;
-		}
-		if ($to_null === false) {
-			return (int)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * Convert input to int via filter_var. If not convertable return default value.
-	 * If to_null is set to true null return is allowed
-	 * NOTE: this is only a drastic fallback and not recommned for special use.
-	 * It will try to check via filter_var if we can get an int value and then use
-	 * intval to convert it.
-	 * Reason is that filter_var will convert eg 1.5 to 15 instead 1
-	 * One is very wrong, the other is at least better, but not perfect
-	 *
-	 * @param  mixed    $val     Input variable
-	 * @param  int|null $default Default value
-	 * @param  bool     $to_null Convert to null (default no)
-	 * @return int|null          Converted input data to int/null
-	 */
-	protected static function makeIntMain(
-		mixed $val,
-		int $default = null,
-		bool $to_null = false
-	): ?int {
-		// if we can filter it to a valid int, we can convert it
-		// we so avoid object, array, etc
-		if (
-			filter_var(
-				$val,
-				FILTER_SANITIZE_NUMBER_INT
-			) !== false
-		) {
-			return intval($val);
-		}
-		if ($to_null === false) {
-			return (int)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * If input is float return it, else set to default value. If to_null is set
-	 * to true, allow null return
-	 *
-	 * @param  mixed      $val     Input variable
-	 * @param  float|null $default Default value
-	 * @param  bool       $to_null Convert to null (default no)
-	 * @return float|null          Input var or default value
-	 */
-	protected static function setFloatMain(
-		mixed $val,
-		?float $default = null,
-		bool $to_null = false
-	): ?float {
-		if (is_float($val)) {
-			return $val;
-		}
-		if ($to_null === false) {
-			return (float)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * Convert intput var to float via filter_var. If failed to so return default.
-	 * If to_null is set to true allow null return
-	 *
-	 * @param  mixed      $val     Input variable
-	 * @param  float|null $default Default value
-	 * @param  bool       $to_null Convert to null (default no)
-	 * @return float|null          Converted intput data to float/null
-	 */
-	protected static function makeFloatMain(
-		mixed $val,
-		float $default = null,
-		bool $to_null = false
-	): ?float {
-		if (
-			(
-				$val = filter_var(
-					$val,
-					FILTER_SANITIZE_NUMBER_FLOAT,
-					FILTER_FLAG_ALLOW_FRACTION
-				)
-			) !== false
-		) {
-			return (float)$val;
-		}
-		if ($to_null === false) {
-			return (float)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * If input var is array return it, else return default value. If to_null is
-	 * set to true, allow null return
-	 *
-	 * @param  mixed             $val     Input variable
-	 * @param  array<mixed>|null $default Default value
-	 * @param  bool              $to_null Convert to null (default no)
-	 * @return array<mixed>|null          Input var or default value
-	 */
-	protected static function setArrayMain(
-		mixed $val,
-		?array $default = null,
-		bool $to_null = false
-	): ?array {
-		if (is_array($val)) {
-			return $val;
-		}
-		if ($to_null === false) {
-			return (array)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * If input var is bool return it, else return default value. If to_null is
-	 * set to true will allow null return.
-	 *
-	 * @param  mixed     $val     Input variable
-	 * @param  bool|null $default Default value
-	 * @param  bool      $to_null Convert to null (default no)
-	 * @return bool|null          Input var or default value
-	 */
-	protected static function setBoolMain(
-		mixed $val,
-		?bool $default = null,
-		bool $to_null = false
-	): ?bool {
-		if (is_bool($val)) {
-			return $val;
-		}
-		if ($to_null === false) {
-			return (bool)$default;
-		}
-		return $default;
-	}
-
-	/**
-	 * Convert anything to bool. If it is a string it will try to use the filter_var
-	 * to convert know true/false strings.
-	 * Else it uses (bool) to convert the rest
-	 * If null is allowed, will return null
-	 *
-	 * @param  mixed     $val     Input variable
-	 * @param  bool      $default Default value if to_null if false
-	 * @param  bool      $to_null Convert to null (default no)
-	 * @return bool|null          Converted input data to bool/ null
-	 */
-	protected static function makeBoolMain(
-		mixed $val,
-		bool $default = false,
-		bool $to_null = false
-	): ?bool {
-		$boolvar = is_string($val) ?
-				filter_var(
-					$val,
-					FILTER_VALIDATE_BOOLEAN,
-					FILTER_NULL_ON_FAILURE
-				) :
-				(bool)$val;
-		return $boolvar === null && !$to_null ? $default : $boolvar;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Html.php

@@ -1,70 +0,0 @@
-<?php
-
-/*
- * html convert functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Html
-{
-	public const SELECTED = 0;
-	public const CHECKED = 1;
-
-	/**
-	 * full wrapper for html entities
-	 *
-	 * @param  mixed $string string to html encode
-	 * @return mixed         if string, encoded, else as is (eg null)
-	 */
-	public static function htmlent($string)
-	{
-		if (is_string($string)) {
-			return htmlentities($string, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		} else {
-			return $string;
-		}
-	}
-
-	/**
-	 * strips out all line breaks or replaced with given string
-	 * @param  string $string  string
-	 * @param  string $replace replace character, default ' '
-	 * @return string          cleaned string without any line breaks
-	 */
-	public static function removeLB(string $string, string $replace = ' '): string
-	{
-		return str_replace(["\n\r", "\r", "\n"], $replace, $string);
-	}
-
-	/**
-	 * returns 'checked' or 'selected' if okay
-	 * $needle is a var, $haystack an array or a string
-	 * **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT NULL IF NOT FOUND ****
-	 *
-	 * @param  array<mixed>|string $haystack (search in) haystack can be
-	 *                                       an array or a string
-	 * @param  string              $needle   needle (search for)
-	 * @param  int                 $type     type: 0: returns selected, 1,
-	 *                                       returns checked
-	 * @return ?string                       returns checked or selected,
-	 *                                       else returns null
-	 */
-	public static function checked($haystack, string $needle, int $type = 0): ?string
-	{
-		if (is_array($haystack)) {
-			if (in_array($needle, $haystack)) {
-				return $type ? 'checked' : 'selected';
-			}
-		} else {
-			if ($haystack == $needle) {
-				return $type ? 'checked' : 'selected';
-			}
-		}
-		return null;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Json.php

@@ -1,97 +0,0 @@
-<?php
-
-/*
- * Converts a json string to array and stores error for later checking
- * can also return empty array on demand
- * and self set json as is on error as array
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Json
-{
-	/** @var int */
-	private static $json_last_error;
-
-	/**
-	 * converts a json string to an array
-	 * or inits an empty array on null string
-	 * or failed convert to array
-	 * In ANY case it will ALWAYS return array.
-	 * Does not throw errors
-	 *
-	 * @param  string|null $json     a json string, or null data
-	 * @param  bool        $override if set to true, then on json error
-	 *                               set original value as array
-	 * @return array<mixed>          returns an array from the json values
-	 */
-	public static function jsonConvertToArray(?string $json, bool $override = false): array
-	{
-		if ($json !== null) {
-			$_json = json_decode($json, true);
-			if (self::$json_last_error = json_last_error()) {
-				if ($override == true) {
-					// init return as array with original as element
-					$json = [$json];
-				} else {
-					$json = [];
-				}
-			} else {
-				$json = $_json;
-			}
-		} else {
-			$json = [];
-		}
-		// be sure that we return an array
-		return (array)$json;
-	}
-
-	/**
-	 * returns human readable string for json errors thrown in jsonConvertToArray
-	 *
-	 * @param  bool|boolean $return_string [default=false] if set to true
-	 *                                     it will return the message string and not
-	 *                                     the error number
-	 * @return int|string                  Either error number (0 for no error)
-	 *                                     or error string ('' for no error)
-	 */
-	public static function jsonGetLastError(bool $return_string = false)
-	{
-		$json_error_string = '';
-		// valid errors as of php 8.0
-		switch (self::$json_last_error) {
-			case JSON_ERROR_NONE:
-				$json_error_string = '';
-				break;
-			case JSON_ERROR_DEPTH:
-				$json_error_string = 'Maximum stack depth exceeded';
-				break;
-			case JSON_ERROR_STATE_MISMATCH:
-				$json_error_string = 'Underflow or the modes mismatch';
-				break;
-			case JSON_ERROR_CTRL_CHAR:
-				$json_error_string = 'Unexpected control character found';
-				break;
-			case JSON_ERROR_SYNTAX:
-				$json_error_string = 'Syntax error, malformed JSON';
-				break;
-			case JSON_ERROR_UTF8:
-				$json_error_string = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-				break;
-			case JSON_ERROR_INVALID_PROPERTY_NAME:
-				$json_error_string = 'A key starting with \u0000 character was in the string';
-				break;
-			case JSON_ERROR_UTF16:
-				$json_error_string = 'Single unpaired UTF-16 surrogate in unicode escape';
-				break;
-			default:
-				$json_error_string = 'Unknown error';
-				break;
-		}
-		return $return_string === true ? $json_error_string : self::$json_last_error;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Math.php

@@ -1,61 +0,0 @@
-<?php
-
-/*
- * various math related function wrappers
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Math
-{
-	/**
-	 * some float numbers will be rounded up even if they have no decimal entries
-	 * this function fixes this by pre-rounding before calling ceil
-	 *
-	 * @param  float       $number    number to round
-	 * @param  int|integer $precision intermediat round up decimals (default 10)
-	 * @return float                  correct ceil number
-	 */
-	public static function fceil(float $number, int $precision = 10): float
-	{
-		return ceil(round($number, $precision));
-	}
-
-	/**
-	 * round inside an a number, not the decimal part only
-	 * eg 48767 with -2 -> 48700
-	 *
-	 * @param  float $number    number to round
-	 * @param  int   $precision negative number for position in number (default -2)
-	 * @return float            rounded number
-	 */
-	public static function floorp(float $number, int $precision = -2): float
-	{
-		// if precision is requal or larger than the number length,
-		// set precision to length -1
-		if (abs($precision) >= strlen((string)$number)) {
-			$precision = (strlen((string)$number) - 1) * -1;
-		}
-		$mult = pow(10, $precision); // Can be cached in lookup table
-		return floor($number * $mult) / $mult;
-	}
-
-	/**
-	 * inits input to 0, if value is not numeric
-	 *
-	 * @param  string|int|float $number string or number to check
-	 * @return float                    if not number, then returns 0, else original input
-	 */
-	public static function initNumeric($number): float
-	{
-		if (!is_numeric($number)) {
-			return 0;
-		} else {
-			return (float)$number;
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/MimeAppName.php

@@ -1,85 +0,0 @@
-<?php
-
-/*
- * Translates a mime id string into the actual application or file name
- * for example 'text/plain' will output 'Text file'
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class MimeAppName
-{
-	/** @var array<string,string> */
-	private static $mime_apps = [];
-
-	/**
-	 * constructor: init mime list
-	 */
-	public function __construct()
-	{
-		self::$mime_apps = [
-			// zip
-			'application/zip' => 'Zip File',
-			// Powerpoint
-			'application/vnd.ms-powerpoint' => 'Microsoft Powerpoint',
-			'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'Microsoft Powerpoint',
-			// PDF
-			'pplication/pdf' => 'PDF',
-			// JPEG
-			'image/jpeg' => 'JPEG',
-			// PNG
-			'image/png' => 'PNG',
-			// Indesign
-			'application/x-indesign' => 'Adobe InDesign',
-			// Photoshop
-			'image/vnd.adobe.photoshop' => 'Adobe Photoshop',
-			'application/photoshop' => 'Adobe Photoshop',
-			// Illustrator
-			'application/illustrator' => 'Adobe Illustrator',
-			// Word
-			'application/vnd.ms-word' => 'Microsoft Word',
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'Microsoft Word',
-			// Excel
-			'application/vnd.ms-excel' => 'Microsoft Excel',
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'Microsoft Excel',
-			// plain text
-			'text/plain' => 'Text file',
-			// html
-			'text/html' => 'HTML',
-			// mp4 (max 45MB each)
-			'video/mpeg' => 'MPEG Video'
-		];
-	}
-
-	/**
-	 * Sets or updates a mime type
-	 *
-	 * @param  string $mime MIME Name, no validiation
-	 * @param  string $app  Applicaiton name
-	 * @return void
-	 */
-	public static function mimeSetAppName(string $mime, string $app): void
-	{
-		// if empty, don't set
-		if (empty($mime) || empty($app)) {
-			return;
-		}
-		self::$mime_apps[$mime] = $app;
-	}
-
-	/**
-	 * get the application name from mime type
-	 * if not set returns "Other file"
-	 *
-	 * @param  string $mime MIME Name
-	 * @return string       Application name matching
-	 */
-	public static function mimeGetAppName(string $mime): string
-	{
-		return self::$mime_apps[$mime] ?? 'Other file';
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/MimeEncode.php

@@ -1,71 +0,0 @@
-<?php
-
-/*
- * alternate for header mime encode to void problems with long strings and
- * spaces/strange encoding problems.
- * Orignal issues during PHP5/7
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class MimeEncode
-{
-	/**
-	 * wrapper function for mb mime convert
-	 * for correct conversion with long strings
-	 *
-	 * @param  string $string     string to encode
-	 * @param  string $encoding   target encoding
-	 * @param  string $line_break default line break is \r\n
-	 * @return string             encoded string
-	 */
-	public static function __mbMimeEncode(
-		string $string,
-		string $encoding,
-		string $line_break = "\r\n"
-	): string {
-		$current_internal_encoding = mb_internal_encoding();
-		// set internal encoding, so the mimeheader encode works correctly
-		mb_internal_encoding($encoding);
-		// if a subject, make a work around for the broken mb_mimencode
-		$pos = 0;
-		// after 36 single bytes characters,
-		// if then comes MB, it is broken
-		// has to 2 x 36 < 74 so the mb_encode_mimeheader
-		// 74 hardcoded split does not get triggered
-		$split = 36;
-		$_string = '';
-		while ($pos < mb_strlen($string, $encoding)) {
-			$output = mb_strimwidth($string, $pos, $split, "", $encoding);
-			$pos += mb_strlen($output, $encoding);
-			// if the strinlen is 0 here, get out of the loop
-			if (!mb_strlen($output, $encoding)) {
-				$pos += mb_strlen($string, $encoding);
-			}
-			$_string_encoded = mb_encode_mimeheader($output, $encoding);
-			// only make linebreaks if we have mime encoded code inside
-			// the space only belongs in the second line
-			if ($_string && preg_match("/^=\?/", $_string_encoded)) {
-				$_string .= $line_break . " ";
-			} elseif (
-				// hack for plain text with space at the end
-				mb_strlen($output, $encoding) == $split &&
-				mb_substr($output, -1, 1, $encoding) == " "
-			) {
-				// if output ends with space, add one more
-				$_string_encoded .= " ";
-			}
-			$_string .= $_string_encoded;
-		}
-		// strip out any spaces BEFORE a line break
-		$string = str_replace(" " . $line_break, $line_break, $_string);
-		// before we end, reset internal encoding
-		mb_internal_encoding($current_internal_encoding);
-		// return mime encoded string
-		return $string;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/Strings.php

@@ -1,123 +0,0 @@
-<?php
-
-/*
- * string convert and transform functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-class Strings
-{
-	/**
-	 * return the number of elements in the split list
-	 * 0 if nothing / invalid split
-	 * 1 if no split character found
-	 * n for the numbers in the split list
-	 *
-	 * @param  string $split_format
-	 * @param  string $split_characters
-	 * @return int
-	 */
-	public static function countSplitParts(
-		string $split_format,
-		string $split_characters = '-'
-	): int {
-		if (
-			empty($split_format) ||
-			// non valid characters inside, abort
-			!preg_match("/^[0-9" . $split_characters . "]/", $split_format) ||
-			preg_match('/[^\x20-\x7e]/', $split_characters)
-		) {
-			return 0;
-		}
-		$split_list = preg_split(
-			// allowed split characters
-			"/([" . $split_characters . "]{1})/",
-			$split_format
-		);
-		if (!is_array($split_list)) {
-			return 0;
-		}
-		return count(array_filter($split_list));
-	}
-
-	/**
-	 * split format a string base on a split format string
-	 * split format string is eg
-	 * 4-4-4 that means 4 characters DASH 4 characters DASH 4 characters
-	 * So a string in the format of
-	 * ABCD1234EFGH will be ABCD-1234-EFGH
-	 * Note a string LONGER then the maxium will be attached with the LAST
-	 * split character. In above exmaple
-	 * ABCD1234EFGHTOOLONG will be ABCD-1234-EFGH-TOOLONG
-	 *
-	 * @param  string $value            string value to split
-	 * @param  string $split_format     split format
-	 * @param  string $split_characters list of charcters with which we split
-	 *                                  if not set uses dash ('-')
-	 * @return string                   split formatted string or original value if not chnaged
-	 */
-	public static function splitFormatString(
-		string $value,
-		string $split_format,
-		string $split_characters = '-'
-	): string {
-		if (
-			// abort if split format is empty
-			empty($split_format) ||
-			// if not in the valid ASCII character range for any of the strings
-			preg_match('/[^\x20-\x7e]/', $value) ||
-			// preg_match('/[^\x20-\x7e]/', $split_format) ||
-			preg_match('/[^\x20-\x7e]/', $split_characters) ||
-			// only numbers and split characters in split_format
-			!preg_match("/[0-9" . $split_characters . "]/", $split_format)
-		) {
-			return $value;
-		}
-		// split format list
-		$split_list = preg_split(
-			// allowed split characters
-			"/([" . $split_characters . "]{1})/",
-			$split_format,
-			-1,
-			PREG_SPLIT_DELIM_CAPTURE
-		);
-		// if this is false, or only one array, abort split
-		if (!is_array($split_list) || count($split_list) == 1) {
-			return $value;
-		}
-		$out = '';
-		$pos = 0;
-		$last_split = '';
-		foreach ($split_list as $offset) {
-			if (is_numeric($offset)) {
-				$_part = substr($value, $pos, (int)$offset);
-				if (empty($_part)) {
-					break;
-				}
-				$out .= $_part;
-				$pos += (int)$offset;
-			} elseif ($pos) { // if first, do not add
-				$out .= $offset;
-				$last_split = $offset;
-			}
-		}
-		if (!empty($out) && $pos < strlen($value)) {
-			$out .= $last_split . substr($value, $pos);
-		}
-		// if last is not alphanumeric remove, remove
-		if (!strcspn(substr($out, -1, 1), $split_characters)) {
-			$out = substr($out, 0, -1);
-		}
-		// overwrite only if out is set
-		if (!empty($out)) {
-			return $out;
-		} else {
-			return $value;
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/VarSetType.php

@@ -1,136 +0,0 @@
-<?php
-
-/*
- * Run is_<type> checks and return default value if not this type
- * This will return a default value as always what is expected and never null
- * Use this for santize output from multi return functions where we know what
- * will come back
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-use CoreLibs\Convert\Extends\VarSetTypeMain;
-
-class VarSetType extends Extends\VarSetTypeMain
-{
-	/**
-	 * Check is input is string, if not return default string.
-	 * Will always return string
-	 *
-	 * @param  mixed  $val     Input value
-	 * @param  string $default Default override value
-	 * @return string          Input value or default as string
-	 */
-	public static function setStr(mixed $val, string $default = ''): string
-	{
-		return (string)VarSetTypeMain::setStrMain($val, $default, false);
-	}
-
-	/**
-	 * Convert input to string if possible.
-	 * Will only work on string/int/float/bool/null types
-	 * Will always return string
-	 *
-	 * @param  mixed  $val     Input value
-	 * @param  string $default Default override value
-	 * @return string          Input value as string or default as string
-	 */
-	public static function makeStr(mixed $val, string $default = ''): string
-	{
-		return (string)VarSetTypeMain::makeStrMain($val, $default, false);
-	}
-
-	/**
-	 * Check if input is int, if not return default int value 0.
-	 * Will always return int.
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  int   $default Default override value
-	 * @return int            Input value or default as int
-	 */
-	public static function setInt(mixed $val, int $default = 0): int
-	{
-		return (int)VarSetTypeMain::setIntMain($val, $default, false);
-	}
-
-	/**
-	 * Convert intput to int if possible, if not return default value 0.
-	 * Will always return int.
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  int   $default Default override value
-	 * @return int            Input value as int or default as int
-	 */
-	public static function makeInt(mixed $val, int $default = 0): int
-	{
-		return (int)VarSetTypeMain::makeIntMain($val, $default, false);
-	}
-
-	/**
-	 * Check if input is float, if not return default value value 0.0.
-	 * Will always return float
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  float $default Default override value
-	 * @return float          Input value or default as float
-	 */
-	public static function setFloat(mixed $val, float $default = 0.0): float
-	{
-		return (float)VarSetTypeMain::setFloatMain($val, $default, false);
-	}
-
-	/**
-	 * Convert input to float, if not possible return default value 0.0.
-	 * Will always return float
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  float $default Default override value
-	 * @return float          Input value as float or default as float
-	 */
-	public static function makeFloat(mixed $val, float $default = 0.0): float
-	{
-		return (float)VarSetTypeMain::makeFloatMain($val, $default, false);
-	}
-
-	/**
-	 * Check if input is array, if not return default empty array.
-	 * Will always return array.
-	 *
-	 * @param  mixed        $val     Input value
-	 * @param  array<mixed> $default Default override value
-	 * @return array<mixed>          Input value or default as array
-	 */
-	public static function setArray(mixed $val, array $default = []): array
-	{
-		return (array)VarSetTypeMain::setArrayMain($val, $default, false);
-	}
-
-	/**
-	 * Check if input is bool, if not will return default value false.
-	 * Will aways return bool.
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  bool  $default Default override value
-	 * @return bool           Input value or default as bool
-	 */
-	public static function setBool(mixed $val, bool $default = false): bool
-	{
-		return (bool)VarSetTypeMain::setBoolMain($val, $default, false);
-	}
-
-	/**
-	 * Convert anything to bool
-	 *
-	 * @param  mixed $val     Input value
-	 * @param  bool  $default Default override value
-	 * @return bool           Input value as bool or default as bool
-	 */
-	public static function makeBool(mixed $val, bool $default = false): bool
-	{
-		return (bool)VarSetTypeMain::makeBoolMain($val, $default, false);
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Convert/VarSetTypeNull.php

@@ -1,130 +0,0 @@
-<?php
-
-/*
- * Run is_<type> checks and return default value if not this type
- * This will return default null on invalid entries
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Convert;
-
-use CoreLibs\Convert\Extends\VarSetTypeMain;
-
-class VarSetTypeNull extends Extends\VarSetTypeMain
-{
-	/**
-	 * Check is input is string, if not return default string.
-	 * Will return null if no string as default.
-	 *
-	 * @param  mixed       $val     Input value
-	 * @param  string|null $default Default override value
-	 * @return string|null          Input value or default as string/null
-	 */
-	public static function setStr(mixed $val, ?string $default = null): ?string
-	{
-		return VarSetTypeMain::setStrMain($val, $default, true);
-	}
-
-	/**
-	 * Convert input to string if possible.
-	 * Will only work on string/int/float/bool/null types.
-	 * Will return null if convert failed as default.
-	 *
-	 * @param  mixed       $val     Input value
-	 * @param  string|null $default Default override value
-	 * @return string|null          Input value as string or default as string/null
-	 */
-	public static function makeStr(mixed $val, string $default = null): ?string
-	{
-		return VarSetTypeMain::makeStrMain($val, $default, true);
-	}
-
-
-	/**
-	 * Check if input is int, if not return default value null.
-	 *
-	 * @param  mixed    $val     Input value
-	 * @param  int|null $default Default override value
-	 * @return int|null          Input value or default as int/null
-	 */
-	public static function setInt(mixed $val, ?int $default = null): ?int
-	{
-		return VarSetTypeMain::setIntMain($val, $default, true);
-	}
-
-	/**
-	 * Convert intput to int if possible, if not return default value value null.
-	 *
-	 * @param  mixed    $val     Input value $val
-	 * @param  int|null $default Default override value
-	 * @return int|null          Input value as int or default as int/null
-	 */
-	public static function makeInt(mixed $val, int $default = null): ?int
-	{
-		return VarSetTypeMain::makeIntMain($val, $default, true);
-	}
-
-	/**
-	 * Check if input is float, if not return default value value null.
-	 *
-	 * @param  mixed      $val     Input value $val
-	 * @param  float|null $default Default override value
-	 * @return float|null          Input value or default as float/null
-	 */
-	public static function setFloat(mixed $val, ?float $default = null): ?float
-	{
-		return VarSetTypeMain::setFloatMain($val, $default, true);
-	}
-
-	/**
-	 * Convert input to float, if not possible return default value null.
-	 *
-	 * @param  mixed      $val     Input value $val
-	 * @param  float|null $default Default override value
-	 * @return float|null          Input value as float or default as float/null
-	 */
-	public static function makeFloat(mixed $val, float $default = null): ?float
-	{
-		return VarSetTypeMain::makeFloatMain($val, $default, true);
-	}
-
-	/**
-	 * Check if input is array, if not return default value null.
-	 *
-	 * @param  mixed             $val     Input value $val
-	 * @param  array<mixed>|null $default Default override value
-	 * @return array<mixed>|null          Input value or default as array/null
-	 */
-	public static function setArray(mixed $val, ?array $default = null): ?array
-	{
-		return VarSetTypeMain::setArrayMain($val, $default, true);
-	}
-
-	/**
-	 * Check if input is bool, if not will return default value null.
-	 *
-	 * @param  mixed     $val     Input value $val
-	 * @param  bool|null $default Default override value
-	 * @return bool|null          Input value or default as bool/null
-	 */
-	public static function setBool(mixed $val, ?bool $default = null): ?bool
-	{
-		return VarSetTypeMain::setBoolMain($val, $default, true);
-	}
-
-	/**
-	 * Convert anything to bool
-	 *
-	 * @param  mixed     $val Input value $val
-	 * @return bool|null      Input value as bool or default as bool/null
-	 */
-	public static function makeBool(mixed $val): ?bool
-	{
-		// note that the default value here is irrelevant, we return null
-		// on unsetable string var
-		return VarSetTypeMain::makeBoolMain($val, false, true);
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Create/Email.php

@@ -1,291 +0,0 @@
-<?php
-
-/*
- * Create email class
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Create;
-
-/**
- * sending simple text emails
- */
-class Email
-{
-	/** @var array<string> allowed list for encodings that can do KV folding */
-	private static $encoding_kv_allowed = [
-		'UTF-8',
-		'EUC-JP',
-		'SJIS',
-		'SJIS-win',
-		'ISO-2022-JP',
-		'ISO-2022-JP-MS',
-		'JIS',
-		'JIS-ms',
-	];
-	/** @var string normaly this does not need to be changed */
-	private static $mb_convert_kana_mode = 'KV';
-
-	/**
-	 * create mime encoded email part for to/from emails.
-	 * If encoding is not UTF-8 it will convert the email name to target encoding
-	 * FROM UTF-8
-	 * Source data is ALWAYS seen as utf-8
-	 *
-	 * @param  string $email      E-Mail address
-	 * @param  string $email_name Name for the email address, in UTF-8, if not set, empty
-	 * @param  string $encoding   Encoding, if not set UTF-8
-	 * @param  bool   $kv_folding If set to true and a valid encoding, do KV folding
-	 * @return string             Correctly encoded and build email string
-	 */
-	public static function encodeEmailName(
-		string $email,
-		string $email_name = '',
-		string $encoding = 'UTF-8',
-		bool $kv_folding = false
-	): string {
-		if (empty($email_name)) {
-			return $email;
-		}
-		// if encoding is not UTF-8 then we convert
-		if ($encoding != 'UTF-8') {
-			$email_name = mb_convert_encoding($email_name, $encoding, 'UTF-8');
-		}
-		$email_name =
-			mb_encode_mimeheader(
-				in_array($encoding, self::$encoding_kv_allowed) && $kv_folding ?
-					mb_convert_kana(
-						$email_name,
-						self::$mb_convert_kana_mode,
-						$encoding
-					) :
-					$email_name,
-				$encoding
-			);
-		return '"' . $email_name . '" '
-			. '<' . (string)$email . '>';
-	}
-
-	/**
-	 * Subject/Body replace sub function
-	 *
-	 * @param  string               $subject    Subject string, in UTF-8
-	 * @param  string               $body       Body string, in UTF-8
-	 * @param  array<string,string> $replace    Replace the array as key -> value, in UTF-8
-	 * @param  string               $encoding   Encoding for subject encode mime header
-	 * @param  bool                 $kv_folding If set to true and a valid encoding,
-	 *                                          do KV folding
-	 * @return array<string>                    Pos 0: Subject, Pos 1: Body
-	 */
-	private static function replaceContent(
-		string $subject,
-		string $body,
-		array $replace,
-		string $encoding,
-		bool $kv_folding
-	): array {
-		foreach (['subject', 'body'] as $element) {
-			$$element = str_replace(
-				array_map(
-					function ($key) {
-						return '{' . $key . '}';
-					},
-					array_keys($replace)
-				),
-				array_values($replace),
-				$$element
-			);
-		}
-		// if encoding is NOT UTF-8 convert to target
-		if ($encoding != 'UTF-8') {
-			$subject = mb_convert_encoding($subject, $encoding, 'UTF-8');
-			$body = mb_convert_encoding($body, $encoding, 'UTF-8');
-		}
-		// we need to encodde the subject
-		$subject = mb_encode_mimeheader(
-			in_array($encoding, self::$encoding_kv_allowed) && $kv_folding ?
-				// for any non UTF-8 encoding convert kana
-				mb_convert_kana(
-					$subject,
-					self::$mb_convert_kana_mode,
-					$encoding
-				) :
-				$subject,
-			$encoding
-		);
-		return [$subject, $body];
-	}
-
-	/**
-	 * Send plain text email with possible to replace subject/body data
-	 * either global or per to email set.
-	 * replace to tags are in {} in the subject or body
-	 *
-	 * @param  string               $subject         Mail subject, mandatory, in UTF-8
-	 * @param  string               $body            Mail body, mandatory, in UTF-8
-	 * @param  string               $from_email      From email, mandatory
-	 * @param  string               $from_name       From email name, in UTF-8
-	 *                                               if empty '' then not set
-	 * @param  array<mixed>         $send_to_emails  to email or array for email/replace
-	 *                                               If array: name/email/replace[key,value]
-	 *                                               name and replace must be in UTF-8
-	 *                                               At least one must be set
-	 * @param  array<string,string> $replace_content Subject/Body replace as
-	 *                                               search -> replace, in UTF-8
-	 * @param  string               $encoding        E-Mail encoding, default UTF-8
-	 * @param  bool                 $kv_folding      If set to true and a valid encoding,
-	 *                                               do KV folding
-	 * @param  bool                 $test            test flag, default off
-	 * @param  \CoreLibs\Debug\Logging|null $log     Logging class,
-	 *                                               only used if test flag is true
-	 * @return int                  2 test only, no sent
-	 *                              1 for ok,
-	 *                              0 for send not ok
-	 *                              -1 for nothing set (emails, subject, body)
-	 *                              -2 for empty to list
-	 *                              -3 encoding target not valid or not installed
-	 */
-	public static function sendEmail(
-		string $subject,
-		string $body,
-		string $from_email,
-		string $from_name,
-		array $send_to_emails,
-		array $replace_content = [],
-		string $encoding = 'UTF-8',
-		bool $kv_folding = false,
-		bool $test = false,
-		?\CoreLibs\Debug\Logging $log = null
-	): int {
-		/** @var array<string> */
-		$to_emails = [];
-		/** @var array<string,array<string,string>> */
-		$to_replace = [];
-		/** @var string */
-		$out_subject = $subject;
-		/** @var string */
-		$out_body = $body;
-		// check basic set
-		if (empty($subject) || empty($body) || empty($from_email)) {
-			return -1;
-		}
-		if (
-			$encoding != 'UTF-8' &&
-			!in_array($encoding, mb_list_encodings())
-		) {
-			return -3;
-		}
-		// if not one valid to, abort
-		foreach ($send_to_emails as $to_email) {
-			// to_email can be string, then only to email
-			// else expect 'email' & 'name'
-			if (
-				is_array($to_email) &&
-				isset($to_email['email'])
-			) {
-				$_to_email = self::encodeEmailName(
-					$to_email['email'],
-					$to_email['name'] ?? '',
-					$encoding,
-					$kv_folding
-				);
-				$to_emails[] = $_to_email;
-				// if we have to replacement, this override replace content
-				if (isset($to_email['replace']) && count($to_email['replace'])) {
-					// merge with original replace content,
-					// to data will override original data
-					$to_replace[$_to_email] = array_merge(
-						$replace_content,
-						$to_email['replace']
-					);
-				}
-			} elseif (is_string($to_email)) {
-				$to_emails[] = $to_email;
-			}
-		}
-		if (!count($to_emails)) {
-			return -2;
-		}
-
-		// the  email headers needed
-		$headers = [
-			'From' => self::encodeEmailName($from_email, $from_name, $encoding),
-			'Content-type' => "text/plain; charset=" . $encoding,
-			'MIME-Version' => "1.0",
-		];
-
-		// if we have a replace string, we need to do replace run
-		// only if there is no dedicated to replace
-		// also run replace if there is nothing to replace at all
-		// this will mime encode the subject
-		if (!count($to_replace)) {
-			list($out_subject, $out_body) = self::replaceContent(
-				$subject,
-				$body,
-				$replace_content,
-				$encoding,
-				$kv_folding
-			);
-		}
-
-		$mail_delivery_status = 1;
-		// send the email
-		foreach ($to_emails as $to_email) {
-			// default mail status is success
-			$mail_status = true;
-			// if there is a to replace, if not use the original replace content
-			if (count($to_replace)) {
-				$_replace = [];
-				if (!empty($to_replace[$to_email])) {
-					$_replace = $to_replace[$to_email];
-				} elseif (count($replace_content)) {
-					$_replace = $replace_content;
-				}
-				if (count($_replace)) {
-					list($out_subject, $out_body) = self::replaceContent(
-						$subject,
-						$body,
-						$_replace,
-						$encoding,
-						$kv_folding
-					);
-				}
-			}
-			// if we are in test mode, do not send an email and set status to 2
-			if ($test === false) {
-				$mail_status = mail($to_email, $out_subject, $out_body, $headers);
-			} else {
-				$mail_delivery_status = 2;
-			}
-			// log if an log instance exists
-			if ($log instanceof \CoreLibs\Debug\Logging) {
-				// build debug strings: convert to UTF-8 if not utf-8
-				$log->debug('SEND EMAIL', 'HEADERS: ' . $log->prAr($headers) . ', '
-					. 'ENCODING: ' . $encoding . ',  '
-					. 'KV FOLDING: ' . $log->prBl($kv_folding) . ',  '
-					. 'TO: ' . $to_email . ', '
-					. 'SUBJECT: ' . $out_subject . ', '
-					. 'BODY: ' . ($encoding == 'UTF-8' ?
-						$out_body :
-						mb_convert_encoding($out_body, 'UTF-8', $encoding)));
-				$log->debug('SEND EMAIL JSON', json_encode([
-					'encoding' => $encoding,
-					'kv_folding' => $kv_folding,
-					'header' => $headers,
-					'to' => $to_email,
-					'subject' => $out_subject,
-					'body' => ($encoding == 'UTF-8' ?
-						$out_body :
-						mb_convert_encoding($out_body, 'UTF-8', $encoding))
-				]) ?: '{}');
-			}
-			if (!$mail_status) {
-				$mail_delivery_status = 0;
-			}
-		}
-		return $mail_delivery_status;
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Create/Hash.php

@@ -1,122 +0,0 @@
-<?php
-
-/*
- * hash wrapper functions for old problem fixes
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Create;
-
-class Hash
-{
-	public const STANDARD_HASH_LONG = 'ripemd160';
-	public const STANDARD_HASH_SHORT = 'adler32';
-
-	/**
-	 * checks php version and if >=5.2.7 it will flip the string
-	 * can return empty string if none of string sets work
-	 * hash returns false
-	 * preg_replace fails for older php version
-	 * Use __hash with crc32b or hash('crc32b', ...) for correct output
-	 *
-	 * @param  string $string string to crc
-	 * @return string         crc32b hash (old type)
-	 */
-	public static function __crc32b(string $string): string
-	{
-		// do normal hash crc32b
-		$string = hash('crc32b', $string);
-		// if bigger than 5.2.7, we need to "unfix" the fix
-		if (\CoreLibs\Check\PhpVersion::checkPHPVersion('5.2.7')) {
-			// flip it back to old (two char groups)
-			$string = preg_replace("/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/", "$4$3$2$1", $string);
-		}
-		if (!is_string($string)) {
-			$string = '';
-		}
-		return $string;
-	}
-
-	/**
-	 * replacement for __crc32b call
-	 *
-	 * @param  string $string  string to hash
-	 * @param  bool   $use_sha use sha instead of crc32b (default false)
-	 * @return string          hash of the string
-	 */
-	public static function __sha1Short(string $string, bool $use_sha = false): string
-	{
-		if ($use_sha) {
-			// return only the first 9 characters
-			return substr(hash('sha1', $string), 0, 9);
-		} else {
-			return self::__crc32b($string);
-		}
-	}
-
-	/**
-	 * replacemend for __crc32b call (alternate)
-	 * defaults to adler 32
-	 * allowed crc32b, adler32, fnv132, fnv1a32, joaat
-	 * all that create 8 char long hashes
-	 *
-	 * @param  string $string    string to hash
-	 * @param  string $hash_type hash type (default adler32)
-	 * @return string            hash of the string
-	 */
-	public static function __hash(
-		string $string,
-		string $hash_type = self::STANDARD_HASH_SHORT
-	): string {
-		if (
-			!in_array(
-				$hash_type,
-				['crc32b', 'adler32', 'fnv132', 'fnv1a32', 'joaat']
-			)
-		) {
-			$hash_type = 'adler32';
-		}
-		return hash($hash_type, $string);
-	}
-
-	/**
-	 * Wrapper function for standard long hashd
-	 *
-	 * @param string $string String to be hashed
-	 * @return string        Hashed string
-	 */
-	public static function __hashLong(string $string): string
-	{
-		return hash(self::STANDARD_HASH_LONG, $string);
-	}
-
-	/**
-	 * create a unique id with the standard hash type defined in __hash
-	 *
-	 * @return string Unique ID with fixed length of 8 characters
-	 * @deprecated Use \CoreLibs\Create\Uids::uniqIdShort() instead
-	 */
-	public static function __uniqId(): string
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, '
-			. '\CoreLibs\Create\Uids::uniqIdShort() class', E_USER_DEPRECATED);
-		return \CoreLibs\Create\Uids::uniqIdShort();
-	}
-
-	/**
-	 * create a unique id with the standard long hash type
-	 * defined in __hashLong
-	 *
-	 * @return string Unique ID with length of current default long hash
-	 * @deprecated Use \CoreLibs\Create\Uids::uniqIdLong() instead
-	 */
-	public static function __uniqIdLong(): string
-	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, '
-			. '\CoreLibs\Create\Uids::uniqIdLong() class', E_USER_DEPRECATED);
-		return \CoreLibs\Create\Uids::uniqIdLong();
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Create/RandomKey.php

@@ -1,121 +0,0 @@
-<?php
-
-/*
- * random key functions
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Create;
-
-class RandomKey
-{
-	// key generation
-	/** @var string */
-	private static $key_range = '';
-	/** @var int */
-	private static $one_key_length;
-	/** @var int */
-	private static $key_length = 4; // default key length
-	/** @var int */
-	private static $max_key_length = 256; // max allowed length
-
-	/**
-	 * if launched as class, init random key data first
-	 */
-	public function __construct()
-	{
-		$this->initRandomKeyData();
-	}
-	/**
-	 * sets the random key range with the default values
-	 *
-	 * @return void has no return
-	 */
-	private static function initRandomKeyData()
-	{
-		// random key generation base string
-		self::$key_range = join('', array_merge(
-			range('A', 'Z'),
-			range('a', 'z'),
-			range('0', '9')
-		));
-		self::$one_key_length = strlen(self::$key_range);
-	}
-
-	/**
-	 * validates they key length for random string generation
-	 *
-	 * @param  int  $key_length key length
-	 * @return bool             true for valid, false for invalid length
-	 */
-	private static function validateRandomKeyLenght(int $key_length): bool
-	{
-		if (
-			is_numeric($key_length) &&
-			$key_length > 0 &&
-			$key_length <= self::$max_key_length
-		) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * sets the key length and checks that they key given is valid
-	 * if failed it will not change the default key length and return false
-	 *
-	 * @param  int  $key_length key length
-	 * @return bool             true/false for set status
-	 */
-	public static function setRandomKeyLength(int $key_length): bool
-	{
-		// only if valid int key with valid length
-		if (self::validateRandomKeyLenght($key_length) === true) {
-			self::$key_length = $key_length;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the current set random key length
-	 *
-	 * @return int Current set key length
-	 */
-	public static function getRandomKeyLength(): int
-	{
-		return self::$key_length;
-	}
-
-	/**
-	 * creates a random key based on the key_range with key_length
-	 * if override key length is set, it will check on valid key and use this
-	 * this will not set the class key length variable
-	 *
-	 * @param  int    $key_length key length override, -1 for use default
-	 * @return string             random key
-	 */
-	public static function randomKeyGen(int $key_length = -1): string
-	{
-		// init random key strings if not set
-		if (!is_numeric(self::$one_key_length)) {
-			self::initRandomKeyData();
-		}
-		$use_key_length = 0;
-		// only if valid int key with valid length
-		if (self::validateRandomKeyLenght($key_length) === true) {
-			$use_key_length = $key_length;
-		} else {
-			$use_key_length = self::$key_length;
-		}
-		// create random string
-		$random_string = '';
-		for ($i = 1; $i <= $use_key_length; $i++) {
-			$random_string .= self::$key_range[random_int(0, self::$one_key_length - 1)];
-		}
-		return $random_string;
-	}
-}

4dev/deprecated/CoreLibs/Create/Session.php

@@ -1,371 +0,0 @@
-<?php
-
-/*
- * AUTHOR: Clemens Schwaighofer
- * DESCRIPTION:
- * start a php sesseion
- * name can be given via startSession parameter
- * if not set tries to read $SET_SESSION_NAME from global
- * else will use default set in php.ini
- */
-
-declare(strict_types=1);
-
-namespace CoreLibs\Create;
-
-class Session
-{
-	/** @var string list for errors */
-	private $session_intern_error_str = '';
-
-	/**
-	 * Start session
-	 * startSession should be called for complete check
-	 * If this is called without any name set before the php.ini name is
-	 * used.
-	 *
-	 * @return void
-	 */
-	protected function startSessionCall(): void
-	{
-		session_start();
-	}
-
-	/**
-	 * init a session, if array is empty or array does not have session_name set
-	 * then no auto init is run
-	 *
-	 * @param string $session_name if set and not empty, will start session
-	 */
-	public function __construct(string $session_name = '')
-	{
-		if (!empty($session_name)) {
-			$this->startSession($session_name);
-		}
-	}
-
-	/**
-	 * check if we are in CLI, we set this, so we can mock this
-	 * Not this is just a wrapper for the static System::checkCLI call
-	 *
-	 * @return bool True if we are in a CLI enviroment, or false for everything else
-	 */
-	public function checkCliStatus(): bool
-	{
-		return \CoreLibs\Get\System::checkCLI();
-	}
-
-	/**
-	 * Set session name call. If not valid session name, will return false
-	 *
-	 * @param  string $session_name A valid string for session name
-	 * @return bool                 True if session name is valid,
-	 *                              False if not
-	 */
-	public function setSessionName(string $session_name): bool
-	{
-		if (!$this->checkValidSessionName($session_name)) {
-			return false;
-		}
-		session_name($session_name);
-		return true;
-	}
-
-	/**
-	 * Return set error string, empty if none set
-	 * Error strings are only set in the startSession method
-	 *
-	 * @return string Last error string
-	 */
-	public function getErrorStr(): string
-	{
-		return $this->session_intern_error_str;
-	}
-
-	/**
-	 * check if session name is valid
-	 *
-	 * As from PHP 8.1/8.0/7.4 error
-	 * INVALID CHARS: =,; \t\r\n\013\014
-	 * NOTE: using . will fail even thought valid
-	 * we allow only alphanumeric with - (dash) and 1 to 128 characters
-	 *
-	 * @param  string $session_name any string, not null
-	 * @return bool                 True for valid, False for invalid
-	 */
-	public static function checkValidSessionName(string $session_name): bool
-	{
-		// check
-		if (
-			// must only have those
-			!preg_match('/^[-a-zA-Z0-9]{1,128}$/', $session_name) ||
-			// cannot be only numbers
-			preg_match('/^[0-9]+$/', $session_name)
-		) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * start session with given session name if set
-	 * aborts on command line or if sessions are not enabled
-	 * also aborts if session cannot be started
-	 * On sucess returns the session id
-	 *
-	 * @param string|null $session_name
-	 * @return string|bool
-	 */
-	public function startSession(?string $session_name = null)
-	{
-		// we can't start sessions on command line
-		if ($this->checkCliStatus()) {
-			$this->session_intern_error_str = '[SESSION] No sessions in php cli';
-			return false;
-		}
-		// if session are OFF
-		if ($this->getSessionStatus() === PHP_SESSION_DISABLED) {
-			$this->session_intern_error_str = '[SESSION] Sessions are disabled';
-			return false;
-		}
-		// session_status
-		// initial the session if there is no session running already
-		if (!$this->checkActiveSession()) {
-			// if session name is emtpy, check if there is a global set
-			// this is a deprecated fallback
-			$session_name = $session_name ?? $GLOBALS['SET_SESSION_NAME'] ?? '';
-			// DEPRECTED: constant SET_SESSION_NAME is no longer used
-			// if set, set special session name
-			if (!empty($session_name)) {
-				// invalid session name, abort
-				if (!$this->checkValidSessionName($session_name)) {
-					$this->session_intern_error_str = '[SESSION] Invalid session name: ' . $session_name;
-					return false;
-				}
-				$this->setSessionName($session_name);
-			}
-			// start session
-			$this->startSessionCall();
-		}
-		// if we still have no active session
-		if (!$this->checkActiveSession()) {
-			$this->session_intern_error_str = '[SESSION] Failed to activate session';
-			return false;
-		}
-		if (false === ($session_id = $this->getSessionId())) {
-			$this->session_intern_error_str = '[SESSION] getSessionId did not return a session id';
-		}
-		return $session_id;
-	}
-
-	/**
-	 * get current set session id or false if none started
-	 *
-	 * @return string|bool
-	 */
-	public function getSessionId()
-	{
-		return session_id();
-	}
-
-	/**
-	 * get set session name or false if none started
-	 *
-	 * @return string|bool
-	 */
-	public function getSessionName()
-	{
-		return session_name();
-	}
-
-	/**
-	 * Checks if there is an active session.
-	 * Does not check if we can have a session
-	 *
-	 * @return bool True if there is an active session, else false
-	 */
-	public function checkActiveSession(): bool
-	{
-		if ($this->getSessionStatus() === PHP_SESSION_ACTIVE) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * unlock the session file, so concurrent AJAX requests can be done
-	 * NOTE: after this has been called, no changes in _SESSION will be stored
-	 * NOTE: a new session with a different name can be started after this one is called
-	 * if problem, run ob_flush() and flush() too
-	 *
-	 * @return bool True und sucess, false on failure
-	 */
-	public function writeClose(): bool
-	{
-		return session_write_close();
-	}
-
-	/**
-	 * Proper destroy a session
-	 * - unset the _SESSION array
-	 * - unset cookie if cookie on and we have not strict mode
-	 * - destroy session
-	 *
-	 * @return bool
-	 */
-	public function sessionDestroy(): bool
-	{
-		$_SESSION = [];
-		if (
-			ini_get('session.use_cookies') &&
-			!ini_get('session.use_strict_mode')
-		) {
-			$session_name = $this->getSessionName();
-			if ($session_name === false) {
-				$session_name = '';
-			}
-			$params = session_get_cookie_params();
-			setcookie(
-				(string)$session_name,
-				'',
-				time() - 42000,
-				$params['path'],
-				$params['domain'],
-				$params['secure'],
-				$params['httponly']
-			);
-		}
-		return session_destroy();
-	}
-
-	/**
-	 * get session status
-	 * PHP_SESSION_DISABLED if sessions are disabled.
-	 * PHP_SESSION_NONE if sessions are enabled, but none exists.
-	 * PHP_SESSION_ACTIVE if sessions are enabled, and one exists.
-	 *
-	 * https://www.php.net/manual/en/function.session-status.php
-	 *
-	 * @return int See possible return int values above
-	 */
-	public function getSessionStatus(): int
-	{
-		return session_status();
-	}
-
-	// _SESSION set/unset methods
-
-	/**
-	 * unset all _SESSION entries
-	 *
-	 * @return void
-	 */
-	public function unsetAllS(): void
-	{
-		foreach (array_keys($_SESSION ?? []) as $name) {
-			unset($_SESSION[$name]);
-		}
-	}
-
-	/**
-	 * set _SESSION entry 'name' with any value
-	 *
-	 * @param  string|int $name  array name in _SESSION
-	 * @param  mixed      $value value to set (can be anything)
-	 * @return void
-	 */
-	public function setS($name, $value): void
-	{
-		$_SESSION[$name] = $value;
-	}
-
-	/**
-	 * get _SESSION 'name' entry or empty string if not set
-	 *
-	 * @param  string|int $name value key to get from _SESSION
-	 * @return mixed            value stored in _SESSION
-	 */
-	public function getS($name)
-	{
-		return $_SESSION[$name] ?? '';
-	}
-
-	/**
-	 * Check if a name is set in the _SESSION array
-	 *
-	 * @param  string|int $name Name to check for
-	 * @return bool             True for set, False fornot set
-	 */
-	public function issetS($name): bool
-	{
-		return isset($_SESSION[$name]);
-	}
-
-	/**
-	 * unset one _SESSION entry 'name' if exists
-	 *
-	 * @param  string|int $name _SESSION key name to remove
-	 * @return void
-	 */
-	public function unsetS($name): void
-	{
-		if (isset($_SESSION[$name])) {
-			unset($_SESSION[$name]);
-		}
-	}
-
-	// set/get below
-	// ->var = value;
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @param  mixed      $value
-	 * @return void
-	 */
-	public function __set($name, $value): void
-	{
-		$_SESSION[$name] = $value;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return mixed
-	 */
-	public function __get($name)
-	{
-		if (isset($_SESSION[$name])) {
-			return $_SESSION[$name];
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return bool
-	 */
-	public function __isset($name): bool
-	{
-		return isset($_SESSION[$name]);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @param  string|int $name
-	 * @return void
-	 */
-	public function __unset($name): void
-	{
-		if (isset($_SESSION[$name])) {
-			unset($_SESSION[$name]);
-		}
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/Create/Uids.php

@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CoreLibs\Create;
-
-class Uids
-{
-	// what to use as a default hash if non ise set and no DEFAULT_HASH is defined
-	public const DEFAULT_HASH = 'sha256';
-	public const STANDARD_HASH_LONG = 'ripemd160';
-	public const STANDARD_HASH_SHORT = 'adler32';
-
-	/**
-	 * creates psuedo random uuid v4
-	 * Code take from class here:
-	 * https://www.php.net/manual/en/function.uniqid.php#94959
-	 *
-	 * @return string pseudo random uuid v4
-	 */
-	public static function uuidv4(): string
-	{
-		return sprintf(
-			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-			// 32 bits for "time_low"
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff),
-			// 16 bits for "time_mid"
-			mt_rand(0, 0xffff),
-			// 16 bits for "time_hi_and_version",
-			// four most significant bits holds version number 4
-			mt_rand(0, 0x0fff) | 0x4000,
-			// 16 bits, 8 bits for "clk_seq_hi_res",
-			// 8 bits for "clk_seq_low",
-			// two most significant bits holds zero and one for variant DCE1.1
-			mt_rand(0, 0x3fff) | 0x8000,
-			// 48 bits for "node"
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff)
-		);
-	}
-
-	/**
-	 * TODO: make this a proper uniq ID creation
-	 *       add uuidv4 subcall to the uuid function too
-	 * creates a uniq id
-	 *
-	 * @param  string $type uniq id type, currently md5 or sha256 allowed
-	 *                      if not set will use DEFAULT_HASH if set
-	 * @return string       uniq id
-	 */
-	public static function uniqId(string $type = ''): string
-	{
-		$uniq_id = '';
-		switch ($type) {
-			case 'md5':
-				$uniq_id = md5(uniqid((string)rand(), true));
-				break;
-			case self::DEFAULT_HASH:
-				$uniq_id = hash(self::DEFAULT_HASH, uniqid((string)rand(), true));
-				break;
-			case self::STANDARD_HASH_LONG:
-				$uniq_id = hash(self::STANDARD_HASH_LONG, uniqid((string)rand(), true));
-				break;
-			case self::STANDARD_HASH_SHORT:
-				$uniq_id = hash(self::STANDARD_HASH_SHORT, uniqid((string)rand(), true));
-				break;
-			default:
-				// if not empty, check if in valid list
-				if (
-					!empty($type) &&
-					in_array($type, hash_algos())
-				) {
-					$hash = $type;
-				} else {
-					// fallback to default hash type if none set or invalid
-					$hash = self::DEFAULT_HASH;
-				}
-				$uniq_id = hash($hash, uniqid((string)rand(), true));
-				break;
-		}
-		return $uniq_id;
-	}
-
-	/**
-	 * create a unique id with the standard hash type defined in __hash
-	 *
-	 * @return string Unique ID with fixed length of 8 characters
-	 */
-	public static function uniqIdShort(): string
-	{
-		return self::uniqId(self::STANDARD_HASH_SHORT);
-	}
-
-	/**
-	 * create a unique id with the standard long hash type
-	 * defined in __hashLong
-	 *
-	 * @return string Unique ID with length of current default long hash
-	 */
-	public static function uniqIdLong(): string
-	{
-		return self::uniqId(self::STANDARD_HASH_LONG);
-	}
-}
-
-// __END__

4dev/deprecated/CoreLibs/DB/Extended/ArrayIO.php

@@ -1,655 +0,0 @@
-<?php
-
-/*********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2002/12/17
-* VERSION: 1.0.0
-* RELEASED LICENSE: GNU GPL 3
-* SHORT DESC  :RIPTION:
-*   DB Array IO Class:
-*   writes, reads or deletes a complete array (one data set) in/out a
-*   table from the connected DB.
-*   you don't have to write any SQL queries, worry over update/insert
-*
-* HISTORY:
-* 2019/9/11 (cs) error string 21->1021, 22->1022 for not overlapping with IO
-* 2005/07/07 (cs) updated array class for postgres: set 0 & NULL if int field given, insert uses () values () syntax
-* 2005/03/31 (cs) fixed the class call with all debug vars
-* 2003-03-10: error_ids where still wrong chagned 11->21 and 12->22
-* 2003-02-26: db_array_io is no longer single class but extens db_io,
-*             as it needs it anyway
-*             moved the class info vars into class_info array into
-*             the constructor, removed info function
-* 2003-02-24: in db_delete moved query build to top, or pk_name/value
-*             will be reset before delete is done
-* 2002-12-20: just added info() method
-* 2002-12-17: splitted the class from other file (with main db wrapper)
-*********************************************************************/
-
-// picture upload should be taken out from here and out in media_class
-// as it actually has nothing to do with this one here ? (or at least
-// put into separete function in this class)
-
-declare(strict_types=1);
-
-namespace CoreLibs\DB\Extended;
-
-// subclass for one array handling
-class ArrayIO extends \CoreLibs\DB\IO
-{
-	// main calss variables
-	/** @var array<mixed> */
-	public $table_array; // the array from the table to work on
-	/** @var string */
-	public $table_name; // the table_name
-	/** @var string */
-	public $pk_name = ''; // the primary key from this table
-	/** @var int|string|null */
-	public $pk_id; // the PK id
-	// security values
-	/** @var int base acl for current page */
-	private $base_acl_level = 0;
-
-	/**
-	 * constructor for the array io class, set the
-	 * primary key name automatically (from array)
-	 *
-	 * @param array<mixed> $db_config      db connection config
-	 * @param array<mixed> $table_array    table array config
-	 * @param string       $table_name     table name string
-	 * @param \CoreLibs\Debug\Logging|null $log Logging class, default set if not set
-	 * @param int          $base_acl_level Set base acl level, if needed
-	 * @param int          $acl_admin      Flag if this is an admin ACL access level
-	 */
-	public function __construct(
-		array $db_config,
-		array $table_array,
-		string $table_name,
-		\CoreLibs\Debug\Logging $log = null,
-		int $base_acl_level = 0,
-		int $acl_admin = 0
-	) {
-		// instance db_io class
-		parent::__construct($db_config, $log ?? new \CoreLibs\Debug\Logging());
-		// more error vars for this class
-		$this->error_string['1999'] = 'No table array or table name set';
-		$this->error_string['1021'] = 'No Primary Key given';
-		$this->error_string['1022'] = 'Could not run Array Query';
-
-		$this->table_array = $table_array;
-		$this->table_name = $table_name;
-
-		// error abort if no table array or no table name
-		if (empty($table_array) || empty($table_name)) {
-			$this->__dbError(1999, false, 'MAJOR ERROR: Core settings missing');
-		}
-
-		// set primary key for given table_array
-		foreach ($this->table_array as $key => $value) {
-			if (!empty($value['pk'])) {
-				$this->pk_name = $key;
-			}
-		}
-		$this->dbArrayIOSetAcl($base_acl_level, $acl_admin);
-	}
-
-	/**
-	 * class deconstructor
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-	/**
-	 * set the base acl level and admin acl flag
-	 * This is needed for table array ACL checks
-	 * if not set I assume 0 (non write/non read/non admin)
-	 *
-	 * @param  int  $base_acl_level ACL Level from 0 to 100, -1 is not allowed
-	 *                              Will sett 0 if invalid
-	 * @param  int  $acl_admin      0 for non admin, 1 for admin (base acl is 100)
-	 * @return void
-	 */
-	public function dbArrayIOSetAcl(int $base_acl_level, int $acl_admin): void
-	{
-		// default not allowed, must be 0 at least
-		if ($base_acl_level < 0) {
-			$base_acl_level = 0;
-		}
-		// only 0 or 1 allowed
-		if (!in_array($acl_admin, [0, 1])) {
-			$acl_admin = 0;
-		}
-		// if the user is admin flagged, auto set to 100, if not already set to 100
-		if ($acl_admin == 1) {
-			$base_acl_level = 100;
-		}
-		$this->base_acl_level = $base_acl_level;
-	}
-
-	/**
-	 * changes all previously alterd HTML code into visible one,
-	 * works for <b>,<i>, and <a> (thought <a> can be / or should
-	 * be handled with the magic links functions
-	 * used with the read function
-	 *
-	 * @param  string $text any html encoded string
-	 * @return string       decoded html string
-	 */
-	public function convertData($text): string
-	{
-		$text = str_replace('&lt;b&gt;', '<b>', $text);
-		$text = str_replace('&lt;/b&gt;', '</b>', $text);
-		$text = str_replace('&lt;i&gt;', '<i>', $text);
-		$text = str_replace('&lt;/i&gt;', '</i>', $text);
-		// my need a change
-		$text = str_replace('&lt;a href=&quot;', '<a target="_blank" href="', $text);
-		$text = str_replace('&quot;&gt;', '">', $text);
-		$text = str_replace('&lt;/a&gt;', '</a>', $text);
-		return $text;
-	}
-
-	/**
-	 * changeds all HTML entities into non HTML ones
-	 *
-	 * @param  string $text encoded html string
-	 * @return string       decoded html string
-	 */
-	public function convertEntities($text): string
-	{
-		$text = str_replace('&lt;', '<', $text);
-		$text = str_replace('&gt;', '>', $text);
-		$text = str_replace('&amp;', '&', $text);
-		$text = str_replace('&quot;', '"', $text);
-		$text = str_replace('&#039;', "'", $text);
-		return $text;
-	}
-
-	/**
-	 * dumps the current data
-	 *
-	 * @param  bool   $write write to error message, default false
-	 * @return string        the array data as html string entry
-	 */
-	public function dbDumpArray($write = false): string
-	{
-		reset($this->table_array);
-		$string = '';
-		foreach ($this->table_array as $column => $data_array) {
-			$string .= '<b>' . $column . '</b> -> ' . $data_array['value'] . '<br>';
-		}
-		// add output to internal error_msg
-		if ($write === true) {
-			$this->__dbDebug('dbArray', $string);
-		}
-		return $string;
-	}
-
-	/**
-	 * checks if pk is set and if not, set from pk_id and
-	 * if this also not set return 0
-	 *
-	 * @return bool true if pk value is set, else false
-	 */
-	public function dbCheckPkSet()
-	{
-		// if pk_id is set, overrule ...
-		if ($this->pk_id) {
-			$this->table_array[$this->pk_name]['value'] = $this->pk_id;
-		}
-		// if not set ... produce error
-		if (!$this->table_array[$this->pk_name]['value']) {
-			// if no PK found, error ...
-			$this->__dbError(1021);
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * resets the whole array values
-	 * @param  boolean $reset_pk true if we want to reset the pk too
-	 * @return void              has no return
-	 */
-	public function dbResetArray($reset_pk = false): void
-	{
-		reset($this->table_array);
-		foreach (array_keys($this->table_array) as $column) {
-			if (!$this->table_array[$column]['pk']) {
-				unset($this->table_array[$column]['value']);
-			} elseif ($reset_pk) {
-				unset($this->table_array[$column]['value']);
-			}
-		}
-	}
-
-	/**
-	 * deletes one dataset
-	 *
-	 * @param  array<mixed> $table_array optional override for table array set
-	 *                                   set this as new table array too
-	 * @param  boolean      $acl_limit   [false], if set to true, well do ACL limit check
-	 * @return array<mixed>              returns the table array that was deleted
-	 */
-	public function dbDelete($table_array = [], $acl_limit = false)
-	{
-		// is array and has values, override set and set new
-		if (is_array($table_array) && count($table_array)) {
-			$this->table_array = $table_array;
-		}
-		if (!$this->dbCheckPkSet()) {
-			return $this->table_array;
-		}
-		if ($acl_limit === true && $this->base_acl_level < 100) {
-			$this->log->debug('DB DELETE ERROR', 'ACL Limit on, Delete, '
-				. 'but base ACL level of 100 not met: ' . $this->base_acl_level);
-			return $this->table_array;
-		}
-		// delete query
-		$q = 'DELETE FROM ' . $this->table_name . ' WHERE ';
-		$q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
-		// delete files and build FK query
-		reset($this->table_array);
-		$q_where = '';
-		foreach (array_keys($this->table_array) as $column) {
-			// suchen nach bildern und lschen ...
-			if (
-				!empty($this->table_array[$column]['file']) &&
-				file_exists($this->table_array[$column]['url'] . $this->table_array[$column]['value'])
-			) {
-				if (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
-					unlink($this->table_array[$column]['path'] . $this->table_array[$column]['value']);
-				}
-				$file_name = str_replace('_tn', '', $this->table_array[$column]['value']);
-				if (file_exists($this->table_array[$column]['path'] . $file_name)) {
-					unlink($this->table_array[$column]['path'] . $file_name);
-				}
-			}
-			// if we have a foreign key
-			if (!empty($this->table_array[$column]['fk'])) {
-				// create FK constraint checks
-				if ($q_where) {
-					$q_where .= ' AND ';
-				}
-				$q_where .= $column . ' = ' . $this->table_array[$column]['value'];
-			}
-			// allgemeines zurcksetzen des arrays
-			unset($this->table_array[$column]['value']);
-		}
-
-		// attach fk row if there ...
-		if ($q_where) {
-			$q .= ' AND ' . $q_where;
-		}
-		// if 0, error
-		$this->pk_id = null;
-		if (!$this->dbExec($q)) {
-			$this->__dbError(1022);
-		}
-		return $this->table_array;
-	}
-
-	/**
-	 * reads one row into the array
-	 *
-	 * @param  boolean      $edit        on true convert data, else as is
-	 * @param  array<mixed> $table_array optional table array, overwrites
-	 *                                   internal set array
-	 * @return array<mixed>              set table array with values
-	 */
-	public function dbRead($edit = false, $table_array = [])
-	{
-		// if array give, overrules internal array
-		if (is_array($table_array) && count($table_array)) {
-			$this->table_array = $table_array;
-		}
-		if (!$this->dbCheckPkSet()) {
-			return $this->table_array;
-		}
-		reset($this->table_array);
-		$q_select = '';
-		$q_where = '';
-		// create select part & addition FK part
-		foreach ($this->table_array as $column => $data_array) {
-			if ($q_select) {
-				$q_select .= ', ';
-			}
-			if (
-				!empty($data_array['type']) && $data_array['type'] == 'datetime' &&
-				!empty($data_array['sql_read'])
-			) {
-				// convert tom different timestamp type
-				$q_select .= "TO_CHAR($column, '" . $data_array['sql_read'] . "') AS $column";
-			} else {
-				$q_select .= $column;
-			}
-
-			// check FK ...
-			if (
-				isset($this->table_array[$column]['fk']) &&
-				isset($this->table_array[$column]['value'])
-			) {
-				if (!empty($q_where)) {
-					$q_where .= ' AND ';
-				}
-				$q_where .= $column .= ' = ' . $this->table_array[$column]['value'];
-			}
-		}
-
-		$q = 'SELECT ';
-		$q .= $q_select;
-		$q .= ' FROM ' . $this->table_name . ' WHERE ';
-		$q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
-		if ($q_where) {
-			$q .= ' AND ' . $q_where;
-		}
-
-		// if query was executed okay, else set error
-		if ($this->dbExec($q)) {
-			if (is_array($res = $this->dbFetchArray())) {
-				reset($this->table_array);
-				foreach ($this->table_array as $column => $data_array) {
-					// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten fr ausgabe
-					// ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen
-					// $this->log->debug('DB READ', 'EDIT: $edit | Spalte: $column | type: '
-					//	.$this->table_array[$column]['type'].' | Res: '.$res[$column]);
-					if ($edit) {
-						$this->table_array[$column]['value'] = $res[$column];
-						// if password, also write to hidden
-						if (
-							isset($this->table_array[$column]['type']) &&
-							$this->table_array[$column]['type'] == 'password'
-						) {
-							$this->table_array[$column]['HIDDEN_value'] = $res[$column];
-						}
-					} else {
-						$this->table_array[$column]['value'] = $this->convertData(nl2br($res[$column]));
-						// had to put out the htmlentities from the line above as it breaks japanese characters
-					}
-				}
-			}
-			// possible dbFetchArray errors ...
-			$this->pk_id = $this->table_array[$this->pk_name]['value'];
-		} else {
-			$this->__dbError(1022);
-		}
-		return $this->table_array;
-	}
-
-	/**
-	 * writes one set into DB or updates one set (if PK exists)
-	 *
-	 * @param  boolean      $addslashes  old convert entities and set set escape
-	 * @param  array<mixed> $table_array optional table array, overwrites internal one
-	 * @param  boolean      $acl_limit   [false], if set to true, well do ACL limit check
-	 * @return array<mixed>              table array or null
-	 */
-	public function dbWrite(
-		bool $addslashes = false,
-		array $table_array = [],
-		bool $acl_limit = false
-	): array {
-		if (is_array($table_array) && count($table_array)) {
-			$this->table_array = $table_array;
-		}
-		// PK ID check
-		// if ($this->pk_id && !$this->table_array[$this->pk_name]["value"]) {
-		// 	$this->table_array[$this->pk_name]["value"]=$this->pk_id;
-		// }
-		// checken ob PKs gesetzt, wenn alle -> update, wenn keiner -> insert, wenn ein paar -> ERROR!
-		if (!$this->table_array[$this->pk_name]['value']) {
-			$insert = 1;
-		} else {
-			$insert = 0;
-		}
-		// early abort for new write with not enough ACL level
-		if ($insert && $acl_limit === true && $this->base_acl_level < 100) {
-			$this->log->debug('DB WRITE ERROR', 'ACL Limit on, Insert, '
-				. 'but base ACL level of 100 not met: ' . $this->base_acl_level);
-			return $this->table_array;
-		}
-
-		reset($this->table_array);
-		$q_data = '';
-		$q_vars = '';
-		$q_where = '';
-		foreach ($this->table_array as $column => $data_array) {
-			/********************************* START FILE *************************************/
-			// file upload
-			if (isset($this->table_array[$column]['file'])) {
-				// falls was im tmp drinnen, sprich ein upload, datei kopieren, Dateinamen in db schreiben
-				// falls datei schon am server (physischer pfad), dann einfach url in db schreiben (update)
-				// falls in 'delete' 'ja' dann loeschen (und gibts eh nur beim update)
-				if ($this->table_array[$column]['delete']) {
-					unset($this->table_array[$column]['delete']);
-					if (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
-						unlink($this->table_array[$column]['path'] . $this->table_array[$column]['value']);
-					}
-					$file_name = str_replace('_tn', '', $this->table_array[$column]['value']);
-					if (file_exists($this->table_array[$column]['path'] . $file_name)) {
-						unlink($this->table_array[$column]['path'] . $file_name);
-					}
-					$this->table_array[$column]['value'] = '';
-				} else {
-					if ($this->table_array[$column]['tmp'] != 'none' && $this->table_array[$column]['tmp']) {
-						// mozilla, patch
-						$fn_name = explode('/', $this->table_array[$column]['dn']);
-						$this->table_array[$column]['dn'] = $fn_name[count($fn_name) - 1];
-						$filename_parts = explode('.', $this->table_array[$column]['dn']);
-						$ext = end($filename_parts);
-						array_splice($filename_parts, -1, 1);
-						$name = str_replace(' ', '_', implode('.', $filename_parts));
-						$file_name = $name . '.' . $ext;
-						//echo 'Dn: $file_name';
-						copy($this->table_array[$column]['tmp'], $this->table_array[$column]['path'] . $file_name);
-						// automatisch thumbnail generieren, geht nur mit convert (ImageMagic!!!), aber nur bei bild ..
-						if (in_array(strtolower($ext), ['jpeg', 'jpg', 'gif', 'png'])) {
-							$file_name_tn = $name . '_tn.' . $ext;
-							$input = $this->table_array[$column]['path'] . $file_name;
-							$output = $this->table_array[$column]['path'] . $file_name_tn;
-							$com = 'convert -geometry 115 ' . $input . ' ' . $output;
-							exec($com);
-							$this->table_array[$column]['value'] = $file_name_tn;
-						} else {
-							$this->table_array[$column]['value'] = $file_name;
-						}
-					} elseif (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
-						// mach gar nix, wenn bild schon da ???
-					}
-				} // delete or upload
-			} // file IF
-			/********************************* END FILE **************************************/
-
-			// do not write 'pk' (primary key) or 'view' values
-			// also do not write UPDATE for elements that are
-			// acl flagged, not if we have an ACL limiter, don't insert
-			// $this->log->debug('DB WRITE', 'C: ' . $column . ', '
-			// 	. 'ACL Level ' . $this->log->prBl($acl_limit) . ', '
-			// 	. 'TA ACL: ' . ($this->table_array[$column]['min_edit_acl'] ?? 100) . ', '
-			// 	. 'Base ACL: ' . $this->base_acl_level);
-			if (
-				!isset($this->table_array[$column]['pk']) &&
-				isset($this->table_array[$column]['type']) &&
-				$this->table_array[$column]['type'] != 'view' &&
-				strlen($column) > 0 &&
-				// no acl limiter
-				($acl_limit === false ||
-				(
-					// acl limit is true, min edit must be at larger than set
-					$acl_limit === true &&
-					$this->base_acl_level >=
-						($this->table_array[$column]['min_edit_acl'] ?? 100)
-				))
-			) {
-				// for password use hidden value if main is not set
-				if (
-					isset($this->table_array[$column]['type']) &&
-					$this->table_array[$column]['type'] == 'password' &&
-					empty($this->table_array[$column]['value'])
-				) {
-					$this->table_array[$column]['value'] = $this->table_array[$column]['HIDDEN_value'];
-				}
-				if (!$insert) {
-					if (strlen($q_data)) {
-						$q_data .= ', ';
-					}
-					$q_data .= $column . ' = ';
-				} else {
-					// this is insert
-					if (strlen($q_data)) {
-						$q_data .= ', ';
-					}
-					if (strlen($q_vars)) {
-						$q_vars .= ', ';
-					}
-					$q_vars .= $column;
-				}
-				// integer is different
-				if (isset($this->table_array[$column]['int']) || isset($this->table_array[$column]['int_null'])) {
-					$this->log->debug('WRITE CHECK', '[' . $column . '][' . $this->table_array[$column]['value'] . ']'
-						. '[' . $this->table_array[$column]['type'] . '] '
-						. 'VALUE SET: ' . (string)isset($this->table_array[$column]['value'])
-						. ' | INT NULL: ' . (string)isset($this->table_array[$column]['int_null']));
-					if (
-						isset($this->table_array[$column]['value']) &&
-						!$this->table_array[$column]['value'] &&
-						isset($this->table_array[$column]['int_null'])
-					) {
-						$_value = 'NULL';
-					} elseif (
-						!isset($this->table_array[$column]['value']) ||
-						(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
-					) {
-						$_value = 0;
-					} else {
-						$_value = $this->table_array[$column]['value'];
-					}
-					$q_data .= $_value;
-				} elseif (isset($this->table_array[$column]['bool'])) {
-					// boolean storeage (reverse check on ifset)
-					$q_data .= "'" . $this->dbBoolean($this->table_array[$column]['value'], true) . "'";
-				} elseif (
-					isset($this->table_array[$column]['interval']) ||
-					isset($this->table_array[$column]['date']) ||
-					isset($this->table_array[$column]['datetime']) ||
-					isset($this->table_array[$column]['emptynull'])
-				) {
-					// for interval we check if no value, then we set null
-					if (
-						!isset($this->table_array[$column]['value']) ||
-						(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
-					) {
-						$_value = 'NULL';
-					} elseif (isset($this->table_array[$column]['value'])) {
-						$_value = $this->dbEscapeLiteral($this->table_array[$column]['value']);
-					} else {
-						// fallback
-						$_value = 'NULL';
-					}
-					$q_data .= $_value;
-				} else {
-					// if the error check is json, we set field to null if NOT set
-					// else normal string write
-					if (
-						isset($this->table_array[$column]['error_check']) &&
-						$this->table_array[$column]['error_check'] == 'json' &&
-						(
-							!isset($this->table_array[$column]['value']) ||
-							(isset($this->table_array[$column]['value']) &&
-							!$this->table_array[$column]['value'])
-						)
-					) {
-						$q_data .= 'NULL';
-					} else {
-						// normal string
-						$q_data .= "'";
-						// if add slashes do convert & add slashes else write AS is
-						if ($addslashes) {
-							$q_data .= $this->dbEscapeString(
-								$this->convertEntities($this->table_array[$column]['value'])
-							);
-						} else {
-							$q_data .= $this->dbEscapeString($this->table_array[$column]['value']);
-						}
-						$q_data .= "'";
-					}
-				}
-			}
-		} // while ...
-
-		if (empty($q_data)) {
-			$this->log->debug('DB WRITE ERROR', 'No data to write, possible through ACL');
-			return $this->table_array;
-		}
-
-		// NOW get PK, and FK settings (FK only for update query)
-		// get it at the end, cause now we can be more sure of no double IDs, etc
-		reset($this->table_array);
-		// create select part & addition FK part
-		foreach ($this->table_array as $column => $data_array) {
-			// check FK ...
-			if (
-				isset($this->table_array[$column]['fk']) &&
-				isset($this->table_array[$column]['value'])
-			) {
-				if (!empty($q_where)) {
-					$q_where .= ' AND ';
-				}
-				$q_where .= $column .= ' = ' . $this->table_array[$column]['value'];
-			}
-		}
-
-		// if no PK set, then get max ID from DB
-		if (!$this->table_array[$this->pk_name]['value']) {
-			// max id, falls INSERT
-			$q = 'SELECT MAX(' . $this->pk_name . ') + 1 AS pk_id FROM ' . $this->table_name;
-			if (is_array($res = $this->dbReturnRow($q))) {
-				$pk_id = $res['pk_id'];
-			} else {
-				$pk_id = 1;
-			}
-			$this->table_array[$this->pk_name]['value'] = $pk_id;
-		}
-
-		if (!$insert) {
-			$q = 'UPDATE ' . $this->table_name . ' SET ';
-			$q .= $q_data;
-			$q .= ' WHERE ';
-			$q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
-			if (!empty($q_where)) {
-				$q .= ' AND ' . $q_where;
-			}
-			// set pk_id ... if it has changed or so
-			$this->pk_id = $this->table_array[$this->pk_name]['value'];
-		} else {
-			$q = 'INSERT INTO ' . $this->table_name . ' ';
-			$q .= '(' . $q_vars . ') ';
-			$q .= 'VALUES (' . $q_data . ')';
-			// write primary key too
-			// if ($q_data)
-			//	$q .= ", ";
-			// $q .= $this->pk_name." = ".$this->table_array[$this->pk_name]['value']." ";
-			// $this->pk_id = $this->table_array[$this->pk_name]['value'];
-		}
-		// return success or not
-		if (!$this->dbExec($q)) {
-			$this->__dbError(1022);
-		}
-		// set primary key
-		if ($insert) {
-			$insert_id = $this->dbGetInsertPK();
-			if (is_array($insert_id)) {
-				$insert_id = 0;
-			}
-			$this->table_array[$this->pk_name]['value'] = $insert_id;
-			$this->pk_id = $insert_id;
-		}
-		// return the table if needed
-		return $this->table_array;
-	}
-	// end of class
-}
-
-// __END__

4dev/deprecated/CoreLibs/DB/SQL/PgSQL.php

@@ -1,883 +0,0 @@
-<?php
-
-/*********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2003/04/09
-* SHORT DESCRIPTION:
-*   2018/3/23, the whole class system is transformed to namespaces
-*   also all internal class calls are converted to camel case
-*
-* pgsql wrapper calls
-*
-* HISTORY:
-* 2008/04/16 (cs) wrapper for pg escape string
-* 2007/01/11 (cs) add prepare/execute for postgres
-* 2006/09/12 (cs) in case db_query retuns false, save the query and
-*                 run the query through the send/get procedure to get
-*                 correct error data from the db
-* 2006/06/26 (cs) added port for db connection
-* 2006/04/03 (cs) added meta data for table
-* 2005/07/25 (cs) removed the plural s remove, not needed and not 100% working
-* 2005/07/07 (cs) the default it is table_name _ id
-* 2005/01/19 (cs) changed the pgsql connect, so it dies if it can't connect to the DB
-* 2004/09/30 (cs) layout cleanup
-*
-*
-* collection of PostgreSQL wrappers
-*
-* pg_prepare
-* pg_execute
-* pg_num_rows
-* pg_num_fields
-* pg_field_name
-* pg_affected_rows (*)
-* pg_fetch_array
-* pg_query
-* pg_send_query
-* pg_get_result
-* pg_connection_busy
-* pg_close
-* pg_connect (*)
-* pg_meta_data
-* pg_escape_string
-*
-*/
-
-declare(strict_types=1);
-
-namespace CoreLibs\DB\SQL;
-
-// below no ignore is needed if we want to use PgSql interface checks with PHP 8.0
-// as main system. Currently all @var sets are written as object
-/** @#phan-file-suppress PhanUndeclaredTypeProperty,PhanUndeclaredTypeParameter,PhanUndeclaredTypeReturnType */
-
-class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
-{
-	/** @var string */
-	private $last_error_query;
-	// NOTE for PHP 8.1 this is no longer a resource
-	/** @var object|resource|bool */ // replace object with PgSql\Connection
-	private $dbh;
-
-	/**
-	 * queries last error query and returns true or false if error was set
-	 *
-	 * @return bool true/false if last error is set
-	 */
-	public function __dbLastErrorQuery(): bool
-	{
-		if ($this->last_error_query) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * wrapper for pg_query, catches error and stores it in class var
-	 *
-	 * @param  string $query Query string
-	 * @return object|resource|bool query result (PgSql\Result)
-	 */
-	public function __dbQuery(string $query)
-	{
-		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		// read out the query status and save the query if needed
-		$result = pg_query($this->dbh, $query);
-		if ($result === false) {
-			$this->last_error_query = $query;
-		}
-		return $result;
-	}
-
-	/**
-	 * Proposed
-	 * wrapperf or pg_query_params for queries in the style of
-	 * SELECT foo FROM bar WHERE foobar = $1
-	 *
-	 * @param  string       $query  Query string with placeholders $1, ..
-	 * @param  array<mixed> $params Matching parameters for each placerhold
-	 * @return object|resource|bool Query result (PgSql\Result)
-	 */
-	public function __dbQueryParams(string $query, array $params)
-	{
-		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		// parse query and get all $n entries
-		// TODO count of $n must match params
-		// read out the query status and save the query if needed
-		$result = pg_query_params($this->dbh, $query, $params);
-		if ($result === false) {
-			$this->last_error_query = $query;
-		}
-		return $result;
-	}
-
-	/**
-	 * sends an async query to the server
-	 *
-	 * @param  string $query query string
-	 * @return bool          true/false if query was sent successful
-	 */
-	public function __dbSendQuery(string $query): bool
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		$result = pg_send_query($this->dbh, $query);
-		return $result ? true : false;
-	}
-
-	/**
-	 * wrapper for pg_get_result
-	 *
-	 * @return object|resource|bool resource handler or false for error (PgSql\Result)
-	 */
-	public function __dbGetResult()
-	{
-		$this->last_error_query = '';
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		$result = pg_get_result($this->dbh);
-		if ($result === false) {
-			return false;
-		}
-		if ($error = pg_result_error($result)) {
-			$this->last_error_query = $error;
-		}
-		return $result;
-	}
-
-	/**
-	 * wrapper for pg_close
-	 *
-	 * @return void has no return
-	 */
-	public function __dbClose(): void
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return;
-		}
-		if (pg_connection_status($this->dbh) === PGSQL_CONNECTION_OK) {
-			// in 8.1 this throws an error, and we don't need that anyway
-			// pg_close($this->dbh);
-		}
-	}
-
-	/**
-	 * wrapper for pg_prepare
-	 *
-	 * @param  string $name  statement name
-	 * @param  string $query query string
-	 * @return object|resource|bool prepare statement handler or
-	 *                              false for error (PgSql\Result)
-	 */
-	public function __dbPrepare(string $name, string $query)
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		$result = pg_prepare($this->dbh, $name, $query);
-		if (!$result) {
-			$this->last_error_query = $query;
-		}
-		return $result;
-	}
-
-	/**
-	 * wrapper for pg_execute for running a prepared statement
-	 *
-	 * @param  string        $name statement name
-	 * @param  array<mixed>  $data data array
-	 * @return object|resource|bool returns status or false for error (PgSql\Result)
-	 */
-	public function __dbExecute(string $name, array $data)
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		$result = pg_execute($this->dbh, $name, $data);
-		if (!$result) {
-			$this->last_error_query = $name;
-		}
-		return $result;
-	}
-
-	/**
-	 * wrapper for pg_num_rows
-	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                  number of rows, -1 on error
-	 */
-	public function __dbNumRows($cursor): int
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return -1;
-		}
-		return pg_num_rows($cursor);
-	}
-
-	/**
-	 * wrapper for pg_num_fields
-	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                  number for fields in result, -1 on error
-	 */
-	public function __dbNumFields($cursor): int
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return -1;
-		}
-		return pg_num_fields($cursor);
-	}
-
-	/**
-	 * wrapper for pg_field_name
-	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @param  int                  $i      field position
-	 * @return string|bool          name or false on error
-	 */
-	public function __dbFieldName($cursor, int $i)
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return false;
-		}
-		return pg_field_name($cursor, $i);
-	}
-
-	/**
-	 * wrapper for pg_fetch_array
-	 * if through/true false, use __dbResultType(true)
-	 *
-	 * @param  object|resource|bool $cursor      cursor PgSql\Result (former resource)
-	 * @param  int                  $result_type result type as int number
-	 * @return array<mixed>|bool    array result data or false on end/error
-	 */
-	public function __dbFetchArray($cursor, int $result_type = PGSQL_BOTH)
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return false;
-		}
-		// result type is passed on as is [should be checked]
-		return pg_fetch_array($cursor, null, $result_type);
-	}
-
-	/**
-	 * simple match up between assoc true/false
-	 *
-	 * @param  bool $assoc_type true (default) for PGSQL_ASSOC, false for PGSQL_BOTH
-	 * @return int              valid result type for fetch array
-	 */
-	public function __dbResultType(bool $assoc_type = true): int
-	{
-		if ($assoc_type == true) {
-			return PGSQL_ASSOC;
-		}
-		// fallback to default
-		return PGSQL_BOTH;
-	}
-
-	/**
-	 * wrapper for pg_fetch_all
-	 *
-	 * @param  object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return array<mixed>|bool    data array or false for end/error
-	 */
-	public function __dbFetchAll($cursor)
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return false;
-		}
-		return pg_fetch_all($cursor);
-	}
-
-	/**
-	 * wrapper for pg_affected_rows
-	 *
-	 * @param object|resource|bool $cursor cursor PgSql\Result (former resource)
-	 * @return int                 affected rows, 0 for none, -1 for error
-	 */
-	public function __dbAffectedRows($cursor): int
-	{
-		if ($cursor === false || is_bool($cursor)) {
-			return -1;
-		}
-		return pg_affected_rows($cursor);
-	}
-
-	/**
-	 * reads the last inserted primary key for the query
-	 * if there is no pk_name tries to auto built it from the table name
-	 * this only works if db schema is after no plural names
-	 * and pk name is table name + _id
-	 *
-	 * detects schema prefix in table name
-	 * @param  string           $query   query string
-	 * @param  string|null      $pk_name primary key name, if '' then auto detect
-	 * @return string|int|false          primary key value
-	 */
-	public function __dbInsertId(string $query, ?string $pk_name)
-	{
-		// only if an insert has been done
-		if (preg_match("/^insert /i", $query)) {
-			$schema = '';
-			// get table name from insert
-			$array = explode(' ', $query);
-			$_table = $array[2];
-			// if there is a dot inside, we need to split
-			if (strstr($_table, '.')) {
-				list($schema, $table) = explode('.', $_table);
-			} else {
-				$table = $_table;
-			}
-			// no PK name given at all
-			if (empty($pk_name)) {
-				// if name is plurar, make it singular
-				// if (preg_match("/.*s$/i", $table))
-				// 	$table = substr($table, 0, -1);
-				// set pk_name to "id"
-				$pk_name = $table . "_id";
-			}
-			$seq = ($schema ? $schema . '.' : '') . $table . "_" . $pk_name . "_seq";
-			$q = "SELECT CURRVAL('$seq') AS insert_id";
-			// I have to do manually or I overwrite the original insert internal vars ...
-			if ($q = $this->__dbQuery($q)) {
-				if (is_array($res = $this->__dbFetchArray($q))) {
-					list($id) = $res;
-				} else {
-					return false;
-				}
-			} else {
-				$id = [-1, $q];
-			}
-			return $id;
-		} else {
-			//if not insert, return false
-			return false;
-		}
-	}
-
-	/**
-	 * queries database for the primary key name to this table in the selected schema
-	 *
-	 * @param  string      $table  table name
-	 * @param  string      $schema optional schema name, '' for default
-	 * @return string|bool         primary key name or false if not found
-	 */
-	public function __dbPrimaryKey(string $table, string $schema = '')
-	{
-		if ($table) {
-			// check if schema set is different from schema given,
-			// only needed if schema is not empty
-			$table_prefix = '';
-			if ($schema) {
-				$search_path = $this->__dbGetSchema();
-				if ($search_path != $schema) {
-					$table_prefix = $schema . '.';
-				}
-			}
-			// read from table the PK name
-			// faster primary key get
-			$q = "SELECT pg_attribute.attname AS column_name, "
-				. "format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type "
-				. "FROM pg_index, pg_class, pg_attribute ";
-			if ($schema) {
-				$q .= ", pg_namespace ";
-			}
-			$q .= "WHERE "
-				// regclass translates the OID to the name
-				. "pg_class.oid = '" . $table_prefix . $table . "'::regclass AND "
-				. "indrelid = pg_class.oid AND ";
-			if ($schema) {
-				$q .= "nspname = '" . $schema . "' AND "
-					. "pg_class.relnamespace = pg_namespace.oid AND ";
-			}
-			$q .= "pg_attribute.attrelid = pg_class.oid AND "
-				. "pg_attribute.attnum = any(pg_index.indkey) "
-				. "AND indisprimary";
-			$cursor = $this->__dbQuery($q);
-			if ($cursor !== false) {
-				$__db_fetch_array = $this->__dbFetchArray($cursor);
-				if (!is_array($__db_fetch_array)) {
-					return false;
-				}
-				return $__db_fetch_array['column_name'] ?? false;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * wrapper for pg_connect, writes out failure to screen if error occurs (hidden var)
-	 *
-	 * @param  string  $db_host host name
-	 * @param  string  $db_user user name
-	 * @param  string  $db_pass password
-	 * @param  string  $db_name databse name
-	 * @param  integer $db_port port (int, 5432 is default)
-	 * @param  string  $db_ssl  SSL (allow is default)
-	 * @return object|resource|bool db handler PgSql\Connection or false on error
-	 */
-	public function __dbConnect(
-		string $db_host,
-		string $db_user,
-		string $db_pass,
-		string $db_name,
-		int $db_port,
-		string $db_ssl = 'allow'
-	) {
-		if (empty($db_name)) {
-			return false;
-		}
-		// if there is no host, leave it empty, this will try default unix path
-		// same for port (defaults to 5432 if not set)
-		// must set is db name
-		// if no user name, db name is used
-		$connection_string = [];
-		if (!empty($db_host)) {
-			$connection_string[] = 'host=' . $db_host;
-		}
-		if (!empty($db_port)) {
-			$connection_string[] = 'port=' . $db_port;
-		}
-		if (!empty($db_user)) {
-			$connection_string[] = 'user=' . $db_user;
-		}
-		if (!empty($db_pass)) {
-			$connection_string[] = 'password=' . $db_pass;
-		}
-		// we must have at least db name set
-		$connection_string[] = 'dbname=' . $db_name;
-		if (!empty($db_ssl)) {
-			$connection_string[] = 'sslmode=' . $db_ssl;
-		}
-		// connect
-		$this->dbh = pg_connect(join(' ', $connection_string));
-		return $this->dbh;
-	}
-
-	/**
-	 * reads the last error for this cursor and returns
-	 * html formatted string with error name
-	 *
-	 * @param  bool|object|resource $cursor cursor PgSql\Result (former resource)
-	 *                              or null
-	 * @return string               error string
-	 */
-	public function __dbPrintError($cursor = false): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		// run the query again for the error result here
-		if (($cursor === false || is_bool($cursor)) && $this->last_error_query) {
-			pg_send_query($this->dbh, $this->last_error_query);
-			$this->last_error_query = '';
-			$cursor = pg_get_result($this->dbh);
-		}
-		if ($cursor && !is_bool($cursor) && $error_str = pg_result_error($cursor)) {
-			return '-PostgreSQL-Error- '
-				. $error_str;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * wrapper for pg_meta_data
-	 *
-	 * @param  string $table     table name
-	 * @param  bool   $extended  show extended info (default true)
-	 * @return array<mixed>|bool array data for the table info or false on error
-	 */
-	public function __dbMetaData(string $table, $extended = true)
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		// needs to prefixed with @ or it throws a warning on not existing table
-		return @pg_meta_data($this->dbh, $table, $extended);
-	}
-
-	/**
-	 * wrapper for pg_escape_string
-	 *
-	 * @param  string|int|float|bool $string any string/int/float/bool
-	 * @return string                excaped string
-	 */
-	public function __dbEscapeString($string): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		return pg_escape_string($this->dbh, (string)$string);
-	}
-
-	/**
-	 * wrapper for pg_escape_literal
-	 * difference to escape string is that this one adds quotes ('') around
-	 * the string too
-	 *
-	 * @param  string|int|float|bool $string any string/int/float/bool
-	 * @return string                excaped string including quites
-	 */
-	public function __dbEscapeLiteral($string): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return (string)'';
-		}
-		// for phpstan, thinks this is string|false?
-		return (string)pg_escape_literal($this->dbh, (string)$string);
-	}
-
-	/**
-	 * wrapper for pg_escape_identifier
-	 * Only used for table names, column names
-	 *
-	 * @param  string $string any string
-	 * @return string         escaped string
-	 */
-	public function __dbEscapeIdentifier(string $string): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		// for phpstan, thinks this is string|false?
-		return (string)pg_escape_identifier($this->dbh, (string)$string);
-	}
-
-	/**
-	 * wrapper for pg_escape_byte
-	 *
-	 * @param  string $data data stream
-	 * @return string       escaped bytea string
-	 */
-	public function __dbEscapeBytea(string $data): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		return pg_escape_bytea($this->dbh, $data);
-	}
-
-	/**
-	 * unescape bytea data from postgesql
-	 *
-	 * @param  string $bytea Bytea data stream
-	 * @return string        Unescaped bytea data
-	 */
-	public function __dbUnescapeBytea(string $bytea): string
-	{
-		return pg_unescape_bytea($bytea);
-	}
-
-	/**
-	 * wrapper for pg_connection_busy
-	 *
-	 * @return bool True if connection is busy, False if not or no db connection at all
-	 */
-	public function __dbConnectionBusy(): bool
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		return pg_connection_busy($this->dbh);
-	}
-
-	/**
-	 * Experimental wrapper with scoket timetout
-	 *
-	 * @param integer $timeout_seconds Wait how many seconds on timeout
-	 * @return boolean                 True if connection is busy, or false on
-	 *                                 not busy or no db connection at all
-	 */
-	public function __dbConnectionBusySocketWait(int $timeout_seconds = 3): bool
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		$busy = pg_connection_busy($this->dbh);
-		/** @var array<resource>|null */
-		$socket = [pg_socket($this->dbh)];
-		$null = null;
-		while ($busy) {
-			// Will wait on that socket until that happens or the timeout is reached
-			stream_select($socket, $null, $null, $timeout_seconds);
-			$busy = pg_connection_busy($this->dbh);
-		}
-		return $busy;
-	}
-
-	/**
-	 * extended wrapper for pg_version
-	 * can return any setting in this array block
-	 * If no connection, return empty string,
-	 * if not in array return empty string
-	 * On default 'version' will be stripped of any space attached info
-	 * eg 13.5 (other info) will return only 13.5
-	 *
-	 * @param  string  $parameter Parameter string to extract from array
-	 * @param  boolean $strip     If parameter is server strip out on default
-	 *                            Set to false to get original string AS is
-	 * @return string             The parameter value
-	 */
-	public function __dbVersionInfo(string $parameter, bool $strip = true): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		// extract element
-		$return_string = (string)(pg_version($this->dbh)[$parameter] ?? '');
-		// for version, strip if requested
-		if (
-			in_array($parameter, ['server']) &&
-			$strip === true
-		) {
-			$return_string = explode(' ', $return_string, 2)[0] ?? '';
-		}
-		return $return_string;
-	}
-
-	/**
-	 * Returns all parameters that are possible from the db_version
-	 *
-	 * @return array<mixed> Parameter key names from pg_version
-	 */
-	public function __dbVersionInfoParameterList(): array
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return [];
-		}
-		return array_keys(pg_version($this->dbh));
-	}
-
-	/**
-	 * wrapper for pg_version
-	 * Note: this only returns server version
-	 * not connection version OR client version
-	 *
-	 * @return string version string
-	 */
-	public function __dbVersion(): string
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return '';
-		}
-		// array has client, protocol, server, we just return server stripped
-		return $this->__dbVersionInfo('server', true);
-	}
-
-	/**
-	 * Returns a numeric version eg 90506 or 130006, etc
-	 * Note that this calls a show command on the server
-	 * Note:
-	 * Old version is 9.5.6 where 9.5 is the major version
-	 * Newer Postgresql (10 on) have only one major version so eg 13.5
-	 * is returned as 130005
-	 *
-	 * @return integer Server version
-	 */
-	public function __dbVersionNumeric(): int
-	{
-		return (int)$this->__dbShow('server_version_num');
-	}
-
-	/**
-	 * NOTE: it is recommended to convert arrays to json and parse the json in
-	 * PHP itself, array_to_json(array)
-	 * This is a fallback for old PostgreSQL versions
-	 * postgresql array to php array
-	 * https://stackoverflow.com/a/27964420
-	 *
-	 * @param  string   $array_text Array text from PostgreSQL
-	 * @param  int      $start      Start string position
-	 * @param  int|null $end        End string position from recursive call
-	 * @return array<mixed>|null    PHP type array
-	 */
-	public function __dbArrayParse(
-		string $array_text,
-		int $start = 0,
-		?int &$end = null
-	): ?array {
-		if (empty($array_text) || $array_text[0] != '{') {
-			return null;
-		}
-		$return = [];
-		$string = false;
-		$quote = '';
-		$len = strlen($array_text);
-		$v = '';
-		// start from offset
-		for ($array_pos = $start + 1; $array_pos < $len; $array_pos += 1) {
-			$ch = $array_text[$array_pos];
-			// check wher ein the string are we
-			// end, one down
-			if (!$string && $ch == '}') {
-				if ($v !== '' || !empty($return)) {
-					$return[] = $v;
-				}
-				$end = $array_pos;
-				break;
-			// open new array, jump recusrive up
-			} elseif (!$string && $ch == '{') {
-				// full string + poff set and end
-				$v = $this->__dbArrayParse($array_text, $array_pos, $array_pos);
-			// next array element
-			} elseif (!$string && $ch == ',') {
-				$return[] = $v;
-				$v = '';
-			// flag that this is a string
-			} elseif (!$string && ($ch == '"' || $ch == "'")) {
-				$string = true;
-				$quote = $ch;
-			// quoted string
-			} elseif ($string && $ch == $quote && $array_text[$array_pos - 1] == "\\") {
-				$v = substr($v, 0, -1) . $ch;
-			} elseif ($string && $ch == $quote && $array_text[$array_pos - 1] != "\\") {
-				$string = false;
-			} else {
-				// build string
-				$v .= $ch;
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Returns any server setting
-	 * if no connection or empty parameter or other error returns false
-	 * else returns a string
-	 *
-	 * @param  string      $parameter Parameter to query
-	 * @return string|bool            Settings value as string
-	 */
-	public function __dbParameter(string $parameter)
-	{
-		if ($this->dbh === false || is_bool($this->dbh)) {
-			return false;
-		}
-		if (empty($parameter)) {
-			return false;
-		}
-		return pg_parameter_status($this->dbh, $parameter);
-	}
-
-	/**
-	 * wrapper for any SHOW data blocks
-	 * eg search_path or client_encoding
-	 *
-	 * @param  string $show_string Part to show, if invalid will return empty string
-	 * @return string              Found part as is
-	 */
-	public function __dbShow(string $show_string): string
-	{
-		// get search path
-		$cursor = $this->__dbQuery("SHOW " . $this->__dbEscapeIdentifier($show_string));
-		// abort on failure and return empty
-		if ($cursor === false) {
-			return '';
-		}
-		// get result
-		$db_schema = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
-		return $db_schema[$show_string] ?? '';
-	}
-
-	/**
-	 * Sets a new database schema/search_path
-	 * Checks if schema exits and if not aborts with error code 2
-	 *
-	 * @param  string $db_schema Schema to set
-	 * @return int               Returns 0 if no error
-	 *                           1 for check query failed
-	 *                           2 for schema not found in database
-	 */
-	public function __dbSetSchema(string $db_schema): int
-	{
-		// check if schema actually exists
-		$query = "SELECT EXISTS("
-			. "SELECT 1 FROM information_schema.schemata "
-			. "WHERE schema_name = " . $this->__dbEscapeLiteral($db_schema)
-			. ")";
-		$cursor = $this->__dbQuery($query);
-		// abort if execution fails
-		if ($cursor === false) {
-			return 1;
-		}
-		// check if schema does not exists
-		$row = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
-		if (empty($row['exists']) || $row['exists'] == 'f') {
-			return 2;
-		}
-		$query = "SET search_path TO " . $this->__dbEscapeLiteral($db_schema);
-		$this->__dbQuery($query);
-		return 0;
-	}
-
-	/**
-	 * Returns current set schema/search_path
-	 *
-	 * @return string Search Path as currently set in DB
-	 */
-	public function __dbGetSchema(): string
-	{
-		return $this->__dbShow('search_path');
-	}
-
-	/**
-	 * set the client encoding
-	 * Returns 0 on set ok, or 3 if the client encoding could not be set
-	 *
-	 * @param  string $db_encoding
-	 * @return int    Returns 0 for no error
-	 *                [not used] 1 for check query failed
-	 *                [not used] 2 for invalid client encoding
-	 *                3 client encoding could not be set
-	 */
-	public function __dbSetEncoding(string $db_encoding): int
-	{
-		// check if ecnoding is valid first
-		// does not take into account aliases
-		// TODO lookup with alisaes so eg ShiftJIS does not get a false
-		// $query = "SELECT EXISTS("
-		// 	. "SELECT pg_catalog.pg_encoding_to_char(conforencoding) "
-		// 	. "FROM pg_catalog.pg_conversion "
-		// 	. "WHERE pg_catalog.pg_encoding_to_char(conforencoding) = "
-		// 	. $this->dbEscapeLiteral($db_encoding)
-		// 	. ")";
-		// $cursor = $this->__dbQuery($query);
-		// if ($cursor === false) {
-		// 	return 1;
-		// }
-		// $row = $this->__dbFetchArray($cursor, PGSQL_ASSOC);
-		// if ($row['exists'] == 'f') {
-		// 	return 2;
-		// }
-		$query = "SET client_encoding TO " . $this->__dbEscapeLiteral($db_encoding);
-		if ($this->__dbQuery($query) === false) {
-			return 3;
-		}
-		return 0;
-	}
-
-	/**
-	 * Returns current set client encoding
-	 * @return string Client encoding string, empty if not set
-	 */
-	public function __dbGetEncoding(): string
-	{
-		return $this->__dbShow('client_encoding');
-	}
-}
-
-// __END__