Backport Login changes

Password change backport

.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,127 +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 [
-	// 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' => true,
-
-	// 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,
-
-	// default false for include path check
-	"enable_include_path_checks" => true,
-	"include_paths" => [
-		'.', '../configs/'
-	],
-	'ignore_undeclared_variables_in_global_scope' => true,
-
-	"file_list" => [
-		"./www/configs/config.db.php",
-		"./www/configs/config.host.php",
-		"./www/configs/config.path.php",
-		"./www/configs/config.other.php",
-		"./www/configs/config.master.php",
-		"./www/includes/admin_header.php",
-	],
-
-	// A list of directories that should be parsed for class and
-	// method information. After excluding the directories
-	// defined in exclude_analysis_directory_list, the remaining
-	// files will be statically analyzed for errors.
-	//
-	// Thus, both first-party and third-party code being used by
-	// your application should be included in this list.
-	'directory_list' => [
-		// Change this to include the folders you wish to analyze
-		// (and the folders of their dependencies)
-		'www',
-		// To speed up analysis, we recommend going back later and
-		// limiting this to only the vendor/ subdirectories your
-		// project depends on.
-		// `phan --init` will generate a list of folders for you
-		//'www/vendor',
-	],
-
-
-	// A list of directories holding code that we want
-	// to parse, but not analyze
-	"exclude_analysis_directory_list" => [
-		'www/vendor',
-		'www/tests',
-		'www/lib/Smarty',
-		'www/lib/smarty-3.1.30',
-		'www/templates_c',
-		'www/log',
-		'www/tmp',
-		'www/cache',
-		'www/media',
-	],
-	'exclude_file_list' => [
-		// ignore all symlink files to edit
-		'www/admin/edit_access.php',
-		'www/admin/edit_groups.php',
-		'www/admin/edit_languages.php',
-		'www/admin/edit_menu_group.php',
-		'www/admin/edit_order.php',
-		'www/admin/edit_pages.php',
-		'www/admin/edit_schemes.php',
-		'www/admin/edit_users.php',
-		'www/admin/edit_visible_group.php',
-		// ignore the old qq tests
-		'www/admin/qq_file_upload_front.php',
-		'www/admin/qq_file_upload_ajax.php',
-		// symlink ignore
-		'www/lib/smarty-3.1.30/SmartyBC.class.php',
-		'www/lib/htmlMimeMail-2.5.1/HtmlMimeMailCreate.php',
-	],
-
-	// what not to show as problem
-	'suppress_issue_types' => [
-		// 'PhanUndeclaredMethod',
-		'PhanEmptyFile',
-	],
-
-	// Override to hardcode existence and types of (non-builtin) globals in the global scope.
-	// Class names should be prefixed with `\`.
-	//
-	// (E.g. `['_FOO' => '\FooClass', 'page' => '\PageClass', 'userId' => 'int']`)
-	'globals_type_map' => [],
-];

4dev/checking/phan.sh

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

4dev/checking/phpstan.sh

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

4dev/checking/phpunit.sh

@@ -1,4 +0,0 @@
-base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# -c phpunit.xml
-# --testdox
-${base}www/vendor/bin/phpunit -c ${base}phpunit.xml ${base}4dev/tests/

4dev/composer/install.txt

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

4dev/database/ORDER

@@ -1,10 +1,5 @@
 # functions
-function/set_uid.sql
-function/set_generic.sql
-function/random_string.sql
-function/set_edit_generic.sql
-function/edit_set_access_uid.sql
-function/edit_log_partition_insert.sql
+function/update_function.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -19,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,63 +5,19 @@
 #echo "EXIT";
 #exit;
 
-# if flagged 'y' then it will ask after each import to continue
-development='y';
-test='n';
-input='';
-# database connection info
 db='<db name>';
 host='<db host>';
 user='<db user>';
-schema="public";
-export PGPASSWORD='';
+#schema="publicv";
 
-# log files
-error_file="log/error";
-output_file="log/output";
-
-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}'";
-			if [ "$test" = 'n' ]; then
-				echo "=== START [$file] ===>" >> ${error_file};
-				psql -U ${user} -h ${host} -f "${file}" ${db} 1>> ${output_file} 2>> ${error_file}
-				echo "=== END   [$file] ===>" >> ${error_file};
-			fi;
-			if [ "$development" = "y" ]; then
-				echo "Press 'y' to move to next. Press 'r' to reload last file. ^c to abort";
-			fi;
-			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='';
-		done;
-	elif [[ ${file::1} != "#" ]]; then
-		echo "[!] COULD NOT FIND FILE: '${file}'";
-	fi;
-done 3<ORDER;
+done;

4dev/database/data/edit_tables.sql

