ACL\Login class update for phpstan check

All static Session:: calls (except for checking valid session name) are
converted to object type. This Object is passed on to Login, Admin
Backend and any other class that needs basic session checking

.phan/config.php

@@ -95,7 +95,7 @@ return [
 		'www/vendor',
 		'www/tests',
 		'www/lib/Smarty',
-		'www/lib/smarty-3.1.30',
+		'www/lib/smarty-4.1.0',
 		'www/templates_c',
 		'www/log',
 		'www/tmp',
@@ -117,11 +117,7 @@ return [
 		'www/admin/qq_file_upload_front.php',
 		'www/admin/qq_file_upload_ajax.php',
 		// symlink ignore
-		'www/lib/smarty-3.1.30/SmartyBC.class.php',
-		'www/lib/htmlMimeMail-2.5.1/HtmlMimeMailCreate.php',
-		// current not checking smarty4 test file
-		'www/lib/CoreLibs/Template/SmartyExtend4.php',
-		'www/admin/class_test.smarty4.php',
+		'www/lib/smarty-4.1.0/libs/Smarty.class.php'
 	],
 
 	// what not to show as problem

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_access_data.sql

@@ -14,3 +14,7 @@ CREATE TABLE edit_access_data (
 	name	VARCHAR,
 	value	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+-- create a unique index for each attached data block for each edit access can
+-- only have ONE value;
+CREATE UNIQUE INDEX edit_access_data_edit_access_id_name_ukey ON edit_access_data (edit_access_id, name);

4dev/database/table/edit_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

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

4dev/locale/en-frontend.po

@@ -2,34 +2,28 @@
 # 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:
+# Frontend English Messages file for gettext
 # ********************************************************************/
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Project Version\n"
+"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: \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"
-
-msgid "Year"
-msgstr "Year"
-
-msgid "Month"
-msgstr "Month"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 msgid "INPUT TEST"
-msgstr "OUTPUT TEST EN"
+msgstr "OUTPUT TEST FRONTEND EN"
 
-msgid "I should be translated"
-msgstr "I should be translated: I WAS TRANSLATED"
-
-msgid "Are we translated?"
-msgstr "Are we translated? Yes, we are!"
+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"
@@ -75,3 +93,5 @@ msgstr "「スマーティー」これは正しいです"
 msgid "Are we translated?"
 msgstr "「クラス」これは翻訳です？"
 
+msgid "Original with string: %1"
+msgstr "%1と翻訳した"

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,76 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsACLLoginTest extends TestCase
 {
+	private static $db;
+	private static $log;
+	private static $session;
+
 	/**
-	 * 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.'
 			);
 		}
+		// init session
+		self::$session = new \CoreLibs\Create\Session('ACLLoginTest');
+		// 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 +98,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, self::$session);
 	}
 }
 

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

@@ -11,7 +11,7 @@ use PHPUnit\Framework\TestCase;
  * @coversDefaultClass \CoreLibs\Check\PHPVersion
  * @testdox \CoreLibs\Check\PHPVersion method tests
  */
-final class CoreLibsCheckPHPVersionTest extends TestCase
+final class CoreLibsCheckPhpVersionTest extends TestCase
 {
 	/**
 	 * NOTE: The checks must be adapted to the PHP version or they will fail

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

@@ -132,7 +132,7 @@ final class CoreLibsConvertColorsTest extends TestCase
 			],
 			'valid color' => [
 				'rgb' => [10, 100, 200],
-				'hsb' => [212, 95, 78],
+				'hsb' => [212, 95, 78.0],
 				'hsb_rgb' => [10, 98, 199], // should be rgb, but rounding error
 				'hsl' => [211.6, 90.5, 41.2],
 				'valid' => true,
@@ -327,13 +327,13 @@ final class CoreLibsConvertColorsTest extends TestCase
 	 * @dataProvider hsb2rgbColorProvider
 	 * @testdox hsb2rgb $input_h,$input_s,$input_b will be $expected [$_dataName]
 	 *
-	 * @param integer $input_h
-	 * @param integer $input_s
-	 * @param integer $input_b
+	 * @param float $input_h
+	 * @param float $input_s
+	 * @param float $input_b
 	 * @param array|bool $expected
 	 * @return void
 	 */
-	public function testHsb2rgb(int $input_h, int $input_s, int $input_b, $expected): void
+	public function testHsb2rgb(float $input_h, float $input_s, float $input_b, $expected): void
 	{
 		$this->assertEquals(
 			$expected,

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

@@ -11,9 +11,8 @@ use PHPUnit\Framework\TestCase;
  * @coversDefaultClass \CoreLibs\Convert\Json
  * @testdox \CoreLibs\Convert\Json method tests
  */
-final class CoreLibsCheckJsonTest extends TestCase
+final class CoreLibsConvertJsonTest extends TestCase
 {
-
 	/**
 	 * test list for json convert tests
 	 *

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

@@ -20,6 +20,10 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 */
 	public function sessionProvider(): array
 	{
+		// 0: session name as parameter
+		// 1: type p (param), g: global, c: constant
+		// 2: exepcted name (session)
+		// 3: regex check
 		return [
 			'session parameter' => [
 				'sessionNameParameter',
@@ -33,32 +37,20 @@ final class CoreLibsCreateSessionTest extends TestCase
 				'sessionNameGlobals',
 				'/^\w+$/'
 			],
-			'session constant' => [
-				'sessionNameConstant',
-				'c',
-				'sessionNameConstant',
+			'session name default' => [
+				'',
+				'd',
+				'',
 				'/^\w+$/'
 			],
 		];
 	}
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void
-	{
-		if (session_id()) {
-			session_destroy();
-		}
-	}
-
 	/**
 	 * Undocumented function
 	 *
 	 * @dataProvider sessionProvider
-	 * @testdox  startSession $input name for $type will be $expected_n with $expected_i [$_dataName]
+	 * @testdox startSession $input name for $type will be $expected_n with $expected_i [$_dataName]
 	 *
 	 * @param string $input
 	 * @param string $type
@@ -66,20 +58,28 @@ final class CoreLibsCreateSessionTest extends TestCase
 	 * @param string|bool $expected_i
 	 * @return void
 	 */
-	public function testStartSession(string $input, string $type, $expected_n, $expected_i): void
-	{
-		/* $session_id = '';
+	public function testStartSession(
+		string $input,
+		string $type,
+		$expected_n,
+		$expected_i
+	): void {
+		/*
+		// MOCK class for dummy call
+		$session = new \CoreLibs\Create\Session();
+		$session_id = '';
+		unset($GLOBALS['SET_SESSION_NAME']);
 		switch ($type) {
 			case 'p':
-				$session_id = \CoreLibs\Create\Session::startSession($input);
+				$session_id = $session->startSession($input);
 				break;
 			case 'g':
 				$GLOBALS['SET_SESSION_NAME'] = $input;
-				$session_id = \CoreLibs\Create\Session::startSession();
+				$session_id = $session->startSession();
 				break;
-			case 'c':
-				define('SET_SESSION_NAME', $input);
-				$session_id = \CoreLibs\Create\Session::startSession();
+			case 'd':
+				$expected_n = ini_get('session.name');
+				$session_id = \$session->startSession();
 				break;
 		}
 		$this->assertMatchesRegularExpression(
@@ -88,16 +88,75 @@ final class CoreLibsCreateSessionTest extends TestCase
 		);
 		$this->assertMatchesRegularExpression(
 			$expected_i,
-			(string)\CoreLibs\Create\Session::getSessionId()
+			(string)$session->getSessionId()
 		);
 		$this->assertEquals(
 			$expected_n,
-			\CoreLibs\Create\Session::getSessionName()
+			$session->getSessionName()
 		);
 		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');
+	}
+
+	/**
+	 * provider for session name check
+	 *
+	 * @return array
+	 */
+	public function sessionNameProvider(): array
+	{
+		// 0: string for session
+		// 1: expected return
+		return [
+			'valid name' => [
+				'abc',
+				true
+			],
+			'valid name longer' => [
+				'something-abc-123',
+				true
+			],
+			'invalid name' => [
+				'abc#abc',
+				false
+			],
+			'only numbers' => [
+				'123',
+				false
+			],
+			'longer than 128 chars' => [
+				'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+					. 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+					. 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz',
+				false
+			],
+			'too short' => [
+				'',
+				false
+			],
+		];
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::checkValidSessionName
+	 * @dataProvider sessionNameProvider
+	 * @testdox checkValidSessionName $input seessionn name is $expected [$_dataName]
+	 *
+	 * @param  string $input
+	 * @param  bool   $expected
+	 * @return void
+	 */
+	public function testCheckValidSessionName(string $input, bool $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Session::checkValidSessionName($input)
+		);
 	}
 }
 

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);
@@ -2646,7 +2647,8 @@ final class CoreLibsDBIOTest extends TestCase
 					'level' => 'error',
 					'id' => '51',
 					'error' => 'Max query call needs to be set to at least 1',
-					'source' => 'main::run::run::run::run::run::run::runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall',
+					// run:: can be +1 if called in set and not direct
+					'source' => "/^main::run::run::run::run::run::run::(run::)?runBare::runTest::testDbErrorHandling::dbSetMaxQueryCall$/",
 					'pg_error' => '',
 					'msg' => '',
 				]
@@ -2707,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,
@@ -3007,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);
@@ -3386,8 +3389,37 @@ final class CoreLibsDBIOTest extends TestCase
 
 		// if this is a select query, db dbReturn, dbReturnRow, dbReturnArray too
 		if (preg_match("/^(select|show|with) /i", $query)) {
-			// TODO also tst dbReturnRow and dbReturnArray
-			$res = $db->dbReturn($query);
+			// dbReturn
+			$db->dbReturn($query);
+			$this->assertEquals(
+				$expected_rows,
+				$db->dbGetNumRows()
+			);
+			$this->assertEquals(
+				$expected_cols,
+				$db->dbGetNumFields()
+			);
+			$this->assertEquals(
+				$expected_col_names,
+				$db->dbGetFieldNames()
+			);
+			// dbReturnRow
+			// will return ALL rows there, but returns only the first
+			$db->dbReturnRow($query);
+			$this->assertEquals(
+				$expected_rows,
+				$db->dbGetNumRows()
+			);
+			$this->assertEquals(
+				$expected_cols,
+				$db->dbGetNumFields()
+			);
+			$this->assertEquals(
+				$expected_col_names,
+				$db->dbGetFieldNames()
+			);
+			// dbReturnArray
+			$db->dbReturnArray($query);
 			$this->assertEquals(
 				$expected_rows,
 				$db->dbGetNumRows()

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

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable Generic.Files.LineLength
 
 declare(strict_types=1);
 
@@ -255,18 +255,27 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerMethodList
-	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+	 * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
 	 * @testdox getCallerMethodList check if it returns $expected [$_dataName]
 	 *
 	 * @param array $expected
 	 * @return void
 	 */
-	public function testGetCallerMethodList(array $expected): void
+	public function testGetCallerMethodList(array $expected, array $expected_group): void
 	{
-		$this->assertEquals(
-			$expected,
-			\CoreLibs\Debug\Support::getCallerMethodList()
-		);
+		$compare = \CoreLibs\Debug\Support::getCallerMethodList();
+		// if we direct call we have 10, if we call as folder we get 11
+		if (count($compare) == 10) {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Debug\Support::getCallerMethodList()
+			);
+		} else {
+			$this->assertEquals(
+				$expected_group,
+				\CoreLibs\Debug\Support::getCallerMethodList()
+			);
+		}
 	}
 
 	/**

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-bootstrap.php

@@ -4,7 +4,7 @@
 // sets the _SERVER['HTTP_HOST'] var so we can have DB detection
 $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
 // so www/includes/edit_base.php works
-require_once('www/lib/Smarty/SmartyBC.class.php');
+// require_once('www/lib/Smarty/SmartyBC.class.php');
 // for whatever reason it does not load that from the confing.master.php
 // for includes/admin_header.php
 define('BASE_NAME', '');

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
@@ -45,14 +47,14 @@ parameters:
 		- www/lib/smarty-*/
 		# ignore composer
 		- www/vendor
-		# temp ignore smarty 4
-		- www/lib/CoreLibs/Template/SmartyExtend4.php
-		- www/admin/class_test.smarty4.php
 	# 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

@@ -23,14 +23,12 @@ define('USE_DATABASE', true);
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-admin';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 ob_end_flush();
 
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
 	'file_id' => $LOG_FILE_ID,
@@ -43,18 +41,27 @@ $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, $session, $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>";
-print "Messaes: " . \CoreLibs\Debug\Support::printAr($this->messages) . "<br>";
+print "Messaes: " . \CoreLibs\Debug\Support::printAr($backend->messages) . "<br>";
 print "ADBPRINTDATETIME:<br>" . $backend->adbPrintDateTime(2021, 6, 21, 6, 38, '_test') . "<br>";
 
 // error message

www/admin/class_test.array.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-array';
 ob_end_flush();
@@ -45,9 +41,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

@@ -20,10 +20,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-autoloader';
 ob_end_flush();
@@ -32,9 +28,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-byte';
 ob_end_flush();
@@ -43,9 +39,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-colors';
 ob_end_flush();
@@ -44,9 +40,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
 
@@ -57,6 +56,7 @@ print "\$C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: " . $color_class::r
 $rgb = [10, 20, 30];
 $hex = '#0a141e';
 $hsb = [210, 67, 12];
+$hsb_f = [210.5, 67.5, 12.5];
 $hsl = [210, 50, 7.8];
 print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: " . Colors::rgb2hex($rgb[0], $rgb[1], $rgb[2]) . "<br>";
 print "S::COLOR hex->rgb: $hex: " . DgS::printAr(Colors::hex2rgb($hex)) . "<br>";
@@ -69,6 +69,8 @@ print "S::COLOR rgb->hsl: $rgb[0], $rgb[1], $rgb[2]: "
 // D(from hsb/hsl) Note that param 2 + 3 is always 0-100 divided
 print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
 	. DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])) . "<br>";
+	print "S::COLOR hsb_f->rgb: $hsb_f[0], $hsb_f[1], $hsb_f[2]: "
+	. DgS::printAr(Colors::hsb2rgb($hsb_f[0], $hsb_f[1], $hsb_f[2])) . "<br>";
 print "S::COLOR hsl->rgb: $hsl[0], $hsl[1], $hsl[2]: "
 	. DgS::printAr(Colors::hsl2rgb($hsl[0], $hsl[1], $hsl[2])) . "<br>";
 
@@ -76,6 +78,15 @@ $hsb = [0, 0, 5];
 print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
 	. DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])) . "<br>";
 
