Backport Login changes

Password change backport

.eslintrc.js

@@ -1,43 +0,0 @@
-module.exports = {
-	'env': {
-		'browser': true,
-		'es6': true,
-		'commonjs': true,
-		'jquery': true
-	},
-	'extends': 'eslint:recommended',
-	'parserOptions': {
-		'ecmaVersion': 6
-	},
-	'rules': {
-		'indent': [
-			'error',
-			'tab',
-			{
-				'SwitchCase': 1
-			}
-		],
-		'linebreak-style': [
-			'error',
-			'unix'
-		],
-		'quotes': [
-			'error',
-			'single'
-		],
-		'semi': [
-			'error',
-			'always'
-		],
-		'no-console': 'off',
-		'no-unused-vars': [
-			'error', {
-				'vars': 'all',
-				'args': 'after-used',
-				'ignoreRestSiblings': false
-			}
-		],
-		// Requires eslint >= v8.14.0
-		'no-constant-binary-expression': 'error'
-	}
-};

.gitignore

@@ -1 +0,0 @@
-.libs

.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",
-	"minimum_target_php_version" => "8.1",
-	// 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/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',
-	],
-
-	// 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',
-		// start ignore annotations
-		'PhanUnextractableAnnotationElementName',
-		'PhanUnextractableAnnotationSuffix',
-		// enum problems in comments
-		'PhanCommentObjectInClassConstantType'
-	],
-
-	// 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' => [],
-];

.phive/phars.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.6" installed="9.6.19" location="./tools/phpunit" copy="false"/>
-  <phar name="phpcbf" version="^3.7.2" installed="3.10.0" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpcs" version="^3.7.2" installed="3.10.0" location="./tools/phpcs" copy="false"/>
-  <phar name="phpstan" version="^1.10.37" installed="1.11.1" location="./tools/phpstan" copy="false"/>
-  <phar name="phan" version="^5.4.2" installed="5.4.3" location="./tools/phan" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.24.0" location="./tools/psalm" copy="false"/>
-  <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
-  <phar name="phpdocumentor" version="^3.4.2" installed="3.4.3" location="./tools/phpDocumentor" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.34.1" installed="3.57.2" location="./tools/php-cs-fixer" copy="false"/>
-</phive>

.shellcheckrc

@@ -1,2 +0,0 @@
-shell=bash
-external-sources=true

4dev/bin/create_mo.sh