@@ -1,148 +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
-DELETE FROM edit_language;
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1);
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('ja', 'Japanese', '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'),
-    (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_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

@@ -1,6 +1,6 @@
 -- add uid add for edit_access table
 
-CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
+CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS 
 $$
 	DECLARE
 		myrec RECORD;

4dev/database/function/edit_set_group_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/random_string.sql

@@ -1,18 +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_edit_generic.sql

@@ -1,15 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_edit_generic() RETURNS TRIGGER AS '
-	DECLARE
-		random_length INT = 12; -- 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_uid.sql

@@ -1,12 +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,16 +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

@@ -8,12 +8,10 @@
 -- 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,
+	name	VARCHAR(255) UNIQUE,
 	description	VARCHAR,
-	color	VARCHAR,
-	additional_acl	JSONB
+	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

@@ -9,8 +9,8 @@
 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
+	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;

4dev/database/table/edit_access_right.sql

@@ -14,3 +14,14 @@ CREATE TABLE edit_access_right (
 	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

@@ -8,12 +8,15 @@
 -- 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_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,
+	eg_status	INT,
 	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
 	date_updated	TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

@@ -8,13 +8,12 @@
 -- 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,
+	name	VARCHAR(50),
 	enabled	SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
-	uid	VARCHAR,
-	name	VARCHAR,
-	additional_acl	JSONB
+	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

@@ -9,10 +9,12 @@
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
 	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,
-	long_name VARCHAR,
-	short_name VARCHAR,
-	iso_name VARCHAR,
-	order_number INT
+	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

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

4dev/database/table/edit_log_overflow.sql

@@ -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

@@ -8,9 +8,11 @@
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
 	edit_menu_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR,
+	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,
+	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,
-	hostname	VARCHAR
+	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

@@ -8,13 +8,21 @@
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
 	edit_page_access_id	SERIAL PRIMARY KEY,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
 	edit_group_id	INT NOT NULL,
-	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
+	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

@@ -8,7 +8,16 @@
 -- 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_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

@@ -8,7 +8,16 @@
 -- 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_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

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

4dev/database/table/edit_scheme.sql

@@ -9,8 +9,12 @@
 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
+	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

@@ -8,41 +8,31 @@
 -- 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,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT NOT NULL DEFAULT 0,
 	username	VARCHAR UNIQUE,
 	password	VARCHAR,
-	first_name	VARCHAR,
-	last_name	VARCHAR,
-	first_name_furigana	VARCHAR,
-	last_name_furigana	VARCHAR,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
 	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,
-	last_login	TIMESTAMP WITHOUT TIME ZONE,
-	login_error_count	INT DEFAULT 0,
-	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
+	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
-	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
-	password_reset_uid	VARCHAR, -- the uid to access the password reset page
-	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
+	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;
 
-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';
+-- 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

@@ -8,6 +8,10 @@
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
 	edit_visible_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR
+	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/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,4 +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();
+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/database/update/edit_tables_missing_columns.sql

@@ -1,14 +0,0 @@
--- update missing edit_* table data
-
-ALTER TABLE edit_generic ADD cuid VARCHAR;
-
-ALTER TABLE edit_access ADD enabled SMALLINT DEFAULT 0;
-ALTER TABLE edit_access ADD protected SMALLINT DEFAULT 0;
-
-ALTER TABLE edit_group ADD uid VARCHAR;
-ALTER TABLE edit_group ADD deleted SMALLINT DEFAULT 0;
-
-ALTER TABLE temp_files ADD folder VARCHAR;
-ALTER TABLE edit_page ADD hostname VARCHAR;
-
-ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;

4dev/database/update/edit_update_missing_cuid.sql

@@ -1,17 +0,0 @@
--- 2019/9/10 UPDATE missing cuid in edit_* tables
-
-UPDATE edit_access SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_data SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_right SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_user SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_group SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_language SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_log SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_menu_group SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page_access SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page_content SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_query_string SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_scheme SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_user SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_visible_group SET cuid = random_string(12) WHERE cuid IS NULL;

4dev/lang/admin/messages_en_utf8.po

@@ -1,35 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2005/08/09
-# SHORT DESCRIPTION:
-# Backned English Messages file for gettext
-# to craete: msgfmt -o ja.mo messages_en.po
-# HISTORY:
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: Project Version\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: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Year"
-msgstr "Year"
-
-msgid "Month"
-msgstr "Month"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST EN"
-
-msgid "I should be translated"
-msgstr "I should be translated: I WAS TRANSLATED"
-
-msgid "Are we translated?"
-msgstr "Are we translated? Yes, we are!"

4dev/lang/admin/messages_ja_utf8.po

@@ -1,77 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2018/03/28
-# SHORT DESCRIPTION:
-# Backend Japanese Messages file for gettext
-# to craete: msgfmt -o ja.mo messages_ja.po
-# HISTORY:
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: Project Version\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: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\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 JA"
-
-# login string
-msgid "Hello %s"
-msgstr "こにちは %s"
-
-msgid "I should be translated"
-msgstr "「スマーティー」これは正しいです"
-
-msgid "Are we translated?"
-msgstr "「クラス」これは翻訳です？"
-

4dev/sync/sync_template.sh

@@ -1,17 +1,14 @@
 #!/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 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;
@@ -38,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/CoreLibsCheckEmailTest.php

@@ -1,373 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Undocumented class
- * @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
-	 *
-	 * @dataProvider emailRegexProvider
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailCheckProvider
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailCheckFullProvider
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailRegexErrorProvider
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailTypeProviderLong
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailTypeProviderShort
-	 * @testdox Email::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
-	 *
-	 * @dataProvider emailProviderTypeLongToShort
-	 * @testdox Email::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/CoreLibsCheckFileTest.php

@@ -1,89 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Undocumented class
- * @testdox CoreLibs\Check\File method tests
- */
-final class CoreLibsCheckFileTest extends TestCase
-{
-	/** @var array<mixed> */
-	private $files = [];
-
-	protected function setUp(): void
-	{
-		// write a dummy files for testing
-	}
-
-	protected function tearDown(): void
-	{
-		// unlink files
-	}
-
-	/**
-	 * main file list + data provider
-	 *
-	 * @return array
-	 */
-	public function filesList(): array
-	{
-		return [
-			['filename.txt', 'txt', 5]
-		];
-	}
-
-	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
-	 *
-	 * @#dataProvider filesExtensionProvider
-	 * @#testdox File::getFilenameEnding Input $input must be $expected
-	 * //string $input, string $expected
-	 *
-	 * @param string $input
-	 * @param string $expected
-	 * @return void
-	 */
-	public function testGetFilenameEnding(): void
-	{
-		// getFilenameEnding
-		/* $this->assertEquals(
-			$expected,
-			\CoreLibs\Check\File::getFilenameEnding($input)
-		); */
-		$this->assertTrue(true, 'This should already work.');
-		$this->markTestIncomplete(
-			'testGetFilenameEnding has not been implemented yet.'
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 * // string $input, string $expected
-	 *
-	 * @return void
-	 */
-	public function testGetLinesFromFile(): void
-	{
-		// getLinesFromFile
-		$this->assertTrue(true, 'This should already work.');
-		$this->markTestIncomplete(
-			'testGetLinesFromFile has not been implemented yet.'
-		);
-	}
-}
-
-// __END__

4dev/tests/CoreLibsConvertMathTest.php

@@ -1,134 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Undocumented class
- * @testdox CoreLibs\Convert\Math method tests
- */
-final class CoreLibsConvertMathTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function fceilProvider(): array
-	{
-		return [
-			'5.5 must be 6' => [5.5, 6],
-			'5.1234567890 with 5 must be 6' => [5.1234567890, 6],
-			'6 must be 6' => [6, 6]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider fceilProvider
-	 * @testdox Math::fceil: Input $input must be $expected
-	 *
-	 * @param float $input
-	 * @param int $expected
-	 * @return void
-	 */
-	public function testMathFceilValue(float $input, int $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::fceil($input)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function floorProvider(): array
-	{
-		return [
-			'5123456 with -3 must be 5123000' => [5123456, -3, 5123000],
-			'5123456 with -10 must be 5000000' => [5123456, -10, 5000000]
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider floorProvider
-	 * @testdox Math::floor: Input $input with cutoff $cutoff must be $expected
-	 *
-	 * @param int $input
-	 * @param int $cutoff
-	 * @param int $expected
-	 * @return void
-	 */
-	public function testMathFloorValue(int $input, int $cutoff, int $expected): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::floorp($input, $cutoff)
-		);
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return array<mixed>
-	 */
-	public function initNumericProvider(): array
-	{
-		return [
-			'5 must be 5' => [5, 5, 'int'],
-			'5.123 must be 5.123' => [5.123, 5.123, 'float'],
-			"'5' must be 5" => ['5', 5, 'string'],
-			"'5.123' must be 5.123" => ['5.123', 5.123, 'string'],
-		];
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @dataProvider initNumericProvider
-	 * @testdox Math::initNumeric: Input $info $input must match $expected [$_dataName]
-	 *
-	 * @param int|float|string $input
-	 * @param float $expected
-	 * @param string $info
-	 * @return void
-	 */
-	public function testMathInitNumericValue($input, float $expected, string $info): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::initNumeric($input)
-		);
-	}
-
-	/**
-	 * A testWith sample
-	 *
-	 * @testdox Math::initNumeric: alternate tests $input => $expected ($info) [$_dataName]
-	 * @testWith [123.123, 123.123, "float"]
-	 *           ["123.123", 123.123, "string"]
-	 *
-	 * @param int|float|string $input
-	 * @param float $expected
-	 * @param string $info
-	 * @return void
-	 */
-	public function testMathInitNumericValueAlt($input, float $expected, string $info): void
-	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Convert\Math::initNumeric($input)
-		);
-	}
-}
-
-// __END__

4dev/update/20180323_namespace/comp_func.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-OIFS=${IFS};
-base_dir="/home/clemens/html/developers/clemens/core_data/php_libraries/trunk/";
-class_file="CoreLibs/Output/Form/Generate.inc";
-tmp_file=${base_dir}"4dev/tmp/tmp.comp."$(echo "${class_file}" | tr \/. _);
-rpl_file=${base_dir}"4dev/tmp/tmp.rpl."$(echo "${class_file}" | tr \/. _);
-rm -f "${tmp_file}";
-rm -f "${rpl_file}";
-if [ ! -f ${class_file} ];
-then
-    echo "Cannot find ${class_file} in current folder: $(pwd)";
-    exit;
-fi;
-cat "${class_file}" | grep "WAS   :" -B 1 | while read line;
-do
-    # if method grep for function call
-    found=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "METHOD:");
-    if [ -n "${found}" ];
-    then
-        method=$(echo "${line}" | cut -d " " -f 3);
-        echo "1 MET: ${method}";
-        # is method
-        if [ -n "${method}" ];
-        then
-            # the full new call
-            new_function_call_full=$(grep "function ${method}(" "${class_file}" | grep "function" | sed -e 's/^[ \t]*//');
-            # just the method name
-            new_function_call=$(echo "${new_function_call_full}" | sed -e 's/public //' | sed -e 's/private //' | sed -e 's/static //' | sed -e 's/function //' | cut -d "(" -f 1);
-            # check if func call is more than just alphanumeric (we don't need to redeclare those, functions are case insenstivie)
-            #
-            # only params (remove all = ... stuff)
-            new_function_call_params=$(echo "${new_function_call_full}" | cut -d "(" -f 2- | sed -e 's/)//');
-            old_function_call_params='';
-            IFS=',';
-            for el in ${new_function_call_params};
-            do
-                if [ -n "${old_function_call_params}" ];
-                then
-                    old_function_call_params=${old_function_call_params}", ";
-                fi;
-                old_function_call_params=${old_function_call_params}$(echo "${el}" | cut -d "=" -f 1 | tr -d ' ');
-            done;
-            # cut -d "," "${new_function_call_params}" | while
-        fi;
-    fi;
-    # if this is a WAS
-    was=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "WAS   :" | tr -s " ");
-    if [ -n "${was}" ];
-    then
-        old_function_call=$(echo "${was}" | cut -d " " -f 4)
-        echo "2 OLD: ${old_function_call} => ${new_function_call} [${new_function_call_full}]";
-        # for return write:
-        # rpl new -> old { new }
-        rpl=$(echo "${new_function_call_full}" | sed -e "s/${new_function_call}/${old_function_call}/");
-        new_call="${rpl}\n";
-        new_call=${new_call}"{\n";
-        new_call=${new_call}"\terror_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);\n";
-        new_call=${new_call}"\treturn \$this->${new_function_call}(${old_function_call_params});\n";
-        new_call=${new_call}"}\n";
-        echo -e "${new_call}" >> "${tmp_file}";
-        echo "3A RPL CALL: ${rpl}";
-        echo "3B RPL CALL: return \$this->${new_function_call}(${old_function_call_params});";
-        echo "4  SWT RPL : rpl '\$this->${old_function_call}' '\$this->${new_function_call}'";
-        # write the replace calls for old $this->old_call to $this->new_call
-        echo "rpl '\$this->${old_function_call}' '\$this->${new_function_call}' ##TARGET_FILE##" >> "${rpl_file}";
-        echo "----";
-    fi;
-done;
-IFS=${OIFS};
-
-# __END__

4dev/update/20180323_namespace/rpl_old_method_in_file.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cat tmp.comp | while read i;
-do
-	found=$(echo "${i}" | grep "function ");
-	if [ -n "${found}" ]; then
-		fk=$(echo "${i}" | cut -d " " -f 3 | cut -d "(" -f 1);
-	fi;
-	found=$(echo "${i}" | grep "\$this->");
-	if [ -n "${found}" ]; then
-		# no to debug
-		found=$(echo "${i}" | grep "debug(");
-		if [ -z "${found}" ]; then
-			fk_n=$(echo "${i}" | cut -d "(" -f 1);
-			echo "rpl '\$this->${fk}' '${fk_n}' CoreLibs/DB/IO.inc";
-		fi;
-	fi;
-done;

4dev/update/20190910_page_content/20190910_page_content_updates.sql

@@ -1,92 +0,0 @@
--- 2019/9/10 update edit_page with reference and additional ACLs, update core functions
-
--- * random_string function
--- * add cuid column in edit_generic
--- * update generic trigger function
--- * edit_page_content table/trigger
--- * edit_* additional_acl entries
--- * edit_page content alias link
--- * update any missing cuid entries
-
--- 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;
--- edit_gneric update
-ALTER TABLE edit_generic ADD cuid VARCHAR;
--- adds the created or updated date tags
-CREATE OR REPLACE FUNCTION set_edit_generic() RETURNS TRIGGER AS '
-    DECLARE
-        random_length INT = 12; -- 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';
-
--- DROP TABLE edit_page_content;
-CREATE TABLE edit_page_content (
-    edit_page_content_id    SERIAL PRIMARY KEY,
-    edit_page_id    INT NOT NULL,
-    edit_access_right_id    INT NOT NULL,
-    name    VARCHAR,
-    uid VARCHAR UNIQUE,
-    order_number INT NOT NULL,
-    online  SMALLINT NOT NULL DEFAULT 0,
-    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
-    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
-) INHERITS (edit_generic) WITHOUT OIDS;
-DROP TRIGGER 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();
-
--- INSERT new list entry
-INSERT INTO edit_access_right (name, level, type) VALUES ('List', 10, 'list');
-
--- UPDATE
-ALTER TABLE edit_user ADD additional_acl JSONB;
-ALTER TABLE edit_group ADD additional_acl JSONB;
-ALTER TABLE edit_access ADD additional_acl JSONB;
-
--- page content reference settings
-ALTER TABLE edit_page ADD content_alias_edit_page_id INT;
-ALTER TABLE edit_page ADD CONSTRAINT edit_page_content_alias_edit_page_id_fkey FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE;
-
-
--- 2019/9/10 UPDATE missing cuid in edit_* tables
-UPDATE edit_access SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_data SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_right SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_access_user SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_group SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_language SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_log SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_menu_group SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page_access SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_page_content SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_query_string SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_scheme SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_user SET cuid = random_string(12) WHERE cuid IS NULL;
-UPDATE edit_visible_group SET cuid = random_string(12) WHERE cuid IS NULL;
-
--- update all triggers

README.md

@@ -1,13 +1,5 @@
 # PHP Core Library
 
-## Code Standard
-
- * Uses PSR-12
- * tab indent instead of 4 spaces indent
- * Warning at 120 character length, error at 240 character length
-
-## General information
-
 Base PHP class files to setup any project
   * login
   * database wrapper
@@ -22,24 +14,12 @@ There are three branches:
 
 ### master
 
-The active branch, which is the namespace branch
+This is currently the legacy branch set live. This will change to the namespace branch once development is finished
 
 ### legacy
 
-The old non namepsace format layout.
-This is fully deprecated and will no longer be maintaned.
-last tested PHP 5.6 and PHP 7.0
+The old non namepsace format layout. This will only get bug fixes and no new development
 
 ### namespace
 
-The new namespace branch. This is the development area for the master branch
-
-## Static checks
-
-With phpstan
-`phpstan`
-
-With phan
-`phan --progress-bar -C --analyze-twice`
-
-pslam is setup but not configured
+The new namespace branch. Once development is finished this branch will be removed or renamed to development only branch

bin/Progress.pm

@@ -1,498 +0,0 @@
-package Progress;
-
-# AUTHOR: Clemens Schwaighofer
-# DATE CREATED: 2009/6/16
-# DESCRIPTION: progress percent class
-
-# METHODS
-# * init
-# my $prg = Progress->new();
-#   will init a new progress class in the var $prg
-#   the following parameters can be set directly during a new call
-#   - verbose (1/0)
-#   - precision (-1~10)
-#   - wide_time (0/1)
-#   - microtime (0/1)
-#   setting is done via
-# my $prg = Progress->new(verbose => 1, microtime = 1);
-# * setting methods
-# verbose($level int)
-#   $level has to be int, if not set there is no output show, at least 1 has to be given to see visible output
-# precision($decimals int)
-#   $decimals has to be int, if set to -1 then the steps are done in 10 increase, else it sets how many decimals are visible, 0 for no decimals
-# wide_time(0/1 int)
-#   sets the flag for wide time, if set to 1 the estimated time to end and time run is left prefixed with 15 chars
-# microtime(0/1 int)
-#   sets the flag to always show microtime (1) or only if the previous time was the same (0)
-# reset()
-#   resets all the internal vars for another new run
-# SetStartTime(optional timestamp)
-#   sets the start times for this progress run, the overall start/end time is set, and the time used for the actual progress
-#   in case there is some processing done before the run starts, it is highly recommended to call SetETAStartTime before the actual processing starts
-#   if no timestamp is given, internal timestamp is used (this is recommended)
-# SetETAStartTime(optional timestamp)
-#   only sets the start/end time for the actual "estimated time" calculation. It is recommended to call this right before the processing loop starts
-#   eg if there is a big query running that takes a lot of time, this method should be called before the reading loop
-#   as with SetStartTime a timestamp can be given, if not then the internal timestamp is used (this is recommended)
-# SetEndTime(optional timestamp)
-#   sets the end time for the overall processing. This should be called at the very end of the script before any final stat data is printed
-# linecount($lines int)
-#   sets the maximum lines that will be processed, used for percentage calculation. If non int is given, will set to 1. This will be only set once, to
-#   reset used reset() method.
-#   Either this or filesize NEED to be set
-# filesize($bytes int)
-#   filesize in bytes, if non valid data is given, then it is set to 1.
-#   filesize() and linecount() can both be set, but at least one of them has to be set.
-#   if filesize is set a byte data output is added, if only linecount is given, only the linecount output will be given (no bytes per second, etc)
-# ShowPosition(optional current byte position int)
-#   this is the main processing and has to be called at the end of the loop where the data is processed. If no bytes are given the internal counter (linecount)
-#   is used.
-#   for bytes it is recommended to use IO::File and $FH->tell to pass on the bytes
-#
-# VARIABLES
-# * internal set
-#   change: flagged 1 if output is given or would be given. can be used for any post processing after the ShowPosition is called
-#   precision_ten_step: flagged 1 if the precision was set to -1
-#   start: overall start time
-#   end: overall end time
-#   count: count of processed lines
-#   [TODO: describe the others too, at the moment only below in %fields]
-
-use strict;
-use warnings;
-use utf8;
-
-BEGIN {
-	use POSIX;
-	use Carp;
-	use Time::HiRes qw(time);
-	use File::Basename;
-	use Number::Format qw(format_number);
-	use vars qw($AUTOLOAD);
-	push(@INC, File::Basename::dirname($0).'/');
-}
-
-# important includes
-use functions;
-
-# variable declarationf or access
-# * can be set
-# = only for read
-# unmarked are internal only, but can be read if they are needed in further processing in the script
-my %fields = (
-	linecount => 0, # * max lines in input
-	filesize => 0, # * max file size
-	precision => 1, # * comma after percent
-	wide_time => 0, # * if flagged 1, then the wide 15 char left bound format is used
-	verbose => 0, # * verbose status from outside
-	microtime => 0, # * microtime output for last run time (1 for enable, 0 for auto, -1 for disable)
-	change => 0, # = flag if output was given
-	start => undef, # = global start for the full script running time
-	start_run => undef, # = for the eta time, can be set after a query or long read in, to not create a wrong ETA time
-	start_time => undef, # loop start
-	end => undef, # = global end
-	end_time => undef, # loop end
-	count_size => undef, # = filesize current
-	count => 0, # = position current
-	current_count => 0, # last count (position)
-	lines_processed => 0, # lines processed in the last run
-	last_group => 0, # time in seconds for the last group run (until percent change)
-	lines_in_last_group => 0, # float value, lines processed per second to the last group run
-	lines_in_global => 0, # float values, lines processed per second to complete run
-	bytes_in_last_group => 0, # flaot value, bytes processes per second in the last group run
-	bytes_in_global => 0, # float value, bytes processed per second to complete run
-	size_in_last_group => 0, # bytes processed in last run (in bytes)
-	current_size => 0, # current file position (size)
-	last_percent => 0, # last percent position
-	precision_ten_step => 0, # if we have normal % or in steps of 10
-	percent_print => 5, # the default size, this is precision + 4
-	percent_precision => 1, # this is 1 if it is 1 or 0 for precision, or precision size
-	eta => undef, # estimated time to finish
-	full_time_needed => undef, # run time since start
-	lg_microtime => 0 # last group microtime, this is auto set during process.
-);
-
-# class init
-sub new
-{
-	my $proto = shift;
-	my $class = ref($proto) || $proto;
-	my %data = @_;
-	my $self = {
-		_permitted => \%fields,
-		%fields,
-	};
-	# vars to init
-	bless ($self, $class);
-	if ($data{'verbose'} && $data{'verbose'} =~ /^\d{1}$/) {
-		$self->{verbose} = $data{'verbose'};
-	}
-	if (exists($data{'precision'}) && (($data{'precision'} || $data{'precision'} == 0) && $data{'precision'} =~ /^\-?\d{1,2}$/)) {
-		$self->precision($data{'precision'});
-	}
-	if ($data{'microtime'} && $data{'microtime'} =~ /^(0|1)$/) {
-		$self->microtime($data{'microtime'});
-	}
-	if ($data{'wide_time'} && $data{'wide_time'} =~ /^(0|1)$/) {
-		$self->wide_time($data{'wide_time'});
-	}
-	return $self;
-}
-
-# auto load for vars
-sub AUTOLOAD
-{
-	my $self = shift;
-	my $type = ref($self) || croak "$self is not an object";
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-
-	unless (exists $self->{_permitted}->{$name}) {
-		croak "Can't access '$name' field in class $type";
-	}
-
-	if (@_) {
-		return $self->{$name} = shift;
-	} else {
-		return $self->{$name};
-	}
-}
-
-# destructor
-sub DESTROY
-{
-	# do nothing, there is nothing to close or finish
-}
-
-# SUB: reset
-# PARAMS: none
-# DESC: resets all the current counters only and current start times
-sub reset
-{
-	my $self = shift;
-	# reset what always gets reset
-	$self->{count} = 0;
-	$self->{count_size} = undef;
-	$self->{current_count} = 0;
-	$self->{linecount} = 0;
-	$self->{lines_processed} = 0;
-	$self->{last_group} = 0;
-	$self->{lines_in_last_group} = 0;
-	$self->{lines_in_global} = 0;
-	$self->{bytes_in_last_group} = 0;
-	$self->{bytes_in_global} = 0;
-	$self->{size_in_last_group} = 0;
-	$self->{filesize} = 0;
-	$self->{current_size} = 0;
-	$self->{last_percent} = 0;
-	$self->{eta} = 0;
-	$self->{full_time_needed} = 0;
-	$self->{start_run} = undef;
-	$self->{start_time} = undef;
-	$self->{end_time} = undef;
-}
-
-# SUB: microtime
-# PARAMS: 1/0
-# DESC: flag to set microtime on or off in the time output
-#       if not 1 or 0, set to 0
-sub microtime
-{
-	my $self = shift;
-	my $microtime;
-	if (@_) {
-		$microtime = shift;
-		if ($microtime == 1 || $microtime == 0) {
-			$self->{microtime} = $microtime;
-		} else {
-			$self->{microtime} = 0;
-		}
-	}
-	return $self->{microtime};
-}
-
-
-# SUB: wide_time
-# PARAMS: 1/0
-# DESC: flag to set wide_time (15 char spacer).
-#       if not 1 or 0, set to 0
-sub wide_time
-{
-	my $self = shift;
-	my $wide;
-	if (@_) {
-		$wide = shift;
-		if ($wide == 1 || $wide == 0) {
-			$self->{wide_time} = $wide;
-		} else {
-			$self->{wide_time} = 0;
-		}
-	}
-	return $self->{wide_time};
-}
-
-# SUB: precision
-# PARAMS: precision in int
-# DESC: sets the output percent precision calculation and printf width
-#       if negative, to ten step, if bigger 10, set to one
-sub precision
-{
-	my $self = shift;
-	my $comma;
-	if (@_) {
-		$comma = shift;
-		$comma = 0 if ($comma !~ /^\-?\d{1,}$/);
-		if ($comma < 0) {
-			# -2 is 5 step
-			# -1 is 10 step
-			if ($comma < -1) {
-				$self->{precision_ten_step} = 5;
-			} else {
-				$self->{precision_ten_step} = 10;
-			}
-			$self->{precision} = 0; # no comma
-			$self->{percent_precision} = 0; # no print precision
-			$self->{percent_print} = 3; # max 3 length
-		} else {
-			$self->{precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
-			$self->{percent_precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
-			$self->{percent_print} = ($comma == 0 ? 3 : 4) + $self->{percent_precision};
-		}
-	}
-	return $self->{precision};
-}
-
-# SUB: linecount
-# PARAMS: max number of lines to be processed
-# DESC: sets the max number for lines for the percent calculation, if negative or not number, set to 1
-#       can only be set ONCE
-sub linecount
-{
-	my $self = shift;
-	my $linecount;
-	if (!$self->{linecount}) {
-		if (@_) {
-			$linecount = shift;
-			$self->{linecount} = $linecount;
-			$self->{linecount} = 1 if ($linecount < 0 || $linecount !~ /\d+/)
-		}
-	}
-	return $self->{linecount};
-}
-
-# SUB: filesize
-# PARAMS: max filesize for the to processed data
-# DESC: sets the max filesize for the to processed data, if negative or not number, set to 1
-#       input data has to be in bytes without any suffix (no b, kb, etc)
-#       can only be set ONCE
-sub filesize
-{
-	my $self = shift;
-	my $filesize;
-	if (!$self->{filesize}) {
-		if (@_) {
-			$filesize = shift;
-			$self->{filesize} = $filesize;
-			$self->{filesize} = 1 if ($filesize < 0 || $filesize !~ /\d+/)
-		}
-	}
-	return $self->{filesize};
-}
-
-# SUB: SetStartTime
-# PARAMS: time, or nothing
-# DESC: sets all the start times
-sub SetStartTime
-{
-	my $self = shift;
-	if (@_) {
-		$self->{start} = shift;
-	} else {
-		$self->{start} = time();
-	}
-	$self->{start_time} = $self->{start};
-	$self->{start_run} = $self->{start};
-}
-
-# SUB: SetETAStartTime
-# PARAMS: time, or nothing
-# DESC: sets the loop & run time, for correct ETA callculation
-sub SetETAStartTime
-{
-	my $self = shift;
-	if (@_) {
-		$self->{start_time} = shift;
-	} else {
-		$self->{start_time} = time();
-	}
-	$self->{start_run} = $self->{start_time};
-}
-
-# SUB: SetEndTime
-# PARAMS: time, or nothing
-# DESC: sets the end time for running time calculation
-sub SetEndTime
-{
-	my $self = shift;
-	if (@_) {
-		$self->{end} = shift;
-	} else {
-		$self->{end} = time();
-	}
-}
-
-# SUB: ShowPosition
-# PARAMS: optiona; file position (via file pointer)
-# RETURN: string for percent position output
-# DESC: calculates the current percent position based on the passed parameter, if no parameter uses intneral counter
-sub ShowPosition
-{
-	my $self = shift;
-	# set local vars
-	my $percent; # current percent
-	my $full_time_needed; # complete process time
-	my $full_time_per_line; # time per line
-	my $eta; # estimated end time
-	my $string = ''; # percent string that gets output
-	my $show_filesize = 1;
-	# microtime flags
-	my $eta_microtime = 0;
-	my $ftn_microtime = 0;
-	my $lg_microtime = 0;
-	# percent precision calc
-	my $_p_spf = "%.".$self->{precision}."f";
-	# output format for percent
-	my $_pr_p_spf = "%".$self->{percent_print}.".".$self->{percent_precision}."f";
-	# set the linecount precision based on the final linecount, if not, leave it empty
-	my $_pr_lc = "%s";
-	$_pr_lc = "%".length(format_number($self->{linecount}))."s" if ($self->{linecount});
-	# time format, if flag is set, the wide format is used
-	my $_pr_tf = "%s";
-	$_pr_tf = "%-15s" if ($self->{'wide_time'});
-	# do the smae for file size
-	# my $_pr_fs = "%s";
-	# $_pr_fs = "%".length(function::convert_number($self->{filesize}))."s" if ($self->{filesize});
-
-	# increase position by one
-	$self->{count} ++;
-	# see if we get anything from IO tell
-	if (@_) {
-		$self->{file_pos} = shift;
-	} else {
-		# we did not, so we set internal value
-		$self->{file_pos} = $self->{count};
-		# we also check if the filesize was set now
-		if (!$self->{filesize}) {
-			$self->{filesize} = $self->{linecount};
-		}
-		# set ignore filesize output (no data)
-		$show_filesize = 0;
-	}
-	# set the count size based on the file pos, is only used if we have filesize
-	$self->{count_size} = $self->{file_pos};
-
-	# do normal or down to 10 (0, 10, ...) %
-	if ($self->{precision_ten_step}) {
-		# calc 0 comma precision, so just do a floor
-		my $_percent = sprintf("%d", ($self->{file_pos} / $self->{filesize}) * 100);
-		# mod that to 10
-		my $mod = $_percent % $self->{precision_ten_step};
-		# either write this one, or write the previous, old one
-		$percent = $mod == 0 ? $_percent : $self->last_percent;
-		# print "P: $percent, Last: ".$self->last_percent.", Mod: ".$mod.", Calc: ".$_percent."\n";
-	} else {
-		$percent = sprintf($_p_spf, ($self->{file_pos} / $self->{filesize}) * 100);
-	}
-	# print "POS: ".$self->{file_pos}.", PERCENT: $percent / ".$self->last_percent."\n";
-	if ($percent != $self->last_percent) {
-		$self->{end_time} = time();
-		# for from the beginning
-		$full_time_needed = $self->{end_time} - $self->{start_run}; # how long from the start;
-		$self->{last_group} = $self->{end_time} - $self->{start_time};
-		$self->{lines_processed} = $self->{count} - $self->{current_count};
-		# lines in last group
-		$self->{lines_in_last_group} = $self->{'last_group'} ? ($self->{lines_processed} / $self->{last_group}) : 0;
-		# lines in global
-		$self->{lines_in_global} = $full_time_needed ? ($self->{'count'} / $full_time_needed) : 0;
-		# if we have linecount
-		if (!$self->{linecount}) {
-			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count_size}; # how long for all
-			$eta = $full_time_per_line * ($self->{filesize} - $self->{count_size}); # estimate for the rest
-		} else {
-			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count}; # how long for all
-			$eta = $full_time_per_line * ($self->{linecount} - $self->{count}); # estimate for the rest
-		}
-
-		# just in case ...
-		$eta = '0' if ($eta < 0);
-		# check if to show microtime
-		# ON: if microtime is flagged as one
-		$eta_microtime = $ftn_microtime = $lg_microtime = 1 if ($self->{microtime} == 1);
-		# AUTO: foir microtime
-		if ($self->{microtime} == 0) {
-			$eta_microtime = 1 if ($eta > 0 && $eta < 1);
-			$ftn_microtime = 1 if ($full_time_needed > 0 && $full_time_needed < 1);
-			# pre check last group: if pre comma part is same add microtime anyway
-			$lg_microtime = 1 if ($self->{last_group} > 0 && $self->{last_group} < 1);
-		}
-		# print out
-		if ($show_filesize) {
-			# last group size
-			$self->{size_in_last_group} = $self->{count_size} - $self->{current_size};
-			# calc kb/s if there is any filesize data
-			# last group
-			$self->{bytes_in_last_group} = $self->{'last_group'} ? ($self->{size_in_last_group} / $self->{last_group}) : 0;
-			# global
-			$self->{bytes_in_global} = $full_time_needed ? ($self->{count_size} / $full_time_needed) : 0;
-			# only used if we run with file size for the next check
-			$self->{current_size} = $self->{count_size};
-
-			$string = sprintf(
-				"Processed ".$_pr_p_spf."%% [%s / %s] | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines (%s) in %s, %s (%s) lines/s, %s (%s) b/s\n",
-				$percent,
-				function::convert_number($self->{count_size}),
-				function::convert_number($self->{filesize}),
-				format_number($self->{count}),
-				format_number($self->{linecount}),
-				function::convert_time($eta, $eta_microtime),
-				function::convert_time($full_time_needed, $ftn_microtime),
-				format_number($self->{lines_processed}),
-				function::convert_number($self->{size_in_last_group}),
-				function::convert_time($self->{last_group}, $lg_microtime),
-				format_number($self->{lines_in_global}, 2, 1),
-				format_number($self->{lines_in_last_group}, 2, 1),
-				function::convert_number($self->{bytes_in_global}),
-				function::convert_number($self->{bytes_in_last_group})
-			) if ($self->{verbose} >= 1);
-		} else {
-			$string = sprintf(
-				"Processed ".$_pr_p_spf."%% | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines in %s, %s (%s) lines/s\n",
-				$percent,
-				format_number($self->{count}),
-				format_number($self->{linecount}),
-				function::convert_time($eta, $eta_microtime),
-				function::convert_time($full_time_needed, $ftn_microtime),
-				format_number($self->{lines_processed}),
-				function::convert_time($self->{last_group}, $lg_microtime),
-				format_number($self->{lines_in_global}, 2, 1),
-				format_number($self->{lines_in_last_group}, 2, 1)
-			) if ($self->{verbose} >= 1);
-		}
-		# write back vars
-		$self->{last_percent} = $percent;
-		$self->{eta} = $eta;
-		$self->{full_time_needed} = $full_time_needed;
-		$self->{lg_microtime} = $lg_microtime;
-		# for the next run, check data
-		$self->{start_time} = time();
-		$self->{current_count} = $self->{count};
-		# trigger if this is a change
-		$self->{change} = 1;
-	} else {
-		# trigger if this is a change
-		$self->{change} = 0;
-	}
-	return $string;
-}
-
-1;

bin/functions.pm

@@ -1,501 +0,0 @@
-package function;
-
-# AUTHOR: Clemens Schwaighofer
-# DATE CREATED: 2004/11/09
-# DESCRIPTION: functions collection for Adidas scripts
-# HISTORY:
-# 2005/06/22 (cs) added header key check function
-# 2005/02/10 (cs) added debug flag to print output, added two new functions to format a number into B, KB, etc
-# 2005/01/13 (cs) fixed array problem with the clean up and int function
-
-use strict;
-use warnings;
-use 5.000_000;
-use POSIX qw(floor);
-use File::Copy;
-use Digest::SHA qw(sha1_hex);
-use utf8;
-#require Exporter;
-#our @ISA = qw(Exporter);
-#our @EXPORT = qw();
-
-# depending on the options given to the program, it gets the correct settings
-# to which db it should connect
-sub get_db_user
-{
-	my ($target, $db) = @_;
-
-	# the parts of the hash array (tab seperated)
-	my @array_names = qw{db_name	db_port	db_user	db_pass	db_host	db_type	db_test	db_ssl};
-	my %db_out = ();
-
-	# based on the two parameters find the correct vars
-	# each level can hold data, higher level data overrules lower data
-	# eg $config::db{'test'}{'db_user'} overrules $config::db{'db_user'}
-	for (my $i = 1; $i <= 3; $i ++) {
-		foreach my $name (@array_names) {
-			# depending on the level check the level of data
-			if ($i == 1) {
-				$db_out{$name} = $config::db{$name} if (defined($config::db{$name}));
-			} elsif ($i == 2) {
-				$db_out{$name} = $config::db{$target}{$name} if (defined($config::db{$target}{$name}));
-			} elsif ($i == 3) {
-				$db_out{$name} = $config::db{$target}{$db}{$name} if (defined($config::db{$target}{$db}{$name}));
-			}
-		} # for each db data var
-	} # for each data level in the hash
-
-	return (
-		$db_out{'db_name'},
-		$db_out{'db_port'},
-		$db_out{'db_user'},
-		$db_out{'db_pass'},
-		$db_out{'db_host'},
-		$db_out{'db_type'},
-		$db_out{'db_test'},
-		$db_out{'db_ssl'}
-	);
-}
-
-# get the DSN string for the DB connect
-sub get_db_dsn
-{
-	my (
-		$db_name,
-		$db_port,
-		$db_user,
-		$db_pass,
-		$db_host,
-		$db_type,
-		$db_ssl
-	) = @_;
-	my $dsn = '';
-
-	if ($db_type eq 'mysql' && $db_name && $db_host && $db_user) {
-		$dsn = "DBI:mysql:database=".$db_name.";host=".$db_host.";port=".$db_port;
-	} elsif ($db_type eq 'pgsql' && $db_name && $db_host && $db_user) {
-		$dsn = "DBI:Pg:dbname=".$db_name.";host=".$db_host.";port=".$db_port.";sslmode=".$db_ssl;
-	} else {
-		# invalid db type
-		$dsn = -1;
-	}
-	return $dsn;
-}
-
-sub strip_white_spaces
-{
-	my ($element) = @_;
-	# get rid of spaces at the end and at the beginning of each bloack
-	$element =~ s/^\s+//g;
-	$element =~ s/\s+$//g;
-	return $element;
-}
-
-sub prepare_hash_keys
-{
-	my($csv, $data, $csv_header) = @_;
-
-	# unset value starts at 1000 and goes up ...
-	my $unset_value = 1000;
-	my %keys = ();
-
-	# parse header
-	if ($csv->parse($data)) {
-		my @cols = $csv->fields();
-		for (my $i = 0; $i < @cols; $i ++) {
-			# remove all spaces before and afterward
-			$cols[$i] = function::strip_white_spaces($cols[$i]);
-			# write key - id number
-			$keys{$cols[$i]} = $i;
-			print $::DEBUG "\tPostion [".$i."]: ".$cols[$i]."\n" if ($::debug);
-			print "\tPosition [".$i."]: ".$cols[$i]."\n" if ($::verbose > 1);
-		}
-	} else {
-		die "ERROR[".$csv->error_diag()."]: ".$csv->error_input()."\n";
-	}
-	# add empty values
-	foreach my $csv_header_value (@$csv_header) {
-		if (!defined($keys{$csv_header_value})) {
-			$keys{$csv_header_value} = $unset_value;
-			$unset_value ++;
-			print $::DEBUG "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::debug);
-			print "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::verbose > 1);
-		}
-	}
-
-	return %keys;
-}
-
-sub error_check_keys
-{
-	my($csv_header, $keys) = @_;
-
-	if ((keys %$keys) != @$csv_header) {
-		print $::ERR "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
-		print "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
-
-		# if there are more keys in CSV file, then in the header defined in here
-		if ((keys %$keys) > @$csv_header) {
-			print $::ERR "Listing Perl Header missing\n";
-			print "Listing Perl Header missing\n";
-			foreach my $key (keys %$keys) {
-				print $::ERR "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
-				print "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
-			}
-			# if more keys are in the header defined than in the csv file
-		} else {
-			print $::ERR "Listing CSV Header missing\n";
-			print "Listing CSV Header missing\n";
-			for (my $i = 0; $i < @$csv_header; $i ++) {
-				print $::ERR "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
-				print "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
-			}
-		}
-		return 0;
-	}
-	return 1;
-}
-
-sub clean_up_row
-{
-	my ($row) = @_;
-
-	for (my $i = 0; $i < @$row; $i++) {
-		# get rid of spaces at the end and at the beginning of each bloack
-		$$row[$i] =~ s/^\s+//g;
-		$$row[$i] =~ s/\s+$//g;
-		# convert all half width Katakan to Full width Katakana
-		$$row[$i] = Unicode::Japanese->new($$row[$i])->h2zKana->get;
-		# need to decode the converted string, somehow Unicode::Japanese does not return proper utf8 if use utf8 is on
-		utf8::decode($$row[$i]);
-	}
-
-	return @$row;
-}
-
-sub set_int_fields
-{
-	my ($row, $keys, $int_fields) = @_;
-
-	# check ALL smallint/int/etc rows to be set to a number
-	for (my $i = 0; $i < @$int_fields; $i++) {
-		print "\t\tCheck ".$$int_fields[$i]." {".$$keys{$$int_fields[$i]}."} ... " if ($::verbose > 1);
-		if (!$$row[$$keys{$$int_fields[$i]}]) {
-			$$row[$$keys{$$int_fields[$i]}] = 0;
-		}
-		# if its filled, but not a digit, set to 1
-		if ($$row[$$keys{$$int_fields[$i]}] =~ /\D/) {
-			$$row[$$keys{$$int_fields[$i]}] = 1;
-		}
-		print "[".$$row[$$keys{$$int_fields[$i]}]."] [DONE]\n" if ($::verbose > 1);
-	}
-	return @$row;
-}
-
-# formats a number with dots and ,
-sub format_number
-{
-	my ($number) = @_;
-	# dummy, does nothing now
-	# should put . or , every 3 digits later
-	return $number;
-}
-
-# converts bytes to human readable format
-sub convert_number
-{
-	my ($number) = @_;
-	my $pos; # the original position in the labels array
-	# divied number until its division would be < 1024. count that position for label usage
-	for ($pos = 0; $number > 1024; $pos ++) {
-		$number = $number / 1024;
-	}
-	# before we return it, we format it [rounded to 2 digits, if has decimals, else just int]
-	# we add the right label to it and return
-	return sprintf(!$pos ? '%d' : '%.2f', $number)." ".qw(B KB MB GB TB PB EB)[$pos];
-}
-
-# make time from seconds string
-sub convert_time
-{
-	my ($timestamp, $show_micro) = @_;
-	my $ms = '';
-	# cut of the ms, but first round them up to four
-	$timestamp = sprintf("%.4f", $timestamp);
-	# print "T: ".$timestamp."\n";
-	($timestamp, $ms) = split(/\./, $timestamp);
-	my @timegroups = ("86400", "3600", "60", "1");
-	my @output = ();
-	for (my $i = 0; $i < @timegroups; $i ++) {
-		push(@output, floor($timestamp / $timegroups[$i]));
-		$timestamp = $timestamp % $timegroups[$i];
-	}
-	# output has days|hours|min|sec
-	return (($output[0]) ? $output[0]."d " : "").
-		(($output[1] || $output[0]) ? $output[1]."h " : "").
-		(($output[2] ||$output[1] || $output[0]) ? $output[2]."m " : "").
-		$output[3]."s".
-		(($show_micro) ? " ".((!$ms) ? 0 : $ms)."ms" : "");
-}
-
-# get a timestamp and create a proper formated date/time field
-sub create_time
-{
-	my ($timestamp, $show_micro) = @_;
-	my $ms = '';
-	$timestamp = 0 if (!$timestamp);
-	# round ms to 4 numbers
-	$timestamp = sprintf("%.4f", $timestamp);
-	($timestamp, $ms) = split(/\./, $timestamp);
-	# array for time
-	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
-	# year, month fix
-	$year += 1900;
-	$month += 1;
-	# string for return
-	return $year."-".
-		($month < 10 ? '0'.$month : $month)."-".
-		($day < 10 ? '0'.$day : $day)." ".
-		($hour < 10 ? '0'.$hour : $hour).":".
-		($min < 10 ? '0'.$min : $min).":".
-		($sec < 10 ? '0'.$sec : $sec).
-		(($ms && $show_micro) ? ".".$ms : "");
-}
-
-# create YYYYMMDD data
-sub create_date
-{
-	my ($timestamp, $split_string) = @_;
-	my $split = $split_string ? $split_string : '';
-	$timestamp = time() if (!$timestamp);
-	# array for time
-	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
-	# year, month fix
-	$year += 1900;
-	$month += 1;
-	# string for return
-	return $year.$split.
-		($month < 10 ? '0'.$month : $month).$split.
-		($day < 10 ? '0'.$day : $day);
-}
-
-# create YYYYMMDD_HHMMSS data
-sub create_datetime
-{
-	my ($timestamp, $split_string) = @_;
-	my $split = $split_string ? $split_string : '';
-	$timestamp = time() if (!$timestamp);
-	# array for time
-	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
-	# year, month fix
-	$year += 1900;
-	$month += 1;
-	# string for return
-	return $year.$split.
-		($month < 10 ? '0'.$month : $month).$split.
-		($day < 10 ? '0'.$day : $day).'_'.
-		($hour < 10 ? '0'.$hour : $hour).$split.
-		($min < 10 ? '0'.$min : $min).$split.
-		($sec < 10 ? '0'.$sec : $sec);
-}
-
-sub left_fill
-{
-	my($number, $size, $char) = @_;
-	return sprintf($char x ($size - length($number)).$number);
-}
-
-# wrapper to flip the crc32 hex string, so it is like buggy php one (php <= 5.2.6)
-sub crc32b_fix
-{
-	my ($crc) = @_;
-	# left pad with 0 to 8 chars
-	$crc = ('0' x (8 - length($crc))).$crc;
-	# flip two chars (byte hex)
-	$crc =~ s/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/$4$3$2$1/;
-	return $crc;
-}
-
-# short sha1 (9 char) function
-sub sha1_short
-{
-	my ($string) = @_;
-	return substr(sha1_hex($string), 0, 9);
-}
-
-# DEBUG helpers for dumping data
-# from: http://www.perlmonks.org/?node_id=390153
-# alternative use Dump::Dumper and print Dump(VAR);
-sub dump_data
-{
-	my ($level, $base, $data) = @_;
-	my $nextlevel = $level + 1;
-	if (ref($data) eq 'ARRAY') {
-		foreach my $k (0 .. $#{$data}) {
-			my $baseval = $base.'['.$k.']';
-			dump_it($nextlevel, $baseval, $data->[$k]);
-		}
-	} elsif (ref($data) eq 'HASH') {
-		foreach my $k (sort(keys(%{$data}))) {
-			my $baseval = $base.'{'.$k.'}';
-			dump_it($nextlevel, $baseval, $data->{$k});
-		}
-	} elsif (ref($data) eq 'SCALAR') {
-		my $baseval = $base;
-		dump_it($nextlevel, $baseval, ${$data});
-	}
-}
-
-sub dump_it
-{
-	my ($nextlevel, $baseval, $datum) = @_;
-	my $reftype = ref($datum);
-	if ($reftype eq 'HASH') {
-		dump_data($nextlevel, $baseval, \%{$datum});
-	} elsif ($reftype eq 'ARRAY') {
-		dump_data($nextlevel, $baseval, \@{$datum});
-	} else {
-		process_data($nextlevel, $baseval, $datum);
-	}
-}
-
-sub process_data
-{
-	my ($nextlevel, $baseval, $datum) = @_;
-	my $indentation = '  ' x $nextlevel;
-	print $indentation, $baseval, ' = ', $datum, "\n";
-}
-
-# METHOD: lock_run
-# PARAMS: file (plus path) to lock to
-#         the current running pid (if not given will be set in script)
-#         the current name of the script (auto set if not given)
-#         optional write encoding (set to utf8 if not given)
-# RETURN: nothing
-# DESC:   checks if this script is already running based on the lock file, if if yes will abort
-#         if file is there but pid not find it automatically cleans up the stale lock file
-sub lock_run
-{
-	my ($file, $run_pid, $name, $encoding) = @_;
-	# if no encoding, set utf8
-	$encoding = 'utf8' if (!$encoding);
-	# set the run pid if no pid is given
-	$run_pid = $$ if (!$run_pid);
-	# set the script base name
-	$name = File::Basename::fileparse($0) if (!$name);
-	# if lock file exists
-	if (-f $file) {
-		my $exists = 0;
-		my $pid = `cat $file`;
-		chomp($pid);
-		# printDebug("Lock file found for $pid", 1);
-		# check if process excists with this pid
-		# better todo A for ALL processes
-		# ps axu OR short ps a
-		open(PS, 'ps axu|') || die("$!");
-		while (<PS>) {
-			# search for pid and run file name
-			if ($_ =~ /\ $pid\ / && $_ =~ /$name/) {
-				$exists = 1;
-			}
-			last if ($exists);
-		}
-		close(PS);
-		if (!$exists) {
-			# printDebug("Lock file cleaned up for $pid", 1);
-			unlink($file);
-		} else {
-			die("Script is already running with PID $pid\n");
-		}
-	}
-	# write current PID into lock file
-	open(FP, '>:encoding('.$encoding.')', $file) || die ("Cannot open run lock file '$file' for writing\n");
-	print FP $run_pid;
-	close(FP);
-}
-
-# METHOD: printDebug
-# PARAMS: message, verbose level
-# RETURN: nothing
-# DESC:   depeding on the verbose and debug settings it will print out message and or write it to a debug file
-sub printDebug
-{
-	my($msg, $vrb, $dbg) = @_;
-	# print debug only if debug is on and debug file is available
-	print $::DEBUG '['.create_time(time(), 1).'] '.$msg."\n" if ($::debug && $::DEBUG);
-	# print to log if log is accessable and the verbose flag matches, or for debug flag if debug statement is set and not log only, or if log only, if not debug statement
-	print $::LOG $msg."\n" if (($::verbose >= $vrb || (!$::log_only && $dbg && $::debug) || ($::log_only && !$dbg)) && $::LOG);
-	# print to screen if verbose matches, but it is not a log only, or if it is debug statement and debug flag is set
-	print $msg."\n" if (($::verbose >= $vrb && !$::log_only) || ($dbg && $::debug));
-}
-
-# METHOD: waitAbort
-# PARAMS: time in seconds, if not provided set to 5
-# RETURN: nothing
-# DESC:   simple prints out a char while waiting for an abort command
-sub waitAbort
-{
-	my($sleep) = @_;
-	$sleep = 5 if ($sleep !~ /\d/);
-	print "Waiting $sleep seconds (Press CTRL + C to abort)\n";
-	for (my $i = 1; $i <= $sleep; $i ++) {
-		print ".";
-		sleep 1;
-	}
-	print "\n\n";
-}
-
-# METHOD: copyToTemporary
-# PARAMS: file to copy, and target file name
-# RETURN: the target file name
-# DESC  : sets the source to read only and makes a copy, the copy is also set to read only
-sub copyToTemporary
-{
-	my ($source, $target) = @_;
-	# get the current rights
-	my $current_chmod = (stat $source)[2];
-	# set source file ARGV to read only
-	# we skip that, the source might be NOT from the same user as the script read, just copy the file and set the target read only
-	chmod(0444, $source);
-	# create tmp backup file from which we read, data gets removed at the end of an run, or during an abort call
-	copy($source, $target) || die("Copy failed: $!\n");
-	# set read rights to r only for the copied file
-	chmod(0444, $target);
-	# set old access rights for ARGV file
-	chmod($current_chmod, $source);
-	# return target file name
-	return $target;
-}
-
-# METHOD: uniq
-# PARAMS: @array
-# RETURN: array with only unique entries
-# DESC  : used in uniq(@array) to get only unique data back
-sub uniq
-{
-	my %seen;
-	grep !$seen{$_}++, @_;
-}
-
-# METHOD: clean_test
-# PARAMS: array of data
-# RETURN: cleaned up array of data
-# DESC  : sets all undefs to '' for debug output
-sub clean_test
-{
-	my (@data) = @_;
-	# map check for defined, if not, return ''
-	return map { defined($_) ? $_ : '' } @data;
-}
-
-# METHOD: clean_test_string
-# PARAMS: string to be checked
-# RETURN: data or empty for output
-# DESC  : sets all input data to '' if it is undefined
-sub clean_test_string
-{
-	my ($data) = @_;
-	return defined($data) ? $data : '';
-}
-
-1;

phpstan-bootstrap.php

@@ -1,12 +0,0 @@
-<?php // phpcs:ignore PSR1.Files.SideEffects
-
-// Boostrap file for PHPstand
-// sets the _SERVER['HTTP_HOST'] var so we can have DB detection
-$_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
-// so www/includes/edit_base.php works
-require_once('www/lib/Smarty/SmartyBC.class.php');
-// for whatever reason it does not load that from the confing.master.php
-// for includes/admin_header.php
-define('BASE_NAME', '');
-
-// __END__

phpstan.neon

@@ -1,59 +0,0 @@
-# PHP Stan Config
-
-parameters:
-	tmpDir: /tmp/phpstan-corelibs
-	level: 8 # max is now 9
-	paths:
-		- %currentWorkingDirectory%/www
-	bootstrapFiles:
-		- %currentWorkingDirectory%/phpstan-bootstrap.php
-		# - %currentWorkingDirectory%/www/lib/autoloader.php
-		- %currentWorkingDirectory%/www/vendor/autoload.php
-	scanDirectories:
-		- www/lib/Smarty
-	scanFiles:
-		- www/configs/config.php
-		- www/configs/config.master.php
-		# if composer.json autoloader defined, this is not needed
-		# - www/lib/autoloader.php
-		- www/vendor/autoload.php
-		- www/lib/Smarty/Autoloader.php
-	excludePaths:
-		# do not check old qq file uploader tests
-		- www/admin/qq_file_upload_*.php
-		# ignore all test files
-		- www/admin/class_test*php
-		- www/admin/error_test.php
-		# admin synlink files
-		- www/admin/edit_*.php
-		# ignore admin header stuff
-		# - www/includes/admin_header.php # ignore the admin include stuff
-		- www/includes/admin_footer.php # ignore the admin include stuff
-		# deprecated files
-		- www/includes/admin_set_paths.php # ignore the admin include stuff
-		- www/includes/admin_smarty.php # ignore the admin include stuff
-		# folders with data no check needed
-		- www/templates_c
-		- www/cache
-		- www/log
-		- www/media
-		- www/tmp
-		# external libs are not checked
-		- www/lib/Smarty/
-		- www/lib/smarty-*/
-		# ignore composer
-		- www/vendor
-	# ignore errores with
-	ignoreErrors:
-		# this is ignored for now
-		# - '#Expression in empty\(\) is always falsy.#'
-		# -
-		# 	message: '#Reflection error: [a-zA-Z0-9\\_]+ not found.#'
-		# 	path: www/includes/edit_base.php
-		#- 'error regex'
-		#-
-		#	message: 'error regex'
-		#	path: %currentWorkingDirectory%/www/some/*
-		#	paths:
-		#		- ...
-		#		- ...

phpunit.xml

@@ -1,6 +0,0 @@
-<phpunit
-	cacheResultFile="/tmp/phpunit-corelibs.result.cache"
-	colors="true"
-	verbose="true"
->
-</phpunit>

static_checkers.txt

@@ -1,9 +0,0 @@
-# main static checker
-phan --progress-bar -C -o 4dev/tmp/analysis.txt
-# sub static checker
-phpstan analyse -c phpstan.neon --memory-limit=4G -l 0 www
-# only if we work with composer only
-www/: psalm (this needs the composer autoloader defined)
-
-# for linting
-parallel-lint www/

www/Smarty

@@ -0,0 +1 @@
+smarty-3.1.30

www/admin/.htaccess

@@ -1,4 +1,3 @@
-# all .inc files are denied access from outside
-<Files "*.inc">
-	Require all denied
-</Files>
+php_value xdebug.profiler_output_dir /home/developer/html/adidas/20081208_catalogue/4dev/xdebug/
+php_value xdebug.profiler_output_name timestamp 
+php_value xdebug.profiler_enable 0

www/admin/Smarty

@@ -0,0 +1 @@
+../Smarty

www/admin/cache

@@ -0,0 +1 @@
+../cache/

www/admin/class_test.admin.backend.php

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

www/admin/class_test.array.php

@@ -1,203 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-array';
-ob_end_flush();
-
-use CoreLibs\Combined\ArrayHandler;
-use CoreLibs\Debug\Support as DgS;
-
-$basic = new CoreLibs\Basic();
-// $_array = new CoreLibs\Combined\ArrayHandler();
-// $array_class = 'CoreLibs\Combination\ArrayHandler';
-
-print "<html><head><title>TEST CLASS: ARRAY HANDLER</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-// recursive array search
-$test_array = [
-	'foo' => 'bar',
-	'input' => [
-		'element_a' => [
-			'type' => 'text'
-		],
-		'element_b' => [
-			'type' => 'email'
-		],
-		'element_c' => [
-			'type' => 'email'
-		],
-	],
-];
-
-echo "SOURCE ARRAY: " . DgS::printAr($test_array) . "<br>";
-// frist return
-echo "ARRAYSEARCHRECURSIVE(email, [array], type): "
-	. DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array, 'type')) . "<br>";
-echo "ARRAYSEARCHRECURSIVE(email, [array]['input'], type): "
-	. DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array['input'], 'type')) . "<br>";
-// all return
-echo "ARRAYSEARCHRECURSIVEALL(email, [array], type): "
-	. Dgs::printAr((array)ArrayHandler::arraySearchRecursiveAll('email', $test_array, 'type')) . "<br>";
-
-// simple search
-echo "ARRAYSEARCHSIMPLE([array], type, email): "
-	. (string)ArrayHandler::arraySearchSimple($test_array, 'type', 'email') . "<br>";
-
-$array_1 = [
-	'foo' => 'bar'
-];
-$array_2 = [
-	1, 2, 3
-];
-$array_3 = [
-	'alpha' => [
-		'beta' => 4
-	]
-];
-// recusrice merge
-print "ARRAYMERGERECURSIVE: " . DgS::printAr(ArrayHandler::arrayMergeRecursive($array_1, $array_2, $array_3)) . "<br>";
-// array difference
-$array_left = [
-	'same' => 'data',
-	'left' => 'Has L'
-];
-$array_right = [
-	'same' => 'data',
-	'right' => 'has R'
-];
-print "ARRAYDIFF: " . DgS::printAr(ArrayHandler::arrayDiff($array_left, $array_right)) . "<br>";
-// in array check
-print "INARRAYANY([1,3], [array]): " . DgS::printAr(ArrayHandler::inArrayAny([1, 3], $array_2)) . "<br>";
-// flatten array
-print "FLATTENARRAY: " . DgS::printAr(ArrayHandler::flattenArray($test_array)) . "<br>";
-print "FLATTENARRAYKEY: " . DgS::printAr(ArrayHandler::flattenArrayKey($test_array)) . "<br>";
-// flatten for key set
-print "ARRAYFLATFORKEY: " . DgS::printAr(ArrayHandler::arrayFlatForKey($test_array, 'type')) . "<br>";
-
-// DEPRECATED
-// print "ARRAYMERGERECURSIVE: ".DgS::printAr($basic->arrayMergeRecursive($array_1, $array_2, $array_3))."<br>";
-
-/**
- * attach key/value to an array so it becomes nested
- *
- * @param string $pre  Attach to new (empty for new root node)
- * @param string $cur  New node
- * @param array  $node Previous created array
- * @return array       Updated array
- */
-function rec(string $pre, string $cur, array $node = [])
-{
-	if (!is_array($node)) {
-		$node = [];
-	}
-	print "<div style='color: green;'>#### PRE: " . $pre . ", CUR: " . $cur . ", N-c: "
-		. count($node) . " [" . join('|', array_keys($node)) . "]</div>";
-	if (!$pre) {
-		print "** <span style='color: red;'>NEW</span><br>";
-		$node[$cur] = [];
-	} else {
-		if (array_key_exists($pre, $node)) {
-			print "+ <span style='color: orange;'>KEY FOUND:</span> " . $pre . ", add: " . $cur . "<br>";
-			$node[$pre][$cur] = [];
-		} else {
-			print "- NOT FOUND: loop<br>";
-			foreach ($node as $_pre => $_cur) {
-				print "> TRY: " . $_pre . " => " . count($_cur) . " [" . join('|', array_keys($_cur)) . "]<br>";
-				if (count($_cur) > 0) {
-					$node[$_pre] = rec($pre, $cur, $_cur);
-				}
-			}
-		}
-	}
-	return $node;
-}
-
-/**
- * flatten array down to own level
- *
- * @param array $array
- * @param array $return
- * @return array
- */
-function flattenArrayKey(array $array, array $return = [])
-{
-	foreach ($array as $key => $sub) {
-		$return[] = $key;
-		if (count($sub) > 0) {
-			$return = flattenArrayKey($sub, $return);
-		}
-	}
-	return $return;
-}
-
-// $test = [
-// 	'A' => [
-// 		'B' => [],
-// 		'C' => [
-// 			'D' => [],
-// 			'E' => [
-// 				'F' => []
-// 			]
-// 		]
-// 	],
-// 	'1' => [],
-// 	'2' => [],
-// 	'3' => [
-// 		'G' => []
-// 	]
-// ];
-
-// build a tested array for flatten
-$test = [];
-// core
-$test = rec('', 'A', $test);
-$test = rec('', '1', $test);
-$test = rec('', '2', $test);
-$test = rec('', '3', $test);
-$test = rec('3', 'G', $test);
-$test = rec('A', 'B', $test);
-$test = rec('A', 'C', $test);
-$test = rec('C', 'D', $test);
-$test = rec('C', 'E', $test);
-$test = rec('E', 'F', $test);
-// new
-$test = rec('C', 'U', $test);
-$test = rec('F', 'U', $test);
-$test = rec('', 'Al', $test);
-$test = rec('B', 'B1', $test);
-print "ORIGINAL: " . \CoreLibs\Debug\Support::printAr($test) . "<br>";
-print "FLATTEN: " . \CoreLibs\Debug\Support::printAr(flattenArrayKey($test)) . "<br>";
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.autoloader.php

