class check email fix getEmailRegexCheck

This should only return the part email checks from position 1 to n, but it returned all of them. Fixed with slice call
Bug fixes for PSR-12 update
2021-07-20 06:18:14 +09:00 · 2021-07-14 16:36:13 +09:00 · 2021-07-14 14:11:36 +09:00 · 2021-07-14 10:02:27 +09:00 · 2021-07-12 06:25:10 +09:00 · 2021-06-30 15:07:22 +09:00
110 changed files with 3480 additions and 2040 deletions
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -1,7 +1,5 @@
 <?php

-use Phan\Config;
-
 /**
 * This configuration will be read and overlaid on top of the
 * default configuration. Command line arguments will be applied
@@ -24,6 +22,9 @@ use Phan\Config;
 * of the phan executable or a path passed in via the CLI
 * '-d' flag.
 */
+
+use Phan\Config;
+
 return [
 	// If true, missing properties will be created when
 	// they are first seen. If false, we'll report an
--- a/4dev/lang/admin/messages_en_utf8.po
+++ b/4dev/lang/admin/messages_en_utf8.po
@@ -27,3 +27,9 @@ msgstr "Month"

 msgid "INPUT TEST"
 msgstr "OUTPUT TEST EN"
+
+msgid "I should be translated"
+msgstr "I should be translated: I WAS TRANSLATED"
+
+msgid "Are we translated?"
+msgstr "Are we translated? Yes, we are!"
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
 # PHP Core Library

+## Code Standard
+
+ * Uses PSR-12
+ * tab indent instead of 4 spaces indent
+ * Warning at 120 character length, error at 240 character length
+
+## General information
+
 Base PHP class files to setup any project
  * login
  * database wrapper
--- a/phpstan-bootstrap.php
+++ b/phpstan-bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 // Boostrap file for PHPstand
 // sets the _SERVER['HTTP_HOST'] var so we can have DB detection
 $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
--- a/www/admin/class_test.admin.backend.php
+++ b/www/admin/class_test.admin.backend.php
@@ -0,0 +1,54 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-admin';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$backend = new CoreLibs\Admin\Backend(DB_CONFIG);
+
+print "<html><head><title>TEST CLASS: ADMIN BACKEND</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+// set acl, from eg login acl
+print "SETACL[]: " . $backend->setACL([]) . "<br>";
+print "ADBEDITLOG: " . $backend->adbEditLog('CLASSTEST-ADMIN', 'Some info stirng') . "<br>";
+print "ADBTOPMENU(0): " . \CoreLibs\Debug\Support::printAr($backend->adbTopMenu()) . "<br>";
+print "ADBMSG: " . $backend->adbMsg('info', 'Message: %1$d', [1]) . "<br>";
+print "Messaes: " . \CoreLibs\Debug\Support::printAr($this->messages) . "<br>";
+print "ADBPRINTDATETIME:<br>" . $backend->adbPrintDateTime(2021, 6, 21, 6, 38, '_test') . "<br>";
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__
--- a/www/admin/class_test.array.php
+++ b/www/admin/class_test.array.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -55,13 +58,17 @@ $test_array = [

 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>";
+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>";
+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>";
+echo "ARRAYSEARCHSIMPLE([array], type, email): "
+	. (string)ArrayHandler::arraySearchSimple($test_array, 'type', 'email') . "<br>";

 $array_1 = [
 	'foo' => 'bar'
@@ -97,6 +104,97 @@ print "ARRAYFLATFORKEY: ".DgS::printAr(ArrayHandler::arrayFlatForKey($test_array
 // 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();

--- a/www/admin/class_test.byte.php
+++ b/www/admin/class_test.byte.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.colors.php
+++ b/www/admin/class_test.colors.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -50,11 +53,15 @@ print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: ".Colors::rgb2hex($rgb[0],
 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>";
+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>";
+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

--- a/www/admin/class_test.datetime.php
+++ b/www/admin/class_test.datetime.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -99,7 +102,8 @@ $compare_dates = [
 ];
 // 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>";
+	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', ],
@@ -110,7 +114,8 @@ $compare_datetimes = [
 	[ '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>";
+	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', ],
@@ -119,8 +124,10 @@ $compare_dates = [
 	[ '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>";
+	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
@@ -135,11 +142,14 @@ 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>";
+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>";
+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>"; */
+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();
--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -18,6 +21,8 @@ ob_start();
 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);
@@ -28,77 +33,104 @@ ob_end_flush();

 use CoreLibs\Debug\Support as DgS;

-$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
+$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: ".$basic->dbInfo()."<br>";
+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: ".$basic->dbGetEncoding()."<br>";
+print "DB Client encoding: " . $db->dbGetEncoding() . "<br>";

-while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
+while ($res = $db->dbReturn("SELECT * FROM max_test", 0, true)) {
 	print "TIME: " . $res['time'] . "<br>";
 }
-print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
-while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
+print "CACHED DATA: <pre>" . print_r($db->cursor_ext, true) . "</pre><br>";
+while ($res = $db->dbReturn("SELECT * FROM max_test")) {
 	print "[CACHED] TIME: " . $res['time'] . "<br>";
 }

 print "<pre>";
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST " . time() . "') RETURNING test");
 print "DIRECT INSERT STATUS: $status | "
-	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
-	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
-	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+	 . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+	 . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	 . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";

 // should throw deprecated error
-// $basic->getReturningExt();
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->dbGetInsertPK()), true)."<br>";
-$basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
-$status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
+// $db->getReturningExt();
+print "DIRECT INSERT PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "<br>";
+$db->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $db->dbExecute("ins_foo", array('BAR TEST ' . time()));
 print "PREPARE INSERT STATUS: $status | "
-	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
-	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
-	."RETURNING RETURN: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+	 . "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($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->dbGetInsertPK()), true)."<br>";
+print "PREPARE INSERT PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "<br>";
 // returning test with multiple entries
-//	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
-$status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+// $status = $db->db_exec(
+// 	"INSERT INTO foo (test) VALUES "
+// 	. "('BAR 1 " . time() . "'), "
+// 	. "('BAR 2 " . time() . "'), "
+// 	. "('BAR 3 " . time() . "') "
+// 	. "RETURNING foo_id"
+// );
+$status = $db->dbExec(
+	"INSERT INTO foo (test) VALUES "
+	. "('BAR 1 " . time() . "'), "
+	. "('BAR 2 " . time() . "'), "
+	. "('BAR 3 " . time() . "') "
+	. "RETURNING foo_id, test"
+);
 print "DIRECT MULTIPLE INSERT STATUS: $status | "
-	."PRIMARY KEYS: ".print_r($basic->dbGetInsertPK(), true)." | "
-	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
-	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+	 . "PRIMARY KEYS: " . print_r($db->dbGetInsertPK(), true) . " | "
+	 . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	 . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";

 // no returning, but not needed ;
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST " . time() . "');");
 print "DIRECT INSERT STATUS: $status | "
-	."PRIMARY KEY: ".$basic->dbGetInsertPK()." | "
-	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
-	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+	 . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+	 . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	 . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";

 // UPDATE WITH RETURNING
-$status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
+$status = $db->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
 print "UPDATE STATUS: $status | "
-	."RETURNING EXT: ".print_r($basic->dbGetReturningExt(), true)." | "
-	."RETURNING ARRAY: ".print_r($basic->dbGetReturningArray(), true)."<br>";
+	 . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	 . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "<br>";
 print "</pre>";

 // REEAD PREPARE
-if ($basic->dbPrepare('sel_foo', "SELECT foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time FROM foo ORDER BY foo_id DESC LIMIT 5") === false) {
+if (
+	$db->dbPrepare(
+		'sel_foo',
+		"SELECT foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time "
+		. "FROM foo ORDER BY foo_id DESC LIMIT 5"
+	) === false
+) {
 	print "Error in sel_foo prepare<br>";
 } else {
 	$max_rows = 6;
 	// do not run this in dbFetchArray directly as
 	// dbFetchArray(dbExecute(...))
 	// this will end in an endless loop
-	$cursor = $basic->dbExecute('sel_foo', []);
+	$cursor = $db->dbExecute('sel_foo', []);
 	$i = 1;
-	while (($res = $basic->dbFetchArray($cursor, true)) !== false) {
+	while (($res = $db->dbFetchArray($cursor, true)) !== false) {
 		print "DB PREP EXEC FETCH ARR: " . $i . ": <pre>" . print_r($res, true) . "</pre><br>";
 		$i++;
 	}
@@ -107,35 +139,63 @@ if ($basic->dbPrepare('sel_foo', "SELECT foo_id, test, some_bool, string_a, numb

 # db write class test
 $table = 'foo';
-print "TABLE META DATA: ".DgS::printAr($basic->dbShowTableMetaData($table))."<br>";
+print "TABLE META DATA: " . DgS::printAr($db->dbShowTableMetaData($table)) . "<br>";
 $primary_key = ''; # unset
 $db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
 //	$db_write_table = array('test');
 $object_fields_not_touch = array();
 $object_fields_not_update = array();
 $data = array('test' => 'BOOL TEST SOMETHING ' . time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $db->dbWriteDataExt(
+	$db_write_table,
+	$primary_key,
+	$table,
+	$object_fields_not_touch,
+	$object_fields_not_update,
+	$data
+);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array('test' => 'BOOL TEST ON ' . time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $db->dbWriteDataExt(
+	$db_write_table,
+	$primary_key,
+	$table,
+	$object_fields_not_touch,
+	$object_fields_not_update,
+	$data
+);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array('test' => 'BOOL TEST OFF ' . time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $db->dbWriteDataExt(
+	$db_write_table,
+	$primary_key,
+	$table,
+	$object_fields_not_touch,
+	$object_fields_not_update,
+	$data
+);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 $data = array('test' => 'BOOL TEST UNSET ' . time());
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $db->dbWriteDataExt(
+	$db_write_table,
+	$primary_key,
+	$table,
+	$object_fields_not_touch,
+	$object_fields_not_update,
+	$data
+);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";

 // return Array Test
 $query = "SELECT type, sdate, integer FROM foobar";
-$data = $basic->dbReturnArray($query, true);
+$data = $db->dbReturnArray($query, true);
 print "Full foobar list: <br><pre>" . print_r($data, true) . "</pre><br>";

 # async test queries
-/*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
+/*	$db->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
 echo "WAITING FOR ASYNC: ";
 $chars = array('|', '/', '-', '\\');
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $db->dbCheckAsync()) === true)
 {
 	if ((list($_, $char) = each($chars)) === FALSE)
 	{
@@ -147,37 +207,38 @@ while (($ret = $basic->dbCheckAsync()) === true)
 	flush();
 }
 print "<br>END STATUS: " . $ret . "<br>";
-//	while ($res = $basic->dbFetchArray($ret))
-while ($res = $basic->dbFetchArray())
+//	while ($res = $db->dbFetchArray($ret))
+while ($res = $db->dbFetchArray())
 {
 	echo "RES: " . $res['test'] . "<br>";
 }
 # test async insert
-$basic->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+$db->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST " . time() . "')");
 echo "WAITING FOR ASYNC INSERT: ";
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $db->dbCheckAsync()) === true)
 {
 	print " . ";
 	sleep(1);
 	flush();
 }
-print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
-print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>"; */
+print "<br>END STATUS: " . $ret . " | PK: " . $db->insert_id . "<br>";
+print "ASYNC PREVIOUS INSERTED: "
+	. print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->insert_id), true) . "<br>"; */

 $to_db_version = '9.1.9';
-print "VERSION DB: ".$basic->dbVersion()."<br>";
-print "DB Version smaller $to_db_version: ".$basic->dbCompareVersion('<'.$to_db_version)."<br>";
-print "DB Version smaller than $to_db_version: ".$basic->dbCompareVersion('<='.$to_db_version)."<br>";
-print "DB Version equal $to_db_version: ".$basic->dbCompareVersion('='.$to_db_version)."<br>";
-print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$to_db_version)."<br>";
-print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
+print "VERSION DB: " . $db->dbVersion() . "<br>";
+print "DB Version smaller $to_db_version: " . $db->dbCompareVersion('<' . $to_db_version) . "<br>";
+print "DB Version smaller than $to_db_version: " . $db->dbCompareVersion('<=' . $to_db_version) . "<br>";
+print "DB Version equal $to_db_version: " . $db->dbCompareVersion('=' . $to_db_version) . "<br>";
+print "DB Version bigger than $to_db_version: " . $db->dbCompareVersion('>=' . $to_db_version) . "<br>";
+print "DB Version bigger $to_db_version: " . $db->dbCompareVersion('>' . $to_db_version) . "<br>";

 /*	$q = "SELECT FOO FRO BAR";
 // $q = "Select * from foo";
-$foo = $basic->dbExecAsync($q);
+$foo = $db->dbExecAsync($q);
 print "[ERR] Query: " . $q . "<br>";
 print "[ERR] RESOURCE: $foo<br>";
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $db->dbCheckAsync()) === true)
 {
 	print "[ERR]: $ret<br>";
 	sleep(5);
@@ -185,17 +246,21 @@ while (($ret = $basic->dbCheckAsync()) === true)

 // search path check
 $q = "SHOW search_path";
-$cursor = $basic->dbExec($q);
-$data = $basic->dbFetchArray($cursor)['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 = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
-print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
+$status = $db->dbExec(
+	"INSERT INTO test.schema_test (contents, id) VALUES "
+	. "('TIME: " . time() . "', " . rand(1, 10) . ")"
+);
+print "OTHER SCHEMA INSERT STATUS: "
+	. $status . " | PK NAME: " . $db->pk_name . ", PRIMARY KEY: " . $db->insert_id . "<br>";

 print "<b>NULL TEST DB READ</b><br>";
 $q = "SELECT uid, null_varchar, null_int FROM test_null_data WHERE uid = 'A'";
-$res = $basic->dbReturnRow($q);
+$res = $db->dbReturnRow($q);
 var_dump($res);
 print "RES: " . DgS::printAr($res) . "<br>";
 print "ISSET: " . isset($res['null_varchar']) . "<br>";
--- a/www/admin/class_test.debug.php
+++ b/www/admin/class_test.debug.php
@@ -1,9 +1,11 @@
 <?php // phpcs:ignore warning
-declare(strict_types=1);
+
 /**
 * @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;
@@ -52,6 +54,9 @@ 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>";
@@ -89,7 +94,8 @@ class TestR extends TestL
 		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']));
+		$this->log->debug('TESTR', 'Array: '
+			. $this->log->prAr(['a', 'b']) . ', Other: ' . $this->log->prAr(['a', 'b']));
 		return true;
 	}
 }
@@ -121,6 +127,26 @@ class AttachOutside
 $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
--- a/www/admin/class_test.email.php
+++ b/www/admin/class_test.email.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.encoding.php
+++ b/www/admin/class_test.encoding.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -62,7 +65,8 @@ foreach ($enc_strings as $_string) {
 	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 "CONV ENCODING (s,a-false): $_string: "
+		. $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "<br>";
 }
 print "ERROR CHAR: " . $_encoding->getErrorChar() . "<br>";
 // static
@@ -71,8 +75,10 @@ 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::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
--- a/www/admin/class_test.file.php
+++ b/www/admin/class_test.file.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.hash.php
+++ b/www/admin/class_test.hash.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.html.php
+++ b/www/admin/class_test.html.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -45,13 +48,15 @@ $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>";
+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>";
+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>";
@@ -88,11 +93,20 @@ foreach ($magic_links as $magic_link) {
 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>";
+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();
--- a/www/admin/class_test.image.php
+++ b/www/admin/class_test.image.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -46,13 +49,17 @@ $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>";
+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 "<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
@@ -78,15 +85,20 @@ $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>";
+	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>";
+	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 "<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>";
 }

@@ -96,7 +108,8 @@ foreach ($images as $image) {
 // 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>"; */
+echo "<div>S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width<br><img src="
+	. $basic->createThumbnailSimple($image, $thumb_width)."></div>"; */

 // error message
 print $basic->log->printErrorMsg();
--- a/www/admin/class_test.json.php
+++ b/www/admin/class_test.json.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.lang.php
+++ b/www/admin/class_test.lang.php
@@ -0,0 +1,60 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// 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
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__
--- a/www/admin/class_test.math.php
+++ b/www/admin/class_test.math.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.mime.php
+++ b/www/admin/class_test.mime.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.output.form.php
+++ b/www/admin/class_test.output.form.php
@@ -0,0 +1,76 @@
+<?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[\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__
--- a/www/admin/class_test.password.php
+++ b/www/admin/class_test.password.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -56,6 +59,10 @@ 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>';

 // set + check edit access id
 $edit_access_id = 3;
@@ -74,7 +81,8 @@ if (is_object($login) && isset($login->acl['unit'])) {
 //	$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>';

@@ -82,7 +90,8 @@ print '</form>';
 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 $prefix . strtoupper($type) . ' OUT: '
+			. \CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)) . '<br>';
 	}
 }
 foreach (['debug', 'echo', 'print'] as $type) {
@@ -98,12 +107,32 @@ if (is_object($login)) {
 	$basic->log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::printAr($login->acl));
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
-	//	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
+	// $result = array_flip(
+	// 	array_filter(
+	// 		array_flip($login->default_acl_list),
+	// 		function ($key) {
+	// 			if (is_numeric($key)) {
+	// 				return $key;
+	// 			}
+	// 		}
+	// 	)
+	// );
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
 	// DEPRICATED CALL
 	//	$basic->adbSetACL($login->acl);
 }

+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>";
+
+$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
+$du = DS ?? DIRECTORY_SEPARATOR;
+print "DS is: " . $ds . "<br>";
+print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
+
 // print error messages
 // print $login->log->printErrorMsg();
 print $basic->log->printErrorMsg();
--- a/www/admin/class_test.phpv.php
+++ b/www/admin/class_test.phpv.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -49,7 +52,8 @@ print "MIN/S: $min_version_s: ".(string)$_phpv->checkPHPVersion($min_version_s).
 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/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
--- a/www/admin/class_test.randomkey.php
+++ b/www/admin/class_test.randomkey.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.runningtime.php
+++ b/www/admin/class_test.runningtime.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.smarty.php
+++ b/www/admin/class_test.smarty.php
@@ -0,0 +1,96 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', true);
+// set language
+$lang = 'en_utf8';
+// sample config
+require 'config.php';
+// override ECHO ALL FALSE
+$ECHO_ALL = true;
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-smarty';
+ob_end_flush();
+
+$basic = new CoreLibs\Basic();
+$smarty = new CoreLibs\Template\SmartyExtend();
+// for testing with or without CMS
+// $cms = new CoreLibs\Admin\Backend(DB_CONFIG);
+$l = new CoreLibs\Language\L10n($lang);
+
+print "<html><head><title>TEST CLASS: SMARTY</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+
+$smarty->DATA['JS_DEBUG'] = DEBUG;
+$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
+$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
+$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
+$smarty->USE_PROTOTYPE = false;
+$smarty->USE_JQUERY = true;
+$smarty->JS_DATEPICKR = false;
+if ($smarty->USE_PROTOTYPE) {
+	$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
+	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
+} elseif ($smarty->USE_JQUERY) {
+	$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
+	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
+}
+$smarty->PAGE_WIDTH = '100%';
+// require BASE.INCLUDES.'admin_set_paths.php';
+$smarty->setSmartyPaths();
+
+// smarty test
+$smarty->DATA['SMARTY_TEST'] = 'Test Data';
+$smarty->DATA['TRANSLATE_TEST'] = $l->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
+
+// drop down test with optgroups
+$options = [
+	'' => '選択してください',
+	'4/25(木)' => [
+		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
+		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
+	],
+	'4/26(金)' => [
+		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
+		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
+	],
+	'4/27(土)' => [
+		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
+		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
+	],
+];
+
+$smarty->DATA['drop_down_test'] = $options;
+$smarty->DATA['loop_start'] = 2;
+// require BASE.INCLUDES.'admin_smarty.php';
+$smarty->setSmartyVarsAdmin();
+
+// error message
+print $basic->log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__
--- a/www/admin/class_test.system.php
+++ b/www/admin/class_test.system.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
@@ -39,9 +42,11 @@ print "GETHOSTNAME: ".DgS::printAr(System::getHostName())."<br>";
 print "GETPAGENAME(0): " . System::getPageName() . "<br>";
 print "GETPAGENAME(1): " . System::getPageName(1) . "<br>";
 print "GETPAGENAME(2): " . System::getPageName(2) . "<br>";
+print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<br>";
 // seting errro codes file upload
 print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "<br>";
-print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): ".System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE)."<br>";
+print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
+	. System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE) . "<br>";

 // error message
 print $basic->log->printErrorMsg();
--- a/www/admin/class_test.token.php
+++ b/www/admin/class_test.token.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/class_test.uids.php
+++ b/www/admin/class_test.uids.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?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;
--- a/www/admin/error_test.php
+++ b/www/admin/error_test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
--- a/www/admin/l10n_test.php
+++ b/www/admin/l10n_test.php
@@ -1,29 +0,0 @@
-<?php declare(strict_types=1);
-
-// debug for L10n issues in php 7.3
-
-// namespace test
-ob_start();
-
-// init language
-$lang = 'en_utf8';
-// admin class tests
-require 'config.php';
-$l = new CoreLibs\Language\L10n($lang);
-ob_end_flush();
-
-$string = 'INPUT TEST';
-
-echo "LANGUAGE SET: ".$l->__getLang()."<br>";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
-
-// switch to other language
-$lang = 'ja_utf8';
-$l->l10nReloadMOfile($lang);
-
-echo "LANGUAGE SET: ".$l->__getLang()."<br>";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
-
-// __END__
--- a/www/admin/namespace_test.php
+++ b/www/admin/namespace_test.php
@@ -1,41 +0,0 @@
-<?php declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// namespace test
-ob_start();
-
-// admin class tests
-require 'config.php';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-
-echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";
-
-$base = new CoreLibs\Admin\Backend(DB_CONFIG);
-ob_end_flush();
-if ($base->getConnectionStatus()) {
-	die("Cannot connect to database");
-}
-
-print "Start time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
-print "HumanReadableByteFormat: ".\CoreLibs\Convert\Byte::HumanReadableByteFormat(1234567.12)."<br>";
-print "humanReadableByteFormat: ".\CoreLibs\Convert\Byte::humanReadableByteFormat(1234567.12)."<br>";
-print "getPageName: ". \CoreLibs\Get\System::getPageName()."<br>";
-
-print "DB Info: ".$base->dbInfo(true)."<br>";
-
-
-print "End Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
-print "Start Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
-
-print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
-print "Translate test: Year -> ".$base->l->__('Year')."<br>";
-
-print "End Time: ".\CoreLibs\Debug\RunningTime::runningTime()."<br>";
-// end error print
-print $base->log->printErrorMsg();
-
-# __END__
--- a/www/admin/other_test.php
+++ b/www/admin/other_test.php
@@ -1,34 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Foo;
-
-class FooBar
-{
-	public $foo = '';
-
-	public function __construct()
-	{
-		$this->foo = 'BAR';
-	}
-
-	public function otherBarBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-
-	public function barBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-}
-
-$foo = $bar ?? 'EMPTY';
-echo "BAR: ".$foo."<br>";
-// define('DS', DIRECTORY_SEPARATOR);
-$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-$du = DS ?? DIRECTORY_SEPARATOR;
-echo "DS is: ".$ds."<br>";
-
-echo "SERVER HOST: ".$_SERVER['HTTP_HOST']."<br>";
-
-// __END__
--- a/www/admin/phan_test.php
+++ b/www/admin/phan_test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 require 'config.php';
 require BASE . INCLUDES . 'admin_header.php';
--- a/www/admin/qq_file_upload_ajax.php
+++ b/www/admin/qq_file_upload_ajax.php
@@ -21,11 +21,13 @@ $uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit);
 $_action = $_POST['action'] ? $_POST['action'] : $_GET['action'];
 $_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid'];
 $get_post['start'] = microtime(true);
-$base->debug('AJAX UPLOAD', 'Action: '.$_action.', Task UID: '.$_task_uid.' => '.$base->dateStringFormat($get_post['start']));
+$base->debug('AJAX UPLOAD', 'Action: ' . $_action . ', Task UID: '
+	. $_task_uid . ' => ' . $base->dateStringFormat($get_post['start']));

 $upload_path = ROOT . MEDIA . UPLOADS;
 $get_post['result'] = $uploader->handleUpload($upload_path, false);
-$base->debug('AJAX UPLOAD', 'Memory peak: '.$base->ByteStringFormat(memory_get_usage()).' | '.$base->ByteStringFormat(memory_get_peak_usage()));
+$base->debug('AJAX UPLOAD', 'Memory peak: ' . $base->ByteStringFormat(memory_get_usage())
+	. ' | ' . $base->ByteStringFormat(memory_get_peak_usage()));

 // set file name
 $get_post['filename'] = $uploader->uploadFileName;
--- a/www/admin/smarty_test.php
+++ b/www/admin/smarty_test.php
@@ -1,59 +0,0 @@
-<?php declare(strict_types=1);
-$ENABLE_ERROR_HANDLING = 0;
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-$LOG_PER_RUN = 1;
-
-define('USE_DATABASE', true);
-define('USE_HEADER', true);
-require 'config.php';
-require BASE.INCLUDES.'admin_header.php';
-if (is_object($smarty)) {
-	$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
-	$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
-	$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
-	$smarty->USE_PROTOTYPE = false;
-	$smarty->USE_JQUERY = true;
-	$smarty->JS_DATEPICKR = false;
-	if ($smarty->USE_PROTOTYPE) {
-		$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
-		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
-	} elseif ($smarty->USE_JQUERY) {
-		$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
-		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
-	}
-	$smarty->PAGE_WIDTH = '100%';
-	// require BASE.INCLUDES.'admin_set_paths.php';
-	$smarty->setSmartyPaths();
-
-	// smarty test
-	$smarty->DATA['SMARTY_TEST'] = 'Test Data';
-	$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
-}
-
-// drop down test with optgroups
-$options = array (
-	'' => '選択してください',
-	'4/25(木)' => array (
-		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
-		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
-	),
-	'4/26(金)' => array (
-		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
-		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
-	),
-	'4/27(土)' => array (
-		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
-		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
-	)
-);
-
-if (is_object($smarty)) {
-	$smarty->DATA['drop_down_test'] = $options;
-	$smarty->DATA['loop_start'] = 2;
-	// require BASE.INCLUDES.'admin_smarty.php';
-	$smarty->setSmartyVarsAdmin();
-}
-require BASE.INCLUDES.'admin_footer.php';
--- a/www/admin/various_class_test.php
+++ b/www/admin/various_class_test.php
@@ -1,111 +0,0 @@
-<?php
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-namespace CoreLibs;
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// admin class tests
-require 'config.php';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$base = new Basic();
-
-print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."<br>";
-print "DIR: ".DIR."<br>";
-print "BASE: ".BASE."<br>";
-print "ROOT: ".ROOT."<br>";
-print "HOST: ".HOST_NAME." => DB HOST: ".DB_CONFIG_NAME." => ".print_r(DB_CONFIG, true)."<br>";
-
-$text = 'I am some text
-with some
-line breaks
-in there. Theis 
-is sucky';
-
-print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text)."<br>";
-print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text, '##BR##')."<br>";
-
-// $test = array (
-// 	'A' => array (
-// 		'B' => array (),
-// 		'C' => array (
-// 			'D' => array (),
-// 			'E' => array (
-// 				'F' => array ()
-// 			)
-// 		)
-// 	),
-// 	'1' => array (),
-// 	'2' => array (),
-// 	'3' => array (
-// 		'G' => array ()
-// 	)
-// );
-
-// $base->log->debug('ARRAY', \CoreLibs\Debug\Support::printAr($test));
-
-function rec($pre, $cur, $node = array ())
-{
-	if (!is_array($node)) {
-		$node = array ();
-	}
-	print "<div style='color: green;'>#### PRE: ".$pre.", CUR: ".$cur.", N-c: ".count($node)." [".join('|', array_keys($node))."]</div>";
-	if (!$pre) {
-		print "** <span style='color: red;'>NEW</span><br>";
-		$node[$cur] = array ();
-	} else {
-		if (array_key_exists($pre, $node)) {
-			print "+ <span style='color: orange;'>KEY FOUND:</span> ".$pre.", add: ".$cur."<br>";
-			$node[$pre][$cur] = array ();
-		} else {
-			print "- NOT FOUND: loop<br>";
-			foreach ($node as $_pre => $_cur) {
-				print "> TRY: ".$_pre." => ".count($_cur)." [".join('|', array_keys($_cur))."]<br>";
-				if (count($_cur) > 0) {
-					$node[$_pre] = rec($pre, $cur, $_cur);
-				}
-			}
-		}
-	}
-	return $node;
-}
-
-function flattenArrayKey(array $array, array $return = array ())
-{
-	foreach ($array as $key => $sub) {
-		$return[] = $key;
-		if (count($sub) > 0) {
-			$return = flattenArrayKey($sub, $return);
-		}
-	}
-	return $return;
-}
-
-$test = array ();
-// core
-$test = rec('', 'A', $test);
-$test = rec('', '1', $test);
-$test = rec('', '2', $test);
-$test = rec('', '3', $test);
-$test = rec('3', 'G', $test);
-$test = rec('A', 'B', $test);
-$test = rec('A', 'C', $test);
-$test = rec('C', 'D', $test);
-$test = rec('C', 'E', $test);
-$test = rec('E', 'F', $test);
-// new
-$test = rec('C', 'U', $test);
-$test = rec('F', 'U', $test);
-$test = rec('', 'Al', $test);
-$test = rec('B', 'B1', $test);
-$base->log->debug('REC', \CoreLibs\Debug\Support::printAr($test));
-print "FLATTEN: ".\CoreLibs\Debug\Support::printAr(flattenArrayKey($test))."<br>";
-
-print $base->log->printErrorMsg();
-
-// __END__
--- a/www/configs/config.db.php
+++ b/www/configs/config.db.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -7,19 +8,21 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 // please be VERY carefull only to change the right side
 $DB_CONFIG = [
 	'test' => [
-		'db_name' => 'gullevek',
-		'db_user' => 'gullevek',
-		'db_pass' => 'gullevek',
+		'db_name' => 'clemens',
+		'db_user' => 'clemens',
+		'db_pass' => 'clemens',
 		'db_host' => 'db.tokyo.tequila.jp',
 		'db_port' => 5432,
 		'db_schema' => 'public',
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
 		'db_ssl' => 'disable' // allow, disable, require, prefer
-	]
+	],
 ];

 // __END__
--- a/www/configs/config.host.php
+++ b/www/configs/config.host.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -11,6 +12,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 // other master config to attach
 // $__LOCAL_CONFIG = [
 // 	'db_host' => '',
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore PSR1.Files.SideEffects
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/06/10
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 /************* PATHS *********************/
 // directory seperator
 define('DS', DIRECTORY_SEPARATOR);
@@ -114,12 +117,12 @@ define('PASSWORD_UPPER', '(?=.*[A-Z])');
 define('PASSWORD_NUMBER', '(?=.*\d)');
 define('PASSWORD_SPECIAL', "(?=.*[" . PASSWORD_SPECIAL_RANGE . "])");
 // define full regex
-define('PASSWORD_REGEX', "/^".
-	(defined('PASSWORD_LOWER') ? PASSWORD_LOWER : '').
-	(defined('PASSWORD_UPPER') ? PASSWORD_UPPER : '').
-	(defined('PASSWORD_NUMBER') ? PASSWORD_NUMBER : '').
-	(defined('PASSWORD_SPECIAL') ? PASSWORD_SPECIAL : '').
-	"[A-Za-z\d".PASSWORD_SPECIAL_RANGE."]{".PASSWORD_MIN_LENGTH.",".PASSWORD_MAX_LENGTH."}$/");
+define('PASSWORD_REGEX', "/^"
+	. (defined('PASSWORD_LOWER') ? PASSWORD_LOWER : '')
+	. (defined('PASSWORD_UPPER') ? PASSWORD_UPPER : '')
+	. (defined('PASSWORD_NUMBER') ? PASSWORD_NUMBER : '')
+	. (defined('PASSWORD_SPECIAL') ? PASSWORD_SPECIAL : '')
+	. "[A-Za-z\d" . PASSWORD_SPECIAL_RANGE . "]{" . PASSWORD_MIN_LENGTH . "," . PASSWORD_MAX_LENGTH . "}$/");

 /************* AJAX / ACCESS *************/
 // ajax request type
@@ -217,7 +220,8 @@ if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
 // we have either no db selction for this host but have db config entries
 // or we have a db selection but no db config as array or empty
 // or we have a selection but no matching db config entry
-if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
+if (
+	(!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 	(isset($SITE_CONFIG[HOST_NAME]['db_host']) &&
 		// missing DB CONFIG
 		((is_array($DB_CONFIG) && !count($DB_CONFIG)) ||
@@ -230,8 +234,10 @@ if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 	exit;
 }
 // set SSL on
-if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
-	$_SERVER['SERVER_PORT'] == 443) {
+if (
+	(array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
+	$_SERVER['SERVER_PORT'] == 443
+) {
 	define('HOST_SSL', true);
 	define('HOST_PROTOCOL', 'https://');
 } else {
@@ -244,8 +250,10 @@ define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAM
 // define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
 // define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
 // override for login and global schemas
-// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
-// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+// where the edit* tables are
+// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA);
+// where global tables are that are used by all schemas (eg queue tables for online, etc)
+// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA);
 // debug settings, site lang, etc
 define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
 define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
--- a/www/configs/config.other.php
+++ b/www/configs/config.other.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore PSR1.Files.SideEffects
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2019/10/28
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 // DEFINE('SOME_ID', <SOME VALUE>);

 /************* CONVERT *******************/
@@ -14,7 +17,7 @@
 $paths = [
 	'/bin',
 	'/usr/bin',
-	'/usr/local/bin'
+	'/usr/local/bin',
 ];
 // find convert
 foreach ($paths as $path) {
--- a/www/configs/config.path.php
+++ b/www/configs/config.path.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -8,6 +9,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 // File and Folder paths
 // ID is TARGET (first array element)
 /*$PATHS = [
@@ -15,7 +18,7 @@
 		'csv_path' => '',
 		'perl_bin' => '',
 		'other_url' => '',
-	]
+	],
 ];*/

 // __END__
--- a/www/configs/config.php
+++ b/www/configs/config.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php // phpcs:ignore warning
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 define('CONFIG_PATH', 'configs' . DIRECTORY_SEPARATOR);
 // config path prefix search, start with 0, got down each level __DIR__ has, if nothing found -> bail
 $CONFIG_PATH_PREFIX = '';
--- a/www/frontend/index.php
+++ b/www/frontend/index.php
@@ -1,3 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 require 'config.php';
--- a/www/includes/Date.Vars.php
+++ b/www/includes/Date.Vars.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/19
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 $day_short = [
 	1 => 'Mon',
 	2 => 'Tue',
--- a/www/includes/admin_footer.php
+++ b/www/includes/admin_footer.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/14
@@ -7,8 +8,11 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 // print debug messages
 echo $login->log->printErrorMsg();
 echo $cms->log->printErrorMsg();
+$cms->log->debug('DEBUGEND', '==================================== [END]');

 // __END__
--- a/www/includes/admin_header.php
+++ b/www/includes/admin_header.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 //------------------------------ variable init start
 // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log
 if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
@@ -81,8 +84,8 @@ if (!$login->login) {
 // can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
 if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
 	foreach (['debug', 'echo', 'print'] as $target) {
-		$login->log->setLogLevelAll($type, false);
-		$cms->log->setLogLevelAll($type, false);
+		$login->log->setLogLevelAll($target, false);
+		$cms->log->setLogLevelAll($target, false);
 	}
 }
 $smarty->DATA['JS_DEBUG'] = DEBUG;
--- a/www/includes/admin_set_paths.php
+++ b/www/includes/admin_set_paths.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2007/09/03
@@ -7,6 +8,8 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 /******
 NOTE THAT THIS INCLUDE IS OBSOLETE
 USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
--- a/www/includes/admin_smarty.php
+++ b/www/includes/admin_smarty.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/12
@@ -7,11 +8,16 @@
 * HISTORY:
 *********************************************************************/

+declare(strict_types=1);
+
 /******
 NOTE THAT THIS INCLUDE IS OBSOLETE
 USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
 *******/
-trigger_error('admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();', E_USER_DEPRECATED);
+trigger_error(
+	'admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();',
+	E_USER_DEPRECATED
+);
 $smarty->setSmartyVarsAdmin();

 // __END__
--- a/www/includes/edit_base.php
+++ b/www/includes/edit_base.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -12,14 +13,19 @@
 *	 - edit_visible_group.php
 * HISTORY:
 * 2005/06/30 (cs) remove color settings, they are in CSS File now
-* 2005/06/22 (cs) moved load of config array into form class, set lang and lang is must set var for form class; removed the page name setting, moved it into the form class, remove all HTML from main page
+* 2005/06/22 (cs) moved load of config array into form class, set lang
+*                 and lang is must set var for form class; removed the
+*                 page name setting, moved it into the form class,
+*                 emove all HTML from main page
 * 2004/09/30 (cs) changed layout to fit default layout & changed LIBS, etc
 * 2003-06-10: creation of this page
 *********************************************************************/

-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
+declare(strict_types=1);
+
+$DEBUG_ALL = true;
+$PRINT_ALL = true;
+$DB_DEBUG = true;

 // TODO: only extract _POST data that is needed
 extract($_POST, EXTR_SKIP);
@@ -30,10 +36,10 @@ require 'config.php';
 $SET_SESSION_NAME = EDIT_SESSION_NAME;
 // overrride debug flags
 if (!DEBUG)	{
-	$DEBUG_ALL = 0;
-	$PRINT_ALL = 0;
-	$DB_DEBUG = 0;
-	$ECHO_ALL = 0;
+	$DEBUG_ALL = false;
+	$PRINT_ALL = false;
+	$DB_DEBUG = false;
+	$ECHO_ALL = false;
 }

 // should be utf8
@@ -115,15 +121,20 @@ if ($form->my_page_name == 'edit_order') {
 				// this gets temp, id before that, gets actual (moves one "down")
 				// this gets the old before (moves one "up")
 				// is done for every element in row
-				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+				// echo "A: ".$row_data_id[$position[$i]]
+				//	." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]
+				//	." (".$row_data_order[$position[$i]-1].")<br>";
 				$temp_id = $row_data_id[$position[$i]] ?? null;
 				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1] ?? null;
 				$row_data_id[$position[$i] - 1] = $temp_id;
-				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+				// echo "A: ".$row_data_id[$position[$i]]
+				//	." (".$row_data_order[$position[$i]].") -- "
+				//	.$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
 			} // for
 		} // if up

-		// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+		// the last position id from position array is not to be the count - 1 of
+		// row_data_id array, or it is the last element
 		if (isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
 			for ($i = count($position) - 1; $i >= 0; $i--) {
 				// same as up, just up in other way, starts from bottom (last element) and moves "up"
@@ -136,12 +147,15 @@ if ($form->my_page_name == 'edit_order') {
 		} // if down

 		// write data ... (which has to be abstrackt ...)
-		if ((isset($up) && $position[0] > 0) ||
+		if (
+			(isset($up) && $position[0] > 0) ||
 			(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
 		) {
 			for ($i = 0; $i < count($row_data_id); $i++) {
 				if (isset($row_data_order[$i]) && isset($row_data_id[$i])) {
-					$q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
+					$q = "UPDATE " . $table_name
+						. " SET order_number = " . $row_data_order[$i]
+						. " WHERE " . $table_name . "_id = " . $row_data_id[$i];
 					$q = $form->dbExec($q);
 				}
 			} // for all article ids ...
@@ -193,7 +207,8 @@ if ($form->my_page_name == 'edit_order') {
 		// list of points to order
 		for ($j = 0; $j < count($position); $j++) {
 			// if matches, put into select array
-			if (isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
+			if (
+				isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
 				$original_id[$position[$j]] == $row_data[$i]['id']
 			) {
 				$options_selected[] = $i;
@@ -288,11 +303,11 @@ if ($form->my_page_name == 'edit_order') {
 			(isset($data['hostname']) && $data['hostname'] ?
 				$data['hostname'] :
 				''
-			).
+			)
 			// filename
-			($data['filename'] ?? '').
+			. ($data['filename'] ?? '')
 			// query string
-			(isset($data['query_string']) && $data['query_string'] ?
+			. (isset($data['query_string']) && $data['query_string'] ?
 				$data['query_string'] :
 				''
 			);
@@ -302,7 +317,8 @@ if ($form->my_page_name == 'edit_order') {
 			$menu_data[$i]['splitfactor_in'] = 0;
 		}
 		// on matching, we also need to check if we are in the same folder
-		if (isset($data['filename']) &&
+		if (
+			isset($data['filename']) &&
 			$data['filename'] == \CoreLibs\Get\System::getPageName() &&
 			(!isset($data['hostname']) || (
 				isset($data['hostname']) &&
@@ -410,7 +426,8 @@ if ($form->my_page_name == 'edit_order') {
 							if ($t_q) {
 								$t_q .= ', ';
 							}
-							$t_q .= "('".$form->dbEscapeString($matches[1])."', '".$form->dbEscapeString($matches[2])."')";
+							$t_q .= "('" . $form->dbEscapeString($matches[1]) . "', '"
+								. $form->dbEscapeString($matches[2]) . "')";
 						}
 					}
 					$form->dbExec($q . $t_q, 'NULL');
--- a/www/includes/lang/admin/en_utf8.mo
+++ b/www/includes/lang/admin/en_utf8.mo
--- a/www/includes/table_arrays/array_edit_access.php
+++ b/www/includes/table_arrays/array_edit_access.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_access = [
 	'table_array' => [
--- a/www/includes/table_arrays/array_edit_groups.php
+++ b/www/includes/table_arrays/array_edit_groups.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_groups = [
 	'table_array' => [
--- a/www/includes/table_arrays/array_edit_languages.php
+++ b/www/includes/table_arrays/array_edit_languages.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_languages = [
 	'table_array' => [
--- a/www/includes/table_arrays/array_edit_menu_group.php
+++ b/www/includes/table_arrays/array_edit_menu_group.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_menu_group = [
 	'table_array' => [
--- a/www/includes/table_arrays/array_edit_pages.php
+++ b/www/includes/table_arrays/array_edit_pages.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_pages = [
 	'table_array' => [
@@ -112,7 +114,11 @@ $edit_pages = [
 				// "ORDER BY order_number"
 		],
 	],
-	'load_query' => "SELECT edit_page_id, CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
+	'load_query' => "SELECT edit_page_id, "
+		. "CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, "
+		. "name, online, menu, popup "
+		. "FROM edit_page "
+		. "ORDER BY order_number",
 	'table_name' => 'edit_page',
 	'show_fields' => [
 		[
@@ -146,7 +152,8 @@ $edit_pages = [
 			'mandatory' => 1,
 			'select_size' => 10,
 			'selected' => $GLOBALS['edit_visible_group_id'] ?? '',
-			'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_visible_group ORDER BY name"
+			'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
+				. "FROM edit_visible_group ORDER BY name"
 		],
 		'edit_menu_group' => [
 			'table_name' => 'edit_page_menu_group',
@@ -155,7 +162,8 @@ $edit_pages = [
 			'mandatory' => 1,
 			'select_size' => 10,
 			'selected' => $GLOBALS['edit_menu_group_id'] ?? '',
-			'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_menu_group ORDER BY order_number"
+			'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
+				. "FROM edit_menu_group ORDER BY order_number"
 		],

 	],
--- a/www/includes/table_arrays/array_edit_schemes.php
+++ b/www/includes/table_arrays/array_edit_schemes.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_schemes = [
 	'table_array' => [
--- a/www/includes/table_arrays/array_edit_users.php
+++ b/www/includes/table_arrays/array_edit_users.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_users = [
 	'table_array' => [
@@ -34,7 +36,8 @@ $edit_users = [
 		'password_change_interval' => [
 			'value' => $GLOBALS['password_change_interval'] ?? '',
 			'output_name' => 'Password change interval',
-			'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
+			// can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
+			'error_check' => 'intervalshort',
 			'type' => 'text',
 			'interval' => 1, // interval needs NULL write for empty
 			'size' => 5, // make it 5 chars long
@@ -184,7 +187,8 @@ $edit_users = [
 			'cols' => 60
 		],
 	],
-	'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
+	'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count "
+		. "FROM edit_user ORDER BY username",
 	'table_name' => 'edit_user',
 	'show_fields' => [
 		[
--- a/www/includes/table_arrays/array_edit_visible_group.php
+++ b/www/includes/table_arrays/array_edit_visible_group.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 $edit_visible_group = [
 	'table_array' => [
--- a/www/includes/templates/admin/smarty_test.tpl
+++ b/www/includes/templates/admin/smarty_test.tpl
@@ -2,7 +2,10 @@
 	{$SMARTY_TEST}
 </div>
 <div>
-	TRANSLATION CLASS: {$TRANSLATE_TEST}
+	TRANSLATION CLASS (OUT): {$TRANSLATE_TEST}
+</div>
+<div>
+	TRANSLATION CLASS (SMARTY): {$TRANSLATE_TEST_SMARTY}
 </div>
 <div>
 	<select id="drop_down_test" name="drop_down_test">
--- a/www/layout/admin/javascript/datepickr/datepickr.init.js
+++ b/www/layout/admin/javascript/datepickr/datepickr.init.js
--- a/www/layout/admin/javascript/fineuploader/s3/placeholders/not_available-generic.png
+++ b/www/layout/admin/javascript/fineuploader/s3/placeholders/not_available-generic.png
--- a/www/layout/admin/javascript/fineuploader/s3/placeholders/waiting-generic.png
+++ b/www/layout/admin/javascript/fineuploader/s3/placeholders/waiting-generic.png
--- a/www/layout/admin/javascript/fineuploader/traditional/placeholders/not_available-generic.png
+++ b/www/layout/admin/javascript/fineuploader/traditional/placeholders/not_available-generic.png
--- a/www/layout/admin/javascript/fineuploader/traditional/placeholders/waiting-generic.png
+++ b/www/layout/admin/javascript/fineuploader/traditional/placeholders/waiting-generic.png
--- a/www/layout/admin/javascript/jquery.test.js
+++ b/www/layout/admin/javascript/jquery.test.js
--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2000/06/01
@@ -32,16 +33,22 @@
 *
 * HISTORY:
 * 2010/12/21 (cs) merge back password change interface
-* 2010/12/17 (cs) change that password can be blowfish encrypted, auto detects if other encryption is used (md5, std des) and tries to use them
+* 2010/12/17 (cs) change that password can be blowfish encrypted,
+*                 auto detects if other encryption is used (md5, std des)
+*                 and tries to use them
 * 2007/05/29 (cs) BUG with assign query and visible sub arrays to pages
 * 2005/09/21 (cs) if error -> unset the session vars
 * 2005/07/04 (cs) add a function to write into the edit log file
 * 2005/07/01 (cs) start adepting login class to new edit interface layout
 * 2005/03/31 (cs) fixed the class call with all debug vars
 * 2004/11/17 (cs) unused var cleanup
-* 2004/11/16 (cs) rewrite login so it uses a template and not just plain html. prepare it, so it will be able to use external stuff later (some interface has to be designed for that
-* 2004/11/16 (cs) removed the mobile html part from login	* 2004/09/30 (cs) layout fix
-*   2003-11-11: if user has debug 1 unset memlimit, because there can be serious problems with the query logging
+* 2004/11/16 (cs) rewrite login so it uses a template and not just plain html.
+*                 prepare it, so it will be able to use external stuff later
+*                 (some interface has to be designed for that
+* 2004/11/16 (cs) removed the mobile html part from login
+* 2004/09/30 (cs) layout fix
+*   2003-11-11: if user has debug 1 unset memlimit, because there can be serious
+*               problems with the query logging
 *   2003-06-12: added flag to PAGES array
 *               changed the get vars from GLOBALS to _POST
 *               changed the session registration. no more GLOBAL vars are registered
@@ -57,6 +64,8 @@
 *   2000-06-01: created basic idea and functions
 *********************************************************************/

+declare(strict_types=1);
+
 namespace CoreLibs\ACL;

 use CoreLibs\Check\Password;
@@ -64,16 +73,19 @@ use CoreLibs\Check\Password;
 class Login extends \CoreLibs\DB\IO
 {
 	private $euid; // the user id var
-	private $permission_okay = false; // is set to one if login okay, or EUID is set and user is okay to access this page
+	// is set to one if login okay, or EUID is set and user is okay to access this page
+	private $permission_okay = false;
 	public $login; // pressed login
 	private $action; // master action command
 	private $username; // login name
 	private $password; // login password
 	private $logout; // logout button
-	private $login_error = 0; // login error code, can be matched to the array login_error_msg, which holds the string
+	// login error code, can be matched to the array login_error_msg, which holds the string
+	private $login_error = 0;
 	private $password_change = false; // if this is set to true, the user can change passwords
 	private $password_change_ok = false; // password change was successful
-	private $password_forgot = false; // can we reset password and mail to user with new password set screen
+	// can we reset password and mail to user with new password set screen
+	private $password_forgot = false;
 	private $password_forgot_ok = false; // password forgot mail send ok
 	private $change_password;
 	private $pw_username;
@@ -161,7 +173,9 @@ class Login extends \CoreLibs\DB\IO
 		$this->l = new \CoreLibs\Language\L10n($lang);

 		// if we have a search path we need to set it, to use the correct DB to login
-		// check what schema to use. if there is a login schema use this, else check if there is a schema set in the config, or fall back to DB_SCHEMA if this exists, if this also does not exists use public schema
+		// check what schema to use. if there is a login schema use this, else check
+		// if there is a schema set in the config, or fall back to DB_SCHEMA
+		// if this exists, if this also does not exists use public schema
 		if (defined('LOGIN_DB_SCHEMA') && LOGIN_DB_SCHEMA) {
 			$SCHEMA = LOGIN_DB_SCHEMA;
 		} elseif (isset($db_config['db_schema']) && $db_config['db_schema']) {
@@ -175,7 +189,8 @@ class Login extends \CoreLibs\DB\IO
 		if ($this->dbGetSchema() && $this->dbGetSchema() != $SCHEMA) {
 			$this->dbExec("SET search_path TO " . $SCHEMA);
 		}
-		$this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0; // if there is none, there is none, saves me POST/GET check
+		// if there is none, there is none, saves me POST/GET check
+		$this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0;
 		// get login vars, are so, can't be changed
 		// prepare
 		// pass on vars to Object vars
@@ -303,21 +318,24 @@ class Login extends \CoreLibs\DB\IO
 			$password = $this->password;
 		}
 		// first, errors on missing encryption
-		if ((preg_match("/^\\$2(a|y)\\$/", $hash) && CRYPT_BLOWFISH != 1) ||
+		if (
+			(preg_match("/^\\$2(a|y)\\$/", $hash) && CRYPT_BLOWFISH != 1) ||
 			(preg_match("/^\\$1\\$/", $hash) && CRYPT_MD5 != 1) ||
 			(preg_match("/^\\$[0-9A-Za-z.]{12}$/", $hash) && CRYPT_STD_DES != 1)
 		) {
 			// this means password cannot be decrypted because of missing crypt methods
 			$this->login_error = 9999;
 			$password_ok = false;
-		} elseif (preg_match("/^\\$2y\\$/", $hash) &&
+		} elseif (
+			preg_match("/^\\$2y\\$/", $hash) &&
 			!Password::passwordVerify($password, $hash)
 		) {
 			// this is the new password hash methid, is only $2y$
 			// all others are not valid anymore
 			$this->login_error = 1013;
 			$password_ok = false;
-		} elseif (!preg_match("/^\\$2(a|y)\\$/", $hash) &&
+		} elseif (
+			!preg_match("/^\\$2(a|y)\\$/", $hash) &&
 			!preg_match("/^\\$1\\$/", $hash) &&
 			!preg_match("/^\\$[0-9A-Za-z.]{12}$/", $hash) &&
 			$hash != $password
@@ -344,30 +362,37 @@ class Login extends \CoreLibs\DB\IO
 				$this->login_error = 102;
 			} else {
 				// we have to get the themes in here too
-				$q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, eg.name AS edit_group_name, admin, ";
-				$q .= "eu.login_error_count, eu.login_error_date_last, eu.login_error_date_first, eu.strict, eu.locked, ";
-				$q .= "debug, db_debug, ";
-				$q .= "eareu.level AS user_level, eareu.type AS user_type, ";
-				$q .= "eareg.level AS group_level, eareg.type AS group_type, ";
-				$q .= "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, first.header_color AS first_header_color, ";
-				$q .= "second.header_color AS second_header_color, second.template ";
-				$q .= "FROM edit_user eu ";
-				$q .= "LEFT JOIN edit_scheme second ON (second.edit_scheme_id = eu.edit_scheme_id AND second.enabled = 1), ";
-				$q .= "edit_language el, edit_group eg, ";
-				$q .= "edit_access_right eareu, ";
-				$q .= "edit_access_right eareg, ";
-				$q .= "edit_scheme first ";
-				$q .= "WHERE first.edit_scheme_id = eg.edit_scheme_id AND eu.edit_group_id = eg.edit_group_id AND eu.edit_language_id = el.edit_language_id AND ";
-				$q .= "eu.edit_access_right_id = eareu.edit_access_right_id AND ";
-				$q .= "eg.edit_access_right_id = eareg.edit_access_right_id AND ";
+				$q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, "
+					. "eg.name AS edit_group_name, admin, "
+					. "eu.login_error_count, eu.login_error_date_last, "
+					. "eu.login_error_date_first, eu.strict, eu.locked, "
+					. "debug, db_debug, "
+					. "eareu.level AS user_level, eareu.type AS user_type, "
+					. "eareg.level AS group_level, eareg.type AS group_type, "
+					. "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, "
+					. "first.header_color AS first_header_color, "
+					. "second.header_color AS second_header_color, second.template "
+					. "FROM edit_user eu "
+					. "LEFT JOIN edit_scheme second ON "
+					. "(second.edit_scheme_id = eu.edit_scheme_id AND second.enabled = 1), "
+					. "edit_language el, edit_group eg, "
+					. "edit_access_right eareu, "
+					. "edit_access_right eareg, "
+					. "edit_scheme first "
+					. "WHERE first.edit_scheme_id = eg.edit_scheme_id "
+					. "AND eu.edit_group_id = eg.edit_group_id "
+					. "AND eu.edit_language_id = el.edit_language_id AND "
+					. "eu.edit_access_right_id = eareu.edit_access_right_id AND "
+					. "eg.edit_access_right_id = eareg.edit_access_right_id AND "
 					// password match is done in script, against old plain or new blowfish encypted
-				$q .= "(LOWER(username) = '".$this->dbEscapeString(strtolower($this->username))."') ";
+					. "(LOWER(username) = '" . $this->dbEscapeString(strtolower($this->username)) . "') ";
 				$res = $this->dbReturn($q);
 				// username is wrong, but we throw for wrong username and wrong password the same error
 				if (!$this->cursor_ext[md5($q)]['num_rows']) {
 					$this->login_error = 1010;
 				} else {
-					// if login errors is half of max errors and the last login error was less than 10s ago, forbid any new login try
+					// if login errors is half of max errors and the last login error
+					// was less than 10s ago, forbid any new login try

 					// check flow
 					// - user is enabled
@@ -386,10 +411,14 @@ class Login extends \CoreLibs\DB\IO
 						// none to be set, set in login password check
 					} else {
 						// check if the current password is an invalid hash and do a rehash and set password
-						// $this->debug('LOGIN', 'Hash: '.$res['password'].' -> VERIFY: '.($Password::passwordVerify($this->password, $res['password']) ? 'OK' : 'FAIL').' => HASH: '.(Password::passwordRehashCheck($res['password']) ? 'NEW NEEDED' : 'OK'));
+						// $this->debug('LOGIN', 'Hash: '.$res['password'].' -> VERIFY: '
+						//	.($Password::passwordVerify($this->password, $res['password']) ? 'OK' : 'FAIL')
+						//	.' => HASH: '.(Password::passwordRehashCheck($res['password']) ? 'NEW NEEDED' : 'OK'));
 						if (Password::passwordRehashCheck($res['password'])) {
 							// update password hash to new one now
-							$q = "UPDATE edit_user SET password = '".$this->dbEscapeString(Password::passwordSet($this->password))."' WHERE edit_user_id = ".$res['edit_user_id'];
+							$q = "UPDATE edit_user "
+								. "SET password = '" . $this->dbEscapeString(Password::passwordSet($this->password))
+								. "' WHERE edit_user_id = " . $res['edit_user_id'];
 							$this->dbExec($q);
 						}
 						// normal user processing
@@ -410,31 +439,36 @@ class Login extends \CoreLibs\DB\IO
 							$_SESSION['GROUP_ACL_TYPE'] = $res['group_type'];
 							// deprecated TEMPLATE setting
 							$_SESSION['TEMPLATE'] = $res['template'] ? $res['template'] : '';
-							$_SESSION['HEADER_COLOR'] = $res['second_header_color'] ? $res['second_header_color'] : $res['first_header_color'];
+							$_SESSION['HEADER_COLOR'] = $res['second_header_color'] ?
+								$res['second_header_color'] :
+								$res['first_header_color'];
 							$_SESSION['LANG'] = $res['lang_short'];
 							$_SESSION['DEFAULT_CHARSET'] = $res['lang_iso'];
-							$_SESSION['DEFAULT_LANG'] = $res['lang_short'].'_'.strtolower(str_replace('-', '', $res['lang_iso']));
+							$_SESSION['DEFAULT_LANG'] = $res['lang_short'] . '_'
+								. strtolower(str_replace('-', '', $res['lang_iso']));
 							// reset any login error count for this user
 							if ($res['login_error_count'] > 0) {
-								$q = "UPDATE edit_user ";
-								$q .= "SET login_error_count = 0, login_error_date_last = NULL, login_error_date_first = NULL ";
-								$q .= "WHERE edit_user_id = ".$res['edit_user_id'];
+								$q = "UPDATE edit_user "
+									. "SET login_error_count = 0, login_error_date_last = NULL, "
+									. "login_error_date_first = NULL "
+									. "WHERE edit_user_id = " . $res['edit_user_id'];
 								$this->dbExec($q);
 							}
 							$edit_page_ids = [];
 							$pages = [];
 							$pages_acl = [];
 							// set pages access
-							$q = "SELECT ep.edit_page_id, ep.cuid, epca.cuid AS content_alias_uid, ";
-							$q .= "ep.hostname, ep.filename, ep.name AS edit_page_name, ";
-							$q .= "ep.order_number AS edit_page_order, ep.menu, ";
-							$q .= "ep.popup, ep.popup_x, ep.popup_y, ep.online, ear.level, ear.type ";
-							$q .= "FROM edit_page ep ";
-							$q .= "LEFT JOIN edit_page epca ON (epca.edit_page_id = ep.content_alias_edit_page_id)";
-							$q .= ", edit_page_access epa, edit_access_right ear ";
-							$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND ear.edit_access_right_id = epa.edit_access_right_id ";
-							$q .= "AND epa.enabled = 1 AND epa.edit_group_id = ".$res["edit_group_id"]." ";
-							$q .= "ORDER BY ep.order_number";
+							$q = "SELECT ep.edit_page_id, ep.cuid, epca.cuid AS content_alias_uid, "
+								. "ep.hostname, ep.filename, ep.name AS edit_page_name, "
+								. "ep.order_number AS edit_page_order, ep.menu, "
+								. "ep.popup, ep.popup_x, ep.popup_y, ep.online, ear.level, ear.type "
+								. "FROM edit_page ep "
+								. "LEFT JOIN edit_page epca ON (epca.edit_page_id = ep.content_alias_edit_page_id)"
+								. ", edit_page_access epa, edit_access_right ear "
+								. "WHERE ep.edit_page_id = epa.edit_page_id "
+								. "AND ear.edit_access_right_id = epa.edit_access_right_id "
+								. "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " "
+								. "ORDER BY ep.order_number";
 							while ($res = $this->dbReturn($q)) {
 								// page id array for sub data readout
 								$edit_page_ids[$res['edit_page_id']] = $res['cuid'];
@@ -442,7 +476,8 @@ class Login extends \CoreLibs\DB\IO
 								$pages[$res['cuid']] = [
 									'edit_page_id' => $res['edit_page_id'],
 									'cuid' => $res['cuid'],
-									'content_alias_uid' => $res['content_alias_uid'], // for reference of content data on a differen page
+									// for reference of content data on a differen page
+									'content_alias_uid' => $res['content_alias_uid'],
 									'hostname' => $res['hostname'],
 									'filename' => $res['filename'],
 									'page_name' => $res['edit_page_name'],
@@ -462,18 +497,20 @@ class Login extends \CoreLibs\DB\IO
 							} // for each page
 							// get the visible groups for all pages and write them to the pages
 							$_edit_page_id = 0;
-							$q = "SELECT epvg.edit_page_id, name, flag ";
-							$q .= "FROM edit_visible_group evp, edit_page_visible_group epvg ";
-							$q .= "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
-							$q .= "ORDER BY epvg.edit_page_id";
+							$q = "SELECT epvg.edit_page_id, name, flag "
+								. "FROM edit_visible_group evp, edit_page_visible_group epvg "
+								. "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id "
+								. "AND epvg.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+								. "ORDER BY epvg.edit_page_id";
 							while ($res = $this->dbReturn($q)) {
 								$pages[$edit_page_ids[$res['edit_page_id']]]['visible'][$res['name']] = $res['flag'];
 							}
 							// get the same for the query strings
 							$_edit_page_id = 0;
-							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs ";
-							$q .= "WHERE enabled = 1 AND edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
-							$q .= "ORDER BY eqs.edit_page_id";
+							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs "
+								. "WHERE enabled = 1 AND edit_page_id "
+								. "IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+								. "ORDER BY eqs.edit_page_id";
 							while ($res = $this->dbReturn($q)) {
 								$pages[$edit_page_ids[$res['edit_page_id']]]['query'][] = [
 									'name' => $res['name'],
@@ -483,11 +520,12 @@ class Login extends \CoreLibs\DB\IO
 							}
 							// get the page content and add them to the page
 							$_edit_page_id = 0;
-							$q = "SELECT epc.edit_page_id, epc.name, epc.uid, epc.order_number, epc.online, ear.level, ear.type ";
-							$q .= "FROM edit_page_content epc, edit_access_right ear ";
-							$q .= "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND ";
-							$q .= "epc.edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
-							$q .= "ORDER BY epc.order_number";
+							$q = "SELECT epc.edit_page_id, epc.name, epc.uid, epc.order_number, "
+								. "epc.online, ear.level, ear.type "
+								. "FROM edit_page_content epc, edit_access_right ear "
+								. "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND "
+								. "epc.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+								. "ORDER BY epc.order_number";
 							while ($res = $this->dbReturn($q)) {
 								$pages[$edit_page_ids[$res['edit_page_id']]]['content'][$res['uid']] = [
 									'name' => $res['name'],
@@ -503,17 +541,20 @@ class Login extends \CoreLibs\DB\IO
 							$_SESSION['PAGES'] = $pages;
 							$_SESSION['PAGES_ACL_LEVEL'] = $pages_acl;
 							// load the edit_access user rights
-							$q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default ";
-							$q .= "FROM edit_access_user eau, edit_access_right ear, edit_access ea ";
-							$q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id ";
-							$q .= "AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
-							$q .= "ORDER BY ea.name";
+							$q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default "
+								. "FROM edit_access_user eau, edit_access_right ear, edit_access ea "
+								. "WHERE eau.edit_access_id = ea.edit_access_id "
+								. "AND eau.edit_access_right_id = ear.edit_access_right_id "
+								. "AND eau.enabled = 1 AND edit_user_id = " . $this->euid . " "
+								. "ORDER BY ea.name";
 							$unit_access = [];
 							$eauid = [];
 							$unit_acl = [];
 							while ($res = $this->dbReturn($q)) {
 								// read edit access data fields and drop them into the unit access array
-								$q_sub ="SELECT name, value FROM edit_access_data WHERE enabled = 1 AND edit_access_id = ".$res['edit_access_id'];
+								$q_sub = "SELECT name, value "
+									. "FROM edit_access_data "
+									. "WHERE enabled = 1 AND edit_access_id = " . $res['edit_access_id'];
 								$ea_data = [];
 								while ($res_sub = $this->dbReturn($q_sub)) {
 									$ea_data[$res_sub['name']] = $res_sub['value'];
@@ -548,12 +589,14 @@ class Login extends \CoreLibs\DB\IO
 							$login_error_date_first = ", login_error_date_first = NOW()";
 						}
 						// update login error count for this user
-						$q = "UPDATE edit_user ";
-						$q .= "SET login_error_count = login_error_count + 1, login_error_date_last = NOW() ".$login_error_date_first." ";
-						$q .= "WHERE edit_user_id = ".$res['edit_user_id'];
+						$q = "UPDATE edit_user "
+							. "SET login_error_count = login_error_count + 1, "
+							. "login_error_date_last = NOW() " . $login_error_date_first . " "
+							. "WHERE edit_user_id = " . $res['edit_user_id'];
 						$this->dbExec($q);
 						// totally lock the user if error max is reached
-						if ($this->max_login_error_count != -1 &&
+						if (
+							$this->max_login_error_count != -1 &&
 							$res['login_error_count'] + 1 > $this->max_login_error_count
 						) {
 							// do some alert reporting in case this error is too big
@@ -581,14 +624,23 @@ class Login extends \CoreLibs\DB\IO
 	public function loginCheckPermissions(): bool
 	{
 		if ($this->euid && $this->login_error != 103) {
-			$q = "SELECT filename ";
-			$q .= "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu ";
-			$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND eg.edit_group_id = epa.edit_group_id AND eg.edit_group_id = eu.edit_group_id ";
-			$q .= "AND eu.edit_user_id = ".$this->euid." AND filename = '".$this->page_name."' AND eg.enabled = 1 AND epa.enabled = 1";
+			$q = "SELECT filename "
+				. "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu "
+				. "WHERE ep.edit_page_id = epa.edit_page_id "
+				. "AND eg.edit_group_id = epa.edit_group_id "
+				. "AND eg.edit_group_id = eu.edit_group_id "
+				. "AND eu.edit_user_id = " . $this->euid . " "
+				. "AND filename = '" . $this->page_name . "' "
+				. "AND eg.enabled = 1 AND epa.enabled = 1";
 			$res = $this->dbReturnRow($q);
 			// unset mem limit if debug is set to 1
-			// if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
-			// 	ini_set('memory_limit', -1);
+			// if (
+			// 	($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] ||
+			// 	$_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) &&
+			// 	ini_get('memory_limit') != -1
+			// ) {
+			// 	ini_set('memory_limit', '-1');
+			// }
 			if (isset($res['filename']) && $res['filename'] == $this->page_name) {
 				$this->permission_okay = true;
 			} else {
@@ -687,7 +739,10 @@ class Login extends \CoreLibs\DB\IO
 			if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
 				$this->acl['page'] = $_SESSION['GROUP_ACL_LEVEL'];
 			}
-			if (isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) && $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
+			if (
+				isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) &&
+				$_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1
+			) {
 				$this->acl['page'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
 			}

@@ -820,7 +875,10 @@ class Login extends \CoreLibs\DB\IO
 				}
 				// check user exist, if not -> error
 				if (!$this->login_error) {
-					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
+					$q = "SELECT edit_user_id "
+						. "FROM edit_user "
+						. "WHERE enabled = 1 "
+						. "AND username = '" . $this->dbEscapeString($this->pw_username) . "'";
 					list ($edit_user_id) = $this->dbReturnRow($q);
 					if (!$edit_user_id) {
 						// username wrong
@@ -830,7 +888,10 @@ class Login extends \CoreLibs\DB\IO
 				}
 				// check old passwords match -> error
 				if (!$this->login_error) {
-					$q = "SELECT edit_user_id, password FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
+					$q = "SELECT edit_user_id, password "
+						. "FROM edit_user "
+						. "WHERE enabled = 1 "
+						. "AND username = '" . $this->dbEscapeString($this->pw_username) . "'";
 					list ($edit_user_id, $old_password_hash) = $this->dbReturnRow($q);
 					if (!$edit_user_id || !$this->loginPasswordCheck($old_password_hash, $this->pw_old_password)) {
 						// old password wrong
@@ -862,7 +923,10 @@ class Login extends \CoreLibs\DB\IO
 				// no error change this users password
 				if (!$this->login_error && $edit_user_id) {
 					// update the user (edit_user_id) with the new password
-					$q = "UPDATE edit_user SET password = '".$this->dbEscapeString(Password::passwordSet($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
+					$q = "UPDATE edit_user "
+						. "SET password = "
+						. "'" . $this->dbEscapeString(Password::passwordSet($this->pw_new_password)) . "' "
+						. "WHERE edit_user_id = " . $edit_user_id;
 					$this->dbExec($q);
 					$data = 'Password change for user "' . $this->pw_username . '"';
 					$this->password_change_ok = true;
@@ -903,36 +967,69 @@ class Login extends \CoreLibs\DB\IO
 				// pre change the data in the PASSWORD_CHANGE_DIV first
 				foreach ($this->login_template['strings'] as $string => $data) {
 					if ($data) {
-						$html_string_password_change = str_replace('{'.$string.'}', $data, $html_string_password_change);
+						$html_string_password_change = str_replace(
+							'{' . $string . '}',
+							$data,
+							$html_string_password_change
+						);
 					}
 				}
 				// print error messagae
 				if ($this->login_error) {
-					$html_string_password_change = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'<br>', $html_string_password_change);
+					$html_string_password_change = str_replace(
+						'{ERROR_MSG}',
+						$this->login_error_msg[$this->login_error] . '<br>',
+						$html_string_password_change
+					);
 				} else {
-					$html_string_password_change = str_replace('{ERROR_MSG}', '<br>', $html_string_password_change);
+					$html_string_password_change = str_replace(
+						'{ERROR_MSG}',
+						'<br>',
+						$html_string_password_change
+					);
 				}
 				// if pw change action, show the float again
 				if ($this->change_password && !$this->password_change_ok) {
-					$html_string_password_change = str_replace('{PASSWORD_CHANGE_SHOW}', '<script language="JavaScript">ShowHideDiv(\'pw_change_div\');</script>', $html_string_password_change);
+					$html_string_password_change = str_replace(
+						'{PASSWORD_CHANGE_SHOW}',
+						'<script language="JavaScript">'
+							. 'ShowHideDiv(\'pw_change_div\');</script>',
+						$html_string_password_change
+					);
 				} else {
-					$html_string_password_change = str_replace('{PASSWORD_CHANGE_SHOW}', '', $html_string_password_change);
+					$html_string_password_change = str_replace(
+						'{PASSWORD_CHANGE_SHOW}',
+						'',
+						$html_string_password_change
+					);
 				}
 				$this->login_template['strings']['PASSWORD_CHANGE_DIV'] = $html_string_password_change;
 			}

 			// put in the logout redirect string
 			if ($this->logout && $LOGOUT_TARGET) {
-				$html_string = str_replace('{LOGOUT_TARGET}', '<meta http-equiv="refresh" content="0; URL='.$LOGOUT_TARGET.'">', $html_string);
+				$html_string = str_replace(
+					'{LOGOUT_TARGET}',
+					'<meta http-equiv="refresh" content="0; URL=' . $LOGOUT_TARGET . '">',
+					$html_string
+				);
 			} else {
 				$html_string = str_replace('{LOGOUT_TARGET}', '', $html_string);
 			}

 			// print error messagae
 			if ($this->login_error) {
-				$html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'<br>', $html_string);
+				$html_string = str_replace(
+					'{ERROR_MSG}',
+					$this->login_error_msg[$this->login_error] . '<br>',
+					$html_string
+				);
 			} elseif ($this->password_change_ok && $this->password_change) {
-				$html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[300].'<br>', $html_string);
+				$html_string = str_replace(
+					'{ERROR_MSG}',
+					$this->login_error_msg[300] . '<br>',
+					$html_string
+				);
 			} else {
 				$html_string = str_replace('{ERROR_MSG}', '<br>', $html_string);
 			}
@@ -1000,24 +1097,33 @@ class Login extends \CoreLibs\DB\IO
 		];

 		$error_msgs = [
-			'100' => $this->l->__('Fatal Error: <b>[EUID] came in as GET/POST!</b>'), // actually obsolete
-			'1010' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // user not found
-			'1011' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // blowfish password wrong
-			'1012' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // fallback md5 password wrong
-			'1013' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // new password_hash wrong
+			// actually obsolete
+			'100' => $this->l->__('Fatal Error: <b>[EUID] came in as GET/POST!</b>'),
+			// user not found
+			'1010' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'),
+			// blowfish password wrong
+			'1011' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'),
+			// fallback md5 password wrong
+			'1012' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'),
+			// new password_hash wrong
+			'1013' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'),
 			'102' => $this->l->__('Fatal Error: <b>Login Failed - Please enter username and password</b>'),
 			'103' => $this->l->__('Fatal Error: <b>You do not have the rights to access this Page</b>'),
 			'104' => $this->l->__('Fatal Error: <b>Login Failed - User not enabled</b>'),
 			'105' => $this->l->__('Fatal Error: <b>Login Failed - User is locked</b>'),
-			'220' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'), // actually this is an illegal user, but I mask it
+			// actually this is an illegal user, but I mask it
+			'220' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'),
 			'200' => $this->l->__('Fatal Error: <b>Password change - Please enter username and old password</b>'),
 			'201' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'),
 			'202' => $this->l->__('Fatal Error: <b>Password change - The old password is not correct</b>'),
 			'203' => $this->l->__('Fatal Error: <b>Password change - Please fill out both new password fields</b>'),
 			'204' => $this->l->__('Fatal Error: <b>Password change - The new passwords do not match</b>'),
-			'205' => $this->l->__('Fatal Error: <b>Password change - The new password is not in a valid format</b>'), // we should also not here WHAT is valid
-			'300' => $this->l->__('Success: <b>Password change successful</b>'), // for OK password change
-			'9999' => $this->l->__('Fatal Error: <b>necessary crypt engine could not be found</b>. Login is impossible') // this is bad bad error
+			// we should also not here WHAT is valid
+			'205' => $this->l->__('Fatal Error: <b>Password change - The new password is not in a valid format</b>'),
+			// for OK password change
+			'300' => $this->l->__('Success: <b>Password change successful</b>'),
+			// this is bad bad error
+			'9999' => $this->l->__('Fatal Error: <b>necessary crypt engine could not be found</b>. Login is impossible')
 		];

 		// if password change is okay
@@ -1028,23 +1134,36 @@ class Login extends \CoreLibs\DB\IO
 				'NEW_PASSWORD' => $this->l->__('New Password'),
 				'NEW_PASSWORD_CONFIRM' => $this->l->__('New Password confirm'),
 				'CLOSE' => $this->l->__('Close'),
-				'JS_SHOW_HIDE' => "function ShowHideDiv(id) { element = document.getElementById(id); if (element.className == 'visible' || !element.className) element.className = 'hidden'; else element.className = 'visible'; }",
-				'PASSWORD_CHANGE_BUTTON' => '<input type="button" name="pw_change" value="'.$strings['PASSWORD_CHANGE_BUTTON_VALUE'].'" OnClick="ShowHideDiv(\'pw_change_div\');">'
+				'JS_SHOW_HIDE' => "function ShowHideDiv(id) { "
+						. "element = document.getElementById(id); "
+						. "if (element.className == 'visible' || !element.className) element.className = 'hidden'; "
+						. "else element.className = 'visible'; }",
+				'PASSWORD_CHANGE_BUTTON' => '<input type="button" name="pw_change" value="'
+					. $strings['PASSWORD_CHANGE_BUTTON_VALUE']
+					. '" OnClick="ShowHideDiv(\'pw_change_div\');">'
 			]);
+			// NOTE: for the HTML block I ignore line lengths
+			// phpcs:disable
 			$this->login_template['password_change'] = <<<EOM
 <div id="pw_change_div" class="hidden" style="position: absolute; top: 30px; left: 50px; width: 400px; height: 220px; background-color: white; border: 1px solid black; padding: 25px;">
 <table>
 <tr><td class="norm" align="center" colspan="2"><h3>{TITLE_PASSWORD_CHANGE}</h3></td></tr>
 <tr><td class="norm" colspan="2">{ERROR_MSG}</td></tr>
 <tr><td class="norm" align="right">{USERNAME}</td><td><input type="text" name="pw_username" value=""></td></tr>
-<tr><td class="norm" align="right">{OLD_PASSWORD}</td><td><input type="password" name="pw_old_password" value=""></td></tr>
-<tr><td class="norm" align="right">{NEW_PASSWORD}</td><td><input type="password" name="pw_new_password" value=""></td></tr>
-<tr><td class="norm" align="right">{NEW_PASSWORD_CONFIRM}</td><td><input type="password" name="pw_new_password_confirm" value=""></td></tr>
-<tr><td></td><td><input type="submit" name="change_password" value="{PASSWORD_CHANGE_BUTTON_VALUE}"><input type="button" name="pw_change" value="{CLOSE}" OnClick="ShowHideDiv('pw_change_div');"></td></tr>
+<tr><td class="norm" align="right">{OLD_PASSWORD}</td>
+<td><input type="password" name="pw_old_password" value=""></td></tr>
+<tr><td class="norm" align="right">{NEW_PASSWORD}</td>
+<td><input type="password" name="pw_new_password" value=""></td></tr>
+<tr><td class="norm" align="right">{NEW_PASSWORD_CONFIRM}</td>
+<td><input type="password" name="pw_new_password_confirm" value=""></td></tr>
+<tr><td></td>
+<td><input type="submit" name="change_password" value="{PASSWORD_CHANGE_BUTTON_VALUE}">
+<input type="button" name="pw_change" value="{CLOSE}" OnClick="ShowHideDiv('pw_change_div');"></td></tr>
 </table>
 </div>
 {PASSWORD_CHANGE_SHOW}
 EOM;
+			// phpcs:enable
 		}
 		if ($this->password_forgot) {
 		}
@@ -1163,15 +1282,25 @@ EOM;
 		];
 		$data_binary = $this->dbEscapeBytea(bzcompress(serialize($_data_binary)));
 		// SQL querie for log entry
-		$q = "INSERT INTO edit_log ";
-		$q .= "(username, password, euid, event_date, event, error, data, data_binary, page, ";
-		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
-		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
-		$q .= "VALUES ('".$this->dbEscapeString($username)."', 'PASSWORD', ".($this->euid ? $this->euid : 'NULL').", ";
-		$q .= "NOW(), '".$this->dbEscapeString($event)."', '".$this->dbEscapeString((string)$error)."', '".$this->dbEscapeString($data)."', '".$data_binary."', '".$this->page_name."', ";
-		foreach ([
-			'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME', 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
-		 ] as $server_code) {
+		$q = "INSERT INTO edit_log "
+			. "(username, password, euid, event_date, event, error, data, data_binary, page, "
+			. "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
+			. "http_accept, http_accept_charset, http_accept_encoding, session_id, "
+			. "action, action_id, action_yes, action_flag, action_menu, action_loaded, "
+			. "action_value, action_error) "
+			. "VALUES ('" . $this->dbEscapeString($username) . "', 'PASSWORD', "
+			. ($this->euid ? $this->euid : 'NULL') . ", "
+			. "NOW(), '" . $this->dbEscapeString($event) . "', "
+			. "'" . $this->dbEscapeString((string)$error) . "', "
+			. "'" . $this->dbEscapeString($data) . "', '" . $data_binary . "', "
+			. "'" . $this->page_name . "', ";
+		foreach (
+			[
+				'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME',
+				'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT',
+				'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
+			] as $server_code
+		) {
 			if (array_key_exists($server_code, $_SERVER)) {
 				$q .= "'" . $this->dbEscapeString($_SERVER[$server_code]) . "', ";
 			} else {
@@ -1197,7 +1326,8 @@ EOM;
 	 */
 	public function loginCheckEditAccessId(?int $edit_access_id): ?int
 	{
-		if (isset($_SESSION['UNIT']) &&
+		if (
+			isset($_SESSION['UNIT']) &&
 			is_array($_SESSION['UNIT']) &&
 			!array_key_exists($edit_access_id, $_SESSION['UNIT'])
 		) {
@@ -1222,6 +1352,7 @@ EOM;
 			return $_SESSION['UNIT'][$edit_access_id]['data'][$data_key];
 		}
 	}
-} // close class
+	// close class
+}

 // __END__
--- a/www/lib/CoreLibs/Admin/Backend.php
+++ b/www/lib/CoreLibs/Admin/Backend.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2006/08/15
@@ -10,6 +11,10 @@
 * - menu creation
 * - array vars for smarty
 *
+* CHANGE PLAN:
+* loads DB\IO + Logger and returns one group object
+* also checks all missing CONFIG vars from Basic class
+*
 * PUBLIC VARIABLES
 *
 * PRIVATE VARIABLES
@@ -22,6 +27,8 @@
 *
 *********************************************************************/

+declare(strict_types=1);
+
 namespace CoreLibs\Admin;

 class Backend extends \CoreLibs\DB\IO
@@ -30,7 +37,10 @@ class Backend extends \CoreLibs\DB\IO
 	public $menu = [];
 	public $menu_show_flag = 0; // top menu flag (mostly string)
 	// action ids
-	public $action_list = ['action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag', 'action_menu', 'action_value', 'action_error', 'action_loaded'];
+	public $action_list = [
+		'action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag',
+		'action_menu', 'action_value', 'action_error', 'action_loaded'
+	];
 	public $action;
 	public $action_id;
 	public $action_sub_id;
@@ -178,32 +188,38 @@ class Backend extends \CoreLibs\DB\IO
 			$SCHEMA = 'public';
 		}

-		$q = "INSERT INTO ".$SCHEMA.".edit_log ";
-		$q .= "(euid, event_date, event, data, data_binary, page, ";
-		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
-		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
-		$q .= "VALUES ";
-		$q .= "(".$this->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ? $_SESSION['EUID'] : 'NULL').", ";
-		$q .= "NOW(), ";
-		$q .= "'".$this->dbEscapeString((string)$event)."', '".$data."', '".$data_binary."', '".$this->dbEscapeString((string)$this->page_name)."', ";
-		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['QUERY_STRING'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['SERVER_NAME'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['HTTP_HOST'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '')."', ";
-		$q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '')."', ";
-		$q .= "'".session_id()."', ";
-		$q .= "'".$this->dbEscapeString($this->action)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_id)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_yes)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_flag)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_menu)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_loaded)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_value)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_error)."')";
+		$q = "INSERT INTO " . $SCHEMA . ".edit_log "
+			. "(euid, event_date, event, data, data_binary, page, "
+			. "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
+			. "http_accept, http_accept_charset, http_accept_encoding, session_id, "
+			. "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) "
+			. "VALUES "
+			. "(" . $this->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+				$_SESSION['EUID'] :
+				'NULL')
+			. ", "
+			. "NOW(), "
+			. "'" . $this->dbEscapeString((string)$event) . "', '" . $data . "', "
+			. "'" . $data_binary . "', '" . $this->dbEscapeString((string)$this->page_name) . "', "
+			. "'" . @$_SERVER["REMOTE_ADDR"] . "', "
+			. "'" . $this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT']) . "', "
+			. "'" . $this->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['QUERY_STRING'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['SERVER_NAME'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['HTTP_HOST'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '') . "', "
+			. "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '') . "', "
+			. "'" . session_id() . "', "
+			. "'" . $this->dbEscapeString($this->action) . "', "
+			. "'" . $this->dbEscapeString($this->action_id) . "', "
+			. "'" . $this->dbEscapeString($this->action_yes) . "', "
+			. "'" . $this->dbEscapeString($this->action_flag) . "', "
+			. "'" . $this->dbEscapeString($this->action_menu) . "', "
+			. "'" . $this->dbEscapeString($this->action_loaded) . "', "
+			. "'" . $this->dbEscapeString($this->action_value) . "', "
+			. "'" . $this->dbEscapeString($this->action_error) . "')";
 		$this->dbExec($q, 'NULL');
 	}

@@ -224,14 +240,14 @@ class Backend extends \CoreLibs\DB\IO
 			$PAGES = [];
 		}
 		$pages = [];
-		foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
+		foreach ($PAGES as $PAGE_DATA) {
 			$pages[] = $PAGE_DATA;
 		}
 		// $this->debug('pages', $this->print_ar($pages));
 		// if flag is 0, then we show all, else, we show only the matching flagges array points
 		// array is already sorted after correct order
 		reset($pages);
-		foreach ($pages as $i => $data) {
+		foreach ($pages as $data) {
 		// for ($i = 0, $iMax = count($pages); $i < $iMax; $i ++) {
 			$show = 0;
 			// is it visible in the menu & is it online
@@ -258,20 +274,23 @@ class Backend extends \CoreLibs\DB\IO
 					}
 					$query_string = '';

-					if (isset($data['query']) &&
+					if (
+						isset($data['query']) &&
 						is_array($data['query']) &&
 						count($data['query'])
 					) {
 						// for ($j = 0, $jMax = count($pages[$i]['query']); $j < $jMax; $j ++) {
 						foreach ($data['query'] as $j => $query) {
-							if (!empty($query['name']) &&
+							if (
+								!empty($query['name']) &&
 								!empty($query['value'])
 							) {
 								if (strlen($query_string)) {
 									$query_string .= '&';
 								}
 								$query_string .= $query['name'] . '=';
-								if (isset($query['dynamic']) &&
+								if (
+									isset($query['dynamic']) &&
 									$query['dynamic']
 								) {
 									if (isset($_GET[$query['value']])) {
@@ -296,7 +315,8 @@ class Backend extends \CoreLibs\DB\IO
 					$name = $data['page_name'] ?? '';
 					// if page name matchs -> set selected flag
 					$selected = 0;
-					if (isset($data['filename']) &&
+					if (
+						isset($data['filename']) &&
 						\CoreLibs\Get\System::getPageName() == $data['filename'] &&
 						(!isset($data['hostname']) || (
 							isset($data['hostname']) &&
@@ -308,7 +328,8 @@ class Backend extends \CoreLibs\DB\IO
 					}
 					// last check, is this menu point okay to show
 					$enabled = 0;
-					if (isset($data['filename']) &&
+					if (
+						isset($data['filename']) &&
 						$this->adbShowMenuPoint($data['filename'])
 					) {
 						$enabled = 1;
@@ -329,11 +350,12 @@ class Backend extends \CoreLibs\DB\IO
 	}

 	/**
+	 * ONLY USED IN adbTopMenu
 	 * checks if this filename is in the current situation (user id, etc) available
 	 * @param  string|null $filename filename
 	 * @return bool                  true for visible/accessable menu point, false for not
 	 */
-	public function adbShowMenuPoint(?string $filename): bool
+	private function adbShowMenuPoint(?string $filename): bool
 	{
 		$enabled = false;
 		if ($filename === null) {
@@ -359,7 +381,10 @@ class Backend extends \CoreLibs\DB\IO
 	 */
 	public function adbAssocArray(array $db_array, $key, $value): array
 	{
-		trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray', E_USER_DEPRECATED);
+		trigger_error(
+			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray',
+			E_USER_DEPRECATED
+		);
 		return \CoreLibs\Combined\ArrayHandler::genAssocArray($db_array, $key, $value);
 	}

@@ -372,7 +397,10 @@ class Backend extends \CoreLibs\DB\IO
 	 */
 	public function adbByteStringFormat($number): string
 	{
-		trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
+		trigger_error(
+			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()',
+			E_USER_DEPRECATED
+		);
 		return \CoreLibs\Convert\Byte::humanReadableByteFormat($number);
 	}

@@ -389,7 +417,10 @@ class Backend extends \CoreLibs\DB\IO
 	 */
 	public function adbCreateThumbnail($pic, $size_x, $size_y, $dummy = '', $path = "", $cache = "")
 	{
-		trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Output\Image::createThumbnail()', E_USER_DEPRECATED);
+		trigger_error(
+			'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()',
+			E_USER_DEPRECATED
+		);
 		return \CoreLibs\Output\Image::createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
 	}

@@ -453,14 +484,15 @@ class Backend extends \CoreLibs\DB\IO
 		} else {
 			$SCHEMA = 'public';
 		}
-		$q = "INSERT INTO ".$SCHEMA.".live_queue (";
-		$q .= "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file";
-		$q .= ") VALUES (";
-		$q .= "'".$this->dbEscapeString($queue_key)."', '".$this->dbEscapeString($key_value)."', ";
-		$q .= "'".$this->dbEscapeString($key_name)."', '".$this->dbEscapeString($type)."', ";
-		$q .= "'".$this->dbEscapeString($target)."', '".$this->dbEscapeString($data)."', ";
-		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->dbEscapeString((string)$associate)."', ";
-		$q .= "'".$this->dbEscapeString((string)$file)."')";
+		$q = "INSERT INTO " . $SCHEMA . ".live_queue ("
+			. "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file"
+			. ") VALUES ("
+			. "'" . $this->dbEscapeString($queue_key) . "', '" . $this->dbEscapeString($key_value) . "', "
+			. "'" . $this->dbEscapeString($key_name) . "', '" . $this->dbEscapeString($type) . "', "
+			. "'" . $this->dbEscapeString($target) . "', '" . $this->dbEscapeString($data) . "', "
+			. "'" . $this->queue_key . "', '" . $this->action . "', "
+			. "'" . $this->dbEscapeString((string)$associate) . "', "
+			. "'" . $this->dbEscapeString((string)$file) . "')";
 		$this->dbExec($q);
 	}

@@ -490,7 +522,16 @@ class Backend extends \CoreLibs\DB\IO
 		bool $name_pos_back = false
 	) {
 		// get the build layout
-		$html_time = \CoreLibs\Output\Form\Elements::printDateTime($year, $month, $day, $hour, $min, $suffix, $min_steps, $name_pos_back);
+		$html_time = \CoreLibs\Output\Form\Elements::printDateTime(
+			$year,
+			$month,
+			$day,
+			$hour,
+			$min,
+			$suffix,
+			$min_steps,
+			$name_pos_back
+		);
 		// translate the strings inside
 		foreach (['Year ', 'Month ', 'Day ', 'Hour ', 'Minute '] as $_time) {
 			$html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)) . ' ', $html_time);
--- a/www/lib/CoreLibs/Basic.php
+++ b/www/lib/CoreLibs/Basic.php
@@ -1,4 +1,7 @@
-<?php declare(strict_types=1);
+<?php
+
+// phpcs:disable Generic.Files.LineLength
+
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/03/24
@@ -15,12 +18,15 @@
 * HISTORY:
 * 2021/06/16 (cs) CLASS MOSTLY DEPRECATED: moved all methids in their own classes
 * 2010/12/24 (cs) add crypt classes with auto detect what crypt we can use, add php version check class
-* 2008/08/07 (cs) fixed strange DEBUG_ALL on off behavour. data was written even thought DBEUG_ALL was off. now no debug logging is done at all if DEBUG_ALL is off
+* 2008/08/07 (cs) fixed strange DEBUG_ALL on off behavour. data was written even thought
+*                 DBEUG_ALL was off. now no debug logging is done at all if DEBUG_ALL is off
 * 2007/11/13 (cs) add Comparedate function
 * 2007/11/05 (cs) added GenAssocArray and CheckDate functions
-* 2007/10/10 (cs) magic links function can use http:///path as a local prefix. blank target is removed & http:// also
+* 2007/10/10 (cs) magic links function can use http:///path as a local prefix.
+*                 blank target is removed & http:// also
 * 2006/03/09 (cs) added Byte/TimeStringFormat functions
-* 2006/02/21 (cs) fix various problems with the mime magic function: || not always working, fix prefix replacement, etc
+* 2006/02/21 (cs) fix various problems with the mime magic function: || not always working,
+*                 fix prefix replacement, etc
 * 2006/02/09 (cs) added _mb_mime_encode function, replacement for php internal one
 * 2005/07/12 (cs) added some small stylesheet defs to debug output
 * 2005/06/24 (cs) made the check selected/checked function way easier
@@ -43,6 +49,8 @@
 * 2003-03-24: start of stub/basic class
 *********************************************************************/

+declare(strict_types=1);
+
 namespace CoreLibs;

 /** Basic core class declaration */
@@ -77,13 +85,19 @@ class Basic
 		// TODO make check dynamic for entries we MUST have depending on load type
 		// before we start any work, we should check that all MUST constants are defined
 		$abort = false;
-		foreach ([
-			'DS', 'DIR', 'BASE', 'ROOT', 'LIB', 'INCLUDES', 'LAYOUT', 'PICTURES', 'FLASH', 'VIDEOS', 'DOCUMENTS', 'PDFS', 'BINARIES', 'ICONS',
-			'UPLOADS', 'CSV', 'JS', 'CSS', 'TABLE_ARRAYS', 'SMARTY', 'LANG', 'CACHE', 'TMP', 'LOG', 'TEMPLATES', 'TEMPLATES_C',
-			'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
-			'DEFAULT_ACL_LEVEL', 'LOGOUT_TARGET', 'PASSWORD_CHANGE', 'AJAX_REQUEST_TYPE', 'USE_PROTOTYPE', 'USE_SCRIPTACULOUS', 'USE_JQUERY',
-			'PAGE_WIDTH', 'MASTER_TEMPLATE_NAME', 'PUBLIC_SCHEMA', 'TEST_SCHEMA', 'DEV_SCHEMA', 'LIVE_SCHEMA', 'DB_CONFIG_NAME', 'DB_CONFIG', 'TARGET', 'DEBUG', 'SHOW_ALL_ERRORS'
-		 ] as $constant) {
+		foreach (
+			[
+				'DS', 'DIR', 'BASE', 'ROOT', 'LIB', 'INCLUDES', 'LAYOUT', 'PICTURES', 'FLASH',
+				'VIDEOS', 'DOCUMENTS', 'PDFS', 'BINARIES', 'ICONS', 'UPLOADS', 'CSV', 'JS',
+				'CSS', 'TABLE_ARRAYS', 'SMARTY', 'LANG', 'CACHE', 'TMP', 'LOG', 'TEMPLATES',
+				'TEMPLATES_C', 'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
+				'DEFAULT_ACL_LEVEL', 'LOGOUT_TARGET', 'PASSWORD_CHANGE', 'AJAX_REQUEST_TYPE',
+				'USE_PROTOTYPE', 'USE_SCRIPTACULOUS', 'USE_JQUERY', 'PAGE_WIDTH',
+				'MASTER_TEMPLATE_NAME', 'PUBLIC_SCHEMA', 'TEST_SCHEMA', 'DEV_SCHEMA',
+				'LIVE_SCHEMA', 'DB_CONFIG_NAME', 'DB_CONFIG', 'TARGET', 'DEBUG',
+				'SHOW_ALL_ERRORS'
+			] as $constant
+		) {
 			if (!defined($constant)) {
 				echo "Constant $constant misssing<br>";
 				$abort = true;
@@ -357,74 +371,6 @@ class Basic
 		return $this->log->printErrorMsg($string);
 	}

-	/**
-	 * writes error msg data to file for current level
-	 * @param  string $level        the level to write
-	 * @param  string $error_string error string to write
-	 * @return void                 has no return
-	 */
-	/* private function writeErrorMsg(string $level, string $error_string): void
-	{
-		// only write if write is requested
-		if ($this->doDebugTrigger('debug', $level) &&
-			$this->doDebugTrigger('print', $level)
-		) {
-			// replace all html tags
-			// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string);
-			// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string);
-			// replace special line break tag
-			// $error_string = str_replace('<!--#BR#-->', "\n", $error_string);
-
-			// init output variable
-			$output = $error_string; // output formated error string to output file
-			// init base file path
-			$fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
-			// log ID prefix settings, if not valid, replace with empty
-			if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
-				$rpl_string = '_'.$this->log_file_id;
-			} else {
-				$rpl_string = '';
-			}
-			$fn = str_replace('##LOGID##', $rpl_string, $fn); // log id (like a log file prefix)
-
-			if ($this->log_per_run) {
-				if (isset($GLOBALS['LOG_FILE_UNIQUE_ID'])) {
-					$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
-				}
-				if (!$this->log_file_unique_id) {
-					$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
-				}
-				$rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
-			} else {
-				$rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d'); // add date to file
-			}
-			$fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename
-
-			$rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file
-			$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
-
-			$rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', get_class($this)); // set sub class settings
-			$fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename
-
-			$rpl_string = !$this->log_per_page ? '' : '_'.\CoreLibs\Get\System::getPageName(1); // if request to write to one file
-			$fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename
-
-			// write to file
-			// first check if max file size is is set and file is bigger
-			if ($this->log_max_filesize > 0 && ((filesize($fn) / 1024) > $this->log_max_filesize)) {
-				// for easy purpose, rename file only to attach timestamp, nur sequence numbering
-				rename($fn, $fn.'.'.date("YmdHis"));
-			}
-			$fp = fopen($fn, 'a');
-			if ($fp !== false) {
-				fwrite($fp, $output);
-				fclose($fp);
-			} else {
-				echo "<!-- could not open file: $fn //-->";
-			}
-		} // do write to file
-	} */
-
 	/**
 	 * unsests the error message array
 	 * can be used if writing is primary to file
@@ -731,7 +677,7 @@ class Basic
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use join()', E_USER_DEPRECATED);
 		if (!is_array($array)) {
-			$array = array();
+			$array = [];
 		}
 		return join($connect_char, $array);
 	}
@@ -755,7 +701,7 @@ class Basic
 	 * @return array          flattened keys array
 	 * @deprecated Use \CoreLibs\Combined\ArrayHandler::flattenArrayKey() instead
 	 */
-	public static function flattenArrayKey(array $array/*, array $return = array()*/): array
+	public static function flattenArrayKey(array $array/*, array $return = []*/): array
 	{
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use  \CoreLibs\Combined\ArrayHandler::flattenArrayKey()', E_USER_DEPRECATED);
 		return \CoreLibs\Combined\ArrayHandler::flattenArrayKey($array);
@@ -1229,9 +1175,9 @@ class Basic
 	{
 		trigger_error('Method ' . __METHOD__ . ' has been removed', E_USER_DEPRECATED);
 		/* // set default password cost: use default set automatically
-		$this->password_options = array(
+		$this->password_options = [
 			// 'cost' => PASSWORD_BCRYPT_DEFAULT_COST
-		); */
+		]; */
 	}

 	/**
@@ -1619,4 +1565,6 @@ class Basic
 	// *** JSON END ***
 }

+// phpcs:enable
+
 // __END__
--- a/www/lib/CoreLibs/Check/Email.php
+++ b/www/lib/CoreLibs/Check/Email.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 namespace CoreLibs\Check;

@@ -6,7 +8,8 @@ class Email
 {
 	// this is for error check parts in where the email regex failed
 	private static $email_regex_check = [
-		0 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
+		0 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
+			. "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
 		1 => "@(.*)@(.*)", // double @
 		2 => "^[A-Za-z0-9!#$%&'*+-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+-\/=?^_`{|}~\.]{0,63}@", // wrong part before @
 		3 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$", // wrong part after @
@@ -18,28 +21,39 @@ class Email
 	// the array with the mobile types that are valid
 	private static $mobile_email_type = [
 		'.*@docomo\.ne\.jp$' => 'keitai_docomo',
-		'.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb', # correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
-		'.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido', # ez[a-j] or nothing
-		'.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka', # (sky group)
-		'.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky', # (sky group) [tkk,tkc only]
-		'.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg', # dtg (sky group)
-		'.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone', # old vodafone [t,k,d,h,c,r,n,s,q]
-		'.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone', # very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
-		'.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank', # add i for iphone also as keitai, others similar to the vodafone group
-		'.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone', # add iPhone also as keitai and not as pc
-		'.*@disney\.ne\.jp$' => 'keitai_softbank_disney', # (kids)
+		// correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
+		'.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb',
+		// ez[a-j] or nothing
+		'.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido',
+		// (sky group)
+		'.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka',
+		// (sky group) [tkk,tkc only]
+		'.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky',
+		// dtg (sky group)
+		'.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg',
+		// old vodafone [t,k,d,h,c,r,n,s,q]
+		'.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone',
+		// very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
+		'.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone',
+		// add i for iphone also as keitai, others similar to the vodafone group
+		'.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank',
+		// add iPhone also as keitai and not as pc
+		'.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone',
+		'.*@disney\.ne\.jp$' => 'keitai_softbank_disney', // (kids)
 		'.*@willcom\.ne\.jp$' => 'keitai_willcom',
-		'.*@willcom\.com$' => 'keitai_willcom', # new for pdx.ne.jp address
-		'.*@willcom\.com$' => 'keitai_willcom', # new for pdx.ne.jp address
-		'.*@wcm\.ne\.jp$' => 'keitai_willcom', # old willcom wcm.ne.jp
-		'.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', # old pdx address for willcom
-		'.*@bandai\.jp$' => 'keitai_willcom_bandai', # willcom paipo! (kids)
-		'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', # willcom paipo! (kids)
-		'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx', # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
-		'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile', # ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
-		'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile', # y-mobile techincally not willcom, but I group them there (softbank sub)
-		'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
-		'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
+		'.*@willcom\.com$' => 'keitai_willcom', // new for pdx.ne.jp address
+		'.*@wcm\.ne\.jp$' => 'keitai_willcom', // old willcom wcm.ne.jp
+		'.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', // old pdx address for willcom
+		'.*@bandai\.jp$' => 'keitai_willcom_bandai', // willcom paipo! (kids)
+		'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', // willcom paipo! (kids)
+		// actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
+		'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx',
+		// ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
+		'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile',
+		// y-mobile techincally not willcom, but I group them there (softbank sub)
+		'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile',
+		'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
+		'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
 		'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
 	];
 	// short list for mobile email types
@@ -106,7 +120,13 @@ class Email
 	 */
 	public static function getEmailRegexCheck(): array
 	{
-		return self::$email_regex_check;
+		// return all but the first
+		return array_slice(
+			self::$email_regex_check,
+			1,
+			count(self::$email_regex_check) - 1,
+			true
+		);
 	}

 	/**
--- a/www/lib/CoreLibs/Check/File.php
+++ b/www/lib/CoreLibs/Check/File.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * various file/file name functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Check;

 class File
@@ -26,7 +28,8 @@ class File
 	 */
 	public static function getLinesFromFile(string $file): int
 	{
-		if (is_file($file) &&
+		if (
+			is_file($file) &&
 			file_exists($file) &&
 			is_readable($file)
 		) {
--- a/www/lib/CoreLibs/Check/Jason.php
+++ b/www/lib/CoreLibs/Check/Jason.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * Converts a json string to array and stores error for later checking
@@ -6,6 +6,8 @@
 * and self set json as is on error as array
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Check;

 class Jason
--- a/www/lib/CoreLibs/Check/Password.php
+++ b/www/lib/CoreLibs/Check/Password.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * core password set, check and rehash check wrapper functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Check;

 class Password
--- a/www/lib/CoreLibs/Check/PhpVersion.php
+++ b/www/lib/CoreLibs/Check/PhpVersion.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 namespace CoreLibs\Check;

--- a/www/lib/CoreLibs/Combined/ArrayHandler.php
+++ b/www/lib/CoreLibs/Combined/ArrayHandler.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * html convert functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Combined;

 class ArrayHandler
@@ -23,7 +25,8 @@ class ArrayHandler
 		if (!is_array($haystack)) {
 			$haystack = [];
 		}
-		if ($key_lookin != null &&
+		if (
+			$key_lookin != null &&
 			!empty($key_lookin) &&
 			array_key_exists($key_lookin, $haystack) &&
 			$needle === $haystack[$key_lookin]
@@ -31,20 +34,23 @@ class ArrayHandler
 			$path[] = $key_lookin;
 		} else {
 			foreach ($haystack as $key => $val) {
-				if (is_scalar($val) &&
+				if (
+					is_scalar($val) &&
 					$val === $needle &&
 					empty($key_lookin)
 				) {
 					$path[] = $key;
 					break;
-				} elseif (is_scalar($val) &&
+				} elseif (
+					is_scalar($val) &&
 					!empty($key_lookin) &&
 					$key === $key_lookin &&
 					$val == $needle
 				) {
 					$path[] = $key;
 					break;
-				} elseif (is_array($val) &&
+				} elseif (
+					is_array($val) &&
 					$path = self::arraySearchRecursive(
 						$needle,
 						(array)$val,
@@ -122,7 +128,7 @@ class ArrayHandler

 	/**
 	 * array search simple. looks for key, value combination, if found, returns true
-	 * @param  array      $array array(search in)
+	 * @param  array      $array search in as array
 	 * @param  string|int $key   key (key to search in)
 	 * @param  string|int $value value (what to find)
 	 * @return bool              true on found, false on not found
@@ -261,7 +267,8 @@ class ArrayHandler
 		// do this to only run count once
 		for ($i = 0, $iMax = count($db_array); $i < $iMax; $i++) {
 			// if no key then we make an order reference
-			if ($key !== false &&
+			if (
+				$key !== false &&
 				$value !== false &&
 				(($set_only && $db_array[$i][$value]) || (!$set_only))
 			) {
@@ -313,7 +320,7 @@ class ArrayHandler
 	/**
 	 * searches for key -> value in an array tree and writes the value one level up
 	 * this will remove this leaf will all other values
-	 * @param  array      $array  array(nested)
+	 * @param  array      $array  nested array
 	 * @param  string|int $search key to find that has no sub leaf and will be pushed up
 	 * @return array              modified, flattened array
 	 */
--- a/www/lib/CoreLibs/Combined/DateTime.php
+++ b/www/lib/CoreLibs/Combined/DateTime.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * image thumbnail, rotate, etc
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Combined;

 class DateTime
@@ -159,7 +161,8 @@ class DateTime
 		if (!is_numeric($hour) || !is_numeric($min)) {
 			return false;
 		}
-		if (($hour < 0 || $hour > 24) ||
+		if (
+			($hour < 0 || $hour > 24) ||
 			($min < 0 || $min > 60) ||
 			(is_numeric($sec) && ($sec < 0 || $sec > 60))
 		) {
@@ -190,8 +193,8 @@ class DateTime
 		list ($start_year, $start_month, $start_day) = array_pad(preg_split('/[\/-]/', $start_date), 3, null);
 		list ($end_year, $end_month, $end_day) = array_pad(preg_split('/[\/-]/', $end_date), 3, null);
 		// check that month & day are two digits and then combine
-		foreach (array('start', 'end') as $prefix) {
-			foreach (array('month', 'day') as $date_part) {
+		foreach (['start', 'end'] as $prefix) {
+			foreach (['month', 'day'] as $date_part) {
 				$_date = $prefix . '_' . $date_part;
 				if (isset($$_date) && $$_date < 10 && !preg_match("/^0/", $$_date)) {
 					$$_date = '0' . $$_date;
@@ -199,7 +202,7 @@ class DateTime
 			}
 			$_date = $prefix . '_date';
 			$$_date = '';
-			foreach (array('year', 'month', 'day') as $date_part) {
+			foreach (['year', 'month', 'day'] as $date_part) {
 				$_sub_date = $prefix . '_' . $date_part;
 				$$_date .= $$_sub_date;
 			}
@@ -254,7 +257,7 @@ class DateTime
 	public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
 	{
 		// pos 0 all, pos 1 weekday, pos 2 weekend
-		$days = array();
+		$days = [];
 		$start = new \DateTime($start_date);
 		$end = new \DateTime($end_date);
 		// so we include the last day too, we need to add +1 second in the time
@@ -275,11 +278,11 @@ class DateTime
 			}
 		}
 		if ($return_named === true) {
-			return array(
+			return [
 				'overall' => $days[0],
 				'weekday' => $days[1],
 				'weekend' => $days[2]
-			);
+			];
 		} else {
 			return $days;
 		}
--- a/www/lib/CoreLibs/Convert/Byte.php
+++ b/www/lib/CoreLibs/Convert/Byte.php
@@ -1,17 +1,19 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * image thumbnail, rotate, etc
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Convert;

 class Byte
 {
 	// define byteFormat
-	const BYTE_FORMAT_NOSPACE = 1;
-	const BYTE_FORMAT_ADJUST = 2;
-	const BYTE_FORMAT_SI = 4;
+	public const BYTE_FORMAT_NOSPACE = 1;
+	public const BYTE_FORMAT_ADJUST = 2;
+	public const BYTE_FORMAT_SI = 4;

 	/**
 	 * This function replaces the old byteStringFormat
@@ -65,7 +67,7 @@ class Byte
 				return $bytes . 'B';
 			}
 			// labels in order of size [Y, Z]
-			$labels = array('', 'K', 'M', 'G', 'T', 'P', 'E');
+			$labels = ['', 'K', 'M', 'G', 'T', 'P', 'E'];
 			// exp position calculation
 			$exp = floor(log($abs_bytes, $unit));
 			// avoid printing out anything larger than max labels
@@ -75,7 +77,8 @@ class Byte
 			// deviation calculation
 			$dev = pow($unit, $exp) * ($unit - 0.05);
 			// shift the exp +1 for on the border units
-			if ($exp < 6 &&
+			if (
+				$exp < 6 &&
 				$abs_bytes > ($dev - (((int)$dev & 0xfff) == 0xd00 ? 52 : 0))
 			) {
 				$exp++;
@@ -120,7 +123,11 @@ class Byte
 		// all valid units
 		$valid_units_ = 'bkmgtpezy';
 		// detects up to exo bytes
-		preg_match("/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i", strtolower($number), $matches);
+		preg_match(
+			"/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i",
+			strtolower($number),
+			$matches
+		);
 		if (isset($matches[1]) && isset($matches[2])) {
 			// remove all non valid characters from the number
 			$number = preg_replace('/[^0-9\.]/', '', $matches[1]);
--- a/www/lib/CoreLibs/Convert/Colors.php
+++ b/www/lib/CoreLibs/Convert/Colors.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * Convert color spaces
@@ -10,6 +10,8 @@
 * hsl to rgb
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Convert;

 class Colors
@@ -24,7 +26,7 @@ class Colors
 	public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
 	{
 		$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
-		$rgbArray = array();
+		$rgbArray = [];
 		if (strlen($hexStr) == 6) {
 			// If a proper hex code, convert using bitwise operation. No overhead... faster
 			$colorVal = hexdec($hexStr);
@@ -59,7 +61,7 @@ class Colors
 		if ($hex_prefix === true) {
 			$hex_color = '#';
 		}
-		foreach (array('red', 'green', 'blue') as $color) {
+		foreach (['red', 'green', 'blue'] as $color) {
 			// if not valid, set to gray
 			if ($$color < 0 || $$color > 255) {
 				$$color = 125;
@@ -82,7 +84,7 @@ class Colors
 	public static function rgb2hsb(int $red, int $green, int $blue): array
 	{
 		// check that rgb is from 0 to 255
-		foreach (array('red', 'green', 'blue') as $c) {
+		foreach (['red', 'green', 'blue'] as $c) {
 			if ($$c < 0 || $$c > 255) {
 				$$c = 0;
 			}
@@ -94,7 +96,7 @@ class Colors
 		$HUE = 0;

 		if ($MAX == $MIN) {
-			return array(0, 0, round($MAX * 100));
+			return [0, 0, round($MAX * 100)];
 		}
 		if ($red == $MAX) {
 			$HUE = ($green - $blue) / ($MAX - $MIN);
@@ -108,11 +110,11 @@ class Colors
 			$HUE += 360;
 		}

-		return array(
+		return [
 			(int)round($HUE),
 			(int)round((($MAX - $MIN) / $MAX) * 100),
 			(int)round($MAX * 100)
-		);
+		];
 	}

 	/**
@@ -140,7 +142,7 @@ class Colors
 		$V /= 100;

 		if ($S == 0) {
-			return array($V * 255, $V * 255, $V * 255);
+			return [$V * 255, $V * 255, $V * 255];
 		}

 		$Hi = floor($H / 60);
@@ -186,11 +188,11 @@ class Colors
 				$blue = 0;
 		}

-		return array(
+		return [
 			(int)round($red * 255),
 			(int)round($green * 255),
 			(int)round($blue * 255)
-		);
+		];
 	}

 	/**
@@ -205,7 +207,7 @@ class Colors
 	public static function rgb2hsl(int $red, int $green, int $blue): array
 	{
 		// check that rgb is from 0 to 255
-		foreach (array('red', 'green', 'blue') as $c) {
+		foreach (['red', 'green', 'blue'] as $c) {
 			if ($$c < 0 || $$c > 255) {
 				$$c = 0;
 			}
@@ -270,7 +272,7 @@ class Colors
 		$lum /= 100;
 		// if saturation is 0
 		if ($sat == 0) {
-			return array($lum * 255, $lum * 255, $lum * 255);
+			return [$lum * 255, $lum * 255, $lum * 255];
 		} else {
 			$m2 = $lum < 0.5 ? $lum * ($sat + 1) : ($lum + $sat) - ($lum * $sat);
 			$m1 = $lum * 2 - $m2;
@@ -292,11 +294,11 @@ class Colors
 				return $m1;
 			};

-			return array(
+			return [
 				(int)round(255 * $hueue($hue + (1 / 3))),
 				(int)round(255 * $hueue($hue)),
 				(int)round(255 * $hueue($hue - (1 / 3)))
-			);
+			];
 		}
 	}
 }
--- a/www/lib/CoreLibs/Convert/Html.php
+++ b/www/lib/CoreLibs/Convert/Html.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * html convert functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Convert;

 class Html
@@ -30,7 +32,7 @@ class Html
 	 */
 	public static function removeLB(string $string, string $replace = ' '): string
 	{
-		return str_replace(array("\r", "\n"), $replace, $string);
+		return str_replace(["\r", "\n"], $replace, $string);
 	}

 	/**
--- a/www/lib/CoreLibs/Convert/Math.php
+++ b/www/lib/CoreLibs/Convert/Math.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * various math related function wrappers
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Convert;

 class Math
--- a/www/lib/CoreLibs/Convert/MimeAppName.php
+++ b/www/lib/CoreLibs/Convert/MimeAppName.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * Translates a mime id string into the actual application or file name
 * for example 'text/plain' will output 'Text file'
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Convert;

 class MimeAppName
--- a/www/lib/CoreLibs/Create/Hash.php
+++ b/www/lib/CoreLibs/Create/Hash.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * hash wrapper functions for old problem fixes
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Create;

 class Hash
--- a/www/lib/CoreLibs/Create/RandomKey.php
+++ b/www/lib/CoreLibs/Create/RandomKey.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * html convert functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Create;

 class RandomKey
@@ -39,7 +41,8 @@ class RandomKey
 	 */
 	private static function validateRandomKeyLenght(int $key_length): bool
 	{
-		if (is_numeric($key_length) &&
+		if (
+			is_numeric($key_length) &&
 			$key_length > 0 &&
 			$key_length <= self::$max_key_length
 		) {
--- a/www/lib/CoreLibs/Create/Uids.php
+++ b/www/lib/CoreLibs/Create/Uids.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);

 namespace CoreLibs\Create;

--- a/www/lib/CoreLibs/DB/Extended/ArrayIO.php
+++ b/www/lib/CoreLibs/DB/Extended/ArrayIO.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2002/12/17
@@ -29,6 +30,8 @@
 // as it actually has nothing to do with this one here ? (or at least
 // put into separete function in this class)

+declare(strict_types=1);
+
 namespace CoreLibs\DB\Extended;

 // subclass for one array handling
@@ -192,7 +195,8 @@ class ArrayIO extends \CoreLibs\DB\IO
 		$q_where = '';
 		foreach ($this->table_array as $column => $data_array) {
 			// suchen nach bildern und lschen ...
-			if (!empty($this->table_array[$column]['file']) &&
+			if (
+				!empty($this->table_array[$column]['file']) &&
 				file_exists($this->table_array[$column]['url'] . $this->table_array[$column]['value'])
 			) {
 				if (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
@@ -277,11 +281,13 @@ class ArrayIO extends \CoreLibs\DB\IO
 				foreach ($this->table_array as $column => $data_array) {
 					// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten fr ausgabe
 					// ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen
-					// echo 'EDIT: $edit | Spalte: $column | type: '.$this->table_array[$column]['type'].' | Res: '.$res[$column].'<br>';
+					// $this->log->debug('DB READ', 'EDIT: $edit | Spalte: $column | type: '
+					//	.$this->table_array[$column]['type'].' | Res: '.$res[$column]);
 					if ($edit) {
 						$this->table_array[$column]['value'] = $res[$column];
 						// if password, also write to hidden
-						if (isset($this->table_array[$column]['type']) &&
+						if (
+							isset($this->table_array[$column]['type']) &&
 							$this->table_array[$column]['type'] == 'password'
 						) {
 							$this->table_array[$column]['HIDDEN_value'] = $res[$column];
@@ -360,7 +366,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 						//echo 'Dn: $file_name';
 						copy($this->table_array[$column]['tmp'], $this->table_array[$column]['path'] . $file_name);
 						// automatisch thumbnail generieren, geht nur mit convert (ImageMagic!!!), aber nur bei bild ..
-						if (strtolower($ext) == 'jpeg' || strtolower($ext) == 'jpg' || strtolower($ext) == 'gif' || strtolower($ext) == 'png') {
+						if (in_array(strtolower($ext), ['jpeg', 'jpg', 'gif', 'png'])) {
 							$file_name_tn = $name . '_tn.' . $ext;
 							$input = $this->table_array[$column]['path'] . $file_name;
 							$output = $this->table_array[$column]['path'] . $file_name_tn;
@@ -378,13 +384,15 @@ class ArrayIO extends \CoreLibs\DB\IO
 			/********************************* END FILE **************************************/

 			// do not write 'pk' (primary key) or 'view' values
-			if (!isset($this->table_array[$column]['pk']) &&
+			if (
+				!isset($this->table_array[$column]['pk']) &&
 				isset($this->table_array[$column]['type']) &&
 				$this->table_array[$column]['type'] != 'view' &&
 				strlen($column) > 0
 			) {
 				// for password use hidden value if main is not set
-				if (isset($this->table_array[$column]['type']) &&
+				if (
+					isset($this->table_array[$column]['type']) &&
 					$this->table_array[$column]['type'] == 'password' &&
 					empty($this->table_array[$column]['value'])
 				) {
@@ -407,15 +415,18 @@ class ArrayIO extends \CoreLibs\DB\IO
 				}
 				// integer is different
 				if (isset($this->table_array[$column]['int']) || isset($this->table_array[$column]['int_null'])) {
-					$this->log->debug('write_check', '['.$column.']['.$this->table_array[$column]['value'].']['.$this->table_array[$column]['type'].'] '.
-						'VALUE SET: '.(string)isset($this->table_array[$column]['value']).
-						' | INT NULL: '.(string)isset($this->table_array[$column]['int_null']));
-					if (isset($this->table_array[$column]['value']) &&
+					$this->log->debug('WRITE CHECK', '[' . $column . '][' . $this->table_array[$column]['value'] . ']'
+						. '[' . $this->table_array[$column]['type'] . '] '
+						. 'VALUE SET: ' . (string)isset($this->table_array[$column]['value'])
+						. ' | INT NULL: ' . (string)isset($this->table_array[$column]['int_null']));
+					if (
+						isset($this->table_array[$column]['value']) &&
 						!$this->table_array[$column]['value'] &&
 						isset($this->table_array[$column]['int_null'])
 					) {
 						$_value = 'NULL';
-					} elseif (!isset($this->table_array[$column]['value']) ||
+					} elseif (
+						!isset($this->table_array[$column]['value']) ||
 						(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
 					) {
 						$_value = 0;
@@ -428,7 +439,8 @@ class ArrayIO extends \CoreLibs\DB\IO
 					$q_data .= "'" . $this->dbBoolean($this->table_array[$column]['value'], true) . "'";
 				} elseif (isset($this->table_array[$column]['interval'])) {
 					// for interval we check if no value, then we set null
-					if (!isset($this->table_array[$column]['value']) ||
+					if (
+						!isset($this->table_array[$column]['value']) ||
 						(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
 					) {
 						$_value = 'NULL';
@@ -442,9 +454,14 @@ class ArrayIO extends \CoreLibs\DB\IO
 				} else {
 					// if the error check is json, we set field to null if NOT set
 					// else normal string write
-					if (isset($this->table_array[$column]['error_check']) &&
+					if (
+						isset($this->table_array[$column]['error_check']) &&
 						$this->table_array[$column]['error_check'] == 'json' &&
-						(!isset($this->table_array[$column]['value']) || (isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value']))
+						(
+							!isset($this->table_array[$column]['value']) ||
+							(isset($this->table_array[$column]['value']) &&
+							!$this->table_array[$column]['value'])
+						)
 					) {
 						$q_data .= 'NULL';
 					} else {
@@ -452,7 +469,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 						$q_data .= "'";
 						// if add slashes do convert & add slashes else write AS is
 						if ($addslashes) {
-							$q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]['value']));
+							$q_data .= $this->dbEscapeString(
+								$this->convertEntities($this->table_array[$column]['value'])
+							);
 						} else {
 							$q_data .= $this->dbEscapeString($this->table_array[$column]['value']);
 						}
@@ -520,6 +539,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 		// return the table if needed
 		return $this->table_array;
 	}
-} // end of class
+	// end of class
+}

 // __END__
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2000/11/23
@@ -41,7 +42,7 @@
 *   $class_name
 *     - the name of the class
 *   $class_version
-*     - the version as an array(major, minor, patchlvl, daypatch)
+*     - the version as an array [major, minor, patchlvl, daypatch]
 *   $class_last_changed
 *     - date (mysql format) for the last change
 *   $class_created
@@ -107,9 +108,11 @@
 *   _db_io()
 *     - pseudo deconstructor - functionality moved to db_close
 *   $string info($show=1)
-*     - returns a string various info about class (version, authoer, etc), if $show set to 0, it will not be appended to the error_msgs string
+*     - returns a string various info about class (version, authoer, etc)
+*     - if $show set to 0, it will not be appended to the error_msgs string
 *   $string db_info($show=1)
-*     - returns a string with info about db connection, etc, if $show set to 0, it will not be appended to the error_msgs string
+*     - returns a string with info about db connection, etc, if $show set to 0,
+*     - it will not be appended to the error_msgs string
 *   $string db_dump_data($query=0)
 *     - returns a string with all data of that query or if no query given with all data in the cursor_ext
 *   0/$cursor db_exec($query=0)
@@ -135,13 +138,15 @@
 *   $string db_boolean(string)
 *     - if the string value is 't' or 'f' it returns correct TRUE/FALSE for php
 *   $primary_key db_write_data($write_array, $not_write_array, $primary_key, $table, $data = [])
-*     - writes into one table based on arrays of columns to write and not write, reads data from global vars or optional array
+*     - writes into one table based on arrays of columns to write and not write,
+*     - reads data from global vars or optional array
 *   $boolean db_set_schema(schema)
 *     - sets search path to a schema
 *   $boolean db_set_encoding(encoding)
 *     - sets an encoding for this database output and input
 *   $string db_time_format($age/datetime diff, $micro_time = false/true)
-*     - returns a nice formatted time string based on a age or datetime difference (postgres only), micro time is default false
+*     - returns a nice formatted time string based on a age or datetime difference
+*     - (postgres only), micro time is default false
 *
 *   PRIVATE METHODS
 *   _db_error()
@@ -159,10 +164,12 @@
 *   string _db_debug_prepare($prepare_id, $data_array)
 *     - returns the prepared statement with the actual data. for debug purposes only
 *   none _db_debug($debug_id, $string, $id, $type)
-*     - wrapper for normal debug, adds prefix data from id & type and strips all HTML from the query data (color codes, etc) via flag to debug call
+*     - wrapper for normal debug, adds prefix data from id & type and strips
+*     - all HTML from the query data (color codes, etc) via flag to debug call
 *
 * HISTORY:
-* 2008/10/25 (cs) add db_boolean to fix the postgres to php boolean var problem (TODO: implement this in any select return)
+* 2008/10/25 (cs) add db_boolean to fix the postgres to php boolean var problem
+*                 (TODO: implement this in any select return)
 * 2008/07/03 (cs) add db_write_data function, original written for inventory tool "invSQLWriteData"
 * 2008/04/16 (cs) add db_escape_string function for correct string escape
 * 2007/11/14 (cs) add a prepare debug statement to replace the placeholders with the actual data in a prepared statement
@@ -241,6 +248,8 @@
 *   23.11.2000: erster Test
 *********************************************************************/

+declare(strict_types=1);
+
 namespace CoreLibs\DB;

 class IO extends \CoreLibs\Basic
@@ -317,13 +326,15 @@ class IO extends \CoreLibs\Basic
 		if (!is_array($db_config)) {
 			$db_config = [];
 		}
+		// TODO: check must set CONSTANTS
 		// sets the names (for connect/reconnect)
 		$this->db_name = $db_config['db_name'] ?? '';
 		$this->db_user = $db_config['db_user'] ?? '';
 		$this->db_pwd = $db_config['db_pass'] ?? '';
 		$this->db_host = $db_config['db_host'] ?? '';
 		$this->db_port = !empty($db_config['db_port']) ? $db_config['db_port'] : 5432;
-		$this->db_schema = !empty($db_config['db_schema']) ? $db_config['db_schema'] : ''; // do not set to 'public' if not set, because the default is already public
+		// do not set to 'public' if not set, because the default is already public
+		$this->db_schema = !empty($db_config['db_schema']) ? $db_config['db_schema'] : '';
 		$this->db_encoding = !empty($db_config['db_encoding']) ? $db_config['db_encoding'] : '';
 		$this->db_type = $db_config['db_type'] ?? '';
 		$this->db_ssl = !empty($db_config['db_ssl']) ? $db_config['db_ssl'] : 'allow';
@@ -342,16 +353,19 @@ class IO extends \CoreLibs\Basic
 		$this->error_string['14'] = 'Can\'t connect to DB server';
 		$this->error_string['15'] = 'Can\'t select DB';
 		$this->error_string['16'] = 'No DB Handler found / connect or reconnect failed';
-		$this->error_string['17'] = 'All dbReturn* methods work only with SELECT statements, please use dbExec for everything else';
+		$this->error_string['17'] = 'All dbReturn* methods work only with SELECT statements, '
+			. 'please use dbExec for everything else';
 		$this->error_string['18'] = 'Query not found in cache. Nothing has been reset';
 		$this->error_string['19'] = 'Wrong PK name given or no PK name given at all, can\'t get Insert ID';
-		$this->error_string['20'] = 'Found given Prepare Statement Name in array, Query not prepared, will use existing one';
+		$this->error_string['20'] = 'Found given Prepare Statement Name in array, '
+			. 'Query not prepared, will use existing one';
 		$this->error_string['21'] = 'Query Prepare failed';
 		$this->error_string['22'] = 'Query Execute failed';
 		$this->error_string['23'] = 'Query Execute failed, data array does not match placeholders';
 		$this->error_string['24'] = 'Missing prepared query entry for execute.';
 		$this->error_string['25'] = 'Prepare query data is not in array format.';
-		$this->error_string['30'] = 'Query call in a possible endless loop. Was called more than '.$this->MAX_QUERY_CALL.' times';
+		$this->error_string['30'] = 'Query call in a possible endless loop. '
+			. 'Was called more than ' . $this->MAX_QUERY_CALL . ' times';
 		$this->error_string['31'] = 'Could not fetch PK after query insert';
 		$this->error_string['32'] = 'Multiple PK return as array';
 		$this->error_string['33'] = 'Returning PK was not found';
@@ -396,7 +410,7 @@ class IO extends \CoreLibs\Basic
 	public function __destruct()
 	{
 		$this->__closeDB();
-		parent::__destruct();
+		// parent::__destruct();
 	}

 	// *************************************************************
@@ -411,7 +425,14 @@ class IO extends \CoreLibs\Basic
 	private function __connectToDB(): bool
 	{
 		// generate connect string
-		$this->dbh = $this->db_functions->__dbConnect($this->db_host, $this->db_user, $this->db_pwd, $this->db_name, $this->db_port, $this->db_ssl);
+		$this->dbh = $this->db_functions->__dbConnect(
+			$this->db_host,
+			$this->db_user,
+			$this->db_pwd,
+			$this->db_name,
+			$this->db_port,
+			$this->db_ssl
+		);
 		// if no dbh here, we couldn't connect to the DB itself
 		if (!$this->dbh) {
 			$this->error_id = 14;
@@ -547,7 +568,7 @@ class IO extends \CoreLibs\Basic
 		if ($prefix) {
 			$prefix .= '- ';
 		}
-		$this->log->debug($debug_id, $prefix.$error_string, true);
+		$this->log->debug($debug_id, $error_string, true, $prefix);
 	}

 	/**
@@ -575,12 +596,26 @@ class IO extends \CoreLibs\Basic
 		// okay, an error occured
 		if ($this->error_id) {
 			// write error msg ...
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$this->error_id.': '.$this->error_string[$this->error_id].($msg ? ', '.$msg : '').'</span>', 'DB_ERROR', $where_called);
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> ' . $this->error_id . ': '
+					. $this->error_string[$this->error_id] . ($msg ? ', ' . $msg : '')
+					. '</span>',
+				'DB_ERROR',
+				$where_called
+			);
 			$this->had_error = $this->error_id;
 			// write detailed error log
 		}
 		if ($this->warning_id) {
-			$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$this->warning_id.': '.$this->error_string[$this->warning_id].($msg ? ', '.$msg : '').'</span>', 'DB_WARNING', $where_called);
+			$this->__dbDebug(
+				'db',
+				'<span style="color: orange;"><b>DB-Warning</b> ' . $this->warning_id . ': '
+					. $this->error_string[$this->warning_id]
+					. ($msg ? ', ' . $msg : '') . '</span>',
+				'DB_WARNING',
+				$where_called
+			);
 			$this->had_warning = $this->warning_id;
 		}
 		// unset the error/warning vars
@@ -596,7 +631,8 @@ class IO extends \CoreLibs\Basic
 	private function __dbConvertEncoding($row)
 	{
 		// only do if array, else pass through row (can be false)
-		if (!is_array($row) || empty($this->to_encoding) || empty($this->db_encoding)
+		if (
+			!is_array($row) || empty($this->to_encoding) || empty($this->db_encoding)
 		) {
 			return $row;
 		}
@@ -642,7 +678,7 @@ class IO extends \CoreLibs\Basic
 		} else {
 			preg_match("/(INSERT INTO|DELETE FROM|UPDATE) (([\w_]+)\.)?([\w_]+) /i", $query, $matches);
 		}
-		return array($matches[3], $matches[4]);
+		return [$matches[3], $matches[4]];
 	}

 	/**
@@ -735,7 +771,8 @@ class IO extends \CoreLibs\Basic
 		}
 		// count up the run, if this is run more than the max_run then exit with error
 		// if set to -1, then ignore it
-		if ($this->MAX_QUERY_CALL != -1 &&
+		if (
+			$this->MAX_QUERY_CALL != -1 &&
 			$this->query_called[$md5] > $this->MAX_QUERY_CALL
 		) {
 				$this->error_id = 30;
@@ -781,7 +818,8 @@ class IO extends \CoreLibs\Basic
 				// if not select do here
 				// count affected rows
 				$this->num_rows = $this->db_functions->__dbAffectedRows($this->cursor);
-				if (($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
+				if (
+					($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
 					($this->__checkQueryForUpdate($this->query) && $this->returning_id)
 				) {
 					// set insert_id
@@ -797,22 +835,30 @@ class IO extends \CoreLibs\Basic
 						// echo "** PREPARE RETURNING FOR CURSOR: ".$this->cursor."<br>";
 						// we have returning, now we need to check if we get one or many returned
 						// we'll need to loop this, if we have multiple insert_id returns
-						while ($_insert_id = $this->db_functions->__dbFetchArray(
+						while (
+							$_insert_id = $this->db_functions->__dbFetchArray(
 								$this->cursor,
 								$this->db_functions->__dbResultType(true)
-						)) {
+							)
+						) {
 							// echo "*** RETURNING: ".print_r($_insert_id, true)."<br>";
 							$this->insert_id[] = $_insert_id;
 							$this->insert_id_arr[] = $_insert_id;
 						}
 						// if we have only one, revert from array to single
 						if (count($this->insert_id) == 1) {
-							// echo "* SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->pk_name, $this->insert_id[0])."<br>";
-							// echo "* PK DIRECT: ".(isset($this->insert_id[0][$this->pk_name]) ? $this->insert_id[0][$this->pk_name] : '[NO PK NAME SET]' )."<Br>";
-							// if this has only the pk_name, then only return this, else array of all data (but without the position)
-							// example if insert_id[0]['foo'] && insert_id[0]['bar'] it will become insert_id['foo'] & insert_id['bar']
-							// if only ['foo_id'] and it is the PK then the PK is directly written to the insert_id
-							if (count($this->insert_id[0]) > 1 ||
+							// $this->log->debug('SINGLE DATA CONVERT', count($this->insert_id[0])." => "
+							//	.array_key_exists($this->pk_name, $this->insert_id[0]));
+							// $this->log->debug('PK DIRECT', (isset($this->insert_id[0][$this->pk_name]) ?
+							//	$this->insert_id[0][$this->pk_name] : '[NO PK NAME SET]' ));
+							// if this has only the pk_name, then only return this,
+							// else array of all data (but without the position)
+							// example if insert_id[0]['foo'] && insert_id[0]['bar']
+							// it will become insert_id['foo'] & insert_id['bar']
+							// if only ['foo_id'] and it is the PK then the
+							// PK is directly written to the insert_id
+							if (
+								count($this->insert_id[0]) > 1 ||
 								!array_key_exists($this->pk_name, $this->insert_id[0])
 							) {
 								$this->insert_id_ext = $this->insert_id[0];
@@ -869,6 +915,24 @@ class IO extends \CoreLibs\Basic
 		return $this->db_debug;
 	}

+	/**
+	 * Switches db debug flag on or off
+	 * OR
+	 * with the optional parameter fix sets debug
+	 * returns current set stats
+	 * @param  bool|null $debug Flag to turn debug on off
+	 * @return bool True for debug is on, False for off
+	 */
+	public function dbToggleDebug(?bool $debug = null)
+	{
+		if ($debug !== null) {
+			$this->db_debug = $debug;
+		} else {
+			$this->db_debug = $this->db_debug ? false : true;
+		}
+		return $this->db_debug;
+	}
+
 	/**
 	 * set max query calls, set to --1 to disable loop
 	 * protection. this will generate a warning
@@ -897,11 +961,12 @@ class IO extends \CoreLibs\Basic
 			return false;
 		}
 		// ok entry, set
-		if ($max_calls == -1 ||
+		if (
+			$max_calls == -1 ||
 			$max_calls > 0
 		) {
 			$this->MAX_QUERY_CALL = $max_calls;
-			$succes = true;
+			$success = true;
 		}
 		return $success;
 	}
@@ -1048,19 +1113,21 @@ class IO extends \CoreLibs\Basic
 	public function dbInfo(bool $show = true): string
 	{
 		$string = '';
-		$string .= '<b>-DB-info-></b> Connected to db <b>\''.$this->db_name.'\'</b> ';
-		$string .= 'with schema <b>\''.$this->db_schema.'\'</b> ';
-		$string .= 'as user <b>\''.$this->db_user.'\'</b> ';
-		$string .= 'at host <b>\''.$this->db_host.'\'</b> ';
-		$string .= 'on port <b>\''.$this->db_port.'\'</b> ';
-		$string .= 'with ssl mode <b>\''.$this->db_ssl.'\'</b><br>';
-		$string .= '<b>-DB-info-></b> DB IO Class debug output: <b>'.($this->db_debug ? 'Yes' : 'No').'</b>';
+		$string .= '{b}-DB-info->{/b} Connected to db {b}\'' . $this->db_name . '\'{/b} ';
+		$string .= 'with schema {b}\'' . $this->db_schema . '\'{/b} ';
+		$string .= 'as user {b}\'' . $this->db_user . '\'{/b} ';
+		$string .= 'at host {b}\'' . $this->db_host . '\'{/b} ';
+		$string .= 'on port {b}\'' . $this->db_port . '\'{/b} ';
+		$string .= 'with ssl mode {b}\'' . $this->db_ssl . '\'{/b}{br}';
+		$string .= '{b}-DB-info->{/b} DB IO Class debug output: {b}' . ($this->db_debug ? 'Yes' : 'No') . '{/b}';
 		if ($show === true) {
-			$this->__dbDebug('db', $string, 'dbInfo');
+			// if debug, remove / change b
+			$this->__dbDebug('db', str_replace(['{b}', '{/b}', '{br}'], ['', '', ' **** '], $string), 'dbInfo');
 		} else {
-			$string = $string.'<br>';
+			$string = $string . '{br}';
 		}
-		return $string;
+		// for direct print, change to html
+		return str_replace(['{b}', '{/b}', '{br}'], ['<b>', '</b>', '<br>'], $string);
 	}

 	/**
@@ -1099,8 +1166,12 @@ class IO extends \CoreLibs\Basic
 	 * - if set to 3, after EACH row, the data will be reset,
 	 *   no caching is done except for basic (count, etc)
 	 * @param  string     $query Query string
-	 * @param  int        $reset reset status: 1: read cache, clean at the end, 2: read new, clean at end, 3: never cache
-	 * @param  bool       $assoc_only true to only returned the named and not index position ones
+	 * @param  int        $reset reset status:
+	 *                    1: read cache, clean at the end
+	 *                    2: read new, clean at end
+	 *                    3: never cache
+	 * @param  bool       $assoc_only true to only returned the named and not
+	 *                    index position ones
 	 * @return array|bool             return array data or false on error/end
 	 * @suppress PhanTypeMismatchDimFetch
 	 */
@@ -1140,7 +1211,9 @@ class IO extends \CoreLibs\Basic
 		if ($reset && !$this->cursor_ext[$md5]['pos']) {
 			$this->cursor_ext[$md5]['cursor'] = null;
 		}
-		// $this->debug('MENU', 'Reset: '.$reset.', Cursor: '.$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos'].', Query: '.$query);
+		// $this->debug('MENU', 'Reset: '.$reset.', Cursor: '
+		//	.$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos']
+		//	.', Query: '.$query);

 		// if no cursor yet, execute
 		if (!$this->cursor_ext[$md5]['cursor']) {
@@ -1182,12 +1255,18 @@ class IO extends \CoreLibs\Basic
 		if ($this->cursor_ext[$md5]['cursor']) {
 			if ($this->cursor_ext[$md5]['firstcall'] == 1) {
 				// count the rows returned (if select)
-				$this->cursor_ext[$md5]['num_rows'] = $this->db_functions->__dbNumRows($this->cursor_ext[$md5]['cursor']);
+				$this->cursor_ext[$md5]['num_rows'] =
+					$this->db_functions->__dbNumRows($this->cursor_ext[$md5]['cursor']);
 				// count the fields
-				$this->cursor_ext[$md5]['num_fields'] = $this->db_functions->__dbNumFields($this->cursor_ext[$md5]['cursor']);
+				$this->cursor_ext[$md5]['num_fields'] =
+					$this->db_functions->__dbNumFields($this->cursor_ext[$md5]['cursor']);
 				// set field names
 				for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) {
-					$this->cursor_ext[$md5]['field_names'][] = $this->db_functions->__dbFieldName($this->cursor_ext[$md5]['cursor'], $i);
+					$this->cursor_ext[$md5]['field_names'][] =
+						$this->db_functions->__dbFieldName(
+							$this->cursor_ext[$md5]['cursor'],
+							$i
+						);
 				}
 				// reset first call vars
 				$this->cursor_ext[$md5]['firstcall'] = 0;
@@ -1216,7 +1295,9 @@ class IO extends \CoreLibs\Basic
 				// check if end of output ...
 				if ($this->cursor_ext[$md5]['pos'] >= $this->cursor_ext[$md5]['num_rows']) {
 					$this->cursor_ext[$md5]['pos'] = 0;
-					# if not reset given, set the cursor to true, so in a cached call on a different page we don't get problems from DB connection (as those will be LOST)
+					// if not reset given, set the cursor to true, so in a cached
+					// call on a different page we don't get problems from
+					// DB connection (as those will be LOST)
 					$this->cursor_ext[$md5]['cursor'] = 1;
 					$return = false;
 				} else {
@@ -1224,16 +1305,24 @@ class IO extends \CoreLibs\Basic
 					$return = [];
 					for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) {
 						// create mixed return array
-						if ($assoc_only === false && isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) {
+						if (
+							$assoc_only === false &&
+							isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])
+						) {
 							$return[$i] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i];
 						}
 						// named part
 						if (isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) {
-							$return[$this->cursor_ext[$md5]['field_names'][$i]] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i];
+							$return[$this->cursor_ext[$md5]['field_names'][$i]] =
+								$this->cursor_ext[$md5]['data']
+									[$this->cursor_ext[$md5]['pos']][$i];
 						} else {
-							// throws PhanTypeMismatchDimFetch error, but in this case we know we will access only named array parts
+							// throws PhanTypeMismatchDimFetch error, but in this
+							// case we know we will access only named array parts
 							// @suppress PhanTypeMismatchDimFetch
-							$return[$this->cursor_ext[$md5]['field_names'][$i]] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$this->cursor_ext[$md5]['field_names'][$i]];
+							$return[$this->cursor_ext[$md5]['field_names'][$i]] =
+								$this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]
+									['pos']][$this->cursor_ext[$md5]['field_names'][$i]];
 						}
 					}
 					$this->cursor_ext[$md5]['pos'] ++;
@@ -1372,7 +1461,12 @@ class IO extends \CoreLibs\Basic
 		} else {
 			// if no async running print error
 			$this->error_id = 42;
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> No async query has been started yet.</span>', 'DB_ERROR');
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> No async query '
+					. 'has been started yet.</span>',
+				'DB_ERROR'
+			);
 			return false;
 		}
 	}
@@ -1561,7 +1655,10 @@ class IO extends \CoreLibs\Basic
 					if (!preg_match("/ returning /i", $query) && $this->prepare_cursor[$stm_name]['pk_name']) {
 						$query .= " RETURNING " . $this->prepare_cursor[$stm_name]['pk_name'];
 						$this->prepare_cursor[$stm_name]['returning_id'] = true;
-					} elseif (preg_match("/ returning (.*)/i", $query, $matches) && $this->prepare_cursor[$stm_name]['pk_name']) {
+					} elseif (
+						preg_match("/ returning (.*)/i", $query, $matches) &&
+						$this->prepare_cursor[$stm_name]['pk_name']
+					) {
 						// if returning exists but not pk_name, add it
 						if (!preg_match("/{$this->prepare_cursor[$stm_name]['pk_name']}/", $matches[1])) {
 							$query .= " , " . $this->prepare_cursor[$stm_name]['pk_name'];
@@ -1585,7 +1682,13 @@ class IO extends \CoreLibs\Basic
 			} else {
 				$this->error_id = 21;
 				$this->__dbError();
-				$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepare field with: '.$stm_name.' | '.$query.'</span>', 'DB_ERROR');
+				$this->__dbDebug(
+					'db',
+					'<span style="color: red;"><b>DB-Error</b> ' . $stm_name
+						. ': Prepare field with: ' . $stm_name . ' | '
+						. $query . '</span>',
+					'DB_ERROR'
+				);
 				return $result;
 			}
 		} else {
@@ -1606,17 +1709,34 @@ class IO extends \CoreLibs\Basic
 		// if we do not have no prepare cursor array entry for this statement name, abort
 		if (!is_array($this->prepare_cursor[$stm_name])) {
 			$this->error_id = 24;
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': We do not have a prepared query entry for this statement name.</span>', 'DB_ERROR');
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> ' . $stm_name
+					. ': We do not have a prepared query entry for this statement name.</span>',
+				'DB_ERROR'
+			);
 			return false;
 		}
 		if (!is_array($data)) {
 			$this->error_id = 25;
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Prepared query Data has to be given in array form.</span>', 'DB_ERROR');
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> ' . $stm_name
+					. ': Prepared query Data has to be given in array form.</span>',
+				'DB_ERROR'
+			);
 			return false;
 		}
 		if ($this->prepare_cursor[$stm_name]['count'] != count($data)) {
 			$this->error_id = 23;
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Array data count does not match prepared fields. Need: '.$this->prepare_cursor[$stm_name]['count'].', has: '.count($data).'</span>', 'DB_ERROR');
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> ' . $stm_name
+					. ': Array data count does not match prepared fields. Need: '
+					. $this->prepare_cursor[$stm_name]['count'] . ', has: '
+					. count($data) . '</span>',
+				'DB_ERROR'
+			);
 			return false;
 		}
 		if ($this->db_debug) {
@@ -1624,17 +1744,28 @@ class IO extends \CoreLibs\Basic
 		}
 		$result = $this->db_functions->__dbExecute($stm_name, $data);
 		if (!$result) {
-			$this->log->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[$stm_name]['result'].']: '.$this->log->prAr($data));
+			$this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|'
+				. $this->prepare_cursor[$stm_name]['result'] . ']: '
+				. $this->log->prAr($data));
 			$this->error_id = 22;
 			$this->__dbError($this->prepare_cursor[$stm_name]['result']);
-			$this->__dbDebug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Execution failed</span>', 'DB_ERROR');
+			$this->__dbDebug(
+				'db',
+				'<span style="color: red;"><b>DB-Error</b> ' . $stm_name
+					. ': Execution failed</span>',
+				'DB_ERROR'
+			);
 			return false;
 		}
-		if ($this->__checkQueryForInsert($this->prepare_cursor[$stm_name]['query'], true) &&
+		if (
+			$this->__checkQueryForInsert($this->prepare_cursor[$stm_name]['query'], true) &&
 			$this->prepare_cursor[$stm_name]['pk_name'] != 'NULL'
 		) {
 			if (!$this->prepare_cursor[$stm_name]['returning_id']) {
-				$this->insert_id = $this->db_functions->__dbInsertId($this->prepare_cursor[$stm_name]['query'], $this->prepare_cursor[$stm_name]['pk_name']);
+				$this->insert_id = $this->db_functions->__dbInsertId(
+					$this->prepare_cursor[$stm_name]['query'],
+					$this->prepare_cursor[$stm_name]['pk_name']
+				);
 				$this->insert_id_ext = $this->insert_id;
 				$this->insert_id_arr[] = $this->insert_id;
 			} elseif ($result) {
@@ -1643,21 +1774,28 @@ class IO extends \CoreLibs\Basic
 				$this->insert_id_arr = [];
 				// we have returning, now we need to check if we get one or many returned
 				// we'll need to loop this, if we have multiple insert_id returns
-				while ($_insert_id = $this->db_functions->__dbFetchArray(
+				while (
+					$_insert_id = $this->db_functions->__dbFetchArray(
 						$result,
 						$this->db_functions->__dbResultType(true)
-				)) {
+					)
+				) {
 					$this->insert_id[] = $_insert_id;
 					$this->insert_id_arr[] = $_insert_id;
 				}
 				// if we have only one, revert from arry to single
 				if (count($this->insert_id) == 1) {
-					// echo "+ SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0])."<br>";
-					// echo "+ PK DIRECT: ".$this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]."<Br>";
-					// if this has only the pk_name, then only return this, else array of all data (but without the position)
-					// example if insert_id[0]['foo'] && insert_id[0]['bar'] it will become insert_id['foo'] & insert_id['bar']
-					// if only ['foo_id'] and it is the PK then the PK is directly written to the insert_id
-					if (count($this->insert_id[0]) > 1 ||
+					// $this->log->debug('SINGLE DATA CONVERT', count($this->insert_id[0])." => "
+					//	.array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0]));
+					// $this->log->debug('PK DIRECT', $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]);
+					// if this has only the pk_name, then only return this,
+					// else array of all data (but without the position)
+					// example if insert_id[0]['foo'] && insert_id[0]['bar']
+					// it will become insert_id['foo'] & insert_id['bar']
+					// if only ['foo_id'] and it is the PK then the PK is directly
+					// written to the insert_id
+					if (
+						count($this->insert_id[0]) > 1 ||
 						!array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0])
 					) {
 						$this->insert_id_ext = $this->insert_id[0];
@@ -1670,19 +1808,34 @@ class IO extends \CoreLibs\Basic
 					$this->insert_id = '';
 					$this->warning_id = 33;
 					$this->__dbError();
-					$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id returned no data</span>', 'DB_WARNING');
+					$this->__dbDebug(
+						'db',
+						'<span style="color: orange;"><b>DB-Warning</b> ' . $stm_name
+							. ': insert id returned no data</span>',
+						'DB_WARNING'
+					);
 				}
 			}
 			// this error handling is only for pgsql
 			if (is_array($this->insert_id)) {
 				$this->warning_id = 32;
 				$this->__dbError();
-				$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id data returned as array</span>', 'DB_WARNING');
+				$this->__dbDebug(
+					'db',
+					'<span style="color: orange;"><b>DB-Warning</b> ' . $stm_name
+						. ': insert id data returned as array</span>',
+					'DB_WARNING'
+				);
 			} elseif (!$this->insert_id) {
 				// NOTE should we keep this inside
 				$this->warning_id = 31;
 				$this->__dbError();
-				$this->__dbDebug('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': Could not get insert id</span>', 'DB_WARNING');
+				$this->__dbDebug(
+					'db',
+					'<span style="color: orange;"><b>DB-Warning</b> ' . $stm_name
+						. ': Could not get insert id</span>',
+					'DB_WARNING'
+				);
 			}
 		}
 		return $result;
@@ -1831,8 +1984,13 @@ class IO extends \CoreLibs\Basic
 	 * @param  array    $data            data array to override _POST data
 	 * @return int|bool                  primary key
 	 */
-	public function dbWriteData(array $write_array, array $not_write_array, $primary_key, string $table, $data = [])
-	{
+	public function dbWriteData(
+		array $write_array,
+		array $not_write_array,
+		int $primary_key,
+		string $table,
+		array $data = []
+	) {
 		if (!is_array($write_array)) {
 			$write_array = [];
 		}
@@ -1843,14 +2001,21 @@ class IO extends \CoreLibs\Basic
 			return false;
 		}
 		$not_write_update_array = [];
-		return $this->dbWriteDataExt($write_array, $primary_key, $table, $not_write_array, $not_write_update_array, $data);
+		return $this->dbWriteDataExt(
+			$write_array,
+			$primary_key,
+			$table,
+			$not_write_array,
+			$not_write_update_array,
+			$data
+		);
 	}

 	/**
 	 * writes into one table based on array of table columns
 	 * PARAM INFO: $primary key
 	 * this can be a plain string/int and will be internal transformed into the array form
-	 * or it takes the array form of array(row => column, value => pk value)
+	 * or it takes the array form of array [row => column, value => pk value]
 	 * @param  array            $write_array            list of elements to write
 	 * @param  int|string|array $primary_key            primary key string or array set
 	 * @param  string           $table                  name for the target table
@@ -1890,7 +2055,8 @@ class IO extends \CoreLibs\Basic
 		$primary_key['row'] = $primary_key['row'] ?? '';
 		// loop through the write array and each field to build the query
 		foreach ($write_array as $field) {
-			if ((!$primary_key['value'] ||
+			if (
+				(!$primary_key['value'] ||
 					($primary_key['value'] &&
 					!in_array($field, $not_write_update_array))
 				) &&
@@ -1915,8 +2081,11 @@ class IO extends \CoreLibs\Basic
 				}
 				// we detect bool, so we can force a write on "false"
 				$is_bool = $table_data[$field]['type'] == 'bool' ? true : false;
-				// write if the field has to be not null, or if there is no data and the field has no default values or if there is data or if this is an update and there is no data (set null)
-				if (($not_null && $_data) ||
+				// write if the field has to be not null, or if there is
+				// no data and the field has no default values or if there
+				// is data or if this is an update and there is no data (set null)
+				if (
+					($not_null && $_data) ||
 					(!$has_default && !$_data) ||
 					(is_numeric($_data) && $_data) ||
 					($primary_key['value'] && !$_data) ||
@@ -1925,7 +2094,9 @@ class IO extends \CoreLibs\Basic
 					if ($q_sub_value && !$primary_key['value']) {
 						$q_sub_value .= ', ';
 					}
-					if ($q_sub_data) { // && (!$primary_key || ($primary_key && !in_array($field, $not_write_array))))
+					if ($q_sub_data) {
+						// && (!$primary_key ||
+						// ($primary_key && !in_array($field, $not_write_array))))
 						$q_sub_data .= ', ';
 					}
 					if ($primary_key['value']) {
@@ -1942,7 +2113,13 @@ class IO extends \CoreLibs\Basic
 						$q_sub_data .= is_numeric($_data) ? $_data : 'NULL';
 					} else {
 						// if bool -> set bool, else write data
-						$q_sub_data .= isset($_data) ? "'".($is_bool ? $this->dbBoolean($_data, true) : $this->dbEscapeString($_data))."'" : 'NULL';
+						$q_sub_data .= isset($_data) ?
+							"'" . (
+								$is_bool ?
+									$this->dbBoolean($_data, true) :
+									$this->dbEscapeString($_data)
+							) . "'" :
+							'NULL';
 					}
 				}
 			}
@@ -1992,7 +2169,11 @@ class IO extends \CoreLibs\Basic
 		$seconds = $matches[4] != '00' ? preg_replace('/^0/', '', $matches[4]) : '';
 		$milliseconds = $matches[6];

-		return $prefix.($hour ? $hour.'h ' : '').($minutes ? $minutes.'m ' : '').($seconds ? $seconds.'s' : '').($show_micro && $milliseconds? ' '.$milliseconds.'ms' : '');
+		return $prefix
+			. ($hour ? $hour . 'h ' : '')
+			. ($minutes ? $minutes . 'm ' : '')
+			. ($seconds ? $seconds . 's' : '')
+			. ($show_micro && $milliseconds ? ' ' . $milliseconds . 'ms' : '');
 	}

 	/**
@@ -2125,24 +2306,6 @@ class IO extends \CoreLibs\Basic
 		return $this->num_rows ?? null;
 	}

-	/**
-	 * Switches db debug flag on or off
-	 * OR
-	 * with the optional parameter fix sets debug
-	 * returns current set stats
-	 * @param  bool|null $debug Flag to turn debug on off
-	 * @return bool True for debug is on, False for off
-	 */
-	public function dbToggleDebug(?bool $debug = null)
-	{
-		if ($debug !== null) {
-			$this->db_debug = $debug;
-		} else {
-			$this->db_debug = $this->db_debug ? false : true;
-		}
-		return $this->db_debug;
-	}
-
 	// DEPEREACTED CALLS

 	/**
@@ -2213,6 +2376,7 @@ class IO extends \CoreLibs\Basic
 		trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetNumRows()', E_USER_DEPRECATED);
 		return $this->dbGetNumRows();
 	}
-} // end if db class
+	// end if db class
+}

 // __END__
--- a/www/lib/CoreLibs/DB/SQL/PgSQL.php
+++ b/www/lib/CoreLibs/DB/SQL/PgSQL.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/04/09
@@ -11,7 +12,9 @@
 *  HISTORY:
 * 2008/04/16 (cs) wrapper for pg escape string
 * 2007/01/11 (cs) add prepare/execute for postgres
-* 2006/09/12 (cs) in case db_query retuns false, save the query and run the query through the send/get procedure to get correct error data from the db
+* 2006/09/12 (cs) in case db_query retuns false, save the query and
+*                 run the query through the send/get procedure to get
+*                 correct error data from the db
 * 2006/06/26 (cs) added port for db connection
 * 2006/04/03 (cs) added meta data for table
 * 2005/07/25 (cs) removed the plural s remove, not needed and not 100% working
@@ -41,6 +44,8 @@
 *
 */

+declare(strict_types=1);
+
 namespace CoreLibs\DB\SQL;

 class PgSQL
@@ -293,22 +298,23 @@ class PgSQL
 			}
 			// read from table the PK name
 			// faster primary key get
-			$q = "SELECT pg_attribute.attname AS column_name, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type ";
-			$q .= "FROM pg_index, pg_class, pg_attribute ";
+			$q = "SELECT pg_attribute.attname AS column_name, "
+				. "format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type "
+				. "FROM pg_index, pg_class, pg_attribute ";
 			if ($schema) {
 				$q .= ", pg_namespace ";
 			}
-			$q .= "WHERE ";
+			$q .= "WHERE "
 				// regclass translates the OID to the name
-			$q .= "pg_class.oid = '".$table_prefix.$table."'::regclass AND ";
-				$q .= "indrelid = pg_class.oid AND ";
+				. "pg_class.oid = '" . $table_prefix . $table . "'::regclass AND "
+				. "indrelid = pg_class.oid AND ";
 			if ($schema) {
-				$q .= "nspname = '".$schema."' AND ";
-				$q .= "pg_class.relnamespace = pg_namespace.oid AND ";
+				$q .= "nspname = '" . $schema . "' AND "
+					. "pg_class.relnamespace = pg_namespace.oid AND ";
 			}
-			$q .= "pg_attribute.attrelid = pg_class.oid AND ";
-			$q .= "pg_attribute.attnum = any(pg_index.indkey) ";
-			$q .= "AND indisprimary";
+			$q .= "pg_attribute.attrelid = pg_class.oid AND "
+				. "pg_attribute.attnum = any(pg_index.indkey) "
+				. "AND indisprimary";
 			$cursor = $this->__dbQuery($q);
 			if ($cursor) {
 				return $this->__dbFetchArray($cursor)['column_name'] ?? false;
@@ -330,15 +336,23 @@ class PgSQL
 	 * @param  string    $db_ssl  SSL (allow is default)
 	 * @return ?resource          db handler resource or null on error
 	 */
-	public function __dbConnect(string $db_host, string $db_user, string $db_pass, string $db_name, int $db_port = 5432, string $db_ssl = 'allow')
-	{
+	public function __dbConnect(
+		string $db_host,
+		string $db_user,
+		string $db_pass,
+		string $db_name,
+		int $db_port = 5432,
+		string $db_ssl = 'allow'
+	) {
 		// to avoid empty db_port
 		if (!$db_port) {
 			$db_port = 5432;
 		}
-		$this->dbh = pg_connect("host=".$db_host." port=".$db_port." user=".$db_user." password=".$db_pass." dbname=".$db_name." sslmode=".$db_ssl);
+		$this->dbh = pg_connect("host=" . $db_host . " port=" . $db_port . " user="
+			. $db_user . " password=" . $db_pass . " dbname=" . $db_name . " sslmode=" . $db_ssl);
 		if (!$this->dbh) {
-			die("<!-- Can't connect [host=".$db_host." port=".$db_port." user=".$db_user." password=XXXX dbname=".$db_name." sslmode=".$db_ssl."] //-->");
+			die("<!-- Can't connect [host=" . $db_host . " port=" . $db_port . " user="
+				. $db_user . " password=XXXX dbname=" . $db_name . " sslmode=" . $db_ssl . "] //-->");
 			return null;
 		}
 		return $this->dbh;
--- a/www/lib/CoreLibs/Debug/FileWriter.php
+++ b/www/lib/CoreLibs/Debug/FileWriter.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * direct write to log file
 * must have BASE folder and LOG foder defined
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Debug;

 class FileWriter
@@ -51,7 +53,8 @@ class FileWriter
 		if ($enter === true) {
 			$string .= "\n";
 		}
-		$string = "[".\CoreLibs\Debug\Support::printTime()."] [".\CoreLibs\Get\System::getPageName(2)."] - ".$string;
+		$string = "[" . \CoreLibs\Debug\Support::printTime() . "] "
+			. "[" . \CoreLibs\Get\System::getPageName(2) . "] - " . $string;
 		fwrite($fh, $string);
 		fclose($fh);
 		return true;
--- a/www/lib/CoreLibs/Debug/Logging.php
+++ b/www/lib/CoreLibs/Debug/Logging.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * Debug support functions
@@ -20,6 +20,8 @@
 　*	print_output_not
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Debug;

 class Logging
@@ -45,6 +47,7 @@ class Logging
 	// debug flags/settings
 	private $running_uid = ''; // unique ID set on class init and used in logging as prefix
 	// log file name
+	private $log_folder = '';
 	private $log_file_name_ext = 'log'; // use this for date rotate
 	private $log_max_filesize = 0; // set in kilobytes
 	private $log_print_file = 'error_msg##LOGID####LEVEL####CLASS####PAGENAME####DATE##';
@@ -60,6 +63,14 @@ class Logging

 	public function __construct()
 	{
+		// check must set constants
+		if (defined('BASE') && defined('LOG')) {
+			$this->log_folder = BASE . LOG;
+		} else {
+			// fallback + warning
+			trigger_error('constant BASE or LOG are not defined, fallback to getcwd()', E_USER_WARNING);
+			$this->log_folder = getcwd() . DS;
+		}
 		// running time start for script
 		$this->script_starttime = microtime(true);
 		// set per run UID for logging
@@ -143,7 +154,8 @@ class Logging
 		// check if we do debug, echo or print
 		switch ($target) {
 			case 'debug':
-				if ((
+				if (
+					(
 						(isset($this->debug_output[$level]) && $this->debug_output[$level]) ||
 						$this->debug_output_all
 					) &&
@@ -155,7 +167,8 @@ class Logging
 				}
 				break;
 			case 'echo':
-				if ((
+				if (
+					(
 						(isset($this->echo_output[$level]) && $this->echo_output[$level]) ||
 						$this->echo_output_all
 					) &&
@@ -167,7 +180,8 @@ class Logging
 				}
 				break;
 			case 'print':
-				if ((
+				if (
+					(
 						(isset($this->print_output[$level]) && $this->print_output[$level]) ||
 						$this->print_output_all
 					) &&
@@ -191,7 +205,8 @@ class Logging
 	private function writeErrorMsg(string $level, string $error_string): bool
 	{
 		// only write if write is requested
-		if (!($this->doDebugTrigger('debug', $level) &&
+		if (
+			!($this->doDebugTrigger('debug', $level) &&
 			$this->doDebugTrigger('print', $level))
 		) {
 			return false;
@@ -205,7 +220,7 @@ class Logging
 		// init output variable
 		$output = $error_string; // output formated error string to output file
 		// init base file path
-		$fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
+		$fn = $this->log_folder . $this->log_print_file . '.' . $this->log_file_name_ext;
 		// log ID prefix settings, if not valid, replace with empty
 		if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
 			$rpl_string = '_' . $this->log_file_id;
@@ -219,7 +234,9 @@ class Logging
 				$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
 			}
 			if (!$this->log_file_unique_id) {
-				$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
+				$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id =
+					date('Y-m-d_His') . '_U_'
+						. substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
 			}
 			$rpl_string = '_' . $this->log_file_unique_id; // add 8 char unique string
 		} else {
@@ -230,10 +247,13 @@ class Logging
 		$rpl_string = !$this->log_per_level ? '' : '_' . $level; // if request to write to one file
 		$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
 		// set per class, but don't use get_class as we will only get self
-		$rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', \CoreLibs\Debug\Support::getCallerClass()); // set sub class settings
+		$rpl_string = !$this->log_per_class ? '' : '_'
+			// set sub class settings
+			. str_replace('\\', '-', \CoreLibs\Debug\Support::getCallerClass());
 		$fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename

-		$rpl_string = !$this->log_per_page ? '' : '_'.\CoreLibs\Get\System::getPageName(1); // if request to write to one file
+		// if request to write to one file
+		$rpl_string = !$this->log_per_page ? '' : '_' . \CoreLibs\Get\System::getPageName(1);
 		$fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename

 		// write to file
@@ -424,7 +444,7 @@ class Logging
 	 */
 	public function prAr(array $a): string
 	{
-		return '{##HTMLPRE##}'.print_r($a, true).'{##/HTMLPRE##}';
+		return '##HTMLPRE##' . print_r($a, true) . '##/HTMLPRE##';
 	}

 	/**
@@ -434,9 +454,12 @@ class Logging
 	 * @param  bool   $strip  default on false, if set to true,
 	 *                        all html tags will be stripped and <br> changed to \n
 	 *                        this is only used for debug output
+	 * @param  string $prefix Attach some block before $string. Will not be stripped even
+	 *                        when strip is true
+	 *                        if strip is false, recommended to add that to $string
 	 * @return bool           True if logged, false if not logged
 	 */
-	public function debug(string $level, string $string, bool $strip = false): bool
+	public function debug(string $level, string $string, bool $strip = false, string $prefix = ''): bool
 	{
 		if (!$this->doDebugTrigger('debug', $level)) {
 			return false;
@@ -456,15 +479,15 @@ class Logging
 			. '{' . $class . '} '
 			. '<' . $level . '> - '
 			// strip the htmlpre special tags if exist
-			.preg_replace(
-				"/{##HTMLPRE##}((.|\n)*?){##\/HTMLPRE##}/m",
-				'\\1',
+			. str_replace(
+				['##HTMLPRE##', '##/HTMLPRE##'],
+				'',
 				// if stripping all html, etc is requested, only for write error msg
 				($strip ?
 					// find any <br> and replace them with \n
 					// strip rest of html elements (base only)
-					preg_replace("/(<\/?)(\w+)([^>]*>)/", '', str_replace('<br>', "\n", $string)) :
-					$string
+					preg_replace("/(<\/?)(\w+)([^>]*>)/", '', str_replace('<br>', "\n", $prefix . $string)) :
+					$prefix . $string
 				)
 			)
 			. "\n"
@@ -483,8 +506,14 @@ class Logging
 				. '[<span style="color: #08b369;">' . $this->page_name . '</span>] '
 				. '[<span style="color: #0062A2;">' . $this->running_uid . '</span>] '
 				. '{<span style="font-style: italic; color: #928100;">' . $class . '</span>} - '
+				// as is prefix, allow HTML
+				. $prefix
 				// we replace special HTMLPRE with <pre> entries
-				.preg_replace("/{##HTMLPRE##}((.|\n)*?){##\/HTMLPRE##}/m", "<pre>\\1</pre>", \CoreLibs\Convert\Html::htmlent($string))
+				. str_replace(
+					['##HTMLPRE##', '##/HTMLPRE##'],
+					['<pre>', '</pre>'],
+					\CoreLibs\Convert\Html::htmlent($string)
+				)
 				. "</div><!--#BR#-->";
 		}
 		return true;
@@ -530,10 +559,15 @@ class Logging
 			} // for each level
 			// create the output wrapper around, so we have a nice formated output per class
 			if ($string_output) {
-				$string_prefix = '<div style="text-align: left; padding: 5px; font-size: 10px; font-family: sans-serif; border-top: 1px solid black; border-bottom: 1px solid black; margin: 10px 0 10px 0; background-color: white; color: black;">'
-					.'<div style="font-size: 12px;">{<span style="font-style: italic; color: #928100;">'.\CoreLibs\Debug\Support::getCallerClass().'</span>}</div>';
+				$string_prefix = '<div style="text-align: left; padding: 5px; font-size: 10px; '
+					. 'font-family: sans-serif; border-top: 1px solid black; '
+					. 'border-bottom: 1px solid black; margin: 10px 0 10px 0; '
+					. 'background-color: white; color: black;">'
+					. '<div style="font-size: 12px;">{<span style="font-style: italic; color: #928100;">'
+					. \CoreLibs\Debug\Support::getCallerClass() . '</span>}</div>';
 				$string_output = $string_prefix . $string_output
-					.'<div><span style="font-style: italic; color: #108db3;">Script Run Time:</span> '.$script_end.'</div>'
+					. '<div><span style="font-style: italic; color: #108db3;">Script Run Time:</span> '
+					. $script_end . '</div>'
 					. '</div>';
 			}
 		}
@@ -555,6 +589,16 @@ class Logging
 			unset($this->error_msg[$level]);
 		}
 	}
+
+	/**
+	 * Get current error message array
+	 *
+	 * @return array error messages collected
+	 */
+	public function getErrorMsg(): array
+	{
+		return $this->error_msg;
+	}
 }

 // __END__
--- a/www/lib/CoreLibs/Debug/RunningTime.php
+++ b/www/lib/CoreLibs/Debug/RunningTime.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * various running time checkers
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Debug;

 class RunningTime
--- a/www/lib/CoreLibs/Debug/Support.php
+++ b/www/lib/CoreLibs/Debug/Support.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * Debug support functions
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Debug;

 class Support
@@ -68,10 +70,31 @@ class Support
 		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) ?? [['class' => get_called_class()]];
 		$class = null;
 		while ($class === null) {
+			// if current is
+			// [function] => debug
+			// [class] => CoreLibs\Debug\Logging
+			// then return
+			// (OUTSIDE) because it was not called from a class method
+			// or return file name
 			$class = array_pop($backtrace)['class'] ?? null;
 		}
 		return $class ?? '';
 	}
+
+	/**
+	 * If a string is empty, sets '-' for return, or if given any other string
+	 *
+	 * @param  string|null $string  The string to check
+	 * @param  string      $replace [default '-'] What to replace the empty string with
+	 * @return string               String itself or the replaced value
+	 */
+	public static function debugString(?string $string, string $replace = '-'): string
+	{
+		if (empty($string)) {
+			return $replace;
+		}
+		return $string;
+	}
 }

 // __END__
--- a/www/lib/CoreLibs/Get/System.php
+++ b/www/lib/CoreLibs/Get/System.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * system related functions to get self name, host name, error strings
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Get;

 class System
@@ -80,6 +82,16 @@ class System
 			return $page_temp['basename'];
 		}
 	}
+
+	/**
+	 * similar to getPageName, but it retuns the raw array
+	 *
+	 * @return array pathinfo array from PHP SELF
+	 */
+	public static function getPageNameArray(): array
+	{
+		return pathinfo($_SERVER['PHP_SELF']);
+	}
 }

 // __END__
--- a/www/lib/CoreLibs/Language/Core/CachedFileReader.php
+++ b/www/lib/CoreLibs/Language/Core/CachedFileReader.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
@@ -20,6 +20,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language\Core;

 // Preloads entire file in memory first, then creates a StringReader
@@ -27,7 +29,7 @@ namespace CoreLibs\Language\Core;
 class CachedFileReader extends \CoreLibs\Language\Core\StringReader
 {
 	public $error = 0;
-	public $_str = '';
+	public $fd_str = '';

 	public function __construct($filename)
 	{
@@ -39,7 +41,7 @@ class CachedFileReader extends \CoreLibs\Language\Core\StringReader
 			if (!$fd) {
 				$this->error = 3; // Cannot read file, probably permissions
 			}
-			$this->_str = fread($fd, $length);
+			$this->fd_str = fread($fd, $length);
 			fclose($fd);
 		} else {
 			$this->error = 2; // File doesn't exist
--- a/www/lib/CoreLibs/Language/Core/FileReader.php
+++ b/www/lib/CoreLibs/Language/Core/FileReader.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
@@ -20,6 +20,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language\Core;

 class FileReader
--- a/www/lib/CoreLibs/Language/Core/GetTextReader.php
+++ b/www/lib/CoreLibs/Language/Core/GetTextReader.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+
 /*
 	Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
 	Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
@@ -20,6 +21,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language\Core;

 /**
@@ -50,7 +53,7 @@ class GetTextReader
 	private $total = 0;          // total string count
 	private $table_originals = null;  // table for original strings (offsets)
 	private $table_translations = null;  // table for translated strings (offsets)
-	private $cache_translations = array();  // original -> translation mapping
+	private $cache_translations = [];  // original -> translation mapping


 	/* Methods */
@@ -149,9 +152,11 @@ class GetTextReader
 	*/
 	private function load_tables()
 	{
-		if (is_array($this->cache_translations) &&
+		if (
+			is_array($this->cache_translations) &&
 			is_array($this->table_originals) &&
-			is_array($this->table_translations)) {
+			is_array($this->table_translations)
+		) {
 			return;
 		}

@@ -166,7 +171,7 @@ class GetTextReader
 		}

 		if ($this->enable_cache) {
-			$this->cache_translations = array();
+			$this->cache_translations = [];
 			/* read all strings in the cache */
 			for ($i = 0; $i < $this->total; $i++) {
 				$this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
--- a/www/lib/CoreLibs/Language/Core/StreamReader.php
+++ b/www/lib/CoreLibs/Language/Core/StreamReader.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
@@ -20,6 +20,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language\Core;

 // Simple class to wrap file streams, string streams, etc.
--- a/www/lib/CoreLibs/Language/Core/StringReader.php
+++ b/www/lib/CoreLibs/Language/Core/StringReader.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php

 /*
 	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
@@ -20,6 +20,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language\Core;

 class StringReader
--- a/www/lib/CoreLibs/Language/Encoding.php
+++ b/www/lib/CoreLibs/Language/Encoding.php
@@ -1,9 +1,11 @@
-<?php declare(strict_types=1);
+<?php

 /*
 * hash wrapper functions for old problem fixes
 */

+declare(strict_types=1);
+
 namespace CoreLibs\Language;

 class Encoding
@@ -89,13 +91,17 @@ class Encoding
 		$compare = mb_convert_encoding($temp, $from_encoding, $to_encoding);
 		// if string does not match anymore we have a convert problem
 		if ($string != $compare) {
-			$failed = array();
+			$failed = [];
 			// go through each character and find the ones that do not match
 			for ($i = 0, $iMax = mb_strlen($string, $from_encoding); $i < $iMax; $i++) {
 				$char = mb_substr($string, $i, 1, $from_encoding);
 				$r_char = mb_substr($compare, $i, 1, $from_encoding);
 				// the ord 194 is a hack to fix the IE7/IE8 bug with line break and illegal character
-				if ((($char != $r_char && !self::$mb_error_char) || ($char != $r_char && $r_char == self::$mb_error_char && self::$mb_error_char)) && ord($char) != 194) {
+				if (
+					(($char != $r_char && !self::$mb_error_char) ||
+					($char != $r_char && $r_char == self::$mb_error_char && self::$mb_error_char)) &&
+					ord($char) != 194
+				) {
 					$failed[] = $char;
 				}
 			}
@@ -119,15 +125,20 @@ class Encoding
 	 *                                 to what we sav the source is
 	 * @return string                  encoding converted string
 	 */
-	public static function convertEncoding(string $string, string $to_encoding, string $source_encoding = '', bool $auto_check = true): string
-	{
+	public static function convertEncoding(
+		string $string,
+		string $to_encoding,
+		string $source_encoding = '',
+		bool $auto_check = true
+	): string {
 		// set if not given
 		if (!$source_encoding) {
 			$source_encoding = mb_detect_encoding($string);
 		} else {
 			$_source_encoding = mb_detect_encoding($string);
 		}
-		if ($auto_check === true &&
+		if (
+			$auto_check === true &&
 			isset($_source_encoding) &&
 			$_source_encoding == $source_encoding
 		) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clemens Schwaighofer	8577345799	class check email fix getEmailRegexCheck This should only return the part email checks from position 1 to n, but it returned all of them. Fixed with slice call	2021-07-20 06:18:14 +09:00
Clemens Schwaighofer	4779e4ccbe	Bug fixes for PSR-12 update	2021-07-14 16:36:13 +09:00
Clemens Schwaighofer	c1240c0614	config master & other warning ignore	2021-07-14 14:11:36 +09:00
Clemens Schwaighofer	6722468bdb	Update from PSR-2 to PSR-12 - Tabs are indent - Warning at 120, Error at 240 char length	2021-07-14 10:02:27 +09:00
Clemens Schwaighofer	11daac6d23	Debug tests update, IO class fixes, support class fixes Added more tests to debug, form, system class tests IO: max calls check return variable name was wrong Logging: changed from preg to str replace for HTMLPRE tag clean up Debug: empty string debug, returns filled string with dummy text if string is empty() System: return base name as is array Updated Array IO check for loading control array not only from file, but from direct variable if set or from an array filled with control array	2021-07-12 06:25:10 +09:00
Clemens Schwaighofer	678aa7460e	CoreLibs Array keyword remove and switch over to []	2021-06-30 15:07:22 +09:00
Clemens Schwaighofer	76e0c0ac06	Update and add class test pages, minor updates for CoreLibs Some code clean up in smarty class (check if $cms object is actually set) Logger/Support Debug clean up for some minor logic with debug prefixes DB IO update debug prefix for log line so we can have a HTML formatted prefix for echo output	2021-06-28 18:07:40 +09:00
Clemens Schwaighofer	3512fa73ee	Remove all execute flaggs from javascript files	2021-06-28 09:48:14 +09:00