@@ -1,20 +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 "${base_folder}"../4dev/locale/*.po; do
-	[[ -e "$file" ]] || break
-	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,176 +0,0 @@
-#!/bin/bash
-
-# read source mo files and writes target js files in object form
-
-# check for ARG 1 is "no-move"
-# then do not move the files directly for manual check
-FILE_MOVE=1;
-if [ "${1}" = "no-move" ]; then
-	echo "+++ CREATE TEMPORARY FILES +++";
-	FILE_MOVE=0;
-else
-	echo "*** Direct write ***";
-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="${TEXTDOMAIN}/layout/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 "${base_folder}"../4dev/locale/*.po; do
-	[[ -e "$file" ]] || break
-	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}${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');
-	original_file=${template_file//.TMP/};
-	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}";
-		echo "// Translation strings in the format";
-		echo "// \"Original\":\"Translated\""$'\n'
-		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 -r 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');
-			str_source=${str_source//\"/\\\"}
-			# 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}" || exit;
-				ln -sf "${original_file}" "${template_file}";
-				cd - >/dev/null || exit;
-			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,5 +0,0 @@
-base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# must be run in ${base}
-cd $base;
-${base}tools/phan --progress-bar -C --analyze-twice;
-cd ~;

4dev/checking/phpstan.sh

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

4dev/checking/phpunit.sh

@@ -1,49 +0,0 @@
-#!/bin/env bash
-
-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 php version number to force a certain php version
-
-opt_testdox="";
-if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
-	opt_testdox="--testdox";
-fi;
-php_bin="";
-if [ -n "${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 "; ;;
-		"8.3") php_bin="/usr/bin/php8.4 "; ;;
-		*) echo "Not support PHP: ${1}"; exit; ;;
-	esac;
-fi;
-if [ -n "${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 "; ;;
-		"8.3") php_bin="/usr/bin/php8.3 "; ;;
-		*) echo "Not support PHP: ${1}"; exit; ;;
-	esac;
-fi;
-
-# Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
-phpunit_call="${php_bin}${base}tools/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/composer/sync-to-composer-all-folder.sh

@@ -1,22 +0,0 @@
-#!/bin/env bash
-
-# syncs
-# 4dev/tests/
-# www/lib/CoreLibs/
-#
-# to the composer corelibs all repo
-
-GO="${1}";
-DRY_RUN="";
-if [ "${GO}" != "go" ]; then
-	DRY_RUN="-n ";
-fi;
-
-BASE="/storage/var/www/html/developers/clemens/core_data/";
-SOURCE="${BASE}php_libraries/trunk/"
-TARGET="${BASE}composer-packages/CoreLibs-Composer-All/"
-
-rsync ${DRY_RUN}-Plzvrupt --stats --delete ${SOURCE}4dev/tests/ ${TARGET}test/phpunit/
-rsync ${DRY_RUN}-Plzvrupt --stats --delete ${SOURCE}www/lib/CoreLibs/ ${TARGET}src/
-
-# __END__

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/read_env_file.php

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

4dev/documentation/DB_Query_Params.md

@@ -1,31 +0,0 @@
-# DB Query Params ? and : to $
-
-dbReturn*
-dbExec
-
-keep
-->query
-->params
-for reference
-
-## : named params
-
-in order for each named found replace with order number:
-
-```txt
-:name, :foo, :bar, :name =>
-$1,    $2,   $3,    $1
-```
-
-```php
-$query = str_replace(
-    [':name', ':foo', ':bar'],
-    ['$1', '$2', '$3'],
-    $query
-);
-```
-
-## ? Params
-
-Foreach ? set $1 to $n and store that in new params array
-in QUERY for each ? replace with matching $n

4dev/locale/Readme.md

@@ -1,55 +0,0 @@
-# Translation files
-
-## Source file name convetion
-
-Locale Name . Domain . Encoding .po
-
-## Name parte explenations
-
-### Locale Name Examples
-
-If underscore in name the long version is checked first, then the short version:
-en_US@latin -> en_US -> en
-
-* en
-* en_US
-* en_US.UTF-8
-* en_US@latin
-
-### Domain
-
-For current case auto set CONTENT_PATH is used
-
-* admin
-* frontend
-
-### Encoding
-
-if not set UTF-8 is assumed. Any other utf8 encoding is changed to UTF-8
-
-* UTF-8
-* SJIS
-* EUC
-
-## File name example source
-
-`ja-admin.po`
-
-First part is LOCALE, second part is domain. Separator is `-`
-
-## Folder layout
-
-`includes/locale/ja/LC_MESSAGES/frontend.mo`
-
-ALTERNATE LOCALE NAMES:
-* ja
-* ja_JP
-* ja.UTF-8
-* ja_JP.UTF-8
-
-ja_JP.UTF-8: Locale Name
-frontend: dmain (CONTENT_PATH)
-
-## command
-
-`msgfmt -o www/includes/locale/ja/LC_MESSAGES/frontend.mo 4dev/lang/ja.admin.po`

4dev/locale/en-admin.po

@@ -1,56 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2005/08/09
-# SHORT DESCRIPTION:
-# Backend English Messages file for gettext
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: en.UTF-8 LC_MESSAGES admin\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: clemens.schwaighofer@egplusww.co\n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgid "Year"
-msgstr "Year"
-
-msgid "Month"
-msgstr "Month"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST ADMIN EN"
-
-# testing multi
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi Admin en 0"
-msgstr[1] "Multi Admin en 1"
-msgstr[2] "Multi Admin en 2"
-
-msgctxt "month name"
-msgid "May"
-msgstr "May Admin en"
-
-msgctxt "month name"
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi Admin month en 0"
-msgstr[1] "Multi Admin month en 1"
-msgstr[2] "Multi Admin month en 2"
-
-msgid "I should be translated"
-msgstr "I should be translated: I WAS TRANSLATED"
-
-msgid "Are we translated?"
-msgstr "Are we translated? Yes, we are!"
-
-msgid "Original with string: %1"
-msgstr "Translated with: %1"

4dev/locale/en-frontend.po

@@ -1,29 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2005/08/09
-# SHORT DESCRIPTION:
-# Frontend English Messages file for gettext
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: en.UTF-8 LC_MESSAGES frontend\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: clemens.schwaighofer@egplusww.co\n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST FRONTEND EN"
-
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi frontend en 0"
-msgstr[1] "Multi frontend en 1"
-msgstr[2] "Multi frontend en 2"

4dev/locale/ja-admin.po

@@ -1,97 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2018/03/28
-# SHORT DESCRIPTION:
-# Backend Japanese Messages file for gettext>
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: ja.UTF-8 LC_MESSAGES admin\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: clemens.schwaighofer@egplusww.com\n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-msgid "Yes"
-msgstr "はい"
-
-msgid "No"
-msgstr "いいえ"
-
-# Basic date info
-msgid "Year"
-msgstr "年"
-
-msgid "Month"
-msgstr "月"
-
-msgid "Day"
-msgstr "日"
-
-msgid "Hour"
-msgstr "時"
-
-msgid "Minute"
-msgstr "分"
-
-msgid "Mon"
-msgstr "月"
-
-msgid "Tue"
-msgstr "火"
-
-msgid "Wed"
-msgstr "水"
-
-msgid "Thu"
-msgstr "木"
-
-msgid "Fri"
-msgstr "金"
-
-msgid "Sat"
-msgstr "土"
-
-msgid "Sun"
-msgstr "日"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST ADMIN JA"
-
-# testing multi
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi Admin ja 0"
-msgstr[1] "Multi Admin ja 1"
-msgstr[2] "Multi Admin ja 2"
-
-msgctxt "month name"
-msgid "May"
-msgstr "May Admin ja"
-
-msgctxt "month name"
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi Admin month ja 0"
-msgstr[1] "Multi Admin month ja 1"
-msgstr[2] "Multi Admin month ja 2"
-
-# login string
-msgid "Hello %s"
-msgstr "こにちは %s"
-
-msgid "I should be translated"
-msgstr "「スマーティー」これは正しいです"
-
-msgid "Are we translated?"
-msgstr "「クラス」これは翻訳です？"
-
-msgid "Original with string: %1"
-msgstr "%1と翻訳した"

4dev/locale/ja-frontend.po

@@ -1,29 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2005/08/09
-# SHORT DESCRIPTION:
-# Frontend Japanese Messages file for gettext
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: ja.UTF-8 LC_MESSAGES frontend\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: clemens.schwaighofer@egplusww.com\n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST FRONTEND JA"
-
-msgid "single"
-msgid_plural "multi"
-msgstr[0] "Multi frontend ja 0"
-msgstr[1] "Multi frontend ja 1"
-msgstr[2] "Multi frontend ja 2"

4dev/sync/sync_template.sh

@@ -1,29 +1,20 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # create path
-path=$(pwd)"/"$0;
+path=`pwd`"/"$0;
 
 LOCAL_BASE_DIR="<local folder>";
 LOCAL_DIR=$LOCAL_BASE_DIR"";
 REMOTE_WEB="<remote folder>";
-TARGET_HOST_WEB="<user>@<host>";
-TMP_DIR=$LOCAL_BASE_DIR"/4dev/tmp/";
-tmpf_web=$TMP_DIR"sync.exclude.tmp";
-
-if [ ! -d "$LOCAL_BASE_DIR" ]; then
-	echo "Folder: $LOCAL_BASE_DIR not found";
-	exit;
-fi;
-
-# if vendor be sure group folder is +x
-chmod -R ug+rX ${LOCAL_DIR}/vender/
+TARGET_HOST_WEB="<user>@<host>
+TMP_DIR=$LOCAL_BASE_DIR"/4dev/";
+tmpf_web=$TMP_DIR"tmp.web";
 
 # for web (ika)
 rm -f $tmpf_web;
 echo ".*.swp" >> $tmpf_web;
 echo "._*" >> $tmpf_web;
 echo ".DS_Store" >> $tmpf_web;
-echo ".user.ini" >> $tmpf_web;
 echo ".svn" >> $tmpf_web;
 echo ".svnignore" >> $tmpf_web;
 echo ".git" >> $tmpf_web;
@@ -44,19 +35,20 @@ cat $tmpf_web;
 
 echo "($1) Syncing from $LOCAL_DIR/* to $TARGET_HOST_WEB:$REMOTE_WEB";
 echo "You hav 5 seconds to abort (<ctrl> + c)";
+#c=0;until [ $c -eq 10 ];do echo -n "#"; sleep 1; c=`expr $c + 1`;done;
 for ((i=5;i>=1;i--));
 do
-    echo -n $i" ";
-    sleep 1;
+        echo -n $i" ";
+        sleep 1;
 done;
 
 if [ "$1" = "live" ];
 then
-	# live sync
-	rsync -Plzvrupt --stats --include ".htaccess" --exclude-from=$tmpf_web --delete -e ssh $LOCAL_DIR/* $TARGET_HOST_WEB:$REMOTE_WEB
+		# ika sync
+		rsync -Plzvrupt --stats --include ".htaccess" --exclude-from=$tmpf_web --delete -e ssh $LOCAL_DIR/* $TARGET_HOST_WEB:$REMOTE_WEB
 else
-	# test sync
-	rsync -n -Plzvrupt --stats --include ".htaccess" --exclude-from=$tmpf_web --delete -e ssh $LOCAL_DIR/* $TARGET_HOST_WEB:$REMOTE_WEB
+		# ika sync
+		rsync -n -Plzvrupt --stats --include ".htaccess" --exclude-from=$tmpf_web --delete -e ssh $LOCAL_DIR/* $TARGET_HOST_WEB:$REMOTE_WEB
 fi;
 
 # END

4dev/tests/AAASetupData/CoreLibsAAASetupDataTest.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test base setup
- * @testdox AAASetupData\AAASetupDataTest just setup BASE
- */
-final class CoreLibsAAASetupDataTest extends TestCase
-{
-	/**
-	 * Covers nothing
-	 *
-	 * @testdox Just setup BASE
-	 *
-	 * @return void
-	 */
-	public function testSetupData(): void
-	{
-		if (!defined('BASE')) {
-			define(
-				'BASE',
-				str_replace('/configs', '', __DIR__)
-					. DIRECTORY_SEPARATOR
-			);
-		}
-		$this->assertEquals(
-			str_replace('/configs', '', __DIR__)
-				. DIRECTORY_SEPARATOR,
-			BASE,
-			'BASE Path set check'
-		);
-	}
-}
-
-// __END__

4dev/tests/AAASetupData/includes

@@ -1 +0,0 @@
-../Language/includes/

4dev/tests/AAASetupData/log

@@ -1 +0,0 @@
-../Debug/log/