@@ -1,45 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = true;
-$PRINT_ALL = true;
-$DB_DEBUG = true;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-autoloader';
-ob_end_flush();
-
-# Test if composer autoloader works here
-
-use CoreLibs\Convert\Byte;
-
-print "<html><head><title>TEST CLASS: AUTOLOADER</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$bytes = 10242424;
-$_bytes = Byte::humanReadableByteFormat($bytes);
-print "BYTES: " . $_bytes  . "<br>";
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.byte.php

@@ -1,98 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-byte';
-ob_end_flush();
-
-use CoreLibs\Convert\Byte;
-
-$basic = new CoreLibs\Basic();
-$byte_class = 'CoreLibs\Convert\Byte';
-
-print "<html><head><title>TEST CLASS: BYTE CONVERT</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-// class
-$byte = 254779258;
-$string = '242.98 MB';
-// static
-print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "<br>";
-print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "<br>";
-
-// *** BYTES TEST ***
-$bytes = array(
-	-123123123,
-	999999, // KB-1
-	999999999, // MB-1
-	254779258, // MB-n
-	999999999999999, // TB-1
-	588795544887632, // TB-n
-	999999999999999999, // PB-1
-	9223372036854775807, // MAX INT
-	999999999999999999999, // EB-1
-);
-print "<b>BYTE FORMAT TESTS</b><br>";
-foreach ($bytes as $byte) {
-	print '<div style="display: flex; border-bottom: 1px dashed gray;">';
-	//
-	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
-	print "(" . number_format($byte) . "/" . $byte . ") bytes :";
-	$_bytes = Byte::humanReadableByteFormat($byte);
-	print '</div><div style="width: 10%;">' . $_bytes;
-	print '</div><div style="width: 10%;">';
-	print Byte::stringByteFormat($_bytes);
-	print "</div>";
-	//
-	print "</div>";
-	//
-	print '<div style="display: flex; border-bottom: 1px dotted red;">';
-	//
-	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
-	print "bytes [si]:";
-	$_bytes = Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI);
-	print '</div><div style="width: 10%;">' . $_bytes;
-	print '</div><div style="width: 10%;">';
-	print Byte::stringByteFormat($_bytes);
-	print "</div>";
-	//
-	print "</div>";
-}
-
-// DEPRECATED
-/* $byte = 254779258;
-$string = '242.98 MB';
-print "BYTE TO: $byte: ".$basic->humanReadableByteFormat($byte)."<br>";
-print "BYTE FROM: $string: ".$basic->stringByteFormat($string)."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.colors.php

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

www/admin/class_test.datetime.php

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

www/admin/class_test.db.php

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

www/admin/class_test.debug.php

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

www/admin/class_test.email.php

@@ -1,85 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-email';
-ob_end_flush();
-
-use CoreLibs\Check\Email;
-use CoreLibs\Debug\Support as DgS;
-
-$basic = new CoreLibs\Basic();
-
-print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-// regex get
-print "S::GETEMAILREGEX(0): " . Email::getEmailRegex(0) . "<br>";
-print "S::GETEMAILREGEX(2): " . Email::getEmailRegex(2) . "<br>";
-print "S::GETEMAILREGEX(7): " . Email::getEmailRegex(7) . "<br>";
-print "S::GETEMAILREGEX(8 invalid): " . Email::getEmailRegex(8) . "<br>";
-print "S::GETEMAILREGEXCHECK: " . DgS::printAr(Email::getEmailRegexCheck()) . "<br>";
-print "S::GETEMAILREGEXERRORMESSAGE " . Dgs::printAr(Email::getEmailRegexErrorMessage(1)) . "<br>";
-
-$email = [
-	'foo@bar.org',
-	'foo@i.softbank.ne.jp'
-];
-foreach ($email as $s_email) {
-	print "S::EMAIL: $s_email: " . Email::getEmailType($s_email) . "<br>";
-	print "S::EMAIL SHORT: $s_email: " . Email::getEmailType($s_email, true) . "<br>";
-}
-$email = [
-	'test@test.com',
-	'',
-	'-@-',
-	'.test@test.com',
-	'test@t_est.com',
-	'test@@test.com',
-	'test@test..com',
-	'test@@test..com',
-	'test@test.',
-	'test@test.j',
-];
-foreach ($email as $s_email) {
-	print "S::CHECKEMAIL: " . $s_email . ": " . (Email::checkEmail($s_email) ? 'Yes' : 'No') . "<br>";
-	print "S::CHECKEMAILFULL: " . $s_email . ": " . Dgs::printAr(Email::checkEmailFull($s_email)) . "<br>";
-	print "S::CHECKEMAILFULL(true): " . $s_email . ": " . Dgs::printAr(Email::checkEmailFull($s_email, true)) . "<br>";
-}
-// DEPRECATED
-/* foreach ($email as $s_email) {
-	print "D/S-EMAIL: $s_email: ".$basic->getEmailType($s_email)."<br>";
-	print "D/S-EMAIL SHORT: $s_email: ".$basic->getEmailType($s_email, true)."<br>";
-} */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.encoding.php