+// Random text
+$h = rand(0, 359);
+$s = rand(15, 70);
+$b = 100;
+$l = 50;
+print "RANDOM IN: H: " . $h . ", S: " . $s . ", B/L: " . $b . "/" . $l . "<br>";
+print "RANDOM hsb->rgb: <pre>" . DgS::printAr(Colors::hsb2rgb($h, $s, $b)) . "</pre><br>";
+print "RANDOM hsl->rgb: <pre>" . DgS::printAr(Colors::hsl2rgb($h, $s, $l)) . "</pre><br>";
+
 // TODO: run compare check input must match output
 
 // error message

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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-datetime';
 ob_end_flush();
@@ -44,9 +40,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-email';
 ob_end_flush();
@@ -43,9 +39,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

@@ -21,15 +21,13 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-encoding';
 ob_end_flush();
 
-use CoreLibs\Language\Encoding;
+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 +39,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 +61,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-datetime';
 ob_end_flush();
@@ -42,9 +38,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-hash';
 ob_end_flush();
@@ -45,9 +41,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-html';
 ob_end_flush();
@@ -49,9 +45,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-image';
 ob_end_flush();
@@ -46,9 +42,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-json';
 ob_end_flush();
@@ -46,9 +42,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,38 +19,164 @@ ob_start();
 
 // basic class test file
 define('USE_DATABASE', false);