4dev/tests/ACL/CoreLibsACLLogin_database_prepare.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# note: there is currently no port selection, standard 5432 port is assumed
-# note: we use the default in path postgresql commands and connect to whatever default DB is set
-
-# PARAMETER 1: database data file to load
-# PARAMETER 2: db user WHO MUST BE ABLE TO CREATE A DATABASE
-# PARAMETER 3: db name
-# PARAMETER 4: db host
-# PARAMETER 5: print out for testing
-
-load_sql="${1}";
-# abort with 1 if we cannot find the file
-if [ ! -f "${load_sql}" ]; then
-	echo 1;
-	exit 1;
-fi;
-db_user="${2}";
-db_name="${3}";
-db_host="${4}";
-# empty db name or db user -> exit with 2
-if [ -z "${db_user}" ] || [ -z "${db_name}" ] || [ -z "${db_host}" ]; then
-	echo 2;
-	exit 2;
-fi;
-# drop database, on error exit with 3
-dropdb -U ${db_user} -h ${db_host} ${db_name} 2>&1;
-if [ $? -ne 0 ]; then
-	echo 3;
-	exit 3;
-fi;
-# create database, on error exit with 4
-createdb -U ${db_user} -O ${db_user} -h ${db_host} -E utf8 ${db_name} 2>&1;
-if [ $? -ne 0 ]; then
-	echo 4;
-	exit 4;
-fi;
-# if error 5 thrown, test with enabled below
-if [ ! -z "${5}" ]; then
-	psql -U ${db_user} -h ${db_host} -f ${load_sql} ${db_name};
-else
-	# load data (redirect ALL error to null), on error exit with 5
-	psql -U ${db_user} -h ${db_host} -f ${load_sql} ${db_name} 2>&1 1>/dev/null 2>/dev/null;
-fi;
-if [ $? -ne 0 ]; then
-	echo 5;
-	exit 5;
-fi;
-echo 0;
-exit 0;
-
-# __END__

4dev/tests/ACL/includes

@@ -1 +0,0 @@
-../AAASetupData/includes

4dev/tests/ACL/log/.gitignore

@@ -1,3 +0,0 @@
-*log
-*LOG
-!.gitignore

4dev/tests/Admin/CoreLibsAdminBackendTest.php

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

4dev/tests/Admin/CoreLibsAdminEditPageTest.php

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

4dev/tests/Check/CoreLibsCheckColorsTest.php

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

4dev/tests/Check/CoreLibsCheckEmailTest.php