@@ -1,100 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-encoding';
-ob_end_flush();
-
-use CoreLibs\Language\Encoding;
-
-$basic = new CoreLibs\Basic();
-$_encoding = new CoreLibs\Language\Encoding();
-$encoding_class = 'CoreLibs\Language\Encoding';
-
-print "<html><head><title>TEST CLASS: ENCODING</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-// print "Valid encoding: ".$basic->printAr(mb_list_encodings())."<br>";
-
-$mime_encodes = [
-	['Simple string UTF8', 'UTF-8'],
-	['Simple string ISO-2022-JP-MS', 'ISO-2022-JP-MS'],
-	['日本語ながい', 'UTF-8'],
-	['日本語ながい', 'ISO-2022-JP-MS'],
-	['日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい', 'ISO-2022-JP-MS'],
-];
-foreach ($mime_encodes as $mime_encode) {
-	print "__MBMIMEENCODE: $mime_encode[0]: " . Encoding::__mbMimeEncode($mime_encode[0], $mime_encode[1]) . "<br>";
-}
-
-$enc_strings = [
-	'Normal Text',
-	'日本語',
-	// unworkable
-	''
-];
-// class
-$_encoding->setErrorChar('∴');
-foreach ($enc_strings as $_string) {
-	$string = $_encoding->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-	print "ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "<br>";
-	print "CONV ENCODING: $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP') . "<br>";
-	print "CONV ENCODING (s): $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "<br>";
-	print "CONV ENCODING (s,a-false): $_string: "
-		. $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "<br>";
-}
-print "ERROR CHAR: " . $_encoding->getErrorChar() . "<br>";
-// static
-$encoding_class::setErrorChar('∴');
-foreach ($enc_strings as $_string) {
-	$string = $encoding_class::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-	print "S::ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "<br>";
-	print "S::CONV ENCODING: $_string: " . $encoding_class::convertEncoding($_string, 'ISO-2022-JP') . "<br>";
-	print "S::CONV ENCODING (s): $_string: "
-		. $encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "<br>";
-	print "S::CONV ENCODING (s,a-false): $_string: "
-		. $encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "<br>";
-}
-print "S::ERROR CHAR: " . $encoding_class::getErrorChar() . "<br>";
-// static use
-$_string = $enc_strings[1];
-$string = Encoding::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-print "S::ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "<br>";
-
-// DEPRECATED
-/* $string = $basic->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-print "ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."<br>";
-print "CONV ENCODING: $_string: ".$basic->convertEncoding($_string, 'ISO-2022-JP')."<br>";
-print "D/__MBMIMEENCODE: ".$basic->__mbMimeEncode('Some Text', 'UTF-8')."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.file.php

@@ -1,50 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-datetime';
-ob_end_flush();
-
-use CoreLibs\Check\File;
-
-$basic = new CoreLibs\Basic();
-
-print "<html><head><title>TEST CLASS: FILE</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$file = '/some/path/to/some/file.txt';
-print "GETFILENAMEENDING: $file: " . File::getFilenameEnding($file) . "<br>";
-$file = getcwd() . DIRECTORY_SEPARATOR . 'class_test.file.php';
-print "GETLINESFROMFILE: $file: " . File::getLinesFromFile($file) . "<br>";
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.hash.php

@@ -1,65 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-hash';
-ob_end_flush();
-
-use CoreLibs\Create\Hash;
-
-$basic = new CoreLibs\Basic();
-$hash_class = 'CoreLibs\Create\Hash';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: HASH</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$to_crc = 'Some text block';
-// static
-print "S::__CRC32B: $to_crc: " . $hash_class::__crc32b($to_crc) . "<br>";
-print "S::__SHA1SHORT(off): $to_crc: " . $hash_class::__sha1short($to_crc) . "<br>";
-print "S::__SHA1SHORT(on): $to_crc: " . $hash_class::__sha1short($to_crc, true) . "<br>";
-print "S::__hash(d): $to_crc: " . $hash_class::__hash($to_crc) . "<br>";
-foreach (['adler32', 'fnv132', 'fnv1a32', 'joaat'] as $__hash_c) {
-	print "S::__hash($__hash_c): $to_crc: " . $hash_class::__hash($to_crc, $__hash_c) . "<br>";
-}
-// static use
-print "U-S::__CRC32B: $to_crc: " . Hash::__crc32b($to_crc) . "<br>";
-
-// DEPRECATED
-/* print "D/__CRC32B: $to_crc: ".$basic->__crc32b($to_crc)."<br>";
-print "D/__SHA1SHORT(off): $to_crc: ".$basic->__sha1short($to_crc)."<br>";
-print "D/__hash(d): $to_crc: ".$basic->__hash($to_crc)."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.html.php

@@ -1,116 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-html';
-ob_end_flush();
-
-use CoreLibs\Convert\Html;
-use CoreLibs\Output\Form\Elements;
-
-$basic = new CoreLibs\Basic();
-$_html = new CoreLibs\Convert\Html();
-$_elements = new CoreLibs\Output\Form\Elements();
-$html_class = 'CoreLibs\Convert\Html';
-$elements_class = 'CoreLibs\Output\Form\Elements';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$string = "Something < = > Other <br> Next line";
-print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . "<br>";
-print "REMOVELB: " . Html::htmlent($string) . ": " . $_html->removeLB($string) . "<br>";
-$date_str = [2021, 5, 1, 11, 10];
-print "PRINTDATETIME: "
-	. $_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "<br>";
-// STATIC
-$string = "Something < = > Other <br> Next line";
-print "S::HTMLENT: " . Html::htmlent($string) . ": " . $html_class::htmlent($string) . "<br>";
-print "S::REMOVELB: " . Html::htmlent($string) . ": " . $html_class::removeLB($string) . "<br>";
-$date_str = [2021, 5, 1, 11, 10];
-print "S::PRINTDATETIME: "
-	. $elements_class::printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "<br>";
-
-// STATIC use
-echo "U-S::HTML ENT INT: " . Html::htmlent(5) . "<br>";
-echo "U-S::HTML ENT STRING: " . Html::htmlent('5<<>') . "<br>";
-echo "U-S::HTML ENT NULL: " . Html::htmlent(null) . "<br>";
-
-// check convert
-$checked_list = [
-	['foo', 'foo'],
-	['foo', 'bar'],
-	['foo', ['foo', 'bar']],
-	['foo', ['bar']],
-];
-foreach ($checked_list as $check) {
-	print "CHECKED(0): $check[0]: " . Html::checked($check[1], $check[0]) . "<br>";
-	print "CHECKED(1): $check[0]: " . Html::checked($check[1], $check[0], 1) . "<br>";
-}
-
-// magic link creation test
-$magic_links = [
-	'mailto:user@bubu.at',
-	'user@bubu.at',
-	'user@bubu.at|Send me email|',
-	'http://www.somelink.com/?with=1234',
-	'http://www.somelink.com/?with=1234|Some Title|',
-	'http://www.somelink.com/?with=1234 <br>Some Title',
-];
-foreach ($magic_links as $magic_link) {
-	print "MAGICLINK: " . Html::htmlent($magic_link) . ": " . Html::htmlent(Elements::magicLinks($magic_link)) . "<br>";
-}
-
-// DEPREACTED
-/* $string = "Deprecated Something < = > Other <br> Deprecated Next line";
-print "D/HTMLENT: $string: ".$basic->htmlent($string)."<br>";
-print "D/REMOVELB: $string: ".$basic->removeLB($string)."<br>";
-$date_str = [2021, 5, 1, 11, 10];
-print "D/PRINTDATETIME: "
-	. $basic->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."<br>";
-$magic_link = 'http://www.somelink.com/?with=1234|Some Title|';
-print "D/MAGICLINK: ".Html::htmlent($basic->magicLinks($magic_link))."<Br>";
-*/
-
-$text = 'I am some text
-with some
-line breaks
-in there. Theis 
-is sucky';
-
-print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text) . "<br>";
-print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text, '##BR##') . "<br>";
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.image.php

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