-// init language
-$lang = 'en_utf8';
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-lang';
-
-$l = new CoreLibs\Language\L10n($lang);
 ob_end_flush();
 
-print "<html><head><title>TEST CLASS: LANG</title><head>";
+$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,61 @@
+<?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-login';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
+// init login & backend class
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
+$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, $session);
+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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-math';
 ob_end_flush();
@@ -44,9 +40,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-mime';
 ob_end_flush();
@@ -41,9 +37,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

@@ -23,10 +23,6 @@ define('USE_DATABASE', true);
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-form';
 ob_end_flush();
@@ -69,9 +65,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

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-pass';
 ob_end_flush();
@@ -46,9 +42,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

@@ -21,14 +21,12 @@ ob_start();
 define('USE_DATABASE', true);
 // 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';
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 
 // init login & backend class
+$session = new CoreLibs\Create\Session($SET_SESSION_NAME);
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
 	'file_id' => $LOG_FILE_ID,
@@ -40,11 +38,18 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
-$login = new CoreLibs\ACL\Login($db, $log);
-$backend = new CoreLibs\Admin\Backend($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
+$locale = \CoreLibs\Language\GetLocale::setLocale();
+$l10n = new \CoreLibs\Language\L10n(
+	$locale['locale'],
+	$locale['domain'],
+	$locale['path'],
+);
+$backend = new CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale);
 $backend->db->dbInfo(true);
 ob_end_flush();
 