@@ -1,381 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Undocumented class
- * @coversDefaultClass \CoreLibs\Check\Email
- * @testdox \CoreLibs\Check\Email method tests
- */
-final class CoreLibsCheckEmailTest extends TestCase
-{
-	/**
-	 * Array position to regex
-	 *
-	 * @return array<mixed>
-	 */
-	public function emailRegexProvider(): array
-	{
-		return [
-			'get email regex invalid -1, will be 0' => [
-				-1,
-				"^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-					. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
-			],
-			'get email regex invalid 10, will be 0' => [
-				10,
-				"^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-					. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
-			],
-			'get email regex valid 1, will be 1' => [
-				1,
-				"@(.*)@(.*)"
-			]
-		];
-	}
-
-	/**
-	 * Test regex level return
-	 *
-	 * @covers ::getEmailRegex
-	 * @dataProvider emailRegexProvider
-	 * @testdox getEmailRegex $input will be $expected [$_dataName]
-	 *
-	 * @param int $input
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testGetEmailRegexReturn(int $input, string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\Email::getEmailRegex($input)
-		);
-	}
-
-	/**
-	 * provides data for emailCheckProvider and emailCheckFullProvider
-	 *
-	 * @return array
-	 */
-	public function emailCheckList(): array
-	{
-		return [
-			'valid email' => ['test@test.com', true, []],
-			'invalid empty email' => ['', false, [0, 2, 3, 4, 5]],
-			'invalid email' => ['-@-', false, [0, 3, 4, 5]],
-			'invalid email leading dot' => ['.test@test.com', false, [0, 2]],
-			'invalid email invalid domain' => ['test@t_est.com', false, [0, 3, 4]],
-			'invalid email double @' => ['test@@test.com', false, [0, 1]],
-			'invalid email double dot' => ['test@test..com', false, [0, 3, 6]],
-			'invalid email end with dot' => ['test@test.', false, [0, 3, 5, 7]],
-			'invalid email bad top level' => ['test@test.j', false, [0, 3, 5]],
-			'invalid email double @ and double dot' => ['test@@test..com', false, [0, 1, 3, 6]],
-		];
-	}
-
-	/**
-	 * Valids or not valid email address
-	 *
-	 * @return array
-	 */
-	public function emailCheckProvider(): array
-	{
-		$list = [];
-		foreach ($this->emailCheckList() as $key => $data) {
-			$list[$key] = [$data[0], $data[1]];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkEmail
-	 * @dataProvider emailCheckProvider
-	 * @testdox checkEmail $input will be $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testCheckEmail(string $input, bool $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\Email::checkEmail($input)
-		);
-	}
-
-	/**
-	 * this is like emailCheckProvider but it has the full detail errors
-	 * All errors should be tetsed in testGetEmailRegexErrorMessage
-	 *
-	 * @return array
-	 */
-	public function emailCheckFullProvider(): array
-	{
-		$list = [];
-		foreach ($this->emailCheckList() as $key => $data) {
-			$list[$key] = [$data[0], $data[2]];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkEmailFull
-	 * @dataProvider emailCheckFullProvider
-	 * @testdox checkEmailFull $input will be $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param array $expected
-	 * @return void
-	 */
-	public function testCheckEmailFull(string $input, array $expected): void
-	{
-		$this->assertEqualsCanonicalizing(
-			$expected,
-			\CoreLibs\Check\Email::checkEmailFull($input, true)
-		);
-	}
-
-	/**
-	 * error data returned for each error position
-	 *
-	 * @return array
-	 */
-	public function emailRegexErrorProvider(): array
-	{
-		return [
-			'error 0 will return general' => [
-				0,
-				[
-					'error' => 0,
-					'message' => 'Invalid email address',
-					'regex' => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-						. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$"
-				]
-			],
-			'error 1 will return double @ error' => [
-				1,
-				[
-					'error' => 1,
-					'message' => 'Double @ mark in email address',
-					'regex' => "@(.*)@(.*)"
-				]
-			],
-			'error 2 will be invalid before @' => [
-				2,
-				[
-					'error' => 2,
-					'message' => 'Invalid email part before @ sign',
-					'regex' => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
-				]
-			],
-			'error 3 will be invalid domain and top level' => [
-				3,
-				[
-					'error' => 3,
-					'message' => 'Invalid domain part after @ sign',
-					'regex' => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$"
-				]
-			],
-			'error 4 will be invalid domain' => [
-				4,
-				[
-					'error' => 4,
-					'message' => 'Invalid domain name part',
-					'regex' => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\."
-				]
-			],
-			'error 5 will be invalid domain top level only' => [
-				5,
-				[
-					'error' => 5,
-					'message' => 'Wrong domain top level part',
-					'regex' => "\.([a-zA-Z]{2,6}){1}$"
-				]
-			],
-			'error 6 will be domain double dot' => [
-				6,
-				[
-					'error' => 6,
-					'message' => 'Double consecutive dots in domain name (..)',
-					'regex' => "@(.*)\.{2,}"
-				]
-			],
-			'error 7 will domain ends with dot' => [
-				7,
-				[
-					'error' => 7,
-					'message' => 'Domain ends with a dot or is missing top level part',
-					'regex' => "@.*\.$"
-				]
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getEmailRegexErrorMessage
-	 * @dataProvider emailRegexErrorProvider
-	 * @testdox getEmailRegexErrorMessage $input will be $expected [$_dataName]
-	 *
-	 * @param integer $input
-	 * @param array $expected
-	 * @return void
-	 */
-	public function testGetEmailRegexErrorMessage(int $input, array $expected): void
-	{
-		$this->assertEqualsCanonicalizing(
-			$expected,
-			\CoreLibs\Check\Email::getEmailRegexErrorMessage($input)
-		);
-	}
-
-	/**
-	 * This holds all email type checks normal and short
-	 *
-	 * @return array
-	 */
-	public function emailTypeProvider(): array
-	{
-		return [
-			['test@test.com', 'pc_html', 'pc'],
-			['test@docomo.ne.jp', 'keitai_docomo', 'docomo'],
-			['test@softbank.ne.jp', 'keitai_softbank', 'softbank'],
-			['test@i.softbank.ne.jp', 'smartphone_softbank_iphone', 'iphone'],
-			// TODO: add more test emails here
-		];
-	}
-
-	/**
-	 * Returns only normal email type checks
-	 *
-	 * @return array<mixed>
-	 */
-	public function emailTypeProviderLong(): array
-	{
-		$list = [];
-		foreach ($this->emailTypeProvider() as $set) {
-			$list['email ' . $set[0] . ' is valid and matches normal ' . $set[1]] = [$set[0], $set[1]];
-		}
-		$list['email is empty and not valid normal'] = ['', 'invalid'];
-		return $list;
-	}
-
-	/**
-	 * only short email type list
-	 *
-	 * @return array<mixed>
-	 */
-	public function emailTypeProviderShort(): array
-	{
-		$list = [];
-		foreach ($this->emailTypeProvider() as $set) {
-			$list['email ' . $set[0] . ' is valid and matches short ' . $set[2]] = [$set[0], $set[2]];
-		}
-		$list['email is empty and not valid short'] = ['', 'invalid'];
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getEmailType
-	 * @dataProvider emailTypeProviderLong
-	 * @testdox getEmailType $input will be normal $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testGetEmailTypeNormal(string $input, string $expected)
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\Email::getEmailType($input, false)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getEmailType
-	 * @dataProvider emailTypeProviderShort
-	 * @testdox getEmailType $input will be short $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testGetEmailTypeShort(string $input, string $expected)
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\Email::getEmailType($input, true)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function emailProviderTypeLongToShort(): array
-	{
-		$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',
-		];
-		$list = [];
-		// use the static one
-		foreach ($mobile_email_type_short as $long => $short) {
-			$list[$long . ' matches to ' . $short] = [$long, $short];
-		}
-		// add invalid check
-		$list['Not found will be bool false'] = ['invalid', false];
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getShortEmailType
-	 * @dataProvider emailProviderTypeLongToShort
-	 * @testdox getShortEmailType $input will be $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param string|bool $expected
-	 * @return void
-	 */
-	public function testGetShortEmailType(string $input, $expected)
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\Email::getShortEmailType($input)
-		);
-	}
-}
-
-// __END__

4dev/tests/Check/CoreLibsCheckEncodingTest.php

@@ -1,120 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Check\Encoding
- * @coversDefaultClass \CoreLibs\Check\Encoding
- * @testdox \CoreLibs\Check\Encoding method tests
- */
-final class CoreLibsCheckEncodingTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function checkConvertEncodingProvider(): array
-	{
-		return [
-			// 0: string to test
-			// 1: source encoding
-			// 2: target encoding
-			// 3: substitue character
-			// 4: false for ok, array with error list
-			'valid test UTF-8 to SJIS (default)' => [
-				'日本語',
-				'UTF-8',
-				'SJIS',
-				null,
-				false
-			],
-			'invalid test UTF-8 to SJIS (dots as code point)' => [
-				'❶',
-				'UTF-8',
-				'SJIS',
-				0x2234,
-				['❶']
-			],
-			'invalid test UTF-8 to SJIS (dots as string)' => [
-				'❶',
-				'UTF-8',
-				'SJIS',
-				'∴',
-				['❶']
-			],
-			'invalid test UTF-8 to SJIS (none)' => [
-				'❶',
-				'UTF-8',
-				'SJIS',
-				'none',
-				['❶']
-			],
-			'invalid test UTF-8 to SJIS (long)' => [
-				'❶',
-				'UTF-8',
-				'SJIS',
-				'long',
-				['❶']
-			],
-			'invalid test UTF-8 to SJIS (entity)' => [
-				'❶',
-				'UTF-8',
-				'SJIS',
-				'entity',
-				['❶']
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkConvertEncoding
-	 * @dataProvider checkConvertEncodingProvider
-	 * @testdox check encoding convert from $from_encoding to $to_encoding [$_dataName]
-	 *
-	 * @param  string          $input
-	 * @param  string          $from_encoding
-	 * @param  string          $to_encoding
-	 * @param  string|int|null $error_char
-	 * @param  array|bool      $expected
-	 * @return void
-	 */
-	public function testCheckConvertEncoding(
-		string $input,
-		string $from_encoding,
-		string $to_encoding,
-		$error_char,
-		$expected
-	): void {
-		$current_subsitute_character = mb_substitute_character();
-		if ($error_char !== null) {
-			\CoreLibs\Check\Encoding::setErrorChar($error_char);
-			if (!in_array($error_char, ['none', 'long', 'entity'])) {
-				$this->assertEquals(
-					\IntlChar::chr($error_char),
-					\CoreLibs\Check\Encoding::getErrorChar()
-				);
-			} else {
-				$this->assertEquals(
-					$error_char,
-					\CoreLibs\Check\Encoding::getErrorChar()
-				);
-			}
-		}
-		$return = \CoreLibs\Check\Encoding::checkConvertEncoding($input, $from_encoding, $to_encoding);
-		$this->assertEquals(
-			$expected,
-			$return
-		);
-		// reset after test
-		mb_substitute_character($current_subsitute_character);
-	}
-}
-
-// __END__

4dev/tests/Check/CoreLibsCheckFileTest.php

@@ -1,174 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Check\File
- * @coversDefaultClass \CoreLibs\Check\File
- * @testdox \CoreLibs\Check\File method tests
- */
-final class CoreLibsCheckFileTest extends TestCase
-{
-	/** @var array<mixed> */
-	// private $files_list = [];
-	/** @var string */
-	private $base_folder = DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR;
-
-	/**
-	 * main file list + data provider
-	 *
-	 * filename, file extension matching, lines in file, -1 for nothing
-	 *
-	 * @return array
-	 */
-	public function filesList(): array
-	{
-		return [
-			['filename.txt', 'txt', 5, 'text/plain'],
-			['filename.csv', 'csv', 15, 'text/csv'],
-			['filename.tsv', 'tsv', 0, 'text/plain'],
-			['file_does_not_exits', '', -1, ''],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function filesExtensionProvider(): array
-	{
-		$list = [];
-		foreach ($this->filesList() as $row) {
-			$list[$row[0] . ' must be extension ' . $row[1]] = [$row[0], $row[1]];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function filesLinesProvider(): array
-	{
-		$list = [];
-		foreach ($this->filesList() as $row) {
-			$list[$row[0] . ' must have ' . $row[2] . ' lines'] = [$row[0], $row[2]];
-		}
-		return $list;
-	}
-
-	public function mimeTypeProvider(): array
-	{
-		$list = [];
-		foreach ($this->filesList() as $row) {
-			$list[$row[0] . ' must be mime type ' . $row[3]] = [$row[0], $row[3]];
-		}
-		return $list;
-	}
-
-	/**
-	 * Tests if file extension matches
-	 *
-	 * @covers ::getFilenameEnding
-	 * @dataProvider filesExtensionProvider
-	 * @testdox getFilenameEnding $input must be extension $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testGetFilenameEnding(string $input, string $expected): void
-	{
-		// getFilenameEnding
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\File::getFilenameEnding($input)
-		);
-	}
-
-	/**
-	 * Tests the file line read
-	 *
-	 * @covers ::getLinesFromFile
-	 * @dataProvider filesLinesProvider
-	 * @testdox getLinesFromFile $input must have $expected lines [$_dataName]
-	 *
-	 * @param  string $input    file name
-	 * @param  int    $expected lines in file
-	 * @return void
-	 */
-	public function testGetLinesFromFile(string $input, int $expected): void
-	{
-		// create file
-		if ($expected > -1) {
-			$file = $this->base_folder . $input;
-			$fp = fopen($file, 'w');
-			for ($i = 0; $i < $expected; $i++) {
-				fwrite($fp, 'This is row ' . ($i + 1) . PHP_EOL);
-			}
-			fclose($fp);
-		}
-		// test
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\File::getLinesFromFile($this->base_folder . $input)
-		);
-		// unlink file
-		if (is_file($this->base_folder . $input)) {
-			unlink($this->base_folder . $input);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::getMimeType
-	 * @dataProvider mimeTypeProvider
-	 * @testdox getMimeType $input must be mime type $expected [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $expected
-	 * @return void
-	 */
-	public function testGetMimeType(string $input, string $expected): void
-	{
-		if (!empty($expected)) {
-			$file = $this->base_folder . $input;
-			$fp = fopen($file, 'w');
-			switch ($expected) {
-				case 'text/csv':
-					for ($i = 1; $i <= 10; $i++) {
-						fwrite($fp, '"This is row","' . $expected . '",' . $i . PHP_EOL);
-					}
-					break;
-				case 'text/tsv':
-					for ($i = 1; $i <= 10; $i++) {
-						fwrite($fp, "\"This is row\"\t\"" . $expected . "\"\t\"" . $i . PHP_EOL);
-					}
-					break;
-				case 'text/plain':
-					fwrite($fp, 'This is mime type: ' . $expected . PHP_EOL);
-					break;
-			}
-			fclose($fp);
-		} else {
-			$this->expectException(\UnexpectedValueException::class);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\File::getMimeType($this->base_folder . $input)
-		);
-		// unlink file
-		if (is_file($this->base_folder . $input)) {
-			unlink($this->base_folder . $input);
-		}
-	}
-}
-
-// __END__

4dev/tests/Check/CoreLibsCheckPhpVersionTest.php

@@ -1,73 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Check\PHPVersion
- * @coversDefaultClass \CoreLibs\Check\PHPVersion
- * @testdox \CoreLibs\Check\PHPVersion method tests
- */
-final class CoreLibsCheckPhpVersionTest extends TestCase
-{
-	/**
-	 * NOTE: The checks must be adapted to the PHP version or they will fail
-	 *
-	 * @return array
-	 */
-	public function phpVersionProvider(): array
-	{
-		return [
-			// min
-			'min 7' => ['7', '', true],
-			'min 7.4' => ['7.4', '', true],
-			'min 7.4.1' => ['7.4.1', '', true],
-			// NOTE: update if php version bigger than 10
-			'min 10' => ['10', '', false],
-			'min 10.0' => ['10.0', '', false],
-			'min 10.0.0' => ['10.0.0', '', false],
-			// min/max version, NOTE: update if php version bigger than 10
-			'min 7/max 10' => ['7', '10', true],
-			'min 7/max 10.0' => ['7', '10.0', true],
-			'min 7/max 10.0.0' => ['7', '10.0.0', true],
-			// min/max version
-			'min 5/max 7' => ['5', '7', false],
-			'min 5/max 7.4' => ['5', '7.4', false],
-			'min 5/max 7.4.1' => ['5', '7.4.1', false],
-			// max only
-			'max 7' => ['', '7', false],
-			'max 7.4' => ['', '7.4', false],
-			'max 7.4.1' => ['', '7.4.1', false],
-			// max over
-			'max 10' => ['', '10', true],
-			'max 10.0' => ['', '10.0', true],
-			'max 10.0.0' => ['', '10.0.0', true],
-			// TODO: add null tests
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checkPHPVersion
-	 * @dataProvider phpVersionProvider
-	 * @testdox checkPHPVersion $input_min and $input_max will be $expected [$_dataName]
-	 *
-	 * @param string $input_min
-	 * @param string $input_max
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testCheckPHPVersion(string $input_min, string $input_max, bool $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Check\PhpVersion::checkPHPVersion($input_min, $input_max)
-		);
-	}
-}
-
-// __END__

4dev/tests/Convert/CoreLibsConvertByteTest.php

@@ -1,282 +0,0 @@
-<?php
-
-// because we have long testdox lines
-// phpcs:disable Generic.Files.LineLength
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Convert\Byte
- * @coversDefaultClass \CoreLibs\Convert\Byte
- * @testdox \CoreLibs\Convert\Byte method tests
- */
-final class CoreLibsConvertByteTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function byteProvider(): array
-	{
-		/*
-		 * 0: input string
-		 * 1: default flags
-		 * 2: BYTE_FORMAT_SI
-		 * 3: BYTE_FORMAT_NOSPACE
-		 * 4: BYTE_FORMAT_ADJUST
-		 * 5: BYTE_FORMAT_SI | BYTE_FORMAT_NOSPACE
-		 */
-		return [
-			'string number' => [
-				0 => '1024',
-				1 => '1 KB',
-				2 => '1.02 KiB',
-				3 => '1KB',
-				4 => '1.00 KB',
-				5 => '1.02KiB',
-			],
-			'invalud string number' => [
-				0 => '1024 MB',
-				1 => '1024 MB',
-				2 => '1024 MB',
-				3 => '1024 MB',
-				4 => '1024 MB',
-				5 => '1024 MB',
-			],
-			'negative number' => [
-				0 => -123123123,
-				1 => '-117.42 MB',
-				2 => '-123.12 MiB',
-				3 => '-117.42MB',
-				4 => '-117.42 MB',
-				5 => '-123.12MiB',
-			],
-			'kilobyte minus one' => [
-				0 => 999999, // KB-1
-				1 => '976.56 KB',
-				2 => '1 MiB',
-				3 => '976.56KB',
-				4 => '976.56 KB',
-				5 => '1MiB',
-			],
-			'megabyte minus one' => [
-				0 => 999999999, // MB-1
-				1 => '953.67 MB',
-				2 => '1 GiB',
-				3 => '953.67MB',
-				4 => '953.67 MB',
-				5 => '1GiB',
-			],
-			'megabyte' => [
-				0 => 254779258,
-				1 => '242.98 MB',
-				2 => '254.78 MiB',
-				3 => '242.98MB',
-				4 => '242.98 MB',
-				5 => '254.78MiB',
-			],
-			'terabyte minus one' => [
-				0 => 999999999999999, // TB-1
-				1 => '909.49 TB',
-				2 => '1 PiB',
-				3 => '909.49TB',
-				4 => '909.49 TB',
-				5 => '1PiB',
-			],
-			'terabyte' => [
-				0 => 588795544887632, // TB-n
-				1 => '535.51 TB',
-				2 => '588.8 TiB',
-				3 => '535.51TB',
-				4 => '535.51 TB',
-				5 => '588.8TiB',
-			],
-			'petabyte minus one' => [
-				0 => 999999999999999999, // PB-1
-				1 => '888.18 PB',
-				2 => '1 EiB',
-				3 => '888.18PB',
-				4 => '888.18 PB',
-				5 => '1EiB',
-			],
-			'max int value' => [
-				0 => 9223372036854775807, // MAX INT
-				1 => '8 EB',
-				2 => '9.22 EiB',
-				3 => '8EB',
-				4 => '8.00 EB',
-				5 => '9.22EiB',
-			],
-			'exabyte minus 1' => [
-				0 => 999999999999999999999, // EB-1
-				1 => '867.36 EB',
-				2 => '1000 EiB',
-				3 => '867.36EB',
-				4 => '867.36 EB',
-				5 => '1000EiB',
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function byteStringProvider(): array
-	{
-		return [
-			'negative number' => [
-				0 => '-117.42 MB',
-				1 => -123123794,
-				2 => -117420000,
-			],
-			'megabyte' => [
-				0 => '242.98 MB',
-				1 => 254782996,
-				2 => 242980000
-			],
-			'megabyte si' => [
-				0 => '254.78 MiB',
-				1 => 267156193,
-				2 => 254780000
-			],
-			'petabyte' => [
-				0 => '1 EiB',
-				1 => 1152921504606846976,
-				2 => 1000000000000000000,
-			],
-			'max int' => [
-				0 => '8 EB',
-				1 => -9223372036854775807 - 1,
-				2 => 8000000000000000000,
-			],
-			'exabyte, overflow' => [
-				0 => '867.36EB',
-				1 => 3873816255479021568,
-				2 => 363028535651074048,
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::humanReadableByteFormat
-	 * @dataProvider byteProvider
-	 * @testdox humanReadableByteFormat $input will be $expected, $expected_si SI, $expected_no_space no space, $expected_adjust adjust, $expected_si_no_space SI/no space [$_dataName]
-	 *
-	 * @param string|int|float $input
-	 * @param string $expected
-	 * @param string $expected_si
-	 * @param string $expected_no_space
-	 * @param string $expected_adjust
-	 * @param string $expected_si_no_space
-	 * @return void
-	 */
-	public function testHumanReadableByteFormat(
-		$input,
-		string $expected,
-		string $expected_si,
-		string $expected_no_space,
-		string $expected_adjust,
-		string $expected_si_no_space
-	): void {
-		// 1024
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Byte::humanReadableByteFormat($input)
-		);
-		// 1000
-		$this->assertEquals(
-			$expected_si,
-			\CoreLibs\Convert\Byte::humanReadableByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_SI)
-		);
-		// no space
-		$this->assertEquals(
-			$expected_no_space,
-			\CoreLibs\Convert\Byte::humanReadableByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_NOSPACE)
-		);
-		// always 2 decimals
-		$this->assertEquals(
-			$expected_adjust,
-			\CoreLibs\Convert\Byte::humanReadableByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_ADJUST)
-		);
-		// combined si + no space
-		$this->assertEquals(
-			$expected_si_no_space,
-			\CoreLibs\Convert\Byte::humanReadableByteFormat(
-				$input,
-				\CoreLibs\Convert\Byte::BYTE_FORMAT_SI | \CoreLibs\Convert\Byte::BYTE_FORMAT_NOSPACE
-			)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::stringByteFormat
-	 * @dataProvider byteStringProvider
-	 * @testdox stringByteFormat $input will be $expected and $expected_si SI [$_dataName]
-	 *
-	 * @param string|int|float $input
-	 * @param string|int|float $expected
-	 * @param string|int|float $expected_si
-	 * @return void
-	 */
-	public function testStringByteFormat($input, $expected, $expected_si): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Byte::stringByteFormat($input)
-		);
-		$this->assertEquals(
-			$expected_si,
-			\CoreLibs\Convert\Byte::stringByteFormat($input, \CoreLibs\Convert\Byte::BYTE_FORMAT_SI)
-		);
-	}
-
-	/**
-	 * Exceptions tests
-	 *
-	 * @covers ::humanReadableByteFormat
-	 * @testWith [99]
-	 * @testdox Test exception for humanReadableByteFormat with flag $flag
-	 *
-	 * @param  int  $flag
-	 * @return void
-	 */
-	public function testHumanReadableByteFormatException(int $flag): void
-	{
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionCode(1);
-		\CoreLibs\Convert\Byte::humanReadableByteFormat(12, $flag);
-	}
-
-	/**
-	 * Exceptions tests
-	 * can only be 4, try 1,2 and over
-	 *
-	 * @covers ::stringByteFormat
-	 * @testWith [1]
-	 *           [2]
-	 *           [99]
-	 * @testdox Test exception for stringByteFormat with flag $flag
-	 *
-	 * @param  int  $flag
-	 * @return void
-	 */
-	public function testStringByteFormatException(int $flag): void
-	{
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionCode(1);
-		\CoreLibs\Convert\Byte::stringByteFormat(12, $flag);
-	}
-}
-
-// __END__

4dev/tests/Convert/CoreLibsConvertColorsTest.php

@@ -1,503 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Convert\Colors
- * @coversDefaultClass \CoreLibs\Convert\Colors
- * @testdox \CoreLibs\Convert\Colors method tests
- */
-final class CoreLibsConvertColorsTest extends TestCase
-{
-	// convert list
-	public static $colors = [];
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function rgb2hexColorProvider(): array
-	{
-		return [
-			'color' => [
-				0 => 10,
-				1 => 100,
-				2 => 200,
-				3 => '#0a64c8',
-				4 => '0a64c8'
-			],
-			'gray' => [
-				0 => 12,
-				1 => 12,
-				2 => 12,
-				3 => '#0c0c0c',
-				4 => '0c0c0c',
-			],
-			'black' => [
-				0 => 0,
-				1 => 0,
-				2 => 0,
-				3 => '#000000',
-				4 => '000000',
-			],
-			'white' => [
-				0 => 255,
-				1 => 255,
-				2 => 255,
-				3 => '#ffffff',
-				4 => 'ffffff',
-			],
-			'invalid color red & green' => [
-				0 => -12,
-				1 => 300,
-				2 => 12,
-				3 => false,
-				4 => false
-			],
-			'invalid color red ' => [
-				0 => -12,
-				1 => 12,
-				2 => 12,
-				3 => false,
-				4 => false
-			],
-			'invalid color green ' => [
-				0 => 12,
-				1 => -12,
-				2 => 12,
-				3 => false,
-				4 => false
-			],
-			'invalid color blue ' => [
-				0 => 12,
-				1 => 12,
-				2 => -12,
-				3 => false,
-				4 => false
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function hex2rgbColorProvider(): array
-	{
-		return [
-			'color' => [
-				0 => '#0a64c8',
-				1 => ['r' => 10, 'g' => 100, 'b' => 200],
-				2 => '10,100,200',
-				3 => ';',
-				4 => '10;100;200',
-			],
-			'gray, long' => [
-				0 => '0c0c0c',
-				1 => ['r' => 12, 'g' => 12, 'b' => 12],
-				2 => '12,12,12',
-				3 => ';',
-				4 => '12;12;12',
-			],
-			'gray, short' => [
-				0 => 'ccc',
-				1 => ['r' => 204, 'g' => 204, 'b' => 204],
-				2 => '204,204,204',
-				3 => ';',
-				4 => '204;204;204',
-			],
-			'hex string with #' => [
-				0 => '#0c0c0c',
-				1 => ['r' => 12, 'g' => 12, 'b' => 12],
-				2 => '12,12,12',
-				3 => ';',
-				4 => '12;12;12',
-			],
-			'a too long hex string' => [
-				0 => '#0c0c0c0c',
-				1 => false,
-				2 => false,
-				3 => ';',
-				4 => false,
-			],
-			'a too short hex string' => [
-				0 => '0c0c',
-				1 => false,
-				2 => false,
-				3 => ';',
-				4 => false,
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function rgb2hslAndhsbList(): array
-	{
-		// if hsb_from or hsl_from is set, this will be used in hsb/hsl convert
-		// hsb_rgb is used for adjusted rgb valus due to round error to in
-		return [
-			'valid gray' => [
-				'rgb' => [12, 12, 12],
-				'hsb' => [0, 0, 5],
-				'hsb_rgb' => [13, 13, 13], // should be rgb, but rounding in this
-				'hsl' => [0.0, 0.0, 4.7],
-				'valid' => true,
-			],
-			'valid color' => [
-				'rgb' => [10, 100, 200],
-				'hsb' => [212, 95, 78.0],
-				'hsb_rgb' => [10, 98, 199], // should be rgb, but rounding error
-				'hsl' => [211.6, 90.5, 41.2],
-				'valid' => true,
-			],
-			// hsg/hsl with 360 which is seen as 0
-			'valid color hue 360' => [
-				'rgb' => [200, 10, 10],
-				'hsb' => [0, 95, 78.0],
-				'hsb_from' => [360, 95, 78.0],
-				'hsb_rgb' => [199, 10, 10], // should be rgb, but rounding error
-				'hsl' => [0.0, 90.5, 41.2],
-				'hsl_from' => [360.0, 90.5, 41.2],
-				'valid' => true,
-			],
-			// invalid values
-			'invalid color r/h/h low' => [
-				'rgb' => [-1, 12, 12],
-				'hsb' => [-1, 50, 50],
-				'hsl' => [-1, 50, 50],
-				'valid' => false,
-			],
-			'invalid color r/h/h high' => [
-				'rgb' => [256, 12, 12],
-				'hsb' => [361, 50, 50],
-				'hsl' => [361, 50, 50],
-				'valid' => false,
-			],
-			'invalid color g/s/s low' => [
-				'rgb' => [12, -1, 12],
-				'hsb' => [1, -1, 50],
-				'hsl' => [1, -1, 50],
-				'valid' => false,
-			],
-			'invalid color g/s/s high' => [
-				'rgb' => [12, 256, 12],
-				'hsb' => [1, 101, 50],
-				'hsl' => [1, 101, 50],
-				'valid' => false,
-			],
-			'invalid color b/b/l low' => [
-				'rgb' => [12, 12, -1],
-				'hsb' => [1, 50, -1],
-				'hsl' => [1, 50, -1],
-				'valid' => false,
-			],
-			'invalid color b/b/l high' => [
-				'rgb' => [12, 12, 256],
-				'hsb' => [1, 50, 101],
-				'hsl' => [1, 50, 101],
-				'valid' => false,
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function rgb2hsbColorProvider(): array
-	{
-		$list = [];
-		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
-			$list[$name . ', rgb to hsb'] = [
-				0 => $values['rgb'][0],
-				1 => $values['rgb'][1],
-				2 => $values['rgb'][2],
-				3 => $values['valid'] ? $values['hsb'] : false
-			];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function hsb2rgbColorProvider(): array
-	{
-		$list = [];
-		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
-			$list[$name . ', hsb to rgb'] = [
-				0 => $values['hsb_from'][0] ?? $values['hsb'][0],
-				1 => $values['hsb_from'][1] ?? $values['hsb'][1],
-				2 => $values['hsb_from'][2] ?? $values['hsb'][2],
-				3 => $values['valid'] ? $values['hsb_rgb'] : false
-			];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function rgb2hslColorProvider(): array
-	{
-		$list = [];
-		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
-			$list[$name . ', rgb to hsl'] = [
-				0 => $values['rgb'][0],
-				1 => $values['rgb'][1],
-				2 => $values['rgb'][2],
-				3 => $values['valid'] ? $values['hsl'] : false
-			];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function hsl2rgbColorProvider(): array
-	{
-		$list = [];
-		foreach ($this->rgb2hslAndhsbList() as $name => $values) {
-			$list[$name . ', hsl to rgb'] = [
-				0 => $values['hsl_from'][0] ?? $values['hsl'][0],
-				1 => $values['hsl_from'][1] ?? $values['hsl'][1],
-				2 => $values['hsl_from'][2] ?? $values['hsl'][2],
-				3 => $values['valid'] ? $values['rgb'] : false
-			];
-		}
-		return $list;
-	}
-
-	/**
-	 * Undocumented function
-	 * TODO: add cross convert check
-	 *
-	 * @covers ::rgb2hex
-	 * @dataProvider rgb2hexColorProvider
-	 * @testdox rgb2hex $input_r,$input_g,$input_b will be $expected [$_dataName]
-	 *
-	 * @param int $input_r
-	 * @param int $input_g
-	 * @param int $input_b
-	 * @param string|bool $expected_hash
-	 * @param string|bool $expected
-	 * @return void
-	 */
-	public function testRgb2hex(
-		int $input_r,
-		int $input_g,
-		int $input_b,
-		string|bool $expected_hash,
-		string|bool $expected
-	) {
-		// if expected hash is or expected is false, we need to check for
-		// LengthException
-		if ($expected_hash === false || $expected === false) {
-			$this->expectException(\LengthException::class);
-		}
-		// with #
-		$this->assertEquals(
-			$expected_hash,
-			\CoreLibs\Convert\Colors::rgb2hex($input_r, $input_g, $input_b)
-		);
-		// without #
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::rgb2hex($input_r, $input_g, $input_b, false)
-		);
-		// cross convert must match
-		// $rgb = \CoreLibs\Convert\Colors::hex2rgb($expected_hash);
-		// if ($rgb === false) {
-		// 	$rgb = [
-		// 		'r' => $input_r,
-		// 		'g' => $input_g,
-		// 		'b' => $input_b,
-		// 	];
-		// }
-		// $this->assertEquals(
-		// 	$expected_hash,
-		// 	\CoreLibs\Convert\Colors::rgb2hex($rgb['r'], $rgb['g'], $rgb['b'])
-		// );
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::hex2rgb
-	 * @dataProvider hex2rgbColorProvider
-	 * @testdox hex2rgb $input will be $expected, $expected_str str[,], $expected_str_sep str[$separator] [$_dataName]
-	 *
-	 * @param string $input
-	 * @param array|bool $expected
-	 * @param string|bool $expected_str
-	 * @param string $separator
-	 * @param string|bool $expected_str_sep
-	 * @return void
-	 */
-	public function testHex2rgb(
-		string $input,
-		array|bool $expected,
-		string|bool $expected_str,
-		string $separator,
-		string|bool $expected_str_sep
-	): void {
-		if ($expected === false || $expected_str === false || $expected_str_sep === false) {
-			$hex_string = preg_replace("/[^0-9A-Fa-f]/", '', $input);
-			if (!is_string($hex_string)) {
-				$this->expectException(\InvalidArgumentException::class);
-			} else {
-				$this->expectException(\UnexpectedValueException::class);
-			}
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::hex2rgb($input)
-		);
-		$this->assertEquals(
-			$expected_str,
-			\CoreLibs\Convert\Colors::hex2rgb($input, true)
-		);
-		$this->assertEquals(
-			$expected_str_sep,
-			\CoreLibs\Convert\Colors::hex2rgb($input, true, $separator)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::rgb2hsb
-	 * @dataProvider rgb2hsbColorProvider
-	 * @testdox rgb2hsb $input_r,$input_g,$input_b will be $expected [$_dataName]
-	 *
-	 * @param integer $input_r
-	 * @param integer $input_g
-	 * @param integer $input_b
-	 * @param array|bool $expected
-	 * @return void
-	 */
-	public function testRgb2hsb(int $input_r, int $input_g, int $input_b, array|bool $expected): void
-	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::rgb2hsb($input_r, $input_g, $input_b)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::hsb2rgb
-	 * @dataProvider hsb2rgbColorProvider
-	 * @testdox hsb2rgb $input_h,$input_s,$input_b will be $expected [$_dataName]
-	 *
-	 * @param float $input_h
-	 * @param float $input_s
-	 * @param float $input_b
-	 * @param array|bool $expected
-	 * @return void
-	 */
-	public function testHsb2rgb(float $input_h, float $input_s, float $input_b, array|bool $expected): void
-	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-			$expected = [];
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::hsb2rgb($input_h, $input_s, $input_b)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::rgb2hsl
-	 * @dataProvider rgb2hslColorProvider
-	 * @testdox rgb2hsl $input_r,$input_g,$input_b will be $expected [$_dataName]
-	 *
-	 * @param integer $input_r
-	 * @param integer $input_g
-	 * @param integer $input_b
-	 * @param array|bool $expected
-	 * @return void
-	 */
-	public function testRgb2hsl(int $input_r, int $input_g, int $input_b, array|bool $expected): void
-	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::rgb2hsl($input_r, $input_g, $input_b)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::hsl2rgb
-	 * @dataProvider hsl2rgbColorProvider
-	 * @testdox hsl2rgb $input_h,$input_s,$input_l will be $expected [$_dataName]
-	 *
-	 * @param integer|float $input_h
-	 * @param integer $input_s
-	 * @param integer $input_l
-	 * @param array|bool $expected
-	 * @return void
-	 */
-	public function testHsl2rgb(int|float $input_h, float $input_s, float $input_l, array|bool $expected): void
-	{
-		if ($expected === false) {
-			$this->expectException(\LengthException::class);
-		}
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Colors::hsl2rgb($input_h, $input_s, $input_l)
-		);
-	}
-
-	/**
-	 * edge case check hsl/hsb and hue 360 (= 0)
-	 *
-	 * @covers ::hsl2rgb
-	 * @covers ::hsb2rgb
-	 * @testdox hsl2rgb/hsb2rgb hue 360 valid check
-	 *
-	 * @return void
-	 */
-	public function testHslHsb360hue(): void
-	{
-		$this->assertIsArray(
-			\CoreLibs\Convert\Colors::hsl2rgb(360.0, 90.5, 41.2),
-			'HSL to RGB with 360 hue'
-		);
-		$this->assertIsArray(
-			\CoreLibs\Convert\Colors::hsb2rgb(360, 95, 78.0),
-			'HSB to RGB with 360 hue'
-		);
-	}
-}
-
-// __END__

4dev/tests/Convert/CoreLibsConvertEncodingTest.php

@@ -1,102 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Convert\Encoding
- * @coversDefaultClass \CoreLibs\Convert\Encoding
- * @testdox \CoreLibs\Convert\Encoding method tests
- */
-final class CoreLibsConvertEncodingTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function convertEncodingProvider(): array
-	{
-		return [
-			// 0: original string
-			// 1: target encoding
-			// 2: optional source encoding
-			// 3: auto check (not used)
-			// 4: expected string
-			// 5: expected string encoding
-			'simple from UTF-8 to SJIS' => [
-				'input string',
-				'SJIS',
-				null,
-				null,
-				'input string',
-				'SJIS'
-			],
-			'kanji from UTF-8 to SJIS' => [
-				'日本語',
-				'SJIS',
-				null,
-				null,
-				'日本語',
-				'SJIS'
-			],
-			'kanji from UTF-8 to SJIS with source' => [
-				'日本語',
-				'SJIS',
-				'UTF-8',
-				null,
-				'日本語',
-				'SJIS'
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::convertEncoding
-	 * @dataProvider convertEncodingProvider
-	 * @testdox convert encoding $target_encoding, source: $source_encoding, auto: $auto_check [$_dataName]
-	 *
-	 * @param  string $input
-	 * @param  string $target_encoding
-	 * @param  string $source_encoding
-	 * @param  bool   $auto_check
-	 * @param  string $expected
-	 * @param  string $expected_encoding
-	 * @return void
-	 */
-	public function testConvertEncoding(
-		string $input,
-		string $target_encoding,
-		?string $source_encoding,
-		?bool $auto_check,
-		string $expected,
-		string $expected_encoding
-	): void {
-		if ($source_encoding === null and $auto_check === null) {
-			$string = \CoreLibs\Convert\Encoding::convertEncoding($input, $target_encoding);
-		} elseif ($auto_check === null) {
-			$string = \CoreLibs\Convert\Encoding::convertEncoding($input, $target_encoding, $source_encoding);
-		} else {
-			$string = \CoreLibs\Convert\Encoding::convertEncoding(
-				$input,
-				$target_encoding,
-				$source_encoding,
-				$auto_check
-			);
-		}
-		// because we can't store encoding in here anyway
-		$target = mb_convert_encoding($expected, $expected_encoding, 'UTF-8');
-		// print "IN: $input, $target_encoding\n";
-		$this->assertEquals(
-			$target,
-			$string
-		);
-	}
-}
-
-// __END__

4dev/tests/Convert/CoreLibsConvertHtmlTest.php

@@ -1,188 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Convert\Html
- * @coversDefaultClass \CoreLibs\Convert\Html
- * @testdox \CoreLibs\Convert\Html method tests
- */
-final class CoreLibsConvertHtmlTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function htmlentProvider(): array
-	{
-		return [
-			'no conversion' => [
-				0 => 'I am some string',
-				1 => 'I am some string',
-			],
-			'conversion' => [
-				0 => 'I have special <> inside',
-				1 => 'I have special &lt;&gt; inside',
-			],
-			'skip number' => [
-				0 => 1234,
-				1 => 1234,
-			],
-			'utf8' => [
-				0 => '日本語 <>',
-				1 => '日本語 &lt;&gt;'
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function removeLBProvider(): array
-	{
-		return [
-			'nothing replaced, default' => [
-				0 => 'I am some string',
-				1 => null,
-				2 => 'I am some string',
-			],
-			'string with \n replace -' => [
-				0 => "I am\nsome string",
-				1 => '-',
-				2 => 'I am-some string',
-			],
-			'string with \r replace _' => [
-				0 => "I am\rsome string",
-				1 => '_',
-				2 => 'I am_some string',
-			],
-			'string with \n\r, default' => [
-				0 => "I am\n\rsome string",
-				1 => null,
-				2 => 'I am some string',
-			],
-			'string with \n\r replae ##BR##' => [
-				0 => "I am\n\rsome string",
-				1 => '##BR##',
-				2 => 'I am##BR##some string',
-			]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array
-	 */
-	public function checkedProvider(): array
-	{
-		return [
-			'haystack is a string and matching selected' => [
-				0 => 'string',
-				1 => 'string',
-				2 => \CoreLibs\Convert\Html::SELECTED,
-				3 => 'selected'
-			],
-			'haystack is a string and matching checked' => [
-				0 => 'string',
-				1 => 'string',
-				2 => \CoreLibs\Convert\Html::CHECKED,
-				3 => 'checked'
-			],
-			'haystack is a string and not matching' => [
-				0 => 'string',
-				1 => 'not matching',
-				2 => \CoreLibs\Convert\Html::CHECKED,
-				3 => null
-			],
-			'haystack is array and matching' => [
-				0 => ['a', 'b', 'c'],
-				1 => 'a',
-				2 => \CoreLibs\Convert\Html::SELECTED,
-				3 => 'selected'
-			],
-			'haystack is array and not matching' => [
-				0 => ['a', 'b', 'c'],
-				1 => 'not matching',
-				2 => \CoreLibs\Convert\Html::SELECTED,
-				3 => null
-			],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::htmlent
-	 * @dataProvider htmlentProvider
-	 * @testdox htmlent $input will be $expected [$_dataName]
-	 *
-	 * @param mixed $input
-	 * @param mixed $expected
-	 * @return void
-	 */
-	public function testHtmlent($input, $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Html::htmlent($input)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::removeLB
-	 * @dataProvider removeLBProvider
-	 * @testdox removeLB $input with replace $replace will be $expected [$_dataName]
-	 *
-	 * @param string $input
-	 * @param string|null $replace
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testRemoveLB(string $input, ?string $replace, string $expected): void
-	{
-		if ($replace !== null) {
-			$this->assertEquals(
-				$expected,
-				\CoreLibs\Convert\Html::removeLB($input, $replace)
-			);
-		} else {
-			$this->assertEquals(
-				$expected,
-				\CoreLibs\Convert\Html::removeLB($input)
-			);
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @covers ::checked
-	 * @dataProvider checkedProvider
-	 * @testdox checked find $needle in $haystack and return $type will be $expected [$_dataName]
-	 *
-	 * @param array<mixed>|string $haystack
-	 * @param string $needle
-	 * @param integer $type
-	 * @param string|null $expected
-	 * @return void
-	 */
-	public function testChecked($haystack, string $needle, int $type, ?string $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Html::checked($haystack, $needle, $type)
-		);
-	}
-}
-
-// __END__