www/admin/class_test.json.php

@@ -1,76 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-json';
-ob_end_flush();
-
-use CoreLibs\Check\Jason;
-use CoreLibs\Debug\Support as DgS;
-
-$basic = new CoreLibs\Basic();
-$json_class = 'CoreLibs\Check\Jason';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: JSON</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$json = '{"foo": "bar"}';
-$output = Jason::jsonConvertToArray($json);
-print "S::JSON: $json: " . DgS::printAr($output) . "<br>";
-print "S::JSON ERROR: " . Jason::jsonGetLastError() . ": " . Jason::jsonGetLastError(true) . "<br>";
-
-$json = '["f: {b"""ar}]';
-$output = Jason::jsonConvertToArray($json);
-print "S::E-JSON: $json: " . DgS::printAr($output) . "<br>";
-print "S::E-JSON ERROR: " . Jason::jsonGetLastError() . ": " . Jason::jsonGetLastError(true) . "<br>";
-
-// direct
-$json = '{"direct": "static function call"}';
-$output = $json_class::jsonConvertToArray($json);
-print "J/S::JSON: $json: " . DgS::printAr($output) . "<br>";
-print "J/S::JSON ERROR: " . $json_class::jsonGetLastError() . ": " . $json_class::jsonGetLastError(true) . "<br>";
-
-$json = '["f: {b"""ar}]';
-$output = $json_class::jsonConvertToArray($json);
-print "J/S::E-JSON: $json: " . DgS::printAr($output) . "<br>";
-print "J/S::E-JSON ERROR: " . $json_class::jsonGetLastError() . ": " . $json_class::jsonGetLastError(true) . "<br>";
-
-// DEPRECATE TEST
-/* $json = '["f: {b"""ar}]';
-$output = $basic->jsonConvertToArray($json);
-print "E-JSON: $json: ".DgS::printAr($output)."<br>";
-print "E-JSON ERROR: ".$basic->jsonGetLastError().": ".$basic->jsonGetLastError(true)."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.lang.php

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

www/admin/class_test.math.php

@@ -1,64 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-math';
-ob_end_flush();
-
-$basic = new CoreLibs\Basic();
-$_math = new CoreLibs\Convert\Math();
-$math_class = 'CoreLibs\Convert\Math';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: MATH</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-print "FCEIL: " . $_math->fceil(5.1234567890, 5) . "<br>";
-print "FLOORP: " . $_math->floorp(5123456, -3) . "<br>";
-print "FLOORP: " . $_math->floorp(5123456, -10) . "<br>";
-print "INITNUMERIC: " . $_math->initNumeric('123') . "<br>";
-
-print "S-FCEIL: " . $math_class::fceil(5.1234567890, 5) . "<br>";
-print "S-FLOORP: " . $math_class::floorp(5123456, -3) . "<br>";
-print "S-INITNUMERIC: " . $math_class::initNumeric(123) . "<br>";
-print "S-INITNUMERIC: " . $math_class::initNumeric(123.456) . "<br>";
-print "S-INITNUMERIC: " . $math_class::initNumeric('123') . "<br>";
-print "S-INITNUMERIC: " . $math_class::initNumeric('123.456') . "<br>";
-
-// DEPRECATED
-/* print "FCEIL: ".$basic->fceil(5.1234567890, 5)."<br>";
-print "FLOORP: ".$basic->floorp(5123456, -3)."<br>";
-print "INITNUMERIC: ".$basic->initNumeric('123')."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.mime.php

@@ -1,68 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
- declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-mime';
-ob_end_flush();
-
-$basic = new CoreLibs\Basic();
-$_mime = new CoreLibs\Convert\MimeAppName();
-
-print "<html><head><title>TEST CLASS: MIME</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$mime = 'application/illustrator';
-print "MIME $mime: " . $_mime->mimeGetAppName($mime) . "<br>";
-$mime = 'fake/mime';
-$_mime->mimeSetAppName($mime, 'This is a fake mime');
-print "MIME $mime: " . $_mime->mimeGetAppName($mime) . "<br>";
-
-// mime test
-$mime = 'application/vnd.ms-excel';
-print "App for mime $mime: " . $_mime->mimeGetAppName($mime) . "<br>";
-$_mime->mimeSetAppName($mime, 'Microsoft (better) Excel');
-print "App for mime changed $mime: " . $_mime->mimeGetAppName($mime) . "<br>";
-
-// static call test
-$mime = 'application/x-indesign';
-print "S::App for mime $mime: " . \CoreLibs\Convert\MimeAppName::mimeGetAppName($mime) . "<br>";
-$mime = 'application/vnd.ms-excel';
-print "S::App for mime $mime: " . \CoreLibs\Convert\MimeAppName::mimeGetAppName($mime) . "<br>";
-
-// DEPRECATED
-/* $mime = 'application/illustrator';
-print "MIME $mime: ".$basic->mimeGetAppName($mime)."<br>";
-$mime = 'fake/mime';
-$basic->mimeSetAppName($mime, 'This is a fake mime');
-print "MIME $mime: ".$basic->mimeGetAppName($mime)."<br>"; */
-
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.output.form.php

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

