Update per level log file writing and with level check

remove all non alphanumeric characters from the level string (debug call
first parameter) so the file name is not invalid:wq

4dev/bin/create_mo.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+base_folder='/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/';
+
+# locale gettext po to mo translator master
+for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
+	file=$(basename $file .po);
+	echo "Translate language ${file}";
+	locale=$(echo "${file}" | cut -d "-" -f 1);
+	domain=$(echo "${file}" | cut -d "-" -f 2);
+	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}../4dev/locale/${locale}-${domain}.po;
+done;
+
+# __END__

4dev/checking/phpunit.sh

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

4dev/database/data/edit_tables.sql

@@ -68,9 +68,10 @@ INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', 'B0C4B3
 INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('User', '1E789E', 1);
 
 -- edit language
+-- iso_name = encoding
 DELETE FROM edit_language;
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1);
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('ja', 'Japanese', 'UTF-8', 2, 1, 0);
+INSERT INTO edit_language (long_name, short_name, iso_name, order_number, enabled, lang_default) VALUES ('English', 'en_US', 'UTF-8', 1, 1, 1);
+INSERT INTO edit_language (long_name, short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('Japanese', 'ja_JP', 'UTF-8', 2, 1, 0);
 
 -- edit group
 DELETE FROM edit_group;

4dev/database/table/edit_language.sql

@@ -12,7 +12,7 @@ CREATE TABLE edit_language (
 	enabled SMALLINT NOT NULL DEFAULT 0,
 	lang_default SMALLINT NOT NULL DEFAULT 0,
 	long_name VARCHAR,
-	short_name VARCHAR,
-	iso_name VARCHAR,
+	short_name VARCHAR, -- en_US, en or en_US@latin without encoding
+	iso_name VARCHAR, -- should actually be encoding
 	order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/locale/Readme.md

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

4dev/locale/en-admin.po

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

4dev/locale/en-frontend.po

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

4dev/locale/ja-admin.po

@@ -2,22 +2,22 @@
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2018/03/28
 # SHORT DESCRIPTION:
-# Backend Japanese Messages file for gettext
-# to craete: msgfmt -o ja.mo messages_ja.po
-# HISTORY:
+# Backend Japanese Messages file for gettext>
 # ********************************************************************/
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Project Version\n"
+"Project-Id-Version: ja.UTF-8 LC_MESSAGES admin\n"
 "Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
 "POT-Creation-Date: 2018-03-28 10:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
+"Last-Translator: clemens.schwaighofer@egplusww.com\n"
 "Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 msgid "Yes"
 msgstr "はい"
@@ -63,7 +63,25 @@ msgid "Sun"
 msgstr "日"
 
 msgid "INPUT TEST"
-msgstr "OUTPUT TEST JA"
+msgstr "OUTPUT TEST ADMIN JA"
+
+# testing multi
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi Admin ja 0"
+msgstr[1] "Multi Admin ja 1"
+msgstr[2] "Multi Admin ja 2"
+
+msgctxt "month name"
+msgid "May"
+msgstr "May Admin ja"
+
+msgctxt "month name"
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi Admin month ja 0"
+msgstr[1] "Multi Admin month ja 1"
+msgstr[2] "Multi Admin month ja 2"
 
 # login string
 msgid "Hello %s"

4dev/locale/ja-frontend.po

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

4dev/tests/CoreLibsACLLoginTest.php

@@ -13,18 +13,73 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsACLLoginTest extends TestCase
 {
+	private static $db;
+	private static $log;
+
 	/**
-	 * Undocumented function
+	 * start DB conneciton, setup DB, etc
 	 *
 	 * @return void
 	 */
-	protected function setUp(): void
+	public static function setUpBeforeClass(): void
 	{
 		if (!extension_loaded('pgsql')) {
-			$this->markTestSkipped(
+			self::markTestSkipped(
 				'The PgSQL extension is not available.'
 			);
 		}
+		// logger is always needed
+		// define basic connection set valid and one invalid
+		self::$log = new \CoreLibs\Debug\Logging([
+			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
+			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
+			'file_id' => 'CoreLibs-ACL-Login-Test',
+			'debug_all' => false,
+			'echo_all' => false,
+			'print_all' => false,
+		]);
+		// if we do have pgsql, we need to create a test DB or check that one
+		// exists and clean the table to zero state
+		self::$db = new \CoreLibs\DB\IO(
+			[
+				'db_name' => 'corelibs_acl_login_test',
+				'db_user' => 'corelibs_acl_login_test',
+				'db_pass' => 'corelibs_acl_login_test',
+				'db_host' => 'localhost',
+				'db_port' => 5432,
+				'db_schema' => 'public',
+				'db_type' => 'pgsql',
+				'db_encoding' => '',
+				'db_ssl' => 'allow', // allow, disable, require, prefer
+				'db_debug' => true,
+			],
+			self::$log
+		);
+		if (!self::$db->dbGetConnectionStatus()) {
+			self::markTestSkipped(
+				'Cannot connect to valid Test DB for ACL\Login test.'
+			);
+		}
+		/*
+		// check if they already exist, drop them
+		if ($db->dbShowTableMetaData('table_with_primary_key') !== false) {
+			$db->dbExec("DROP TABLE table_with_primary_key");
+			$db->dbExec("DROP TABLE table_without_primary_key");
+			$db->dbExec("DROP TABLE test_meta");
+		}
+		*/
+	}
+
+	/**
+	 * close db
+	 *
+	 * @return void
+	 */
+	public static function tearDownAfterClass(): void
+	{
+		if (self::$db->dbGetConnectionStatus()) {
+			self::$db->dbClose();
+		}
 	}
 
 	/**
@@ -40,6 +95,8 @@ final class CoreLibsACLLoginTest extends TestCase
 		$this->markTestIncomplete(
 			'ACL\Login Tests have not yet been implemented'
 		);
+
+		$login = new \CoreLibs\ACL\Login(self::$db, self::$log);
 	}
 }
 

4dev/tests/CoreLibsCheckEncodingTest.php

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

4dev/tests/CoreLibsCombinedArrayHandlerTest.php

@@ -7,6 +7,7 @@ declare(strict_types=1);
 
 namespace tests;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -274,7 +275,6 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	}
 
 	/**
-	 * TODO: create provider for n array merge
 	 * provides array listing for the merge test
 	 *
 	 * @return array
@@ -282,6 +282,61 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	public function arrayMergeRecursiveProvider(): array
 	{
 		return [
+			// 0: expected
+			// 1..n: to merge arrays
+			// n+1: trigger for handle keys as string
+			'two arrays' => [
+				['a' => 1, 'b' => 2, 'c' => 3],
+				['a' => 1, 'b' => 2],
+				['b' => 2, 'c' => 3],
+			],
+			'two arrays, string flag' => [
+				['a' => 1, 'b' => 2, 'c' => 3],
+				['a' => 1, 'b' => 2],
+				['b' => 2, 'c' => 3],
+				true,
+			],
+			// non hash arrays
+			'non hash array merge, no string flag' => [
+				[3, 4, 5],
+				[1, 2, 3],
+				[3, 4, 5],
+			],
+			'non hash array merge, string flag' => [
+				[1, 2, 3, 3, 4, 5],
+				[1, 2, 3],
+				[3, 4, 5],
+				true
+			],
+		];
+	}
+
+	/**
+	 * for warning checks
+	 *
+	 * @return array
+	 */
+	public function arrayMergeRecursiveProviderWarning(): array
+	{
+		return [
+			// error <2 arguments
+			'too view arguments' => [
+				'arrayMergeRecursive needs two or more array arguments',
+				[1]
+			],
+			// error <2 arrays
+			'only one array' => [
+				'arrayMergeRecursive needs two or more array arguments',
+				[1],
+				true,
+			],
+			// error element is not array
+			'non array between array' => [
+				'arrayMergeRecursive encountered a non array argument',
+				[1],
+				'string',
+				[2]
+			],
 		];
 	}
 
@@ -626,21 +681,43 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::arrayMergeRecursive
-	 * @#dataProvider arrayMergeRecursiveProvider
-	 * @testdox arrayMergeRecursive ... will be $expected [$_dataName]
+	 * @dataProvider arrayMergeRecursiveProvider
+	 * @testdox arrayMergeRecursive ... [$_dataName]
 	 *
-	 * @param array $input nested array set as each parameter
-	 * @param bool $flag
-	 * @param bool|array $expected
 	 * @return void
-	 * array $input, bool $flag, $expected
+	 *
 	 */
 	public function testArrayMergeRecursive(): void
 	{
-		$this->assertTrue(true, 'Implement proper test run');
-		$this->markTestIncomplete(
-			'testArrayMergeRecursive has not been implemented yet.'
+		$arrays = func_get_args();
+		// first is expected array, always
+		$expected = array_shift($arrays);
+		$output = \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(
+			...$arrays
 		);
+		$this->assertEquals(
+			$expected,
+			$output
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::arrayMergeRecursive
+	 * @dataProvider arrayMergeRecursiveProviderWarning
+	 * @testdox arrayMergeRecursive with E_USER_WARNING [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testArrayMergeRecursiveWarningA(): void
+	{
+		$arrays = func_get_args();
+		// first is expected warning
+		$warning = array_shift($arrays);
+		$this->expectWarning();
+		$this->expectWarningMessage($warning);
+		\CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...$arrays);
 	}
 
 	/**

4dev/tests/CoreLibsConvertEncodingTest.php

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

4dev/tests/CoreLibsConvertMimeEncodeTest.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Convert\MimeEncode
+ * @coversDefaultClass \CoreLibs\Convert\MimeEncode
+ * @testdox \CoreLibs\Convert\MimeEncode method tests
+ */
+final class CoreLibsConvertMimeEncodeTest extends TestCase
+{
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function mbMimeEncodeProvider(): array
+	{
+		return [
+			// 0: input string
+			// 1: encoding
+			// 2: expected
+			'standard UTF-8' => [
+				'Test string',
+				'UTF-8',
+				'Test string'
+			],
+			'long text UTF-8' => [
+				'The quick brown fox jumps over the lazy sheep that sleeps in the ravine '
+					. 'and has no idea what is going on here',
+				'UTF-8',
+				'The quick brown fox jumps over the lazy sheep that sleeps in the ravine '
+					. 'and has no idea what is going on here'
+			],
+			'standard with special chars UTF-8' => [
+				'This is ümläßtと漢字もカタカナ！!^$%&',
+				'UTF-8',
+				'This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?='
+					. "\r\n"
+					. ' =?UTF-8?B?JQ==?=&'
+			],
+			'35 chars and space at the end UTF-8' => [
+				'12345678901234567890123456789012345 '
+					. 'is there a space?',
+				'UTF-8',
+				'12345678901234567890123456789012345 '
+					. 'is there a =?UTF-8?B?c3BhY2U/?='
+			],
+			'36 chars and space at the end UTF-8' => [
+				'123456789012345678901234567890123456 '
+					. 'is there a space?',
+				'UTF-8',
+				'123456789012345678901234567890123456 '
+					. 'is there a =?UTF-8?B?c3BhY2U/?='
+			],
+			'36 kanji and space UTF-8' => [
+				'カタカナカタカナかなカタカナカタカナかなカタカナカタカナかなカタカナカタ '
+					. 'is there a space?',
+				'UTF-8',
+				"=?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr?=\r\n"
+					. " =?UTF-8?B?44K/44Kr44OK?=\r\n"
+					. " =?UTF-8?B?44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr?=\r\n"
+					. " =?UTF-8?B?44OK44Kr44K/?= is there a =?UTF-8?B?c3BhY2U/?="
+			]
+		];
+	}
+
+	/**
+	 * mb mime header encoding test
+	 *
+	 * @covers ::__mbMimeEncode
+	 * @dataProvider mbMimeEncodeProvider
+	 * @testdox mb encoding target $encoding [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testUuMbMimeEncode(string $input, string $encoding, string $expected): void
+	{
+		// encode string first
+		$encoded = \CoreLibs\Convert\MimeEncode::__mbMimeEncode($input, $encoding);
+		// print "MIME: -" . $encoded . "-\n";
+		$this->assertEquals(
+			$expected,
+			$encoded
+		);
+		$decoded = mb_decode_mimeheader($encoded);
+		// print "INPUT  : " . $input . "\n";
+		// print "DECODED: " . $decoded . "\n";
+		// back compare decoded
+		$this->assertEquals(
+			$input,
+			$decoded
+		);
+	}
+}
+
+// __END__

4dev/tests/CoreLibsCreateSessionTest.php

@@ -68,6 +68,7 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 */
 	public function testStartSession(string $input, string $type, $expected_n, $expected_i): void
 	{
+		// NEEDS MOCKING
 		/* $session_id = '';
 		switch ($type) {
 			case 'p':
@@ -97,7 +98,8 @@ final class CoreLibsCreateSessionTest extends TestCase
 		if ($type == 'g') {
 			unset($GLOBALS['SET_SESSION_NAME']);
 		} */
-		$this->markTestSkipped('No implementation for Create\Session. Cannot run session_start in CLI');
+		$this->markTestSkipped('[CoreLibsCreateSessionTest] No implementation '
+			. 'for Create\Session. Cannot run session_start in CLI');
 	}
 }
 

4dev/tests/CoreLibsDBIOTest.php

@@ -145,7 +145,7 @@ final class CoreLibsDBIOTest extends TestCase
 		);
 		if (!$db->dbGetConnectionStatus()) {
 			self::markTestSkipped(
-				'Cannot connect to valid Test DB.'
+				'Cannot connect to valid Test DB for DB\IO test.'
 			);
 		}
 		// check if they already exist, drop them
@@ -347,6 +347,7 @@ final class CoreLibsDBIOTest extends TestCase
 
 	/**
 	 * Returns test list for dbCompareVersion check
+	 * NOTE: unless we fully mock the =version check needs to be updated
 	 *
 	 * @return array
 	 */
@@ -357,16 +358,16 @@ final class CoreLibsDBIOTest extends TestCase
 		return [
 			'compare = ok' => [ '=13.6.0', true ],
 			'compare = bad' => [ '=9.2.0', false ],
-			'compare < ok' => [ '<20.0.0', true ],
+			'compare < ok' => [ '<99.0.0', true ],
 			'compare < bad' => [ '<9.2.0', false ],
-			'compare <= ok a' => [ '<=20.0.0', true ],
+			'compare <= ok a' => [ '<=99.0.0', true ],
 			'compare <= ok b' => [ '<=13.6.0', true ],
 			'compare <= false' => [ '<=9.2.0', false ],
 			'compare > ok' => [ '>9.2.0', true ],
-			'compare > bad' => [ '>20.2.0', false ],
+			'compare > bad' => [ '>99.2.0', false ],
 			'compare >= ok a' => [ '>=13.6.0', true ],
 			'compare >= ok b' => [ '>=9.2.0', true ],
-			'compare >= bad' => [ '>=20.0.0', false ],
+			'compare >= bad' => [ '>=99.0.0', false ],
 		];
 	}
 
@@ -565,7 +566,7 @@ final class CoreLibsDBIOTest extends TestCase
 	public function testDbSetDebug(
 		string $connection,
 		?bool $set,
-		bool $expected,
+		bool $expected
 	): void {
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
@@ -598,7 +599,7 @@ final class CoreLibsDBIOTest extends TestCase
 	public function testDbToggleDebug(
 		string $connection,
 		?bool $toggle,
-		bool $expected,
+		bool $expected
 	): void {
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
@@ -1733,7 +1734,7 @@ final class CoreLibsDBIOTest extends TestCase
 		$expected,
 		string $warning,
 		string $error,
-		string $insert_data,
+		string $insert_data
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);
@@ -1870,7 +1871,7 @@ final class CoreLibsDBIOTest extends TestCase
 		$expected,
 		string $warning,
 		string $error,
-		string $insert_data,
+		string $insert_data
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);
@@ -2033,7 +2034,7 @@ final class CoreLibsDBIOTest extends TestCase
 		array $cursor_ext_checks,
 		string $warning,
 		string $error,
-		string $insert_data,
+		string $insert_data
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);
@@ -2355,7 +2356,7 @@ final class CoreLibsDBIOTest extends TestCase
 		string $error_execute,
 		string $expected_data_query,
 		array $expected_data,
-		string $insert_data,
+		string $insert_data
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);
@@ -2708,7 +2709,8 @@ final class CoreLibsDBIOTest extends TestCase
 		// comarep all, except timestamp that is a regex
 		foreach ($expected_history as $key => $value) {
 			// check if starts with / because this is regex (timestamp)
-			if (strpos($value, "/") === 0) {
+			// if (substr($expected_2, 0, 1) == '/) {
+			if (strpos($value, '/') === 0) {
 				// this is regex
 				$this->assertMatchesRegularExpression(
 					$value,
@@ -3008,7 +3010,7 @@ final class CoreLibsDBIOTest extends TestCase
 		string $insert,
 		?string $pk_name,
 		string $table,
-		string $primary_key,
+		string $primary_key
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);

4dev/tests/CoreLibsDebugLoggingTest.php

@@ -6,6 +6,8 @@ namespace tests;
 
 use PHPUnit\Framework\TestCase;
 
+// TODO: setLogPer test log file written matches pattern
+
 /**
  * Test class for Debug\Logging
  * @coversDefaultClass \CoreLibs\Debug\Logging
@@ -54,14 +56,16 @@ final class CoreLibsDebugLoggingTest extends TestCase
 			'no options set, constant set' => [
 				null,
 				[
-					'log_folder' => '/tmp/',
+					'log_folder' => str_replace('/configs', '', __DIR__)
+					. DIRECTORY_SEPARATOR . 'log/',
 					'debug_all' => false,
 					'print_all' => false,
 				],
 				[
 					'constant' => [
-						'BASE' => '/tmp',
-						'LOG' => '/'
+						'BASE' => str_replace('/configs', '', __DIR__)
+							. DIRECTORY_SEPARATOR,
+						'LOG' => 'log/'
 					]
 				]
 			],
@@ -728,7 +732,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		bool $expected_debug,
 		string $expected_file,
 		string $expected_string_start,
-		string $expected_string_contains,
+		string $expected_string_contains
 	): void {
 		// must run with below matrix
 		// level    | debug | print | echo | debug() | printErrorMsg() | file

4dev/tests/CoreLibsGetSystemTest.php

@@ -90,11 +90,16 @@ final class CoreLibsGetSystemTest extends TestCase
 	public function getPageNameProvider(): array
 	{
 		return [
+			// 0: input
+			// 1: expected default/WITH_EXTENSION
+			// 2: expected NO_EXTENSION
+			// 3: expected FULL_PATH, if first and last character are / use regex
 			'original set' => [
-				0 => null, // input
+				0 => null,
 				1 => 'phpunit',
 				2 => 'phpunit',
-				3 => 'www/vendor/bin/phpunit', // NOTE: this can change
+				// NOTE: this can change, so it is a regex check
+				3 => "/^(\/?.*\/?)?www\/vendor\/bin\/phpunit$/",
 			],
 			'some path with extension' => [
 				0 => '/some/path/to/file.txt',
@@ -147,11 +152,13 @@ final class CoreLibsGetSystemTest extends TestCase
 		list ($host, $port) = \CoreLibs\Get\System::getHostName();
 		$this->assertEquals(
 			$expected_host,
-			$host
+			$host,
+			'failed expected host assert'
 		);
 		$this->assertEquals(
 			$expected_port,
-			$port
+			$port,
+			'faile expected port assert'
 		);
 	}
 
@@ -176,20 +183,38 @@ final class CoreLibsGetSystemTest extends TestCase
 		// default 0,
 		$this->assertEquals(
 			$expected_0,
-			\CoreLibs\Get\System::getPageName()
+			\CoreLibs\Get\System::getPageName(),
+			'failed default assert'
 		);
 		$this->assertEquals(
 			$expected_0,
-			\CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::WITH_EXTENSION)
+			\CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::WITH_EXTENSION),
+			'failed WITH_EXTESION assert'
 		);
 		$this->assertEquals(
 			$expected_1,
-			\CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::NO_EXTENSION)
-		);
-		$this->assertEquals(
-			$expected_2,
-			\CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::FULL_PATH)
+			\CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::NO_EXTENSION),
+			'failed NO_EXTENSION assert'
 		);
+		// FULL PATH check can be equals or regex
+		$page_name_full_path = \CoreLibs\Get\System::getPageName(\CoreLibs\Get\System::FULL_PATH);
+		if (
+			substr($expected_2, 0, 1) == '/' &&
+			substr($expected_2, -1, 1) == '/'
+		) {
+			// this is regex
+			$this->assertMatchesRegularExpression(
+				$expected_2,
+				$page_name_full_path,
+				'failed FULL_PATH assert regex'
+			);
+		} else {
+			$this->assertEquals(
+				$expected_2,
+				$page_name_full_path,
+				'failed FULL_PATH assert equals'
+			);
+		}
 	}
 }
 

4dev/tests/CoreLibsLanguageEncodingTest.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for Language\Encoding
- * @coversDefaultClass \CoreLibs\Language\Encoding
- * @testdox \CoreLibs\Language\Encoding method tests
- */
-final class CoreLibsLanguageEncodingTest extends TestCase
-{
-	/**
-	 * Undocumented function
-	 *
-	 * @testdox Language\Encoding Class tests
-	 *
-	 * @return void
-	 */
-	public function testLanguageEncoding()
-	{
-		$this->assertTrue(true, 'Language Encoding Tests not implemented');
-		$this->markTestIncomplete(
-			'Language\Encoding Tests have not yet been implemented'
-		);
-	}
-}
-
-// __END__

4dev/tests/CoreLibsLanguageGetLocaleTest.php

@@ -0,0 +1,310 @@
+<?php // phpcs:disable Generic.Files.LineLength
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Language\GetLocale
+ *
+ * @coversDefaultClass \CoreLibs\Language\GetLocale
+ * @testdox \CoreLibs\Language\GetLocale method tests
+ */
+final class CoreLibsLanguageGetLocaleTest extends TestCase
+{
+	/**
+	 * set all constant variables that must be set before call
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		// default web page encoding setting
+		if (!defined('DEFAULT_ENCODING')) {
+			define('DEFAULT_ENCODING', 'UTF-8');
+		}
+		if (!defined('DEFAULT_LOCALE')) {
+			// default lang + encoding
+			define('DEFAULT_LOCALE', 'en_US.UTF-8');
+		}
+		// site
+		if (!defined('SITE_ENCODING')) {
+			define('SITE_ENCODING', DEFAULT_ENCODING);
+		}
+		if (!defined('SITE_LOCALE')) {
+			define('SITE_LOCALE', DEFAULT_LOCALE);
+		}
+		// just set
+		if (!defined('BASE')) {
+			define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('INCLUDES')) {
+			define('INCLUDES', 'includes' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LANG')) {
+			define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('LOCALE')) {
+			define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
+		}
+		if (!defined('CONTENT_PATH')) {
+			define('CONTENT_PATH', 'frontend' . DIRECTORY_SEPARATOR);
+		}
+		// array session
+		$_SESSION = [];
+		global $_SESSION;
+	}
+
+	/**
+	 * all the test data
+	 *
+	 * @return array
+	 */
+	public function setLocaleProvider(): array
+	{
+		return [
+			// 0: locale
+			// 1: domain
+			// 2: encoding
+			// 3: path
+			// 4: SESSION: DEFAULT_LOCALE
+			// 5: SESSION: DEFAULT_CHARSET
+			// 6: expected array
+			'no params, all default constants' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'en_US.UTF-8',
+					'lang' => 'en_US',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			'no params, session charset and lang' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja_JP', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja_JP',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			'no params, session charset and lang short' => [
+				// lang, domain, encoding, path
+				null, null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				'ja', 'UTF-8',
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang (no sessions)
+			'locale param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'frontend',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// different locale setting
+			'locale complex param only, no sessions' => [
+				// lang, domain, encoding, path
+				'ja_JP.SJIS', null, null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja_JP.SJIS',
+					'lang' => 'ja_JP',
+					'domain' => 'frontend',
+					'encoding' => 'SJIS',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'locale, domain params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', null, null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// lang, domain, path (no override)
+			'locale, domain and path, no sessions' => [
+				// lang, domain, encoding, path
+				'ja.UTF-8', 'admin', '', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja.UTF-8',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+			],
+			// all params set (no override)
+			'all parameter, no sessions' => [
+				// lang, domain, encoding, path
+				'ja', 'admin', 'UTF-8', __DIR__ . '/locale_other/',
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'ja',
+					'lang' => 'ja',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?locale_other\/$/",
+				],
+			],
+			// param lang and domain (no override)
+			'long locale, domain, encoding params, no sessions' => [
+				// lang, domain, encoding, path
+				'de_CH.UTF-8@euro', 'admin', 'UTF-8', null,
+				// SESSION DEFAULT_LOCALE, SESSION: DEFAULT_CHARSET
+				null, null,
+				// return array
+				[
+					'locale' => 'de_CH.UTF-8@euro',
+					'lang' => 'de_CH',
+					'domain' => 'admin',
+					'encoding' => 'UTF-8',
+					'path' => "/^\/(.*\/)?includes\/locale\/$/",
+				],
+			],
+			// TODO invalid params (bad path) (no override)
+			// TODO param calls, but with override set
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::setLocale
+	 * @dataProvider setLocaleProvider
+	 * @testdox lang settings lang $language, domain $domain, encoding $encoding, path $path; session lang: $SESSION_DEFAULT_LOCALE, session char: $SESSION_DEFAULT_CHARSET [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testsetLocale(
+		?string $language,
+		?string $domain,
+		?string $encoding,
+		?string $path,
+		?string $SESSION_DEFAULT_LOCALE,
+		?string $SESSION_DEFAULT_CHARSET,
+		array $expected
+	): void {
+		$return_lang_settings = [];
+		global $_SESSION;
+		// set override
+		if ($SESSION_DEFAULT_LOCALE !== null) {
+			$_SESSION['DEFAULT_LOCALE'] = $SESSION_DEFAULT_LOCALE;
+		}
+		if ($SESSION_DEFAULT_CHARSET !== null) {
+			$_SESSION['DEFAULT_CHARSET'] = $SESSION_DEFAULT_CHARSET;
+		}
+		// function call
+		if ($language === null && $domain === null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale();
+		} elseif ($language !== null && $domain === null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language
+			);
+		} elseif ($language !== null && $domain !== null && $encoding === null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain
+			);
+		} elseif ($language !== null && $domain !== null && $encoding !== null && $path === null) {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding
+			);
+		} else {
+			$return_lang_settings  = \CoreLibs\Language\GetLocale::setLocale(
+				$language,
+				$domain,
+				$encoding,
+				$path
+			);
+		}
+		// print "RETURN: " . print_r($return_lang_settings, true) . "\n";
+
+		foreach (
+			[
+				'locale', 'lang', 'domain', 'encoding', 'path'
+			] as $key
+		) {
+			$value = $expected[$key];
+			if (strpos($value, "/") === 0) {
+				// this is regex
+				$this->assertMatchesRegularExpression(
+					$value,
+					$return_lang_settings[$key],
+					'assert regex failed for ' . $key
+				);
+			} else {
+				// assert equal
+				$this->assertEquals(
+					$value,
+					$return_lang_settings[$key],
+					'assert equal failed for ' . $key
+				);
+			}
+		}
+		// unset all vars
+		$_SESSION = [];
+		unset($GLOBALS['OVERRIDE_LANG']);
+	}
+}
+
+// __END__

4dev/tests/includes/create_po.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# if we don't have one base file we are in the wrong folder
+if [ ! -f "locale/en_US/LC_MESSAGES/admin.mo" ]; then
+	echo "Locale file is missing, wrong base folder?"
+	echo "Should be: 4dev/tests/includes/"
+	exit;
+fi;
+
+for file in $(ls -1 locale/*.po); do
+	echo $file;
+	file=$(basename $file .po);
+	locale=$(echo "${file}" | cut -d "-" -f 1);
+	domain=$(echo "${file}" | cut -d "-" -f 2);
+	msgfmt -o locale/${locale}/LC_MESSAGES/${domain}.mo locale/${locale}-${domain}.po;
+done;

4dev/tests/includes/locale/en_US-admin.po

@@ -0,0 +1,34 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: en_US.UTF-8 LC_MESSAGES admin\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: clemens.schwaighofer@egplusww.co\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+msgid "Original"
+msgstr "Translated admin en_US"
+
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi admin en_US 0"
+msgstr[1] "Multi admin en_US 1"
+msgstr[2] "Multi admin en_US 2"
+
+msgctxt "context"
+msgid "Original"
+msgstr "Original context admin en_US"
+
+msgctxt "context"
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi context admin en_US 0"
+msgstr[1] "Multi context admin en_US 1"
+msgstr[2] "Multi context admin en_US 2"

4dev/tests/includes/locale/en_US-frontend.po

@@ -0,0 +1,34 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: en_US.UTF-8 LC_MESSAGES frontend\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: clemens.schwaighofer@egplusww.co\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+msgid "Original"
+msgstr "Translated frontend en_US"
+
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi frontend en_US 0"
+msgstr[1] "Multi frontend en_US 1"
+msgstr[2] "Multi frontend en_US 2"
+
+msgctxt "context"
+msgid "Original"
+msgstr "Original context frontend en_US"
+
+msgctxt "context"
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi context frontend en_US 0"
+msgstr[1] "Multi context frontend en_US 1"
+msgstr[2] "Multi context frontend en_US 2"

4dev/tests/includes/locale/ja_JP-admin.po

@@ -0,0 +1,35 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: ja_JP.UTF-8 LC_MESSAGES admin\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: clemens.schwaighofer@egplusww.co\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+# 0, 1, 2 plural
+
+msgid "Original"
+msgstr "Translated admin ja_JP"
+
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi admin ja_JP 0"
+msgstr[1] "Multi admin ja_JP 1"
+msgstr[2] "Multi admin ja_JP 2"
+
+msgctxt "context"
+msgid "Original"
+msgstr "Original context admin ja_JP"
+
+msgctxt "context"
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi context admin ja_JP 0"
+msgstr[1] "Multi context admin ja_JP 1"
+msgstr[2] "Multi context admin ja_JP 2"

4dev/tests/includes/locale/ja_JP-frontend.po

@@ -0,0 +1,35 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: ja_JP.UTF-8 LC_MESSAGES frontend\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
+"POT-Creation-Date: 2018-03-28 10:40+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: clemens.schwaighofer@egplusww.co\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+# 0, 1, 2 plural
+
+msgid "Original"
+msgstr "Translated frontend ja_JP"
+
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi frontend ja_JP 0"
+msgstr[1] "Multi frontend ja_JP 1"
+msgstr[2] "Multi frontend ja_JP 2"
+
+msgctxt "context"
+msgid "Original"
+msgstr "Original context frontend ja_JP"
+
+msgctxt "context"
+msgid "single"
+msgid_plural "multi"
+msgstr[0] "Multi context frontend ja_JP 0"
+msgstr[1] "Multi context frontend ja_JP 1"
+msgstr[2] "Multi context frontend ja_JP 2"

4dev/tests/phpunit_flow_check.php

@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace test;
-
-use PHPUnit\Framework\TestCase;
-
-final class TemplateMethodsTest extends TestCase
-{
-	public static function setUpBeforeClass(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	protected function setUp(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	protected function assertPreConditions(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	public function testOne(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-		$this->assertTrue(true);
-	}
-
-	public function testTwo(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-		$this->assertTrue(false);
-	}
-
-	protected function assertPostConditions(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	protected function tearDown(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	public static function tearDownAfterClass(): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-	}
-
-	protected function onNotSuccessfulTest(\Throwable $t): void
-	{
-		fwrite(STDOUT, __METHOD__ . "\n");
-		throw $t;
-	}
-}

README.V6-Upgrade.md

@@ -44,9 +44,24 @@ $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login & page access check
 $login = new CoreLibs\ACL\Login($db, $log);
 ```
+* update language class
+```php
+// pre auto detect language after login
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+// set lang and pass to smarty/backend
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
+```
+* smarty needs language
+```php
+$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
+```
 * admin backend also needs logger
 ```php
-$cms = new CoreLibs\Admin\Backend($db, $log);
+$cms = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
 ```
 * update and `$cms` or similar calls so db is in `$cms->db->...` and log are in `$cms->log->...`
 * update all `config.*.php` files where needed
@@ -60,6 +75,12 @@ require BASE . LIB . 'autoloader.php';
 ```
 **UPDATE:**
 ```php
+// po langs [DEPRECAED: use LOCALE]
+define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+// po locale file
+define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
+```
+```php
 // SSL host name
 // define('SSL_HOST', $_ENV['SSL_HOST'] ?? '');
 ```
@@ -85,6 +106,13 @@ define('CONTENT_WIDTH', '100%');
 define('BASE_NAME', preg_replace('/[^A-Za-z0-9]/', '', $_ENV['BASE_NAME'] ?? ''));
 ```
 ```php
+/************* LANGUAGE / ENCODING *******/
+// default lang + encoding
+define('DEFAULT_LOCALE', 'en_US.UTF-8');
+// default web page encoding setting
+define('DEFAULT_ENCODING', 'UTF-8');
+```
+```php
 // BAIL ON MISSING DB CONFIG:
 // we have either no db selction for this host but have db config entries
 // or we have a db selection but no db config as array or empty
@@ -104,6 +132,10 @@ if (
 }
 ```
 ```php
+// remove SITE_LANG
+define('SITE_LOCALE', $SITE_CONFIG[HOST_NAME]['site_locale'] ?? DEFAULT_LOCALE);
+define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCODING);
+```
 ```php
 /************* GENERAL PAGE TITLE ********/
 define('G_TITLE', $_ENV['G_TITLE'] ?? '');
@@ -118,6 +150,15 @@ In the config then
 ```php
 'db_name' => $_ENV['DB_NAME.TEST'] ?? '',
 ```
+* config.host.php update
+must add site_locale (site_lang + site_encoding)
+remove site_lang
+```php
+	// lang + encoding
+	'site_locale' => 'en_US.UTF-8',
+	// site language
+	'site_encoding' => 'UTF-8',
+```
 * copy `layout/admin/javascript/edit.jq.js`
 * check other javacsript files if needed (`edit.jq.js`)
 

phpstan-baseline.neon

@@ -1,7 +1,72 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$result of function pg_result_error expects resource, object\\|resource\\|true given\\.$#"
+			message: "#^Parameter \\#1 \\$connection of function pg_connection_busy expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 3
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_connection_status expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_get_result expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 2
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_meta_data expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_send_query expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 2
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_socket expects PgSql\\\\Connection, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$connection of function pg_version expects PgSql\\\\Connection\\|null, object\\|resource given\\.$#"
+			count: 2
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_affected_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_fetch_all expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_fetch_array expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_field_name expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_num_fields expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_num_rows expects PgSql\\\\Result, object\\|resource given\\.$#"
+			count: 1
+			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
+
+		-
+			message: "#^Parameter \\#1 \\$result of function pg_result_error expects PgSql\\\\Result, object\\|resource given\\.$#"
 			count: 1
 			path: www/lib/CoreLibs/DB/SQL/PgSQL.php
 

phpstan.neon

@@ -24,7 +24,9 @@ parameters:
 		# do not check old qq file uploader tests
 		- www/admin/qq_file_upload_*.php
 		# ignore all test files
-		- www/admin/class_test*php
+		- www/admin/class_test*.php
+		# extra in sub folder
+		- www/admin/subfolder/class_test*.php
 		- www/admin/error_test.php
 		# admin synlink files
 		- www/admin/edit_*.php
@@ -47,9 +49,12 @@ parameters:
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*
+		- # this error is ignore because of the PHP 8.0 to 8.1 change for pg_*, only for 8.0 or lower
 			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects resource(\\|null)?, object\\|resource(\\|bool)? given\\.$#"
 			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
+		- # this is for 8.1 or newer
+			message: "#^Parameter \\#1 \\$(result|connection) of function pg_\\w+ expects PgSql\\\\(Result|Connection(\\|null)?), object\\|resource given\\.$#"
+			path: %currentWorkingDirectory%/www/lib/CoreLibs/DB/SQL/PgSQL.php
 		# this is ignored for now
 		# - '#Expression in empty\(\) is always falsy.#'
 		# -

www/admin/class_test.admin.backend.php

@@ -43,14 +43,23 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 // db config with logger
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
-$backend = new CoreLibs\Admin\Backend($db, $log);
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
+$backend = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
 
-print "<html><head><title>TEST CLASS: ADMIN BACKEND</title><head>";
+$PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // set acl, from eg login acl
-print "SETACL[]: " . $backend->setACL([]) . "<br>";
+print "SETACL[]: " . $backend->setACL(['EMPTY' => 'EMPTY']) . "<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>";

www/admin/class_test.array.php

@@ -45,9 +45,12 @@ $log = new CoreLibs\Debug\Logging([
 // $_array = new CoreLibs\Combined\ArrayHandler();
 // $array_class = 'CoreLibs\Combination\ArrayHandler';
 
-print "<html><head><title>TEST CLASS: ARRAY HANDLER</title><head>";
+$PAGE_NAME = 'TEST CLASS: ARRAY HANDLER';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // recursive array search
 $test_array = [

www/admin/class_test.autoloader.php

@@ -32,9 +32,12 @@ ob_end_flush();
 
 use CoreLibs\Convert\Byte;
 
-print "<html><head><title>TEST CLASS: AUTOLOADER</title><head>";
+$PAGE_NAME = 'TEST CLASS: AUTOLOADER';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $bytes = 10242424;
 $_bytes = Byte::humanReadableByteFormat($bytes);

www/admin/class_test.byte.php

@@ -43,9 +43,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $byte_class = 'CoreLibs\Convert\Byte';
 
-print "<html><head><title>TEST CLASS: BYTE CONVERT</title><head>";
+$PAGE_NAME = 'TEST CLASS: BYTE CONVERT';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // class
 $byte = 254779258;

www/admin/class_test.colors.php

@@ -44,9 +44,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $color_class = 'CoreLibs\Convert\Colors';
 
-print "<html><head><title>TEST CLASS: COLORS</title><head>";
+$PAGE_NAME = 'TEST CLASS: COLORS';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // define a list of from to color sets for conversion test
 

www/admin/class_test.config.direct.php

@@ -0,0 +1,59 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require '../configs/config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-config-direct';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+
+$PAGE_NAME = 'TEST CLASS: CONFIG DIRECT';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+print "DIR: " . DIR . "<br>";
+print "BASE: " . BASE . "<br>";
+print "ROOT: " . ROOT . "<br>";
+print "BASE NAME: " . BASE_NAME . "<br>";
+echo "Config path prefix: " . $CONFIG_PATH_PREFIX . "<br>";
+print "DB Name: " . DB_CONFIG_NAME . "<br>";
+print "DB Config: " . \CoreLibs\Debug\Support::printAr(DB_CONFIG) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.config.link.php

@@ -0,0 +1,59 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-config-link';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+
+$PAGE_NAME = 'TEST CLASS: CONFIG LINK';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+print "DIR: " . DIR . "<br>";
+print "BASE: " . BASE . "<br>";
+print "ROOT: " . ROOT . "<br>";
+print "BASE NAME: " . BASE_NAME . "<br>";
+echo "Config path prefix: " . $CONFIG_PATH_PREFIX . "<br>";
+print "DB Name: " . DB_CONFIG_NAME . "<br>";
+print "DB Config: " . \CoreLibs\Debug\Support::printAr(DB_CONFIG) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.datetime.php

@@ -44,9 +44,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $datetime_class = 'CoreLibs\Combined\DateTime';
 
-print "<html><head><title>TEST CLASS: DATE/TIME</title><head>";
+$PAGE_NAME = 'TEST CLASS: DATE/TIME';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // class
 $timestamp = 1622788315.123456;

www/admin/class_test.db.php

@@ -39,9 +39,12 @@ $log = new CoreLibs\Debug\Logging([
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 $db->log->debug('START', '=============================>');
 
-print "<html><head><title>TEST CLASS: DB</title><head>";
+$PAGE_NAME = 'TEST CLASS: DB';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "LOGFILE NAME: " . $db->log->getSetting('log_file_name') . "<br>";
 print "LOGFILE ID: " . $db->log->getSetting('log_file_id') . "<br>";

www/admin/class_test.debug.php

@@ -44,9 +44,12 @@ $debug = new CoreLibs\Debug\Logging([
 $debug_support_class = 'CoreLibs\Debug\Support';
 $debug_logging_class = 'CoreLibs\Debug\Logging';
 
-print "<html><head><title>TEST CLASS: DEBUG</title><head>";
+$PAGE_NAME = 'TEST CLASS: DEBUG';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 function test()
 {
@@ -67,6 +70,9 @@ print "S::DEBUSTRING(s): " . DebugSupport::debugString('SET') . "<br>";
 print "S::DEBUSTRING(''): " . DebugSupport::debugString('') . "<br>";
 print "S::DEBUSTRING(,s): " . DebugSupport::debugString(null, '{-}') . "<br>";
 
+// get test
+print "LOG FOLDER: " . $debug->getSetting('log_folder') . "<br>";
+
 // debug
 print "C->DEBUG: " . $debug->debug('CLASS-TEST-DEBUG', 'Class Test Debug') . "<br>";
 print "C->DEBUG(html): " . $debug->debug('CLASS-TEST-DEBUG', 'HTML TAG<br><b>BOLD</b>') . "<br>";
@@ -169,6 +175,12 @@ print "GETCALLERCLASS(NON CLASS): " . \CoreLibs\Debug\Support::getCallerClass()
 print "S::FSETFILENAME: " . FileWriter::fsetFilename('class_test_debug_file.log') . "<br>";
 print "S::FDEBUG: " . FileWriter::fdebug('CLASS TEST DEBUG FILE: ' . date('Y-m-d H:i:s')) . "<br>";
 
+// test per level
+$debug->setLogPer('level', true);
+$debug->debug('TEST PER LEVEL', 'Per level test');
+$debug->debug('()', 'Per level test: invalid chars');
+$debug->setLogPer('level', false);
+
 // error message
 // future DEPRECATED
 // $debug->debug('BASIC CLASS', 'Debug test');

www/admin/class_test.email.php

@@ -43,9 +43,12 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 
-print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
+$PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // regex get
 print "S::GETEMAILREGEX(0): " . Email::getEmailRegex(0) . "<br>";

www/admin/class_test.encoding.php

@@ -29,7 +29,9 @@ if (!defined('SET_SESSION_NAME')) {
 $LOG_FILE_ID = 'classTest-encoding';
 ob_end_flush();
 
-use CoreLibs\Language\Encoding;
+use CoreLibs\Convert\Encoding as ConEnc;
+use CoreLibs\Check\Encoding as ChkEnc;
+use CoreLibs\Convert\MimeEncode;
 
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
@@ -41,12 +43,17 @@ $log = new CoreLibs\Debug\Logging([
 	'echo_all' => $ECHO_ALL ?? false,
 	'print_all' => $PRINT_ALL ?? false,
 ]);
-$_encoding = new CoreLibs\Language\Encoding();
-$encoding_class = 'CoreLibs\Language\Encoding';
+// class type
+$_chk_enc = new CoreLibs\Check\Encoding();
+$_con_enc = new CoreLibs\Convert\Encoding();
+$chk_enc = 'CoreLibs\Check\Encoding';
 
-print "<html><head><title>TEST CLASS: ENCODING</title><head>";
+$PAGE_NAME = 'TEST CLASS: ENCODING (CHECK/CONVERT/MIME)';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // print "Valid encoding: ".$log->printAr(mb_list_encodings())."<br>";
 
@@ -58,41 +65,47 @@ $mime_encodes = [
 	['日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい日本語ながい', 'ISO-2022-JP-MS'],
 ];
 foreach ($mime_encodes as $mime_encode) {
-	print "__MBMIMEENCODE: $mime_encode[0]: " . Encoding::__mbMimeEncode($mime_encode[0], $mime_encode[1]) . "<br>";
+	print "__MBMIMEENCODE: $mime_encode[0]: " . MimeEncode::__mbMimeEncode($mime_encode[0], $mime_encode[1]) . "<br>";
 }
+echo "<br>";
 
 $enc_strings = [
 	'Normal Text',
 	'日本語',
+	// bad
+	'❶',
 	// unworkable
 	''
 ];
 // class
-$_encoding->setErrorChar('∴');
+$_chk_enc->setErrorChar(0x2234);
+$_chk_enc->setErrorChar('∴');
+print "ERROR CHAR: " . $_chk_enc->getErrorChar() . "<br>";
 foreach ($enc_strings as $_string) {
-	$string = $_encoding->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-	print "ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "<br>";
-	print "CONV ENCODING: $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP') . "<br>";
-	print "CONV ENCODING (s): $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "<br>";
+	$string = $_chk_enc->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+	print "ENC CHECK: $_string: " . ($string === false ? '<b>-OK-</b>' : print_r($string, true)) . "<br>";
+	print "CONV ENCODING: $_string: " . $_con_enc->convertEncoding($_string, 'ISO-2022-JP') . "<br>";
+	print "CONV ENCODING (s): $_string: " . $_con_enc->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>";
+		. $_con_enc->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "<br>";
 }
-print "ERROR CHAR: " . $_encoding->getErrorChar() . "<br>";
+echo "<br>";
 // static
-$encoding_class::setErrorChar('∴');
+// ChkEnc::setErrorChar('∴');
+ChkEnc::setErrorChar(0x2234);
+print "S::ERROR CHAR: " . ChkEnc::getErrorChar() . "<br>";
 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>";
+	$string = ChkEnc::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+	print "S::ENC CHECK: $_string: " . ($string === false ? '<b>-OK-</b>' : print_r($string, true)) . "<br>";
+	print "S::CONV ENCODING: $_string: " . ConEnc::convertEncoding($_string, 'ISO-2022-JP') . "<br>";
 	print "S::CONV ENCODING (s): $_string: "
-		. $encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "<br>";
+		. ConEnc::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>";
+		. ConEnc::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "<br>";
 }
-print "S::ERROR CHAR: " . $encoding_class::getErrorChar() . "<br>";
 // static use
 $_string = $enc_strings[1];
-$string = Encoding::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
+$string = $chk_enc::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
 print "S::ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "<br>";
 
 // error message

www/admin/class_test.file.php

@@ -42,9 +42,12 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 
-print "<html><head><title>TEST CLASS: FILE</title><head>";
+$PAGE_NAME = 'TEST CLASS: FILE';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $file = '/some/path/to/some/file.txt';
 print "GETFILENAMEENDING: $file: " . File::getFilenameEnding($file) . "<br>";

www/admin/class_test.hash.php

@@ -45,9 +45,12 @@ $hash_class = 'CoreLibs\Create\Hash';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: HASH</title><head>";
+$PAGE_NAME = 'TEST CLASS: HASH';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $to_crc = 'Some text block';
 // static

www/admin/class_test.html.php

@@ -49,9 +49,12 @@ $elements_class = 'CoreLibs\Output\Form\Elements';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
+$PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $string = "Something < = > Other <br> Next line";
 print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . "<br>";

www/admin/class_test.image.php

@@ -46,9 +46,12 @@ $image_class = 'CoreLibs\Output\Image';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: IMAGE</title><head>";
+$PAGE_NAME = 'TEST CLASS: IMAGE';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // thumb sizes
 $thumb_width = 250;

www/admin/class_test.json.php

@@ -46,9 +46,12 @@ $json_class = 'CoreLibs\Convert\Json';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: JSON</title><head>";
+$PAGE_NAME = 'TEST CLASS: JSON';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $json = '{"foo": "bar"}';
 $output = Json::jsonConvertToArray($json);

www/admin/class_test.lang.php

@@ -19,8 +19,6 @@ ob_start();
 
 // basic class test file
 define('USE_DATABASE', false);
-// init language
-$lang = 'en_utf8';
 // sample config
 require 'config.php';
 // set session name
@@ -29,28 +27,160 @@ if (!defined('SET_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>";
+$PAGE_NAME = 'TEST CLASS: LANG';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
+use CoreLibs\Language\L10n;
+use CoreLibs\Debug\Support;
+
+echo "<br><b>LIST LOCALES</b><br>";
+
+$locale = 'en_US.UTF-8';
+$locales = CoreLibs\Language\L10n::listLocales($locale);
+print "[" . $locale . "] LOCALES: " . Support::printAr($locales) . "<br>";
+$locale = 'en.UTF-8';
+$locales = CoreLibs\Language\L10n::listLocales($locale);
+print "[" . $locale . "] LOCALES: " . Support::printAr($locales) . "<br>";
+
+echo "<br><b>LOCALE INFO</b><br>";
+$locale = 'en_US.UTF-8';
+$locale_info = CoreLibs\Language\L10n::parseLocale($locale);
+print "[" . $locale . "] INFO: " . Support::printAr($locale_info) . "<br>";
+$locale = 'en.UTF-8';
+$locale_info = CoreLibs\Language\L10n::parseLocale($locale);
+print "[" . $locale . "] INFO: " . Support::printAr($locale_info) . "<br>";
+
+echo "<br><b>AUTO DETECT</b><br>";
+
+$get_locale = \CoreLibs\Language\GetLocale::setLocale();
+print "[AUTO]: " . Support::printAr($get_locale) . "<br>";
+$get_locale = \CoreLibs\Language\GetLocale::setLocale('en', 'foo', 'ISO-8895');
+print "[OVERRIDE]: " . Support::printAr($get_locale) . "<br>";
+
+// try to load non existing
+echo "<br><b>NEW TYPE</b><br>";
+// translate string
 $string = 'INPUT TEST';
-
-echo "LANGUAGE SET: " . $l->__getLang() . "<br>";
-echo "LANGUAGE FILE: " . $l->__getMoFile() . "<br>";
+// new path test
+$lang = 'ja';
+$domain = 'admin';
+$encoding = 'UTF-8';
+$path = BASE . INCLUDES . LOCALE;
+// load direct
+$l = new CoreLibs\Language\L10n($lang, $domain, $path);
+echo "*<br>";
+echo "LANGUAGE WANT/SET: " . $lang  . '/' . $l->getLocale() . "<br>";
+echo "DOMAIN WANT/SET: " . $domain  . '/' . $l->getDomain() . "<br>";
+echo "LANGUAGE FILE: " . $l->getMoFile() . "<br>";
+echo "CONTENT PATH: " . $l->getBaseContentPath() . "<br>";
+echo "DOMAIN PATH: " . $l->getTextDomain($domain) . "<br>";
+echo "BASE PATH: " . $l->getBaseLocalePath() . "<br>";
+echo "LOAD ERROR: " . $l->getLoadError() . "<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 "TROUGH LOAD: " . $l->getTranslatorClass()->gettext($string) . "<br>";
+$single_string = 'single';
+$multi_string = 'multi';
+for ($n = 0; $n <= 3; $n++) {
+	echo "MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
+		. $l->__n($single_string, $multi_string, $n) . "<br>";
+}
+$context = "month name";
+$context_string = "May";
+echo "CONTEXT TRANSLATION: " . $context_string . " => " . $l->__p($context, $context_string) . "<br>";
+$single_string = 'single';
+$multi_string = 'multi';
+for ($n = 0; $n <= 3; $n++) {
+	echo "CONTEXT MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
+		. $l->__np($context, $single_string, $multi_string, $n) . "<br>";
+}
+// change domain
+$domain = 'frontend';
+$l->getTranslator('', $domain, $path);
+echo "*<br>";
+echo "LANGUAGE WANT/SET: " . $lang  . '/' . $l->getLocale() . "<br>";
+echo "DOMAIN WANT/SET: " . $domain  . '/' . $l->getDomain() . "<br>";
+echo "LANGUAGE FILE: " . $l->getMoFile() . "<br>";
+echo "CONTENT PATH: " . $l->getBaseContentPath() . "<br>";
+echo "DOMAIN PATH: " . $l->getTextDomain($domain) . "<br>";
+echo "BASE PATH: " . $l->getBaseLocalePath() . "<br>";
+echo "LOAD ERROR: " . $l->getLoadError() . "<br>";
 echo "INPUT TEST: " . $string . " => " . $l->__($string) . "<br>";
-// TODO: run compare check input must match output
+echo "TROUGH LOAD: " . $l->getTranslatorClass()->gettext($string) . "<br>";
+// change language short type
+$lang = 'en';
+$domain = 'admin';
+$l->getTranslator($lang, $domain, $path);
+echo "*<br>";
+echo "LANGUAGE WANT/SET: " . $lang  . '/' . $l->getLocale() . "<br>";
+echo "DOMAIN WANT/SET: " . $domain  . '/' . $l->getDomain() . "<br>";
+echo "LANGUAGE FILE: " . $l->getMoFile() . "<br>";
+echo "CONTENT PATH: " . $l->getBaseContentPath() . "<br>";
+echo "DOMAIN PATH: " . $l->getTextDomain($domain) . "<br>";
+echo "BASE PATH: " . $l->getBaseLocalePath() . "<br>";
+echo "LOAD ERROR: " . $l->getLoadError() . "<br>";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "<br>";
+echo "TROUGH LOAD: " . $l->getTranslatorClass()->gettext($string) . "<br>";
+// chang to wrong language
+$lang = 'tr';
+$l->getTranslator($lang, $domain, $path);
+echo "*<br>";
+echo "LANGUAGE WANT/SET: " . $lang  . '/' . $l->getLocale() . "<br>";
+echo "DOMAIN WANT/SET: " . $domain  . '/' . $l->getDomain() . "<br>";
+echo "LANGUAGE FILE: " . $l->getMoFile() . "<br>";
+echo "CONTENT PATH: " . $l->getBaseContentPath() . "<br>";
+echo "DOMAIN PATH: " . $l->getTextDomain($domain) . "<br>";
+echo "BASE PATH: " . $l->getBaseLocalePath() . "<br>";
+echo "LOAD ERROR: " . $l->getLoadError() . "<br>";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "<br>";
+echo "TROUGH LOAD: " . $l->getTranslatorClass()->gettext($string) . "<br>";
+
+$lang = 'en';
+$domain = 'admin';
+echo "<br><b>STATIC TYPE TEST</b><br>";
+// static tests from l10n_load
+L10n::getInstance()->setLocale($lang);
+echo "SET LOCALE: " . L10n::getInstance()->getLocale() . "<br>";
+L10n::getInstance()->setDomain($domain);
+echo "SET DOMAIN: " . L10n::getInstance()->getDomain() . "<br>";
+L10n::getInstance()->setTextDomain($domain, $path);
+echo "SET TEXT DOMAIN: " . L10n::getInstance()->getTextDomain($domain) . "<br>";
+// null call __bind_textdomain_codeset
+echo "INPUT TEST: " . $string . " => " . L10n::getInstance()->getTranslator()->gettext($string) . "<br>";
+
+echo "<br><b>FUNCTIONS</b><br>";
+// real statisc test
+L10n::loadFunctions();
+$locale = 'ja';
+_setlocale(LC_MESSAGES, $locale);
+_textdomain($domain);
+_bindtextdomain($domain, $path);
+_bind_textdomain_codeset($domain, $encoding);
+echo "INPUT TEST $locale: " . $string . " => " . __($string) . "<br>";
+$single_string = 'single';
+$multi_string = 'multi';
+for ($n = 0; $n <= 3; $n++) {
+	echo "MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
+		. _ngettext($single_string, $multi_string, $n) . "<br>";
+}
+
+$locale = 'en_US.UTF-8';
+_setlocale(LC_MESSAGES, $locale);
+_textdomain($domain);
+_bindtextdomain($domain, $path);
+_bind_textdomain_codeset($domain, $encoding);
+echo "INPUT TEST $locale: " . $string . " => " . __($string) . "<br>";
+$single_string = 'single';
+$multi_string = 'multi';
+for ($n = 0; $n <= 3; $n++) {
+	echo "MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
+		. _ngettext($single_string, $multi_string, $n) . "<br>";
+}
 
 print "</body></html>";
 

www/admin/class_test.login.php

@@ -0,0 +1,63 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-login';
+// init login & backend class
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+$db = new CoreLibs\DB\IO(DB_CONFIG, $log);
+$login = new CoreLibs\ACL\Login($db, $log);
+ob_end_flush();
+
+$PAGE_NAME = 'TEST CLASS: LOGIN';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+echo "CHECK PERMISSION: " . ($login->loginCheckPermissions() ? 'OK' : 'BAD') . "<br>";
+echo "IS ADMIN: " . ($login->loginIsAdmin() ? 'OK' : 'BAD') . "<br>";
+echo "MIN ACCESS BASE: " . ($login->loginCheckAccessBase('admin') ? 'OK' : 'BAD') . "<br>";
+echo "MIN ACCESS PAGE: " . ($login->loginCheckAccessPage('admin') ? 'OK' : 'BAD') . "<br>";
+
+echo "ACL: " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()) . "<br>";
+echo "ACL (MIN): " . \CoreLibs\Debug\Support::printAr($login->loginGetAcl()['min']) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";

www/admin/class_test.math.php

@@ -44,9 +44,12 @@ $math_class = 'CoreLibs\Convert\Math';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: MATH</title><head>";
+$PAGE_NAME = 'TEST CLASS: MATH';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "FCEIL: " . $_math->fceil(5.1234567890, 5) . "<br>";
 print "FLOORP: " . $_math->floorp(5123456, -3) . "<br>";

www/admin/class_test.mime.php

@@ -41,9 +41,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $_mime = new CoreLibs\Convert\MimeAppName();
 
-print "<html><head><title>TEST CLASS: MIME</title><head>";
+$PAGE_NAME = 'TEST CLASS: MIME';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $mime = 'application/illustrator';
 print "MIME $mime: " . $_mime->mimeGetAppName($mime) . "<br>";

www/admin/class_test.output.form.php

@@ -69,9 +69,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log);
 
-print "<html><head><title>TEST CLASS: FORM GENERATE</title><head>";
+$PAGE_NAME = 'TEST CLASS: FORM GENERATE';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "MOBILE PHONE: " . $form->mobile_phone . "<br>";
 // sets table array to include

www/admin/class_test.password.php

@@ -46,9 +46,12 @@ $password_class = 'CoreLibs\Check\Password';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: PASSWORD</title><head>";
+$PAGE_NAME = 'TEST CLASS: PASSWORD';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $password = 'something1234';
 $enc_password = $_password->passwordSet($password);

www/admin/class_test.php

@@ -41,10 +41,17 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 $login = new CoreLibs\ACL\Login($db, $log);
-$backend = new CoreLibs\Admin\Backend($db, $log);
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
+$backend = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
 $backend->db->dbInfo(true);
 ob_end_flush();
 
+print "<!DOCTYPE html>";
 print "<html><head><title>TEST CLASS</title><head>";
 print "<body>";
 
@@ -60,7 +67,7 @@ print '<div><a href="class_test.email.php">Class Test: EMAIL</a></div>';
 print '<div><a href="class_test.uids.php">Class Test: UIDS</a></div>';
 print '<div><a href="class_test.phpv.php">Class Test: PHP VERSION</a></div>';
 print '<div><a href="class_test.hash.php">Class Test: HASH</a></div>';
-print '<div><a href="class_test.encoding.php">Class Test: ENCODING</a></div>';
+print '<div><a href="class_test.encoding.php">Class Test: ENCODING (CHECK/CONVERT/MIME)</a></div>';
 print '<div><a href="class_test.image.php">Class Test: IMAGE</a></div>';
 print '<div><a href="class_test.byte.php">Class Test: BYTE CONVERT</a></div>';
 print '<div><a href="class_test.datetime.php">Class Test: DATE/TIME</a></div>';
@@ -74,13 +81,19 @@ print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
 print '<div><a href="class_test.output.form.php">Class Test: OUTPUT FORM</a></div>';
 print '<div><a href="class_test.admin.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.session.php">Class Test: SESSION</a></div>';
 print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';
+print '<div><a href="class_test.login.php">Class Test: LOGIN</a></div>';
 print '<div><a href="class_test.autoloader.php">Class Test: AUTOLOADER</a></div>';
+print '<div><a href="class_test.config.link.php">Class Test: CONFIG LINK</a></div>';
+print '<div><a href="class_test.config.direct.php">Class Test: CONFIG DIRECT</a></div>';
+print '<div><a href="subfolder/class_test.config.direct.php">Class Test: CONFIG DIRECT SUB</a></div>';
 
 print "<hr>";
+print "L: " . CoreLibs\Debug\Support::printAr($locale) . "<br>";
 // print all _ENV vars set
 print "<div>READ _ENV ARRAY:</div>";
-print "<pre>" . print_r(array_map('htmlentities', $_ENV), true) . "</pre>";
+print CoreLibs\Debug\Support::printAr(array_map('htmlentities', $_ENV));
 // set + check edit access id
 $edit_access_id = 3;
 if (is_object($login) && isset($login->acl['unit'])) {

www/admin/class_test.phpv.php

@@ -46,9 +46,12 @@ $phpv_class = 'CoreLibs\Check\PhpVersion';
 
 // define a list of from to color sets for conversion test
 
-print "<html><head><title>TEST CLASS: PHP VERSION</title><head>";
+$PAGE_NAME = 'TEST CLASS: PHP VERSION';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $min_version_s = '7';
 $min_version_ss = '7.1';

www/admin/class_test.randomkey.php

@@ -43,9 +43,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $array_class = 'CoreLibs\Create\RandomKey';
 
-print "<html><head><title>TEST CLASS: RANDOM KEY</title><head>";
+$PAGE_NAME = 'TEST CLASS: RANDOM KEY';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $key_length = 10;
 $key_length_b = 5;

www/admin/class_test.readenvfile.php

@@ -34,9 +34,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $ref_class = 'CoreLibs\Get\ReadEnvFile';
 
-print "<html><head><title>TEST CLASS: READ ENV FILE</title><head>";
+$PAGE_NAME = 'TEST CLASS: READ ENV FILE';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "ALREADY from config.php: " . \CoreLibs\Debug\Support::printAr($_ENV) . "<br>";
 

www/admin/class_test.runningtime.php

@@ -42,9 +42,12 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 
-print "<html><head><title>TEST CLASS: RUNNING IMTE</title><head>";
+$PAGE_NAME = 'TEST CLASS: RUNNING TIME';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 RunningTime::hrRunningTime();
 RunningTime::runningTime();

www/admin/class_test.session.php

@@ -0,0 +1,171 @@
+<?php // phpcs:ignore warning
+
+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);
+}
+
+/**
+ * Undocumented function
+ *
+ * @param  int    $status
+ * @return string
+ */
+/** @phan-suppress-next-line PhanRedefineFunction */
+function getSessionStatusString(int $status): string
+{
+	switch ($status) {
+		case PHP_SESSION_DISABLED:
+			$status = 'PHP_SESSION_DISABLED';
+			break;
+		case PHP_SESSION_NONE:
+			$status = 'PHP_SESSION_NONE';
+			break;
+		case PHP_SESSION_ACTIVE:
+			$status = 'PHP_SESSION_ACTIVE';
+			break;
+		default:
+			$status = '[!] UNDEFINED';
+			break;
+	}
+	return $status;
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// set session name
+// if (!defined('SET_SESSION_NAME')) {
+// 	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+// }
+// define log file id
+$LOG_FILE_ID = 'classTest-session';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+use CoreLibs\Create\Session;
+
+$PAGE_NAME = 'TEST CLASS: SESSION';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+$session_name = 'class-test-session';
+$var = 'foo';
+$value = 'bar';
+
+foreach (['123', '123-123', '123abc'] as $_session_name) {
+	print "[UNSET] Session Name valid for " . $_session_name . ": "
+		. (Session::checkValidSessionName($_session_name) ? 'Valid' : 'Invalid') . "<br>";
+}
+
+echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
+
+print "[UNSET] Current session id: " . Session::getSessionId() . "<br>";
+print "[UNSET] Current session name: " . Session::getSessionName() . "<br>";
+print "[UNSET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+if (isset($_SESSION)) {
+	print "[UNSET] _SESSION is: set<br>";
+} else {
+	print "[UNSET] _SESSION is: not set<br>";
+}
+#
+print "[UNSET] To set session name valid: "
+	. (Session::checkValidSessionName($session_name) ? 'Valid' : 'Invalid') . "<br>";
+if (false === ($session = Session::startSession($session_name))) {
+	print "[FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "[SET] Current session id: " . $session . "<br>";
+}
+// set again
+if (false === ($session = Session::startSession($session_name))) {
+	print "[2 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "[2 SET] Current session id: " . $session . "<br>";
+}
+print "[SET] Current session id: " . Session::getSessionId() . "<br>";
+print "[SET] Current session name: " . Session::getSessionName() . "<br>";
+print "[SET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[SET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+if (isset($_SESSION)) {
+	print "[SET] _SESSION is: set<br>";
+} else {
+	print "[SET] _SESSION is: not set<br>";
+}
+if (!isset($_SESSION['counter'])) {
+	$_SESSION['counter'] = 0;
+}
+$_SESSION['counter']++;
+print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+$_SESSION[$var] = $value;
+print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+print "[READ] Confirm " . $var . " is " . $value . ": "
+	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
+
+// differnt session name
+$session_name = 'class-test-session-ALT';
+if (false === ($session = Session::startSession($session_name))) {
+	print "[3 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "[3 SET] Current session id: " . $session . "<br>";
+}
+print "[SET AGAIN] Current session id: " . Session::getSessionId() . "<br>";
+
+print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
+
+// close session
+Session::writeClose();
+// will never be written
+$_SESSION['will_never_be_written'] = 'empty';
+
+// open again
+$session_name = 'class-test-session';
+if (false === ($session = Session::startSession($session_name))) {
+	print "[4 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "[4 SET] Current session id: " . $session . "<br>";
+}
+print "[START AGAIN] Current session id: " . Session::getSessionId() . "<br>";
+$_SESSION['will_be_written_again'] = 'Full';
+
+// close session
+Session::writeClose();
+// invalid
+$session_name = '123';
+if (false === ($session = Session::startSession($session_name))) {
+	print "[5 FAILED] Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "[5 SET] Current session id: " . $session . "<br>";
+}
+print "[BAD NAME] Current session id: " . Session::getSessionId() . "<br>";
+print "[BAD NAME] Current session name: " . Session::getSessionName() . "<br>";
+print "[BAD NAME] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[BAD NAME] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.session.read.php

@@ -0,0 +1,113 @@
+<?php // phpcs:ignore warning
+
+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);
+}
+
+/**
+ * Undocumented function
+ *
+ * @param  int    $status
+ * @return string
+ */
+/** @phan-suppress-next-line PhanRedefineFunction */
+function getSessionStatusString(int $status): string
+{
+	switch ($status) {
+		case PHP_SESSION_DISABLED:
+			$status = 'PHP_SESSION_DISABLED';
+			break;
+		case PHP_SESSION_NONE:
+			$status = 'PHP_SESSION_NONE';
+			break;
+		case PHP_SESSION_ACTIVE:
+			$status = 'PHP_SESSION_ACTIVE';
+			break;
+		default:
+			$status = '[!] UNDEFINED';
+			break;
+	}
+	return $status;
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require 'config.php';
+// set session name
+if (!defined('SET_SESSION_NAME')) {
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
+// define log file id
+$LOG_FILE_ID = 'classTest-session.read';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+use CoreLibs\Create\Session;
+
+$PAGE_NAME = 'TEST CLASS: SESSION (READ)';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+$session_name = 'class-test-session';
+// $session_name = '';
+$var = 'foo';
+$value = 'bar';
+
+echo "Global session name: " . ($GLOBALS['SET_SESSION_NAME'] ?? '-') . "<br>";
+
+print "[UNSET] Current session id: " . Session::getSessionId() . "<br>";
+print "[UNSET] Current session name: " . Session::getSessionName() . "<br>";
+print "[UNSET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[UNSET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+
+print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+// start
+if (false === ($session = Session::startSession($session_name))) {
+	print "Session start failed: " . Session::getErrorStr() . "<br>";
+} else {
+	print "Current session id: " . $session . "<br>";
+}
+// set again
+if (false === ($session = Session::startSession($session_name))) {
+	print "[2] Session start failed<br>";
+} else {
+	print "[2] Current session id: " . $session . "<br>";
+}
+print "[SET] Current session id: " . Session::getSessionId() . "<br>";
+print "[SET] Current session name: " . Session::getSessionName() . "<br>";
+print "[SET] Current session active: " . (Session::checkActiveSession() ? 'Yes' : 'No') . "<br>";
+print "[SET] Current session status: " . getSessionStatusString(Session::getSessionStatus()) . "<br>";
+print "[READ] " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+print "[READ] Confirm " . $var . " is " . $value . ": "
+	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
+
+print "[ALL SESSION]: " . \CoreLibs\Debug\Support::printAr($_SESSION) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/admin/class_test.smarty.php

@@ -19,8 +19,6 @@ ob_start();
 
 // basic class test file
 define('USE_DATABASE', true);
-// set language
-$lang = 'en_utf8';
 // sample config
 require 'config.php';
 // override ECHO ALL FALSE
@@ -43,12 +41,20 @@ $log = new CoreLibs\Debug\Logging([
 	'echo_all' => $ECHO_ALL ?? false,
 	'print_all' => $PRINT_ALL ?? false,
 ]);
-$smarty = new CoreLibs\Template\SmartyExtend();
-$l = new CoreLibs\Language\L10n($lang);
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
+$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
 
-print "<html><head><title>TEST CLASS: SMARTY</title><head>";
+$PAGE_NAME = 'TEST CLASS: SMARTY';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $smarty->DATA['JS_DEBUG'] = DEBUG;
 $smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
@@ -69,7 +75,8 @@ $smarty->setSmartyPaths();
 
 // smarty test
 $smarty->DATA['SMARTY_TEST'] = 'Test Data';
-$smarty->DATA['TRANSLATE_TEST'] = $l->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST'] = $l10n->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST_FUNCTION'] = _gettext('Are we translated?');
 $smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
 $smarty->DATA['replace'] = 'Replaced';
 // variable variables

www/admin/class_test.system.php

@@ -42,11 +42,13 @@ $log = new CoreLibs\Debug\Logging([
 	'echo_all' => $ECHO_ALL ?? false,
 	'print_all' => $PRINT_ALL ?? false,
 ]);
-$basic = new CoreLibs\Basic($log);
 
-print "<html><head><title>TEST CLASS: SYSTEM</title><head>";
+$PAGE_NAME = 'TEST CLASS: SYSTEM';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 print "GETHOSTNAME: " . DgS::printAr(System::getHostName()) . "<br>";
 print "GETPAGENAME(0): " . System::getPageName() . "<br>";

www/admin/class_test.token.php

@@ -42,9 +42,12 @@ $log = new CoreLibs\Debug\Logging([
 $_token = new CoreLibs\Output\Form\Token();
 $token_class = 'CoreLibs\Output\Form\Token';
 
-print "<html><head><title>TEST CLASS: FORM TOKEN</title><head>";
+$PAGE_NAME = 'TEST CLASS: FORM TOKEN';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $token = 'test_form_token';
 $token_id = $_token->setFormToken($token);

www/admin/class_test.uids.php

@@ -43,9 +43,12 @@ $_uids = new CoreLibs\Create\Uids();
 use CoreLibs\Create\Uids;
 $uids_class = 'CoreLibs\Create\Uids';
 
-print "<html><head><title>TEST CLASS: UIDS</title><head>";
+$PAGE_NAME = 'TEST CLASS: UIDS';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 // class
 print "UUIDV4: " . $_uids->uuidv4() . "<br>";

www/admin/subfolder/class_test.config.direct.php

@@ -0,0 +1,59 @@
+<?php // phpcs:ignore warning
+
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+declare(strict_types=1);
+
+$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
+$DEBUG_ALL = 1;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+if ($DEBUG_ALL) {
+	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
+}
+
+ob_start();
+
+// basic class test file
+define('USE_DATABASE', false);
+// sample config
+require '../../configs/config.php';
+// define log file id
+$LOG_FILE_ID = 'classTest-config-direct';
+ob_end_flush();
+
+$log = new CoreLibs\Debug\Logging([
+	'log_folder' => BASE . LOG,
+	'file_id' => $LOG_FILE_ID,
+	// add file date
+	'print_file_date' => true,
+	// set debug and print flags
+	'debug_all' => $DEBUG_ALL ?? false,
+	'echo_all' => $ECHO_ALL ?? false,
+	'print_all' => $PRINT_ALL ?? false,
+]);
+
+$PAGE_NAME = 'TEST CLASS: CONFIG DIRECT SUB';
+print "<!DOCTYPE html>";
+print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<body>";
+print '<div><a href="../class_test.php">Class Test Master</a></div>';
+print '<div><h1>' . $PAGE_NAME . '</h1></div>';
+
+print "DIR: " . DIR . "<br>";
+print "BASE: " . BASE . "<br>";
+print "ROOT: " . ROOT . "<br>";
+print "BASE NAME: " . BASE_NAME . "<br>";
+echo "Config path prefix: " . $CONFIG_PATH_PREFIX . "<br>";
+print "DB Name: " . DB_CONFIG_NAME . "<br>";
+print "DB Config: " . \CoreLibs\Debug\Support::printAr(DB_CONFIG) . "<br>";
+
+// error message
+print $log->printErrorMsg();
+
+print "</body></html>";
+
+// __END__

www/configs/config.host.php

@@ -27,7 +27,8 @@ $__LOCAL_CONFIG = [
 	'db_host' => 'test',
 	'location' => 'test',
 	'debug_flag' => true,
-	'site_lang' => 'en_utf8',
+	'site_locale' => 'en_US.UTF-8',
+	'site_encoding' => 'UTF-8',
 	'login_enabled' => true
 ];
 
@@ -44,8 +45,10 @@ $SITE_CONFIG = [
 		'location' => 'test',
 		// show DEBUG override
 		'debug_flag' => true,
-		// site language
-		'site_lang' => 'en_utf8',
+		// site locale
+		'site_locale' => 'en_US.UTF-8',
+		// site encoding
+		'site_encoding' => 'UTF-8',
 		// enable/disable login override
 		'login_enabled' => true
 	],

www/configs/config.master.php

@@ -65,8 +65,8 @@ define('JS', 'javascript' . DIRECTORY_SEPARATOR);
 define('TABLE_ARRAYS', 'table_arrays' . DIRECTORY_SEPARATOR);
 // smarty libs path
 define('SMARTY', 'Smarty' . DIRECTORY_SEPARATOR);
-// po langs
-define('LANG', 'lang' . DIRECTORY_SEPARATOR);
+// po locale file
+define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
 // cache path
 define('CACHE', 'cache' . DIRECTORY_SEPARATOR);
 // temp path
@@ -158,7 +158,8 @@ define('CACHE_ID', 'CACHE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
 define('COMPILE_ID', 'COMPILE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
-define('DEFAULT_LANG', 'en_utf8');
+// default lang + encoding
+define('DEFAULT_LOCALE', 'en_US.UTF-8');
 // default web page encoding setting
 define('DEFAULT_ENCODING', 'UTF-8');
 
@@ -258,7 +259,8 @@ $GLOBALS['DB_CONFIG'] = DB_CONFIG;
 // debug settings, site lang, etc
 define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
 define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag'] ?? false);
-define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang'] ?? 'en_utf8');
+define('SITE_LOCALE', $SITE_CONFIG[HOST_NAME]['site_locale'] ?? DEFAULT_LOCALE);
+define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCODING);
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
 // paths

www/configs/config.other.php

@@ -21,7 +21,10 @@ $paths = [
 ];
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path . DIRECTORY_SEPARATOR . 'convert') && is_file($path . DIRECTORY_SEPARATOR . 'convert')) {
+	if (
+		file_exists($path . DIRECTORY_SEPARATOR . 'convert') &&
+		is_file($path . DIRECTORY_SEPARATOR . 'convert')
+	) {
 		// image magick convert location
 		define('CONVERT', $path . DIRECTORY_SEPARATOR . 'convert');
 		break;

www/configs/config.php

@@ -11,51 +11,68 @@
 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 search, start with 0, got down each level __DIR__ has,
+// if nothing found -> bail
 $CONFIG_PATH_PREFIX = '';
+// base path for loads
+$__DIR__PATH = __DIR__ . DIRECTORY_SEPARATOR;
+// don't load autoloader twice
 $end_autoload = false;
-for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos++) {
+for (
+	$dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__));
+	$dir_pos <= $dir_max;
+	$dir_pos++
+) {
 	$CONFIG_PATH_PREFIX .= '..' . DIRECTORY_SEPARATOR;
 	if ($end_autoload === false) {
 		/************* AUTO LOADER *******************/
-		// read auto loader for lib only
-		// It is recommended to setup basic composer and use just one auto loader
-		// if (is_file($CONFIG_PATH_PREFIX . 'lib' . DIRECTORY_SEPARATOR . 'autoloader.php')) {
-		// 	require $CONFIG_PATH_PREFIX . 'lib' . DIRECTORY_SEPARATOR . 'autoloader.php';
-		//	$end_autoload = true;
-		// }
-		// composer auto loader, IF composer.json file includes classmap for lib/:
+		// composer auto loader, in composer.json file add classmap for lib/:
 		// "autoload": {
 		// 	"classmap": [
 		// 		"lib/"
 		// 	]
 		// },
-		// NOTE: MUST RUN composer dump-autoload if file/class names are changed or added
-		// load auto loader
-		if (is_file($CONFIG_PATH_PREFIX . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php')) {
-			require $CONFIG_PATH_PREFIX . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+		// NOTE: MUST RUN composer dump-autoload if file/class names are
+		// changed or new ones are added
+		if (
+			is_file(
+				$__DIR__PATH . $CONFIG_PATH_PREFIX
+					. 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'
+			)
+		) {
+			require $__DIR__PATH . $CONFIG_PATH_PREFIX
+				. 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 			$end_autoload = true;
 		}
-		// load enviorment file if it exists
-		\CoreLibs\Get\ReadEnvFile::readEnvFile($CONFIG_PATH_PREFIX . CONFIG_PATH);
 	}
 	/************* MASTER CONFIG *******************/
-	if (is_file($CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php')) {
+	if (
+		is_file($__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php')
+	) {
+		// load enviorment file if it exists
+		\CoreLibs\Get\ReadEnvFile::readEnvFile(
+			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH
+		);
 		// load master config file that loads all other config files
-		require $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
+		require $__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
 		break;
 	}
 }
 // fail if no base DIR is not set
 if (!defined('DIR')) {
-	exit('Base config unloadable');
+	exit('Base config could not be loaded');
 }
 // find trigger name "admin/" or "frontend/" in the getcwd() folder
 foreach (['admin', 'frontend'] as $folder) {
 	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $folder)) {
-		define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
 		break;
 	}
 }
+// if content path is empty, fallback is default
+/** @phpstan-ignore-next-line can be empty */
+if (empty($folder)) {
+	$folder = 'default';
+}
+define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
 
 // __END__

www/includes/Date.Vars.php

@@ -1,77 +0,0 @@
-<?php
-
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2005/07/19
-* SHORT DESCRIPTION:
-* preset date variables
-* HISTORY:
-*********************************************************************/
-
-declare(strict_types=1);
-
-/******
-All moved to CoreLibs\Combined\DateTime
-DAY_SHORT
-DAY_LONG
-MONTH_LONG
-MONTH_SHORT
-*******/
-trigger_error(
-	'Date.VArs.php is deprecated. '
-		. 'Use CoreLibs\Combined\DateTime:: with upper case old variable name',
-	E_USER_DEPRECATED
-);
-
-$day_short = [
-	1 => 'Mon',
-	2 => 'Tue',
-	3 => 'Wed',
-	4 => 'Thu',
-	5 => 'Fri',
-	6 => 'Sat',
-	7 => 'Sun'
-];
-
-$day_long = [
-	1 => 'Monday',
-	2 => 'Tuesday',
-	3 => 'Wednesday',
-	4 => 'Thursday',
-	5 => 'Friday',
-	6 => 'Saturday',
-	7 => 'Sunday'
-];
-
-// months
-$month_long = [
-	1 => 'January',
-	2 => 'February',
-	3 => 'March',
-	4 => 'April',
-	5 => 'May',
-	6 => 'June',
-	7 => 'July',
-	8 => 'August',
-	9 => 'September',
-	10 => 'October',
-	11 => 'November',
-	12 => 'December'
-];
-
-$month_short = [
-	1 => 'Jan',
-	2 => 'Feb',
-	3 => 'Mar',
-	4 => 'Apr',
-	5 => 'May',
-	6 => 'Jun',
-	7 => 'Jul',
-	8 => 'Aug',
-	9 => 'Sep',
-	10 => 'Oct',
-	11 => 'Nov',
-	12 => 'Dec'
-];
-
-// __END__

www/includes/admin_header.php

@@ -72,10 +72,19 @@ if (
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login & page access check
 $login = new CoreLibs\ACL\Login($db, $log);
+// lang, path, domain
+// pre auto detect language after login
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+// set lang and pass to smarty/backend
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend();
+$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
 // create new Backend class with db and loger attached
-$cms = new CoreLibs\Admin\Backend($db, $log);
+$cms = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db info

www/includes/admin_set_paths.php

@@ -1,22 +0,0 @@
-<?php
-
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2007/09/03
-* SHORT DESCRIPTION:
-* set paths & language variables
-* HISTORY:
-*********************************************************************/
-
-declare(strict_types=1);
-
-/******
-NOTE THAT THIS INCLUDE IS OBSOLETE
-USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
-*******/
-trigger_error('admin_set_paths.php is deprecated. Use SmartyExtended->setSmartyPaths();', E_USER_DEPRECATED);
-if ($smarty) {
-	$smarty->setSmartyPaths();
-}
-
-// __END__

www/includes/admin_smarty.php

@@ -1,23 +0,0 @@
-<?php
-
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2005/07/12
-* SHORT DESCRIPTION:
-* default smarty vars, and create output template for smarty
-* 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
-);
-$smarty->setSmartyVarsAdmin();
-
-// __END__

www/includes/edit_base.php

@@ -61,18 +61,27 @@ $log = new CoreLibs\Debug\Logging([
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login page
 $login = new CoreLibs\ACL\Login($db, $log);
+// lang, path, domain
+// pre auto detect language after login
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+// set lang and pass to smarty/backend
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
 // flush and start
 ob_end_flush();
 // turn off set log per class
 $log->setLogPer('class', false);
 // create form class
-$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log);
+$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $log, $l10n, $locale);
 if ($form->mobile_phone) {
 	echo "I am sorry, but this page cannot be viewed by a mobile phone";
 	exit;
 }
 // smarty template engine (extended Translation version)
-$smarty = new CoreLibs\Template\SmartyExtend();
+$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
 
 // $form->log->debug('POST', $form->log->prAr($_POST));
 
@@ -437,16 +446,15 @@ if ($form->my_page_name == 'edit_order') {
 					$t_q = '';
 					foreach ($output as $output_file) {
 						// split the ouput into folder and file
-						// eg ../admin/test.php is ../admin/ and test.php
-						preg_match("/([\.\/\w]+\/)+(\w+\.\w{1,})$/", $output_file, $matches);
-						// if named config.php, skip
-						if ($matches[2] != 'config.php') {
-							if ($t_q) {
-								$t_q .= ', ';
-							}
-							$t_q .= "('" . $form->dbEscapeString($matches[1]) . "', '"
-								. $form->dbEscapeString($matches[2]) . "')";
+						$pathinfo = pathinfo($output_file);
+						if (!empty($pathinfo['dirname'])) {
+							$pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
 						}
+						if ($t_q) {
+							$t_q .= ', ';
+						}
+						$t_q .= "('" . $form->dbEscapeString($pathinfo['dirname']) . "', '"
+							. $form->dbEscapeString($pathinfo['basename']) . "')";
 					}
 					$form->dbExec($q . $t_q, 'NULL');
 					$elements[] = $form->formCreateElement('filename');

www/includes/templates/admin/smarty_test.tpl

@@ -7,13 +7,19 @@
 <div>
 	<b>Outside translation test</b><br>
 	TRANSLATION CLASS (OUT): {$TRANSLATE_TEST}<br>
-	TRANSLATION CLASS (SMARTY): {$TRANSLATE_TEST_SMARTY}
+	TRANSLATION CLASS (OUT FUNCTION): {$TRANSLATE_TEST_FUNCTION}<br>
+	TRANSLATION CLASS (SMARTY): {$TRANSLATE_TEST_SMARTY}<br>
 </div>
 <div>
 	<b>Translate Test with replace:</b><br>
 	ORIGINAL: Original with string: %1 ({$replace})<br>
 	TRANSLATED: {t 1=$replace}Original with string: %1{/t}<br>
-	TRANSLATED (escape): {t escape=on 1=$replace}Original with string: %1{/t}
+	TRANSLATED (escape): {t escape=on 1=$replace}Original with string: %1{/t}<br>
+	{capture assign="extra_title"}{t}INPUT TEST{/t}{/capture}
+	Capture test: {$extra_title}<br>
+	{section name=plural_test start=0 loop=3}
+	Plural test {$smarty.section.plural_test.index}: {t count=$smarty.section.plural_test.index plural="multi"}single{/t}<br>
+	{/section}
 </div>
 <div>
 	<b>Variable variables:</b><br>

www/includes/templates/admin/smarty_test4.tpl

@@ -1,37 +0,0 @@
-<div>
-	{$SMARTY_TEST}
-</div>
-<div>
-	TRANSLATION CLASS (OUT): {$TRANSLATE_TEST}
-</div>
-<div>
-	TRANSLATION CLASS (SMARTY): {$TRANSLATE_TEST_SMARTY}
-</div>
-<div>
-	<select id="drop_down_test" name="drop_down_test">
-		{html_options options=$drop_down_test selected=$drop_down_test_selected}
-	</select>
-</div>
-<div class="jq-container">
-	<div id="jq-test" class="jp-test">
-		<div id="test-div" class="test-div">
-			Some content here or asdfasdfasf
-		</div>
-		<div id="translate-div">
-			{* TRANSLATION SMARTY: {t}I should be translated{/t} *}
-			TRANSLATION SMARTY: I should be translated
-		</div>
-	</div>
-</div>
-<div class="loop-test">
-	<div>LOOP TEST</div>
-{section name=page_list start=1 loop=$loop_start+1}
-	<div>LOOP OUTPUT: {$smarty.section.page_list.index}</div>
-{/section}
-</div>
-{* progresss indicator *}
-<div id="indicator"></div>
-{* the action confirm box *}
-<div id="actionBox" class="actionBoxElement"></div>
-{* The Overlay box *}
-<div id="overlayBox" class="overlayBoxElement"></div>

www/lib/CoreLibs/ACL/Login.php

@@ -164,16 +164,15 @@ class Login
 	public $l;
 
 	/**
-	 * constructor, does ALL, opens db, works through connection checks, closes itself
+	 * constructor, does ALL, opens db, works through connection checks,
+	 * finishes itself
+	 *
 	 * @param \CoreLibs\DB\IO              $db   Database connection class
 	 * @param \CoreLibs\Debug\Logging      $log  Logging class
-	 * @param \CoreLibs\Language\L10n|null $l10n l10n language class
-	 *                                                if null, auto set
 	 */
 	public function __construct(
 		\CoreLibs\DB\IO $db,
-		\CoreLibs\Debug\Logging $log,
-		?\CoreLibs\Language\L10n $l10n = null
+		\CoreLibs\Debug\Logging $log
 	) {
 		// log login data for this class only
 		$log->setLogPer('class', true);
@@ -194,6 +193,7 @@ class Login
 		// check if session exists and could be created
 		// TODO: move session creation and check to outside?
 		if (Session::startSession() === false) {
+			$this->login_error = 1;
 			echo '<b>Session not started or could not be started!</b><br>'
 				. 'Use \'\CoreLibs\Create\Session::startSession();\'.<br>'
 				. 'For less problems with other session, you can set a '
@@ -203,31 +203,16 @@ class Login
 
 		// pre-check that password min/max lengths are inbetween 1 and 255;
 		if ($this->password_max_length > 255) {
-			echo '<b>Settings problem</b> PMaL<br>';
-			exit;
+			$this->password_max_length = 255;
 		}
 		if ($this->password_min_length < 1) {
-			echo '<b>Settings problem</b> PMiL<br>';
-			exit;
+			$this->password_min_length = 1;
 		}
 
 		// set global is ajax page for if we show the data directly,
 		// or need to pass it back
 		// to the continue AJAX class for output back to the user
 		$this->login_is_ajax_page = isset($GLOBALS['AJAX_PAGE']) && $GLOBALS['AJAX_PAGE'] ? true : false;
-		// set the default lang
-		$locale = 'en_US.UTF-8';
-		$lang = 'en_utf8';
-		if (Session::getSessionId() !== false && !empty($_SESSION['DEFAULT_LANG'])) {
-			$lang = $_SESSION['DEFAULT_LANG'];
-			$locale = $_SESSION['DEFAULT_LOCALE'];
-		} else {
-			$lang = defined('SITE_LANG') && !empty(SITE_LANG) ?
-				SITE_LANG : DEFAULT_LANG;
-			$locale = defined('SITE_LOCALE') && !empty(SITE_LOCALE) ?
-				SITE_LOCALE : DEFAULT_LOCALE;
-		}
-		$this->l = $l10n ?? 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
@@ -283,7 +268,8 @@ class Login
 		// init default ACL list array
 		$_SESSION['DEFAULT_ACL_LIST'] = [];
 		// read the current edit_access_right list into an array
-		$q = "SELECT level, type, name FROM edit_access_right WHERE level >= 0 ORDER BY level";
+		$q = "SELECT level, type, name FROM edit_access_right "
+			. "WHERE level >= 0 ORDER BY level";
 		while (is_array($res = $this->db->dbReturn($q))) {
 			// level to description format (numeric)
 			$this->default_acl_list[$res['level']] = [
@@ -300,6 +286,27 @@ class Login
 		$this->loginCheckPermissions();
 		// logsout user
 		$this->loginLogoutUser();
+		// ** LANGUAGE SET AFTER LOGIN **
+		// set the locale
+		if (
+			Session::getSessionId() !== false &&
+			!empty($_SESSION['DEFAULT_LANG'])
+		) {
+			$locale = $_SESSION['DEFAULT_LOCALE'] ?? '';
+		} else {
+			$locale = defined('SITE_LOCALE') && !empty(SITE_LOCALE) ?
+				SITE_LOCALE :
+				/** @phpstan-ignore-next-line DEFAULT_LOCALE could be empty */
+				(defined('DEFAULT_LOCALE') && !empty(DEFAULT_LOCALE) ?
+					DEFAULT_LOCALE : 'en.UTF-8');
+		}
+		// set domain
+		if (defined('CONTENT_PATH') && !empty(CONTENT_PATH)) {
+			$domain = str_replace('/', '', CONTENT_PATH);
+		} else {
+			$domain = 'admin';
+		}
+		$this->l = new \CoreLibs\Language\L10n($locale, $domain);
 		// if the password change flag is okay, run the password change method
 		if ($this->password_change) {
 			$this->loginPasswordChange();
@@ -312,7 +319,8 @@ class Login
 		$this->login_html = $this->loginPrintLogin();
 		// closing all connections, depending on error status, exit
 		if (!$this->loginCloseClass()) {
-			// if variable AJAX flag is not set, show output, else pass through for ajax work
+			// if variable AJAX flag is not set, show output
+			// else pass through for ajax work
 			if ($this->login_is_ajax_page !== true) {
 				// the login screen if we hav no login permission & login screen html data
 				if ($this->login_html !== null) {
@@ -358,8 +366,13 @@ class Login
 		// NO OP
 	}
 
+	// *************************************************************************
+	// **** PRIVATE INTERNAL
+	// *************************************************************************
+
 	/**
 	 * checks if password is valid, sets internal error login variable
+	 *
 	 * @param  string $hash     password hash
 	 * @param  string $password submitted password
 	 * @return bool             true or false on password ok or not
@@ -416,7 +429,9 @@ class Login
 	}
 
 	/**
-	 * if user pressed login button this script is called, but only if there is no preview euid set]
+	 * if user pressed login button this script is called,
+	 * but only if there is no preview euid set
+	 *
 	 * @return void has not return
 	 */
 	private function loginLoginUser(): void
@@ -700,88 +715,6 @@ class Login
 		}
 	}
 
-	/**
-	 * for every page the user access this script checks if he is allowed to do so
-	 * @return bool permission okay as true/false
-	 */
-	public function loginCheckPermissions(): bool
-	{
-		if ($this->euid && $this->login_error != 103) {
-			$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->db->dbReturnRow($q);
-			if (!is_array($res)) {
-				$this->login_error = 109;
-				$this->permission_okay = false;
-				return $this->permission_okay;
-			}
-			if (isset($res['filename']) && $res['filename'] == $this->page_name) {
-				$this->permission_okay = true;
-			} else {
-				$this->login_error = 103;
-				$this->permission_okay = false;
-			}
-		}
-		// if called from public, so we can check if the permissions are ok
-		return $this->permission_okay;
-	}
-
-	/**
-	 * if a user pressed on logout, destroyes session and unsets all global vars
-	 * @return void has no return
-	 */
-	public function loginLogoutUser(): void
-	{
-		// must be either logout or error
-		if (!$this->logout && !$this->login_error) {
-			return;
-		}
-		// unregister and destroy session vars
-		foreach (
-			// TODO move this into some global array for easier update
-			[
-				'ADMIN',
-				'BASE_ACL_LEVEL',
-				'DB_DEBUG',
-				'DEBUG_ALL',
-				'DEFAULT_ACL_LIST',
-				'DEFAULT_CHARSET',
-				'DEFAULT_LANG',
-				'DEFAULT_LOCALE',
-				'EAID',
-				'EUID',
-				'GROUP_ACL_LEVEL',
-				'GROUP_ACL_TYPE',
-				'GROUP_NAME',
-				'HEADER_COLOR',
-				'LANG',
-				'PAGES_ACL_LEVEL',
-				'PAGES',
-				'TEMPLATE',
-				'UNIT_ACL_LEVEL',
-				'UNIT_DEFAULT',
-				'UNIT',
-				'USER_ACL_LEVEL',
-				'USER_ACL_TYPE',
-				'USER_NAME',
-			] as $session_var
-		) {
-			unset($_SESSION[$session_var]);
-		}
-		// final unset all
-		session_unset();
-		// final destroy session
-		session_destroy();
-		// then prints the login screen again
-		$this->permission_okay = false;
-	}
-
 	/**
 	 * sets all the basic ACLs
 	 * init set the basic acl the user has, based on the following rules
@@ -797,6 +730,7 @@ class Login
 	 * - if an account ACL is set, set this parallel, account ACL overrides user ACL if it applies
 	 * - if edit access ACL level is set, use this, else use page
 	 * set all base ACL levels as a list keyword -> ACL number
+	 *
 	 * @return void has no return
 	 */
 	private function loginSetAcl(): void
@@ -835,10 +769,10 @@ class Login
 		$_SESSION['BASE_ACL_LEVEL'] = $this->acl['base'];
 
 		// set the current page acl
-		// start with default acl
+		// start with base acl
 		// set group if not -1, overrides default
 		// set page if not -1, overrides group set
-		$this->acl['page'] = DEFAULT_ACL_LEVEL;
+		$this->acl['page'] = $this->acl['base'];
 		if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
 			$this->acl['page'] = $_SESSION['GROUP_ACL_LEVEL'];
 		}
@@ -883,37 +817,47 @@ class Login
 			$this->acl['show_ea_extra'] = false;
 		}
 		// set the default edit access
-		$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'];
+		$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'] ?? null;
+		$this->acl['min'] = [];
 		// integrate the type acl list, but only for the keyword -> level
 		foreach ($this->default_acl_list as $level => $data) {
 			$this->acl['min'][$data['type']] = $level;
 		}
 		// set the full acl list too
-		$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'];
+		$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'] ?? [];
 		// debug
 		// $this->debug('ACL', $this->print_ar($this->acl));
 	}
 
 	/**
-	 * checks if this edit access id is valid
-	 * @param  int|null $edit_access_id access id pk to check
-	 * @return bool                     true/false: if the edit access is not
-	 *                                  in the valid list: false
+	 * Check if source (page, base) is matching to the given min access string
+	 * min access string must be valid access level string (eg read, mod, write)
+	 * This does not take in account admin flag set
+	 *
+	 * @param  string $source     a valid base level string eg base, page
+	 * @param  string $min_access a valid min level string, eg read, mod, siteadmin
+	 * @return bool               True for valid access, False for invalid
 	 */
-	public function loginCheckEditAccess($edit_access_id): bool
+	public function loginCheckAccess(string $source, string $min_access): bool
 	{
-		if ($edit_access_id === null) {
+		$source = 'base';
+		if (
+			empty($this->acl['min'][$min_access]) ||
+			empty($this->acl[$source])
+		) {
 			return false;
 		}
-		if (array_key_exists($edit_access_id, $this->acl['unit'])) {
+		// phan claims $this->acl['min'] can be null, but above should skip
+		/** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
+		if ($this->acl[$source] >= $this->acl['min'][$min_access]) {
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
 	 * checks if the password is in a valid format
+	 *
 	 * @param  string $password the new password
 	 * @return bool             true or false if valid password or not
 	 */
@@ -937,6 +881,7 @@ class Login
 
 	/**
 	 * dummy declare for password forget
+	 *
 	 * @return void has no return
 	 */
 	private function loginPasswordForgot(): void
@@ -944,25 +889,9 @@ class Login
 		// will do some password recovert, eg send email
 	}
 
-	/**
-	 * sets the minium length and checks on valid
-	 * @param  int  $length set the minimum length
-	 * @return bool         true/false on success
-	 */
-	public function loginSetPasswordMinLength(int $length): bool
-	{
-		// check that numeric, positive numeric, not longer than max input string lenght
-		// and not short than min password length
-		if (is_numeric($length) && $length >= PASSWORD_MIN_LENGTH && $length <= $this->password_max_length) {
-			$this->password_min_length = $length;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * changes a user password
+	 *
 	 * @return void has no return
 	 */
 	private function loginPasswordChange(): void
@@ -1063,6 +992,7 @@ class Login
 
 	/**
 	 * prints out login html part if no permission (error) is set
+	 *
 	 * @return string|null html data for login page, or null for nothing
 	 */
 	private function loginPrintLogin()
@@ -1168,6 +1098,7 @@ class Login
 	/**
 	 * last function called, writes log and prints out error msg and
 	 * exists script if permission 0
+	 *
 	 * @return bool true on permission ok, false on permission wrong
 	 */
 	private function loginCloseClass(): bool
@@ -1206,6 +1137,7 @@ class Login
 
 	/**
 	 * checks if there are external templates, if not uses internal fallback ones
+	 *
 	 * @return void has no return
 	 */
 	private function loginSetTemplates(): void
@@ -1387,6 +1319,7 @@ EOM;
 
 	/**
 	 * writes detailed data into the edit user log table (keep log what user does)
+	 *
 	 * @param  string     $event    string of what has been done
 	 * @param  string     $data     data information (id, etc)
 	 * @param  string|int $error    error id (mostly an int)
@@ -1447,11 +1380,190 @@ EOM;
 		$this->db->dbExec($q, 'NULL');
 	}
 
+	// *************************************************************************
+	// **** PUBLIC INTERNAL
+	// *************************************************************************
+
+	/**
+	 * sets the minium length and checks on valid
+	 *
+	 * @param  int  $length set the minimum length
+	 * @return bool         true/false on success
+	 */
+	public function loginSetPasswordMinLength(int $length): bool
+	{
+		// check that numeric, positive numeric, not longer than max input string lenght
+		// and not short than min password length
+		if (is_numeric($length) && $length >= PASSWORD_MIN_LENGTH && $length <= $this->password_max_length) {
+			$this->password_min_length = $length;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * if a user pressed on logout, destroyes session and unsets all global vars
+	 *
+	 * @return void has no return
+	 */
+	public function loginLogoutUser(): void
+	{
+		// must be either logout or error
+		if (!$this->logout && !$this->login_error) {
+			return;
+		}
+		// unregister and destroy session vars
+		foreach (
+			// TODO move this into some global array for easier update
+			[
+				'ADMIN',
+				'BASE_ACL_LEVEL',
+				'DB_DEBUG',
+				'DEBUG_ALL',
+				'DEFAULT_ACL_LIST',
+				'DEFAULT_CHARSET',
+				'DEFAULT_LANG',
+				'DEFAULT_LOCALE',
+				'EAID',
+				'EUID',
+				'GROUP_ACL_LEVEL',
+				'GROUP_ACL_TYPE',
+				'GROUP_NAME',
+				'HEADER_COLOR',
+				'LANG',
+				'PAGES_ACL_LEVEL',
+				'PAGES',
+				'TEMPLATE',
+				'UNIT_ACL_LEVEL',
+				'UNIT_DEFAULT',
+				'UNIT',
+				'USER_ACL_LEVEL',
+				'USER_ACL_TYPE',
+				'USER_NAME',
+			] as $session_var
+		) {
+			unset($_SESSION[$session_var]);
+		}
+		// final unset all
+		session_unset();
+		// final destroy session
+		session_destroy();
+		// then prints the login screen again
+		$this->permission_okay = false;
+	}
+
+	/**
+	 * for every page the user access this script checks if he is allowed to do so
+	 *
+	 * @return bool permission okay as true/false
+	 */
+	public function loginCheckPermissions(): bool
+	{
+		// start with not allowed
+		$this->permission_okay = false;
+		// bail for no euid (no login)
+		if (!$this->euid) {
+			return $this->permission_okay;
+		}
+		// bail for previous wrong page match, eg if method is called twice
+		if ($this->login_error == 103) {
+			return $this->permission_okay;
+		}
+		// if ($this->euid && $this->login_error != 103) {
+		$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->db->dbReturnRow($q);
+		if (!is_array($res)) {
+			$this->login_error = 109;
+			return $this->permission_okay;
+		}
+		if (isset($res['filename']) && $res['filename'] == $this->page_name) {
+			$this->permission_okay = true;
+		} else {
+			$this->login_error = 103;
+		}
+		// if called from public, so we can check if the permissions are ok
+		return $this->permission_okay;
+	}
+
+	/**
+	 * Return ACL array as is
+	 *
+	 * @return array<mixed>
+	 */
+	public function loginGetAcl(): array
+	{
+		return $this->acl;
+	}
+
+	/**
+	 * checks if this edit access id is valid
+	 *
+	 * @param  int|null $edit_access_id access id pk to check
+	 * @return bool                     true/false: if the edit access is not
+	 *                                  in the valid list: false
+	 */
+	public function loginCheckEditAccess($edit_access_id): bool
+	{
+		if ($edit_access_id === null) {
+			return false;
+		}
+		if (array_key_exists($edit_access_id, $this->acl['unit'])) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Check if admin flag is set
+	 *
+	 * @return bool True if admin flag set
+	 */
+	public function loginIsAdmin(): bool
+	{
+		if (!empty($this->acl['admin'])) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * check if min accesss string (eg, read, mod, etc) is matchable
+	 * EQUAL to BASE set right
+	 *
+	 * @param  string $min_access
+	 * @return bool
+	 */
+	public function loginCheckAccessBase(string $min_access): bool
+	{
+		return $this->loginCheckAccess('base', $min_access);
+	}
+
+	/**
+	 * check if min accesss string (eg, read, mod, etc) is matchable
+	 * EQUAL to PAGE set right
+	 *
+	 * @param  string $min_access
+	 * @return bool
+	 */
+	public function loginCheckAccessPage(string $min_access): bool
+	{
+		return $this->loginCheckAccess('page', $min_access);
+	}
+
 	/**
 	 * checks that the given edit access id is valid for this user
+	 *
 	 * @param  int|null $edit_access_id edit access id to check
 	 * @return int|null                 same edit access id if ok
-	 *                                  or the default edit access id if given one is not valid
+	 *                                  or the default edit access id
+	 *                                  if given one is not valid
 	 */
 	public function loginCheckEditAccessId(?int $edit_access_id): ?int
 	{
@@ -1461,15 +1573,15 @@ EOM;
 			is_array($_SESSION['UNIT']) &&
 			!array_key_exists($edit_access_id, $_SESSION['UNIT'])
 		) {
-			return (int)$_SESSION['UNIT_DEFAULT'];
-		} else {
-			return $edit_access_id;
+			return $_SESSION['UNIT_DEFAULT'] ?? null;
 		}
+		return $edit_access_id;
 	}
 
 	/**
 	 * retunrn a set entry from the UNIT session for an edit access_id
 	 * if not found return false
+	 *
 	 * @param  int        $edit_access_id edit access id
 	 * @param  string|int $data_key       key value to search for
 	 * @return bool|string                false for not found or string for found data
@@ -1478,9 +1590,8 @@ EOM;
 	{
 		if (!isset($_SESSION['UNIT'][$edit_access_id]['data'][$data_key])) {
 			return false;
-		} else {
-			return $_SESSION['UNIT'][$edit_access_id]['data'][$data_key];
 		}
+		return $_SESSION['UNIT'][$edit_access_id]['data'][$data_key];
 	}
 	// close class
 }

www/lib/CoreLibs/Admin/Backend.php

@@ -114,15 +114,16 @@ class Backend
 	// CONSTRUCTOR / DECONSTRUCTOR |====================================>
 	/**
 	 * main class constructor
-	 * @param \CoreLibs\DB\IO              $db   Database connection class
-	 * @param \CoreLibs\Debug\Logging      $log  Logging class
-	 * @param \CoreLibs\Language\L10n|null $l10n l10n language class
-	 *                                           if null, auto set
+	 * @param \CoreLibs\DB\IO         $db     Database connection class
+	 * @param \CoreLibs\Debug\Logging $log    Logging class
+	 * @param \CoreLibs\Language\L10n $l10n   l10n language class
+	 * @param array<string,string>    $locale locale data read from setLocale
 	 */
 	public function __construct(
 		\CoreLibs\DB\IO $db,
 		\CoreLibs\Debug\Logging $log,
-		?\CoreLibs\Language\L10n $l10n = null
+		\CoreLibs\Language\L10n $l10n,
+		array $locale
 	) {
 		// set to log not per class
 		$log->setLogPer('class', false);
@@ -130,10 +131,15 @@ class Backend
 		$this->log = $log;
 		// attach db class
 		$this->db = $db;
-		// TODO lang create outside of class
-		$this->setLangEncoding();
 		// get the language sub class & init it
-		$this->l = $l10n ?? new \CoreLibs\Language\L10n($this->lang);
+		$this->l = $l10n;
+		// parse and read, legacy stuff
+		$this->encoding = $locale['encoding'];
+		$this->lang = $locale['lang'];
+		// get first part from lang
+		$this->lang_short = explode('_', $locale['lang'])[0];
+		$this->domain = $this->l->getDomain();
+		$this->lang_dir = $this->l->getBaseLocalePath();
 
 		// set the page name
 		$this->page_name = \CoreLibs\Get\System::getPageName();
@@ -159,29 +165,6 @@ class Backend
 		// NO OP
 	}
 
-	// INTERNAL METHODS |===============================================>
-
-	/**
-	 * set the language encoding and language settings
-	 * use $OVERRIDE_LANG to override all language settings
-	 * the default charset from _SESSION login or from
-	 * config DEFAULT ENCODING
-	 * the lang full name for mo loading from _SESSION login
-	 * or SITE LANG or DEFAULT LANG from config
-	 * creates short lang (only first two chars) from the lang
-	 * @return void
-	 */
-	private function setLangEncoding(): void
-	{
-		list (
-			$this->encoding,
-			$this->lang,
-			$this->lang_short,
-			$this->domain,
-			$this->lang_dir
-		) = \CoreLibs\Language\GetSettings::setLangEncoding();
-	}
-
 	// PUBLIC METHODS |=================================================>
 
 	/**

www/lib/CoreLibs/Basic.php

@@ -85,11 +85,13 @@ class Basic
 	 * main Basic constructor to init and check base settings
 	 * @param \CoreLibs\Debug\Logging|null $log Logging class
 	 * @param string|null $session_name Set session name
+	 * @deprecated DO NOT USE Class\Basic anymore. Use dedicated logger and sub classes
 	 */
 	public function __construct(
 		\CoreLibs\Debug\Logging $log = null,
 		?string $session_name = null
 	) {
+		trigger_error('Class \CoreLibs\Basic is deprected', E_USER_DEPRECATED);
 		// 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;
@@ -715,20 +717,20 @@ class Basic
 
 	// *** ARRAY HANDLING END
 	// [!!! DEPRECATED !!!]
-	// Moved to \CoreLibs\Language\Encoding
+	// Moved to \CoreLibs\Convert\MimeEncode
 
 	/**
 	 * wrapper function for mb mime convert, for correct conversion with long strings
 	 * @param  string $string   string to encode
 	 * @param  string $encoding target encoding
 	 * @return string           encoded string
-	 * @deprecated Use \CoreLibs\Language\Encoding::__mbMimeEncode() instead
+	 * @deprecated Use \CoreLibs\Convert\MimeEncode::__mbMimeEncode() instead
 	 */
 	public static function __mbMimeEncode(string $string, string $encoding): string
 	{
 
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::__mbMimeEncode()', E_USER_DEPRECATED);
-		return \CoreLibs\Language\Encoding::__mbMimeEncode($string, $encoding);
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\MimeEncode::__mbMimeEncode()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\MimeEncode::__mbMimeEncode($string, $encoding);
 	}
 
 	// *** HUMAND BYTE READABLE CONVERT
@@ -1009,7 +1011,7 @@ class Basic
 
 	// *** ENCODING FUNCTIONS
 	// [!!! DEPRECATED !!!]
-	// Moved to \CoreLibs\Language\Encoding
+	// Moved to \CoreLibs\Check\Encoding and \CoreLibs\Convert\Encoding
 
 	/**
 	 * test if a string can be safely convert between encodings. mostly utf8 to shift jis
@@ -1026,12 +1028,12 @@ class Basic
 	 * @param  string     $from_encoding encoding of string to test
 	 * @param  string     $to_encoding   target encoding
 	 * @return bool|array<mixed>         false if no error or array with failed characters
-	 * @deprecated use \CoreLibs\Language\Encoding::checkConvertEncoding() instead
+	 * @deprecated use \CoreLibs\Check\Encoding::checkConvertEncoding() instead
 	 */
 	public function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding)
 	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::checkConvertEncoding()', E_USER_DEPRECATED);
-		return \CoreLibs\Language\Encoding::checkConvertEncoding($string, $from_encoding, $to_encoding);
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Encoding::checkConvertEncoding()', E_USER_DEPRECATED);
+		return \CoreLibs\Check\Encoding::checkConvertEncoding($string, $from_encoding, $to_encoding);
 	}
 
 	/**
@@ -1047,12 +1049,12 @@ class Basic
 	 *                                 check that the source is actually matching
 	 *                                 to what we sav the source is
 	 * @return string                  encoding converted string
-	 * @deprecated use \CoreLibs\Language\Encoding::convertEncoding() instead
+	 * @deprecated use \CoreLibs\Convert\Encoding::convertEncoding() instead
 	 */
 	public static function convertEncoding(string $string, string $to_encoding, string $source_encoding = '', bool $auto_check = true): string
 	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::convertEncoding()', E_USER_DEPRECATED);
-		return \CoreLibs\Language\Encoding::convertEncoding($string, $to_encoding, $source_encoding, $auto_check);
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Encoding::convertEncoding()', E_USER_DEPRECATED);
+		return \CoreLibs\Convert\Encoding::convertEncoding($string, $to_encoding, $source_encoding, $auto_check);
 	}
 
 	// *** ENCODING FUNCTIONS END

www/lib/CoreLibs/Check/Encoding.php

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

www/lib/CoreLibs/Combined/ArrayHandler.php

@@ -218,7 +218,8 @@ class ArrayHandler
 				continue;
 			}
 			foreach ($array as $key => $value) {
-				// if string or if key is assumed to be string do key match else add new entry
+				// if string or if key is assumed to be string do key match
+				// else add new entry
 				if (is_string($key) || $key_is_string === false) {
 					if (is_array($value) && array_key_exists($key, $merged) && is_array($merged[$key])) {
 						// $merged[$key] = call_user_func(__METHOD__, $merged[$key], $value, $key_is_string);

www/lib/CoreLibs/Combined/DateTime.php

@@ -20,7 +20,7 @@ class DateTime
 		4 => 'Thu',
 		5 => 'Fri',
 		6 => 'Sat',
-		7 => 'Sun'
+		7 => 'Sun',
 	];
 	/** @var array<int,string> */
 	public const DAY_LONG = [
@@ -30,7 +30,7 @@ class DateTime
 		4 => 'Thursday',
 		5 => 'Friday',
 		6 => 'Saturday',
-		7 => 'Sunday'
+		7 => 'Sunday',
 	];
 	/** @var array<int,string> */
 	public const MONTH_LONG = [
@@ -45,7 +45,7 @@ class DateTime
 		9 => 'September',
 		10 => 'October',
 		11 => 'November',
-		12 => 'December'
+		12 => 'December',
 	];
 	/** @var array<int,string> */
 	public const MONTH_SHORT = [
@@ -60,7 +60,7 @@ class DateTime
 		9 => 'Sep',
 		10 => 'Oct',
 		11 => 'Nov',
-		12 => 'Dec'
+		12 => 'Dec',
 	];
 
 	/**
@@ -349,7 +349,7 @@ class DateTime
 		try {
 			$start = new \DateTime($start_date);
 			$end = new \DateTime($end_date);
-		} catch (Exception) {
+		} catch (Exception $e) {
 			if ($return_named === true) {
 				return [
 					'overall' => 0,

www/lib/CoreLibs/Convert/Encoding.php

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

www/lib/CoreLibs/Convert/MimeEncode.php

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