+print "<!DOCTYPE html>";
 print "<html><head><title>TEST CLASS</title><head>";
 print "<body>";
 
@@ -60,7 +65,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>';
@@ -72,15 +77,21 @@ print '<div><a href="class_test.readenvfile.php">Class Test: READ ENV FILE</a></
 print '<div><a href="class_test.runningtime.php">Class Test: RUNNING TIME</a></div>';
 print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
 print '<div><a href="class_test.output.form.php">Class Test: OUTPUT FORM</a></div>';
-print '<div><a href="class_test.backend.php">Class Test: BACKEND ADMIN CLASS</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'])) {
@@ -145,9 +156,7 @@ print "BASE: " . BASE . "<br>";
 print "ROOT: " . ROOT . "<br>";
 print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . print_r(DB_CONFIG, true) . "<br>";
 
-$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-$du = DS ?? DIRECTORY_SEPARATOR;
-print "DS is: " . $ds . "<br>";
+print "DS is: " . DIRECTORY_SEPARATOR . "<br>";
 print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "<br>";
 
 // print error messages

www/admin/class_test.phpv.php

@@ -21,10 +21,6 @@ ob_start();
 define('USE_DATABASE', false);
 // sample config
 require 'config.php';
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-phpv';
 ob_end_flush();
@@ -46,9 +42,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

@@ -21,10 +21,6 @@ ob_start();
 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-randomkey';
 ob_end_flush();
@@ -43,9 +39,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

@@ -14,10 +14,6 @@ ob_start();
 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-readEnvFile';
 ob_end_flush();
@@ -34,9 +30,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

@@ -21,10 +21,6 @@ ob_start();
 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-runningtime';
 ob_end_flush();
@@ -42,9 +38,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,168 @@
+<?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';
+// 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;
+$session = new 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_id = $session->startSession($session_name))) {
+	print "[FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "[SET] Current session id: " . $session_id . "<br>";
+}
+// set again
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[2 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "[2 SET] Current session id: " . $session_id . "<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] A " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
+$_SESSION[$var] = $value;
+print "[READ] B " . $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_id = $session->startSession($session_name))) {
+	print "[3 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "[3 SET] Current session id: " . $session_id . "<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_id = $session->startSession($session_name))) {
+	print "[4 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "[4 SET] Current session id: " . $session_id . "<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_id = $session->startSession($session_name))) {
+	print "[5 FAILED] Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "[5 SET] Current session id: " . $session_id . "<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,110 @@
+<?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';
+// 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;
+$session = new 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_id = $session->startSession($session_name))) {
+	print "Session start failed: " . $session->getErrorStr() . "<br>";
+} else {
+	print "Current session id: " . $session_id . "<br>";
+}
+// set again
+if (false === ($session_id = $session->startSession($session_name))) {
+	print "[2] Session start failed<br>";
+} else {
+	print "[2] Current session id: " . $session_id . "<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,16 +19,10 @@ ob_start();
 
 // basic class test file
 define('USE_DATABASE', true);
-// set language
-$lang = 'en_utf8';
 // sample config
 require 'config.php';
 // override ECHO ALL FALSE
 $ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
 // define log file id
 $LOG_FILE_ID = 'classTest-smarty';
 ob_end_flush();
@@ -43,12 +37,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';
@@ -65,16 +67,27 @@ if ($smarty->USE_PROTOTYPE) {
 	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
 }
 $smarty->PAGE_WIDTH = '100%';
-// require BASE.INCLUDES.'admin_set_paths.php';
 $smarty->setSmartyPaths();
 
 // smarty test
 $smarty->DATA['SMARTY_TEST'] = 'Test Data';
-$smarty->DATA['TRANSLATE_TEST'] = $l->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST'] = $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
+$smarty->DATA['test'] = 'foo';
+$smarty->DATA['foo'] = 'bar';
+// loop
+$smarty->DATA['loop_start'] = 5;
 // drop down test with optgroups
-$options = [
+$smarty->DATA['drop_down_test'] = [
+	'foo' => 'Foo',
+	'bar' => 'Bar',
+	'foobar' => 'Foo Bar',
+];
+$smarty->DATA['drop_down_test_selected'] = 'bar';
+$smarty->DATA['drop_down_test_nested']  = [
 	'' => '選択してください',
 	'4/25(木)' => [
 		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
@@ -89,11 +102,26 @@ $options = [
 		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
 	],
 ];
+$smarty->DATA['drop_down_test_nested_selected'] = '';
+$smarty->DATA['radio_test'] = [
+	'0' => 'On',
+	'1' => 'Off',
+	'-1' => 'Undefined'
+];
+$smarty->DATA['radio_test_selected'] = -1;
+$smarty->DATA['checkbox_test'] = [
+	'0' => 'On',
+	'1' => 'Off',
+	'-1' => 'Undefined'
+];
+$smarty->DATA['checkbox_test_pos'] = [
+	'0' => 'A',
+	'1' => 'B'
+];
+$smarty->DATA['checkbox_test_selected'] = ['1', '-1'];
+$smarty->DATA['checkbox_test_pos_selected'] = ['0', '-1'];
+
 
-$smarty->DATA['drop_down_test'] = $options;
-$smarty->DATA['drop_down_test_selected'] = '';
-$smarty->DATA['loop_start'] = 2;
-// require BASE.INCLUDES.'admin_smarty.php';
 $smarty->setSmartyVarsAdmin();
 
 // error message

www/admin/class_test.smarty4.php

@@ -1,105 +0,0 @@
-<?php // phpcs:ignore warning
-
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = false; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = true;
-$PRINT_ALL = true;
-$DB_DEBUG = true;
-
-if ($DEBUG_ALL) {
-	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
-}
-
-ob_start();
-
-// basic class test file
-define('USE_DATABASE', true);
-// set language
-$lang = 'en_utf8';
-// sample config
-require 'config.php';
-// override ECHO ALL FALSE
-$ECHO_ALL = true;
-// set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-}
-// define log file id
-$LOG_FILE_ID = 'classTest-smarty';
-ob_end_flush();
-
-$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,
-]);
-$basic = new CoreLibs\Basic($log);
-$smarty = new CoreLibs\Template\SmartyExtend4();
-$l = new CoreLibs\Language\L10n($lang);
-
-print "<html><head><title>TEST CLASS: SMARTY</title><head>";
-print "<body>";
-print '<div><a href="class_test.php">Class Test Master</a></div>';
-
-$smarty->DATA['JS_DEBUG'] = DEBUG;
-$smarty->MASTER_TEMPLATE_NAME = 'main_body4.tpl';
-$smarty->TEMPLATE_NAME = 'smarty_test4.tpl';
-$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
-$smarty->USE_PROTOTYPE = false;
-$smarty->USE_JQUERY = true;
-$smarty->JS_DATEPICKR = false;
-if ($smarty->USE_PROTOTYPE) {
-	$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
-	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
-} elseif ($smarty->USE_JQUERY) {
-	$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
-	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
-}
-$smarty->PAGE_WIDTH = '100%';
-// require BASE.INCLUDES.'admin_set_paths.php';
-$smarty->setSmartyPaths();
-
-// smarty test
-$smarty->DATA['SMARTY_TEST'] = 'Test Data';
-$smarty->DATA['TRANSLATE_TEST'] = $l->__('Are we translated?');
-$smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
-
-// drop down test with optgroups
-$options = [
-	'' => '選択してください',
-	'4/25(木)' => [
-		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
-		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
-	],
-	'4/26(金)' => [
-		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
-		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
-	],
-	'4/27(土)' => [
-		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
-		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
-	],
-];
-
-$smarty->DATA['drop_down_test'] = $options;
-$smarty->DATA['drop_down_test_selected'] = '';
-$smarty->DATA['loop_start'] = 2;
-// require BASE.INCLUDES.'admin_smarty.php';
-$smarty->setSmartyVarsAdmin();
-
-// error message
-print $log->printErrorMsg();
-
-print "</body></html>";
-
-// __END__

www/admin/class_test.system.php

@@ -21,10 +21,6 @@ ob_start();
 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-system';
 ob_end_flush();
@@ -42,22 +38,31 @@ $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 "System::getHostName():<br>";
 print "GETHOSTNAME: " . DgS::printAr(System::getHostName()) . "<br>";
+print "System::getPageName():<br>";
 print "GETPAGENAME(0): " . System::getPageName() . "<br>";
 print "GETPAGENAME(1): " . System::getPageName(System::NO_EXTENSION) . "<br>";
 print "GETPAGENAME(2): " . System::getPageName(System::FULL_PATH) . "<br>";
+print "System::getPageNameArray():<br>";
 print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<br>";
 // seting errro codes file upload
+print "System::fileUploadErrorMessage():<br>";
 print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "<br>";
 print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
 	. System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE) . "<br>";
 