www/admin/class_test.password.php

@@ -1,70 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-pass';
-ob_end_flush();
-
-use CoreLibs\Check\Password as PwdChk;
-
-$basic = new CoreLibs\Basic();
-$_password = new CoreLibs\Check\Password();
-$password_class = 'CoreLibs\Check\Password';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: PASSWORD</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$password = 'something1234';
-$enc_password = $_password->passwordSet($password);
-print "PASSWORD: $password: " . $enc_password . "<br>";
-print "PASSWORD VERIFY: " . (string)$_password->passwordVerify($password, $enc_password) . "<br>";
-print "PASSWORD REHASH: " . (string)$_password->passwordRehashCheck($enc_password) . "<br>";
-// static verify
-$password = 'othername7890';
-$enc_password = $password_class::passwordSet($password);
-print "PASSWORD: $password: " . $enc_password . "<br>";
-print "S-PASSWORD VERIFY: " . (string)$password_class::passwordVerify($password, $enc_password) . "<br>";
-print "PASSWORD REHASH: " . (string)$password_class::passwordRehashCheck($enc_password) . "<br>";
-// direct static
-print "S::PASSWORD VERFIY: " . (string)PwdChk::passwordVerify($password, $enc_password) . "<br>";
-
-// DEPRECATED
-/* $password = 'deprecated4567';
-$enc_password = $basic->passwordSet($password);
-print "PASSWORD: $password: ".$enc_password."<br>";
-print "PASSWORD VERIFY: ".(string)$basic->passwordVerify($password, $enc_password)."<br>";
-print "PASSWORD REHASH: ".(string)$basic->passwordRehashCheck($enc_password)."<br>"; */
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.php

@@ -1,147 +1,195 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = true;
-$PRINT_ALL = true;
-$DB_DEBUG = true;
+<?
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
 
 if ($DEBUG_ALL) {
 	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 }
 
-ob_start();
-
-// basic class test file
 define('USE_DATABASE', true);
 // sample config
-require 'config.php';
+require("config.inc");
 // set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+//	session_name(EDIT_SESSION_NAME);
+//	session_start();
+// basic class test file
+foreach (array ('Login', 'Admin.Backend') as $class) {
+	_spl_autoload('Class.'.$class.'.inc');
 }
-// define log file id
-$LOG_FILE_ID = 'classTest';
 
-// init login & backend class
-$login = new CoreLibs\ACL\Login(DB_CONFIG);
-$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
-$basic->dbInfo(true);
-ob_end_flush();
+$lang = 'en_utf8';
+
+DEFINE('LOG_FILE_ID', 'classTest');
+$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+// init with standard
+//	$basic = new db_io($DB_CONFIG[MAIN_DB]);
+$basic = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
+$basic->db_info(1);
+
+// set + check edit access id
+$edit_access_id = 3;
+print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
+print "ACCESS CHECK: ".$login->login_check_edit_access($edit_access_id)."<br>";
+if ($login->login_check_edit_access($edit_access_id)) {
+	$basic->edit_access_id = $edit_access_id;
+} else {
+	$basic->edit_access_id = $login->acl['unit_id'];
+}
+
+//	$basic->debug('SESSION', $basic->print_ar($_SESSION));
 
 print "<html><head><title>TEST CLASS</title><head>";
 print "<body>";