+print "System::checkCLI():<br>";
+print "Are we in an CLI: " . (System::checkCLI() ? 'Yes' : 'No') . "<br>";
+
 // error message
 print $log->printErrorMsg();
 

www/admin/class_test.token.php

@@ -21,10 +21,6 @@ ob_start();
 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-token';
 ob_end_flush();
@@ -42,9 +38,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

@@ -21,10 +21,6 @@ ob_start();
 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-uids';
 ob_end_flush();
@@ -43,9 +39,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,13 +45,18 @@ $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
 	],
 	// 'other.host.com' => $__LOCAL_CONFIG
-	'soba-dev.tequila.jp' => $__LOCAL_CONFIG
+	'soba-dev.tequila.jp' => $__LOCAL_CONFIG,
+	'soba.tequila.jp' => $__LOCAL_CONFIG,
+	'soba.teq.jp' => $__LOCAL_CONFIG,
+	'soba-local.tokyo.tequila.jp' => $__LOCAL_CONFIG,
 ];
 
 // __END__

www/configs/config.master.php

@@ -11,72 +11,72 @@
 declare(strict_types=1);
 
 /************* PATHS *********************/
-// directory seperator
+// [DEPRECATED] directory seperator
 define('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-define('DIR', __DIR__ . DS);
+define('DIR', __DIR__ . DIRECTORY_SEPARATOR);
 // base dir root folder level
-define('BASE', str_replace('/configs', '', __DIR__) . DS);
+define('BASE', str_replace('/configs', '', __DIR__) . DIRECTORY_SEPARATOR);
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-define('ROOT', getcwd() . DS);
+define('ROOT', getcwd() . DIRECTORY_SEPARATOR);
 // libs path
-define('LIB', 'lib' . DS);
-define('LIBS', 'lib' . DS);
+define('LIB', 'lib' . DIRECTORY_SEPARATOR);
+define('LIBS', 'lib' . DIRECTORY_SEPARATOR);
 // configs folder
-define('CONFIGS', 'configs' . DS);
+define('CONFIGS', 'configs' . DIRECTORY_SEPARATOR);
 // includes (strings, arrays for static, etc)
-define('INCLUDES', 'includes' . DS);
+define('INCLUDES', 'includes' . DIRECTORY_SEPARATOR);
 // data folder (mostly in includes, or root for internal data)
-define('DATA', 'data' . DS);
+define('DATA', 'data' . DIRECTORY_SEPARATOR);
 // layout base path
-define('LAYOUT', 'layout' . DS);
+define('LAYOUT', 'layout' . DIRECTORY_SEPARATOR);
 // pic-root (compatible to CMS)
-define('PICTURES', 'images' . DS);
+define('PICTURES', 'images' . DIRECTORY_SEPARATOR);
 // images
-define('IMAGES', 'images' . DS);
+define('IMAGES', 'images' . DIRECTORY_SEPARATOR);
 // icons (below the images/ folder)
-define('ICONS', 'icons' . DS);
+define('ICONS', 'icons' . DIRECTORY_SEPARATOR);
 // media (accessable from outside)
-define('MEDIA', 'media' . DS);
+define('MEDIA', 'media' . DIRECTORY_SEPARATOR);
 // uploads (anything to keep or data)
-define('UPLOADS', 'uploads' . DS);
+define('UPLOADS', 'uploads' . DIRECTORY_SEPARATOR);
 // files (binaries) (below media or data)
-define('BINARIES', 'binaries' . DS);
+define('BINARIES', 'binaries' . DIRECTORY_SEPARATOR);
 // files (videos) (below media or data)
-define('VIDEOS', 'videos' . DS);
+define('VIDEOS', 'videos' . DIRECTORY_SEPARATOR);
 // files (documents) (below media or data)
-define('DOCUMENTS', 'documents' . DS);
+define('DOCUMENTS', 'documents' . DIRECTORY_SEPARATOR);
 // files (pdfs) (below media or data)
-define('PDFS', 'documents' . DS);
+define('PDFS', 'documents' . DIRECTORY_SEPARATOR);
 // files (general) (below media or data)
-define('FILES', 'files' . DS);
+define('FILES', 'files' . DIRECTORY_SEPARATOR);
 // CSV
-define('CSV', 'csv' . DS);
+define('CSV', 'csv' . DIRECTORY_SEPARATOR);
 // css
-define('CSS', 'css' . DS);
+define('CSS', 'css' . DIRECTORY_SEPARATOR);
 // font (web)
-define('FONT', 'font' . DS);
+define('FONT', 'font' . DIRECTORY_SEPARATOR);
 // js
-define('JS', 'javascript' . DS);
+define('JS', 'javascript' . DIRECTORY_SEPARATOR);
 // table arrays
-define('TABLE_ARRAYS', 'table_arrays' . DS);
+define('TABLE_ARRAYS', 'table_arrays' . DIRECTORY_SEPARATOR);
 // smarty libs path
-define('SMARTY', 'Smarty' . DS);
-// po langs
-define('LANG', 'lang' . DS);
+define('SMARTY', 'Smarty' . DIRECTORY_SEPARATOR);
+// po locale file
+define('LOCALE', 'locale' . DIRECTORY_SEPARATOR);
 // cache path
-define('CACHE', 'cache' . DS);
+define('CACHE', 'cache' . DIRECTORY_SEPARATOR);
 // temp path
-define('TMP', 'tmp' . DS);
+define('TMP', 'tmp' . DIRECTORY_SEPARATOR);
 // log files
-define('LOG', 'log' . DS);
+define('LOG', 'log' . DIRECTORY_SEPARATOR);
 // compiled template folder
-define('TEMPLATES_C', 'templates_c' . DS);
+define('TEMPLATES_C', 'templates_c' . DIRECTORY_SEPARATOR);
 // template base
-define('TEMPLATES', 'templates' . DS);
+define('TEMPLATES', 'templates' . DIRECTORY_SEPARATOR);
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
@@ -150,15 +150,14 @@ define('SERVER_PATH_HASH', hash('crc32b', BASE));
 define('EDIT_SESSION_NAME', BASE_NAME . 'Admin' . SERVER_NAME_HASH . SERVER_PATH_HASH);
 // frontend
 define('SESSION_NAME', BASE_NAME . SERVER_NAME_HASH . SERVER_PATH_HASH);
-// SET_SESSION_NAME should be set in the header if a special session name is needed
-define('SET_SESSION_NAME', SESSION_NAME);
 
 /************* CACHE/COMPILE IDS *************/
 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');
 
@@ -256,10 +255,12 @@ $GLOBALS['DB_CONFIG'] = DB_CONFIG;
 // where global tables are that are used by all schemas (eg queue tables for online, etc)
 // define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA);
 // debug settings, site lang, etc
-define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
+define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag'] ?? false);
+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
 // define('CSV_PATH', $PATHS[TARGET]['csv_path']);
 // define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);

www/configs/config.other.php

@@ -21,9 +21,12 @@ $paths = [
 ];
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path . DS . 'convert') && is_file($path . DS . 'convert')) {
+	if (
+		file_exists($path . DIRECTORY_SEPARATOR . 'convert') &&
+		is_file($path . DIRECTORY_SEPARATOR . 'convert')
+	) {
 		// image magick convert location
-		define('CONVERT', $path . DS . 'convert');
+		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 DS is not set
-if (!defined('DS')) {
-	exit('Base config unloadable');
+// fail if no base DIR is not set
+if (!defined('DIR')) {
+	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

@@ -42,11 +42,11 @@ if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE
 if ($AJAX_PAGE && !$ZIP_STREAM) {
 	header("Content-Type: application/json; charset=UTF-8");
 }
-// start session
-CoreLibs\Create\Session::startSession();
 //------------------------------ basic variable settings start
 
 //------------------------------ class init start
+// start session
+$session = new \CoreLibs\Create\Session($SET_SESSION_NAME);
 // create logger
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
@@ -71,11 +71,20 @@ if (
 // db config with logger
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login & page access check
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
+// 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, $session, $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

@@ -33,8 +33,6 @@ extract($_POST, EXTR_SKIP);
 
 ob_start();
 require 'config.php';
-// set session name here
-// $SET_SESSION_NAME = EDIT_SESSION_NAME;
 // overrride debug flags
 if (!DEBUG)	{
 	$DEBUG_ALL = false;
@@ -45,8 +43,8 @@ if (!DEBUG)	{
 
 // should be utf8
 header("Content-type: text/html; charset=" . DEFAULT_ENCODING);
-// set session
-\CoreLibs\Create\Session::startSession(EDIT_SESSION_NAME);
+// start session
+$session = new \CoreLibs\Create\Session(EDIT_SESSION_NAME);
 // init logger
 $log = new CoreLibs\Debug\Logging([
 	'log_folder' => BASE . LOG,
@@ -60,19 +58,28 @@ $log = new CoreLibs\Debug\Logging([
 // db connection
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 // login page
-$login = new CoreLibs\ACL\Login($db, $log);
+$login = new CoreLibs\ACL\Login($db, $log, $session);
+// 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 +444,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/edit_body.tpl

@@ -33,26 +33,26 @@ function pop(theURL, winName, features) {
 <!-- ERROR MSG END //-->
 <!-- TOP MENU START //-->
 <tr>
-  <td width="{$table_width}" class="menu_bgcolor" valign="top">
-	 <table width="100%" border="0" cellpadding="2" cellspacing="1">
-	 <form method="post">
-	 <tr>
+	<td width="{$table_width}" class="menu_bgcolor" valign="top">
+		<table width="100%" border="0" cellpadding="2" cellspacing="1">
+		<form method="post">
+		<tr>
 		<td bgcolor="{$HEADER_COLOR}" class="normal">
 			Hello <b>{$USER_NAME|upper}</b> [{$EUID}] from the group <b>{$GROUP_NAME}</b> with Access Level <b>{$GROUP_LEVEL}</b>
 		</td>
 		<td bgcolor="{$HEADER_COLOR}" class="normal" align="right">
 			<input type="submit" name="login_logout" value="Logout">
 		</td>
-	 </tr>
-	 </form>
-	 </table>
-	 <table width="100%" border="0" cellpadding="2" cellspacing="1">
-	 <tr>
+		</tr>
+		</form>
+		</table>
+		<table width="100%" border="0" cellpadding="2" cellspacing="1">
+		<tr>
 	{* foreach menu *}
 	{foreach from=$menu_data item=menu_element}
 	{* if split factor is reached *}
 		{if $menu_element.splitfactor_in}
-	 	<td class="menu_fgcolor" class="small" valign="top">
+			<td class="menu_fgcolor" class="small" valign="top">
 		{/if}
 		{if $menu_element.position}
 			<b><a href="{$menu_element.filename}">{$menu_element.pagename}</a></b><br>
@@ -67,22 +67,22 @@ function pop(theURL, winName, features) {
 		</td>
 		{/if}
 	{/foreach}
-	 </tr>
-	 </table>
-	 <table width="100%" border="0" cellpadding="10" cellspacing="1">
-	 <tr>
-		<td class="edit_fgcolor_alt" class="headline" align="center">
-			{$page_name}
-		</td>
-	 </tr>
-	 </table>
-  </td>
-</tr>
+		</tr>
+		</table>
+		<table width="100%" border="0" cellpadding="10" cellspacing="1">
+		<tr>
+			<td class="edit_fgcolor_alt" class="headline" align="center">
+				{$page_name}
+			</td>
+		</tr>
+		</table>
+	</td>
+	</tr>
 <!-- TOP MENU END //-->
-<tr>
-  <td width="{$table_width}" class="edit_bgcolor">
-	 <form method="post" name="edit_form" style="margin-block-end: 0em;">
-	 <table width="100%" border="0" cellpadding="2" cellspacing="1">
+	<tr>
+	<td width="{$table_width}" class="edit_bgcolor">
+		<form method="post" name="edit_form" style="margin-block-end: 0em;">
+		<table width="100%" border="0" cellpadding="2" cellspacing="1">
 	 <!-- LOAD START //-->
 	{include file="edit_load.tpl"}
 	 <!-- LOAD END //-->
@@ -93,23 +93,23 @@ function pop(theURL, winName, features) {
 	{if $form_yes}
 		{include file="edit_save_delete.tpl"}
 		{if $form_my_page_name == "edit_pages" && $filename_exist}
-	 <tr>
-		<td class="edit_fgcolor" class="normal">
-			Filename:
-		</td>
-		<td class="edit_fgcolor" class="normal">
-			{$filename}
-			<input type="hidden" name="filename" value="{$filename}">
-		</td>
-	 </tr>
+		<tr>
+			<td class="edit_fgcolor" class="normal">
+				Filename:
+			</td>
+			<td class="edit_fgcolor" class="normal">
+				{$filename}
+				<input type="hidden" name="filename" value="{$filename}">
+			</td>
+		</tr>
 		{/if}
 		{include file="edit_elements.tpl"}
 		{include file="edit_hidden.tpl"}
 		{include file="edit_save_delete.tpl"}
 	{/if}
-	 </table>
-	 </form>
-  </td>
+		</table>
+		</form>
+	</td>
 </tr>
 </table>
 </body>

www/includes/templates/admin/edit_new.tpl

@@ -8,16 +8,16 @@
 	********************************************************************
 *}
 
-     <tr>
-         <td class="edit_fgcolor_alt" class="normal">
-             {t}Create new media:{/t}
-         </td>
-         <td class="edit_fgcolor_alt" class="normal">
-	{if $new.show_checkbox}
-             <input type="checkbox" name="really_new" value="yes">&nbsp;{t}really{/t}&nbsp;
-	{else}
-             <input type="hidden" name="really_new" value="yes">
-	{/if}
-             <input type="submit" name="new" value="{$new.new_name}">
-         </td>
-     </tr>
+	<tr>
+		<td class="edit_fgcolor_alt" class="normal">
+			{t}Create new media:{/t}
+		</td>
+		<td class="edit_fgcolor_alt" class="normal">
+{if $new.show_checkbox}
+			<input type="checkbox" name="really_new" value="yes">&nbsp;{t}really{/t}&nbsp;
+{else}
+			<input type="hidden" name="really_new" value="yes">
+{/if}
+			<input type="submit" name="new" value="{$new.new_name}">
+		</td>
+	</tr>