-
-print '<div><a href="class_test.db.php">Class Test: DB</a></div>';
-print '<div><a href="class_test.colors.php">Class Test: Colors</a></div>';
-print '<div><a href="class_test.mime.php">Class Test: MIME</a></div>';
-print '<div><a href="class_test.json.php">Class Test: Json</a></div>';
-print '<div><a href="class_test.token.php">Class Test: Form Token</a></div>';
-print '<div><a href="class_test.password.php">Class Test: Password</a></div>';
-print '<div><a href="class_test.math.php">Class Test: Math</a></div>';
-print '<div><a href="class_test.html.php">Class Test: HTML/ELEMENTS</a></div>';
-print '<div><a href="class_test.email.php">Class Test: EMAIL</a></div>';
-print '<div><a href="class_test.uids.php">Class Test: UIDS</a></div>';
-print '<div><a href="class_test.phpv.php">Class Test: PHP VERSION</a></div>';
-print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
-print '<div><a href="class_test.encoding.php">Class Test: ENCODING</a></div>';
-print '<div><a href="class_test.image.php">Class Test: IMAGE</a></div>';
-print '<div><a href="class_test.byte.php">Class Test: BYTE CONVERT</a></div>';
-print '<div><a href="class_test.datetime.php">Class Test: DATE/TIME</a></div>';
-print '<div><a href="class_test.array.php">Class Test: ARRAY HANDLER</a></div>';
-print '<div><a href="class_test.file.php">Class Test: FILE</a></div>';
-print '<div><a href="class_test.randomkey.php">Class Test: RANDOM KEY</a></div>';
-print '<div><a href="class_test.system.php">Class Test: SYSTEM</a></div>';
-print '<div><a href="class_test.runningtime.php">Class Test: RUNNING TIME</a></div>';
-print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
-print '<div><a href="class_test.form.php">Class Test: FORM</a></div>';
-print '<div><a href="class_test.backend.php">Class Test: BACKEND ADMIN CLASS</a></div>';
-print '<div><a href="class_test.lang.php">Class Test: LANG/L10n</a></div>';
-print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';
-print '<div><a href="class_test.autoloader.php">Class Test: AUTOLOADER</a></div>';
-
-print "<hr>";
-// print all _ENV vars set
-print "<div>READ _ENV ARRAY:</div>";
-print "<pre>" . print_r(array_map('htmlentities', $_ENV), true) . "</pre>";
-// set + check edit access id
-$edit_access_id = 3;
-if (is_object($login) && isset($login->acl['unit'])) {
-	print "ACL UNIT: " . print_r(array_keys($login->acl['unit']), true) . "<br>";
-	print "ACCESS CHECK: " . (string)$login->loginCheckEditAccess($edit_access_id) . "<br>";
-	if ($login->loginCheckEditAccess($edit_access_id)) {
-		$basic->edit_access_id = $edit_access_id;
-	} else {
-		$basic->edit_access_id = $login->acl['unit_id'];
-	}
-} else {
-	print "Something went wrong with the login<br>";
-}
-
-//	$basic->log->debug('SESSION', \CoreLibs\Debug\Support::printAr($_SESSION));
-
 print '<form method="post" name="loginlogout">';
-print '<a href="javascript:document.loginlogout.login_logout.value=\'Logou\';'
-	. 'document.loginlogout.submit();">Logout</a>';
+print '<a href="javascript:document.loginlogout.login_logout.value=\'Logou\';document.loginlogout.submit();">Logout</a>';
 print '<input type="hidden" name="login_logout" value="">';
 print '</form>';
 
 // print the debug core vars
-foreach (['on', 'off'] as $flag) {
-	foreach (['debug', 'echo', 'print'] as $type) {
-		$prefix = $flag == 'off' ? 'NOT ' : '';
-		print $prefix . strtoupper($type) . ' OUT: '
-			. \CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)) . '<br>';
+print "DEBUG OUT: ".$basic->debug_output."<br>";
+print "ECHO OUT: ".$basic->echo_output."<br>";
+print "PRINT OUT: ".$basic->print_output."<br>";
+print "NOT DEBUG OUT: ".$basic->debug_output_not."<br>";
+print "NOT ECHO OUT: ".$basic->echo_output_not."<br>";
+print "NOT PRINT OUT: ".$basic->print_output_not."<br>";
+print "DEBUG OUT ALL: ".$basic->debug_output_all."<br>";
+print "ECHO OUT ALL: ".$basic->echo_output_all."<br>";
+print "PRINT OUT ALL: ".$basic->print_output_all."<br>";
+
+print "CALLER BACKTRACE: ".$basic->get_caller_method()."<br>";
+$basic->debug('SOME MARK', 'Some error output');
+
+print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
+//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
+$basic->debug('ACL', "ACL: ".$basic->print_ar($login->acl));
+//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
+//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
+//	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
+//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
+// DEPRICATED CALL
+//	$basic->adbSetACL($login->acl);
+
+while ($res = $basic->db_return("SELECT * FROM max_test")) {
+	print "TIME: ".$res['time']."<br>";
+}
+
+$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+$basic->db_prepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $basic->db_execute("ins_foo", array('BAR TEST '.time()));
+print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+// returning test with multiple entries
+//	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
+$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, 1)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+// no returning, but not needed ;
+$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+
+# db write class test
+$table = 'foo';
+print "TABLE META DATA: ".$basic->print_ar($basic->db_show_table_meta_data($table))."<br>";
+$primary_key = ''; # unset
+$db_write_table = array ('test', 'string_a', 'number_a', 'some_bool');
+//	$db_write_table = array ('test');
+$object_fields_not_touch = array ();
+$object_fields_not_update = array ();
+$data = array ('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
+$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array ('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
+$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array ('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
+$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+$data = array ('test' => 'BOOL TEST UNSET '.time());
+$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+print "Wrote to DB tabel $table and got primary key $primary_key<br>";
+
+# async test queries
+/*	$basic->db_exec_async("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
+echo "WAITING FOR ASYNC: ";
+$chars = array('|', '/', '-', '\\');
+while (($ret = $basic->db_check_async()) === true)
+{
+	if ((list($_, $char) = each($chars)) === FALSE)
+	{
+		reset($chars);
+		list($_, $char) = each($chars);
 	}
+	print $char;
+	sleep(1);
+	flush();
 }
-foreach (['debug', 'echo', 'print'] as $type) {
-	print strtoupper($type) . ' OUT ALL: ' . $basic->log->getLogLevelAll($type) . '<br>';
+print "<br>END STATUS: ".$ret."<br>";
+//	while ($res = $basic->db_fetch_array($ret))
+while ($res = $basic->db_fetch_array())
+{
+	echo "RES: ".$res['test']."<br>";
 }
-
-$basic->log->debug('SOME MARK', 'Some error output');
-
-// INTERNAL SET
-print "EDIT ACCESS ID: " . $basic->edit_access_id . "<br>";
-if (is_object($login)) {
-	//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
-	$basic->log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::printAr($login->acl));
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
-	// $result = array_flip(
-	// 	array_filter(
-	// 		array_flip($login->default_acl_list),
-	// 		function ($key) {
-	// 			if (is_numeric($key)) {
-	// 				return $key;
-	// 			}
-	// 		}
-	// 	)
-	// );
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
-	// DEPRICATED CALL
-	//	$basic->adbSetACL($login->acl);
+# test async insert
+$basic->db_exec_async("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+echo "WAITING FOR ASYNC INSERT: ";
+while (($ret = $basic->db_check_async()) === true)
+{
+	print ".";
+	sleep(1);
+	flush();
 }
+print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
+print "ASYNC PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>"; */
 
-print "THIS HOST: " . HOST_NAME . ", with PROTOCOL: " . HOST_PROTOCOL . " is running SSL: " . HOST_SSL . "<br>";
-print "DIR: " . DIR . "<br>";
-print "BASE: " . BASE . "<br>";
-print "ROOT: " . ROOT . "<br>";
-print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . print_r(DB_CONFIG, true) . "<br>";
+$to_db_version = '9.1.9';
+print "VERSION DB: ".$basic->db_version()."<br>";
+print "DB Version smaller $to_db_version: ".$basic->db_compare_version('<'.$to_db_version)."<br>";
+print "DB Version smaller than $to_db_version: ".$basic->db_compare_version('<='.$to_db_version)."<br>";
+print "DB Version equal $to_db_version: ".$basic->db_compare_version('='.$to_db_version)."<br>";
+print "DB Version bigger than $to_db_version: ".$basic->db_compare_version('>='.$to_db_version)."<br>";
+print "DB Version bigger $to_db_version: ".$basic->db_compare_version('>'.$to_db_version)."<br>";
 
-$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-$du = DS ?? DIRECTORY_SEPARATOR;
-print "DS is: " . $ds . "<br>";
-print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
+/*	$q = "SELECT FOO FRO BAR";
+//	$q = "Select * from foo";
+$foo = $basic->db_exec_async($q);
+print "[ERR] Query: ".$q."<br>";
+print "[ERR] RESOURCE: $foo<br>";
+while (($ret = $basic->db_check_async()) === true)
+{
+	print "[ERR]: $ret<br>";
+//		sleep(5);
+} */
+
+// search path check
+$q = "SHOW search_path";
+$cursor = $basic->db_exec($q);
+$data = $basic->db_fetch_array($cursor)['search_path'];
+print "RETURN DATA FOR search_path: ".$data."<br>";
+//	print "RETURN DATA FOR search_path: ".$basic->print_ar($data)."<br>";
+// insert something into test.schema_test and see if we get the PK back
+$status = $basic->db_exec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
+print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
+
+// time string thest
+$timestamp = 5887998.33445;
+$time_string = $basic->TimeStringFormat($timestamp);
+print "TIME STRING TEST: ".$time_string."<br>";
+print "REVERSE TIME STRING: ".$basic->StringToTime($time_string);
+
+// magic links test
+print $basic->magic_links('user@bubu.at').'<br>';
+print $basic->magic_links('http://test.com/foo/bar.php?foo=1').'<br>';
+
+// compare date
+$date_1 = '2017/1/5';
+$date_2 = '2017-01-05';
+print "COMPARE DATE: ".$basic->CompareDate($date_1, $date_2)."<br>";
 
 // print error messages
-// print $login->log->printErrorMsg();
-print $basic->log->printErrorMsg();
+print $basic->print_error_msg();
 
 print "</body></html>";
-
-# __END__

www/admin/class_test.phpv.php

@@ -1,70 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', false);
-// sample config
-require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-phpv';
-ob_end_flush();
-
-use CoreLibs\Check\PhpVersion;
-
-$basic = new CoreLibs\Basic();
-$_phpv = new CoreLibs\Check\PhpVersion();
-$phpv_class = 'CoreLibs\Check\PhpVersion';
-
-// define a list of from to color sets for conversion test
-
-print "<html><head><title>TEST CLASS: PHP VERSION</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$min_version_s = '7';
-$min_version_ss = '7.1';
-$min_version = '7.1.0';
-$max_version = '7.3.1';
-// class
-print "MIN: $min_version: " . (string)$_phpv->checkPHPVersion($min_version) . "<br>";
-print "MIN/MAX: $min_version/$max_version: " . (string)$_phpv->checkPHPVersion($min_version, $max_version) . "<br>";
-print "MIN/S: $min_version_s: " . (string)$_phpv->checkPHPVersion($min_version_s) . "<br>";
-print "MIN/SS: $min_version_ss: " . (string)$_phpv->checkPHPVersion($min_version_ss) . "<br>";
-// static
-print "S::MIN: $min_version: " . (string)$phpv_class::checkPHPVersion($min_version) . "<br>";
-print "S::MIN/MAX: $min_version/$max_version: "
-	. (string)$phpv_class::checkPHPVersion($min_version, $max_version) . "<br>";
-print "S::MIN/S: $min_version_s: " . (string)$phpv_class::checkPHPVersion($min_version_s) . "<br>";
-print "S::MIN/SS: $min_version_ss: " . (string)$phpv_class::checkPHPVersion($min_version_ss) . "<br>";
-// use stats
-print "U-S::MIN: $min_version: " . (string)PhpVersion::checkPHPVersion($min_version) . "<br>";
-
-// DEPRECATED
-// print "MIN: $min_version: ".(string)$basic->checkPHPVersion($min_version)."<br>";
-
-// error message
-print $basic->log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__