Update per level log file writing and with level check

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

4dev/bin/create_mo.sh

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

4dev/checking/phpunit.sh

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

4dev/locale/en-admin.po

@@ -2,8 +2,7 @@
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2005/08/09
 # SHORT DESCRIPTION:
-# Backned English Messages file for gettext
-# to craete: msgfmt -o <output.po> <input.mo>
+# Backend English Messages file for gettext
 # ********************************************************************/
 
 msgid ""

4dev/locale/en-frontend.po

@@ -1,4 +1,9 @@
-# to craete: msgfmt -o <output.po> <input.mo>
+# ********************************************************************
+# AUTHOR: Clemens Schwaighofer
+# CREATED: 2005/08/09
+# SHORT DESCRIPTION:
+# Frontend English Messages file for gettext
+# ********************************************************************/
 
 msgid ""
 msgstr ""

4dev/locale/ja-admin.po

@@ -2,8 +2,7 @@
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2018/03/28
 # SHORT DESCRIPTION:
-# Backend Japanese Messages file for gettext
-# to craete: msgfmt -o <output.po> <input.mo>
+# Backend Japanese Messages file for gettext>
 # ********************************************************************/
 
 msgid ""

4dev/locale/ja-frontend.po

@@ -1,4 +1,9 @@
-# to craete: msgfmt -o <output.po> <input.mo>
+# ********************************************************************
+# AUTHOR: Clemens Schwaighofer
+# CREATED: 2005/08/09
+# SHORT DESCRIPTION:
+# Frontend Japanese Messages file for gettext
+# ********************************************************************/
 
 msgid ""
 msgstr ""

4dev/tests/CoreLibsACLLoginTest.php

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

4dev/tests/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
@@ -566,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],
@@ -599,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],
@@ -1734,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);
@@ -1871,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);
@@ -2034,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);
@@ -2356,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);
@@ -2709,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,
@@ -3009,7 +3010,7 @@ final class CoreLibsDBIOTest extends TestCase
 		string $insert,
 		?string $pk_name,
 		string $table,
-		string $primary_key,
+		string $primary_key
 	): void {
 		// self::$log->setLogLevelAll('debug', true);
 		// self::$log->setLogLevelAll('print', true);

4dev/tests/CoreLibsDebugLoggingTest.php

@@ -6,6 +6,8 @@ namespace tests;
 
 use PHPUnit\Framework\TestCase;
 
+// TODO: setLogPer test log file written matches pattern
+
 /**
  * Test class for Debug\Logging
  * @coversDefaultClass \CoreLibs\Debug\Logging
@@ -730,7 +732,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
 		bool $expected_debug,
 		string $expected_file,
 		string $expected_string_start,
-		string $expected_string_contains,
+		string $expected_string_contains
 	): void {
 		// must run with below matrix
 		// level    | debug | print | echo | debug() | printErrorMsg() | file

4dev/tests/CoreLibsGetSystemTest.php

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

4dev/tests/CoreLibsLanguageGetLocaleTest.php

@@ -240,7 +240,7 @@ final class CoreLibsLanguageGetLocaleTest extends TestCase
 		?string $path,
 		?string $SESSION_DEFAULT_LOCALE,
 		?string $SESSION_DEFAULT_CHARSET,
-		array $expected,
+		array $expected
 	): void {
 		$return_lang_settings = [];
 		global $_SESSION;

4dev/tests/CoreLibsLanguageL10nTest.php

@@ -109,10 +109,11 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			// 2: encoding
 			// 3: path
 			// 4: locale expected
-			// 5: domain exepcted
-			// 6: context (null for none)
-			// 7: test string in
-			// 8: test translated
+			// 5: locale set expected
+			// 6: domain exepcted
+			// 7: context (null for none)
+			// 8: test string in
+			// 9: test translated
 			// new style load
 			'gettext load en' => [
 				'en_US.UTF-8',
@@ -120,6 +121,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				__DIR__ . 'includes/locale/',
 				//
 				'en_US.UTF-8',
+				'en_US',
 				'frontend',
 				null,
 				'Original',
@@ -131,6 +133,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				__DIR__ . 'includes/locale/',
 				//
 				'en_US.UTF-8',
+				'en_US',
 				'frontend',
 				'context',
 				'Original',
@@ -142,6 +145,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				__DIR__ . 'includes/locale/',
 				//
 				'ja_JP.UTF-8',
+				'ja_JP',
 				'admin',
 				null,
 				'Original',
@@ -154,6 +158,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				'frontend',
 				//
 				'en_US.UTF-8',
+				'en_US',
 				'frontend',
 				'context',
 				'Original',
@@ -167,6 +172,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				//
 				'',
 				'',
+				'',
 				null,
 				'Original',
 				'Original',
@@ -185,6 +191,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @param  string|null $domain
 	 * @param  string|null $path
 	 * @param  string      $locale_expected
+	 * @param  string      $locale_set_expected
 	 * @param  string      $domain_expected
 	 * @param  ?string     $context
 	 * @param  string      $original
@@ -196,10 +203,11 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		?string $domain,
 		?string $path,
 		string $locale_expected,
+		string $locale_set_expected,
 		string $domain_expected,
 		?string $context,
 		string $original,
-		string $translated,
+		string $translated
 	): void {
 		if ($locale === null) {
 			$l10n = new \CoreLibs\Language\L10n();
@@ -217,6 +225,11 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			$l10n->getLocale(),
 			'Locale assert failed'
 		);
+		$this->assertEquals(
+			$locale_set_expected,
+			$l10n->getLocaleSet(),
+			'Locale set assert failed'
+		);
 		$this->assertEquals(
 			$domain_expected,
 			$l10n->getDomain(),
@@ -255,15 +268,17 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			// 3: load error
 			// 4: input string to translated
 			// 5: expected locale
-			// 6: expected domain
-			// 7: expected translation
-			// 8: change locale
-			// 9: change domain
-			// 10: change path
-			// 11: change load error
-			// 12: expected locale
-			// 13: expected domain
-			// 14: expected translation
+			// 6: expected locale set
+			// 7: expected domain
+			// 8: expected translation
+			// 9: change locale
+			// 10: change domain
+			// 11: change path
+			// 12: change load error
+			// 13: expected locale
+			// 14: expected locale set
+			// 15: expected domain
+			// 16: expected translation
 			'load and change (en->ja)' => [
 				// set 0-2
 				'en_US.UTF-8',
@@ -275,6 +290,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				'Original',
 				// check setter 5-7
 				'en_US.UTF-8',
+				'en_US',
 				'frontend',
 				'Translated frontend en_US',
 				// set new 8-10
@@ -285,6 +301,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				false,
 				// check new setter 12-14
 				'ja_JP.UTF-8',
+				'ja_JP',
 				'frontend',
 				'Translated frontend ja_JP',
 			],
@@ -300,6 +317,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				// check setter 5-7
 				'',
 				'',
+				'',
 				'Original',
 				// set new 8-10
 				'en_US.UTF-8',
@@ -309,6 +327,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 				false,
 				// check new setter 12-14
 				'en_US.UTF-8',
+				'en_US',
 				'frontend',
 				'Translated frontend en_US',
 			]
@@ -329,12 +348,14 @@ final class CoreLibsLanguageL10nTest extends TestCase
 	 * @param  bool        $load_error
 	 * @param  string      $original
 	 * @param  string      $locale_expected_a
+	 * @param  string      $locale_set_expected_a
 	 * @param  string      $domain_expected_a
 	 * @param  string      $translated_a
 	 * @param  string|null $locale_new
 	 * @param  string|null $domain_new
 	 * @param  string|null $path_new
 	 * @param  bool        $load_error_new
+	 * @param  string      $locale_set_expected_b
 	 * @param  string      $locale_expected_b
 	 * @param  string      $domain_expected_b
 	 * @param  string      $translated_b
@@ -351,6 +372,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		string $original,
 		// 5-7
 		string $locale_expected_a,
+		string $locale_set_expected_a,
 		string $domain_expected_a,
 		string $translated_a,
 		// 8-10
@@ -361,8 +383,9 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		bool $load_error_new,
 		// 12-14
 		string $locale_expected_b,
+		string $locale_set_expected_b,
 		string $domain_expected_b,
-		string $translated_b,
+		string $translated_b
 	): void {
 		if ($locale === null) {
 			$l10n = new \CoreLibs\Language\L10n();
@@ -384,6 +407,10 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			$locale_expected_a,
 			$l10n->getLocale(),
 			'Locale init assert failed'
+		);$this->assertEquals(
+			$locale_set_expected_a,
+			$l10n->getLocaleSet(),
+			'Locale Set init assert failed'
 		);
 		$this->assertEquals(
 			$domain_expected_a,
@@ -435,6 +462,11 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			$l10n->getLocale(),
 			'Locale change assert failed'
 		);
+		$this->assertEquals(
+			$locale_set_expected_b,
+			$l10n->getLocaleSet(),
+			'Locale Set change assert failed'
+		);
 		$this->assertEquals(
 			$domain_expected_b,
 			$l10n->getDomain(),
@@ -545,7 +577,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 			} else {
 				$this->assertEquals(
 					$expected,
-					$l10n->__pn($context, $original_single, $original_plural, $n),
+					$l10n->__np($context, $original_single, $original_plural, $n),
 					'assert failed for plural: ' . $n . ' in context: ' . $context
 				);
 			}
@@ -731,7 +763,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		string $type,
 		string $var,
 		string $value,
-		string $expected,
+		string $expected
 	): void {
 		switch ($type) {
 			case 'global':
@@ -967,7 +999,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 
 	/**
 	 * fuctions check
-	 * TODO: others d/dn/dp/dpn gettext functions
+	 * TODO: others d/dn/dp/dnp gettext functions
 	 *
 	 * @covers __setlocale
 	 * @covers __bindtextdomain
@@ -994,10 +1026,10 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		string $translated
 	): void {
 		\CoreLibs\Language\L10n::loadFunctions();
-		__setlocale(LC_MESSAGES, $locale);
-		__textdomain($domain);
-		__bindtextdomain($domain, $path);
-		__bind_textdomain_codeset($domain, $encoding);
+		_setlocale(LC_MESSAGES, $locale);
+		_textdomain($domain);
+		_bindtextdomain($domain, $path);
+		_bind_textdomain_codeset($domain, $encoding);
 		$this->assertEquals(
 			$translated,
 			__($original),
@@ -1005,7 +1037,7 @@ final class CoreLibsLanguageL10nTest extends TestCase
 		);
 		$this->assertEquals(
 			$translated,
-			__gettext($original),
+			_gettext($original),
 			'function gettext assert failed'
 		);
 	}

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;
-	}
-}

phpstan-baseline.neon

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

phpstan.neon

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

www/admin/class_test.admin.backend.php

@@ -51,10 +51,12 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 $backend = new CoreLibs\Admin\Backend($db, $log, $l10n, $locale);
 
+$PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: ADMIN BACKEND</title><head>";
+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(['EMPTY' => 'EMPTY']) . "<br>";

www/admin/class_test.array.php

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

www/admin/class_test.autoloader.php

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

www/admin/class_test.byte.php

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

www/admin/class_test.colors.php

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

www/admin/class_test.config.direct.php

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

www/admin/class_test.config.link.php

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

www/admin/class_test.datetime.php

@@ -44,10 +44,12 @@ $log = new CoreLibs\Debug\Logging([
 ]);
 $datetime_class = 'CoreLibs\Combined\DateTime';
 
+$PAGE_NAME = 'TEST CLASS: DATE/TIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: DATE/TIME</title><head>";
+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,10 +39,12 @@ $log = new CoreLibs\Debug\Logging([
 $db = new CoreLibs\DB\IO(DB_CONFIG, $log);
 $db->log->debug('START', '=============================>');
 
+$PAGE_NAME = 'TEST CLASS: DB';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: DB</title><head>";
+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,10 +44,12 @@ $debug = new CoreLibs\Debug\Logging([
 $debug_support_class = 'CoreLibs\Debug\Support';
 $debug_logging_class = 'CoreLibs\Debug\Logging';
 
+$PAGE_NAME = 'TEST CLASS: DEBUG';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: DEBUG</title><head>";
+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()
 {
@@ -68,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>";
@@ -170,6 +175,12 @@ print "GETCALLERCLASS(NON CLASS): " . \CoreLibs\Debug\Support::getCallerClass()
 print "S::FSETFILENAME: " . FileWriter::fsetFilename('class_test_debug_file.log') . "<br>";
 print "S::FDEBUG: " . FileWriter::fdebug('CLASS TEST DEBUG FILE: ' . date('Y-m-d H:i:s')) . "<br>";
 
+// test per level
+$debug->setLogPer('level', true);
+$debug->debug('TEST PER LEVEL', 'Per level test');
+$debug->debug('()', 'Per level test: invalid chars');
+$debug->setLogPer('level', false);
+
 // error message
 // future DEPRECATED
 // $debug->debug('BASIC CLASS', 'Debug test');

www/admin/class_test.email.php

@@ -43,10 +43,12 @@ $log = new CoreLibs\Debug\Logging([
 	'print_all' => $PRINT_ALL ?? false,
 ]);
 
+$PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: HTML/ELEMENTS</title><head>";
+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

@@ -48,10 +48,12 @@ $_chk_enc = new CoreLibs\Check\Encoding();
 $_con_enc = new CoreLibs\Convert\Encoding();
 $chk_enc = 'CoreLibs\Check\Encoding';
 
+$PAGE_NAME = 'TEST CLASS: ENCODING (CHECK/CONVERT/MIME)';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: ENCODING (CHECK/CONVERT/MIME)</title><head>";
+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>";
 

www/admin/class_test.file.php

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

www/admin/class_test.hash.php

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

www/admin/class_test.html.php

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

www/admin/class_test.image.php

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

www/admin/class_test.json.php

@@ -46,10 +46,12 @@ $json_class = 'CoreLibs\Convert\Json';
 
 // define a list of from to color sets for conversion test
 
+$PAGE_NAME = 'TEST CLASS: JSON';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: JSON</title><head>";
+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

@@ -29,10 +29,12 @@ if (!defined('SET_SESSION_NAME')) {
 $LOG_FILE_ID = 'classTest-lang';
 ob_end_flush();
 
+$PAGE_NAME = 'TEST CLASS: LANG';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: LANG</title><head>";
+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;
@@ -95,7 +97,7 @@ $single_string = 'single';
 $multi_string = 'multi';
 for ($n = 0; $n <= 3; $n++) {
 	echo "CONTEXT MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
-		. $l->__pn($context, $single_string, $multi_string, $n) . "<br>";
+		. $l->__np($context, $single_string, $multi_string, $n) . "<br>";
 }
 // change domain
 $domain = 'frontend';
@@ -138,6 +140,7 @@ 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
@@ -154,18 +157,30 @@ 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);
+_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);
+_setlocale(LC_MESSAGES, $locale);
+_textdomain($domain);
+_bindtextdomain($domain, $path);
+_bind_textdomain_codeset($domain, $encoding);
 echo "INPUT TEST $locale: " . $string . " => " . __($string) . "<br>";
+$single_string = 'single';
+$multi_string = 'multi';
+for ($n = 0; $n <= 3; $n++) {
+	echo "MULTI TEST $n: " . $single_string . "/" . $multi_string . " => "
+		. _ngettext($single_string, $multi_string, $n) . "<br>";
+}
 
 print "</body></html>";
 

www/admin/class_test.login.php

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

www/admin/class_test.math.php

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

www/admin/class_test.mime.php

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

www/admin/class_test.output.form.php

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

www/admin/class_test.password.php

@@ -46,10 +46,12 @@ $password_class = 'CoreLibs\Check\Password';
 
 // define a list of from to color sets for conversion test
 
+$PAGE_NAME = 'TEST CLASS: PASSWORD';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: PASSWORD</title><head>";
+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

@@ -81,8 +81,13 @@ print '<div><a href="class_test.debug.php">Class Test: DEBUG</a></div>';
 print '<div><a href="class_test.output.form.php">Class Test: OUTPUT FORM</a></div>';
 print '<div><a href="class_test.admin.backend.php">Class Test: BACKEND ADMIN CLASS</a></div>';
 print '<div><a href="class_test.lang.php">Class Test: LANG/L10n</a></div>';
+print '<div><a href="class_test.session.php">Class Test: SESSION</a></div>';
 print '<div><a href="class_test.smarty.php">Class Test: SMARTY</a></div>';
+print '<div><a href="class_test.login.php">Class Test: LOGIN</a></div>';
 print '<div><a href="class_test.autoloader.php">Class Test: AUTOLOADER</a></div>';
+print '<div><a href="class_test.config.link.php">Class Test: CONFIG LINK</a></div>';
+print '<div><a href="class_test.config.direct.php">Class Test: CONFIG DIRECT</a></div>';
+print '<div><a href="subfolder/class_test.config.direct.php">Class Test: CONFIG DIRECT SUB</a></div>';
 
 print "<hr>";
 print "L: " . CoreLibs\Debug\Support::printAr($locale) . "<br>";

www/admin/class_test.phpv.php

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

www/admin/class_test.randomkey.php

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

www/admin/class_test.readenvfile.php

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

www/admin/class_test.runningtime.php

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

www/admin/class_test.session.php

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

www/admin/class_test.session.read.php

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

www/admin/class_test.smarty.php

@@ -49,10 +49,12 @@ $l10n = new \CoreLibs\Language\L10n(
 );
 $smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale);
 
+$PAGE_NAME = 'TEST CLASS: SMARTY';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: SMARTY</title><head>";
+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';
@@ -74,6 +76,7 @@ $smarty->setSmartyPaths();
 // smarty test
 $smarty->DATA['SMARTY_TEST'] = 'Test Data';
 $smarty->DATA['TRANSLATE_TEST'] = $l10n->__('Are we translated?');
+$smarty->DATA['TRANSLATE_TEST_FUNCTION'] = _gettext('Are we translated?');
 $smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
 $smarty->DATA['replace'] = 'Replaced';
 // variable variables

www/admin/class_test.system.php

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

www/admin/class_test.token.php

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

www/admin/class_test.uids.php

@@ -43,10 +43,12 @@ $_uids = new CoreLibs\Create\Uids();
 use CoreLibs\Create\Uids;
 $uids_class = 'CoreLibs\Create\Uids';
 
+$PAGE_NAME = 'TEST CLASS: UIDS';
 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS: UIDS</title><head>";
+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.php

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

www/includes/edit_base.php

@@ -446,16 +446,15 @@ if ($form->my_page_name == 'edit_order') {
 					$t_q = '';
 					foreach ($output as $output_file) {
 						// split the ouput into folder and file
-						// eg ../admin/test.php is ../admin/ and test.php
-						preg_match("/([\.\/\w]+\/)+(\w+\.\w{1,})$/", $output_file, $matches);
-						// if named config.php, skip
-						if ($matches[2] != 'config.php') {
-							if ($t_q) {
-								$t_q .= ', ';
-							}
-							$t_q .= "('" . $form->dbEscapeString($matches[1]) . "', '"
-								. $form->dbEscapeString($matches[2]) . "')";
+						$pathinfo = pathinfo($output_file);
+						if (!empty($pathinfo['dirname'])) {
+							$pathinfo['dirname'] .= DIRECTORY_SEPARATOR;
 						}
+						if ($t_q) {
+							$t_q .= ', ';
+						}
+						$t_q .= "('" . $form->dbEscapeString($pathinfo['dirname']) . "', '"
+							. $form->dbEscapeString($pathinfo['basename']) . "')";
 					}
 					$form->dbExec($q . $t_q, 'NULL');
 					$elements[] = $form->formCreateElement('filename');

www/includes/templates/admin/smarty_test.tpl

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

www/includes/templates/admin/smarty_test4.tpl

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

www/lib/CoreLibs/ACL/Login.php

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

www/lib/CoreLibs/Basic.php

@@ -85,11 +85,13 @@ class Basic
 	 * main Basic constructor to init and check base settings
 	 * @param \CoreLibs\Debug\Logging|null $log Logging class
 	 * @param string|null $session_name Set session name
+	 * @deprecated DO NOT USE Class\Basic anymore. Use dedicated logger and sub classes
 	 */
 	public function __construct(
 		\CoreLibs\Debug\Logging $log = null,
 		?string $session_name = null
 	) {
+		trigger_error('Class \CoreLibs\Basic is deprected', E_USER_DEPRECATED);
 		// TODO make check dynamic for entries we MUST have depending on load type
 		// before we start any work, we should check that all MUST constants are defined
 		$abort = false;

www/lib/CoreLibs/Combined/DateTime.php

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

www/lib/CoreLibs/Create/Session.php

@@ -7,9 +7,6 @@
  * name can be given via startSession parameter
  * if not set tries to read $SET_SESSION_NAME from global
  * if this is not set tries to read SET_SESSION_NAME constant
- *
- * TODO: add _SESSION write unset
- * TODO: add session close down with all _SESSION vars unset
  */
 
 declare(strict_types=1);
@@ -18,6 +15,9 @@ namespace CoreLibs\Create;
 
 class Session
 {
+	/** @var string list for errors*/
+	private static $error_str = '';
+
 	/**
 	 * init a session
 	 */
@@ -25,6 +25,41 @@ class Session
 	{
 	}
 
+	/**
+	 * Return set error string, empty if none set
+	 *
+	 * @return string Last error string
+	 */
+	public static function getErrorStr(): string
+	{
+		return self::$error_str;
+	}
+
+	/**
+	 * check if session name is valid
+	 *
+	 * As from PHP 8.1/8.0/7.4 error
+	 * INVALID CHARS: =,; \t\r\n\013\014
+	 * NOTE: using . will fail even thought valid
+	 * we allow only alphanumeric with - (dash) and 1 to 128 characters
+	 *
+	 * @param  string $session_name any string, not null
+	 * @return bool                 True for valid, False for invalid
+	 */
+	public static function checkValidSessionName(string $session_name): bool
+	{
+		// check
+		if (
+			// must only have those
+			!preg_match('/^[-a-zA-Z0-9]{1,128}$/', $session_name) ||
+			// cannot be only numbers
+			preg_match('/^[0-9]+$/', $session_name)
+		) {
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Undocumented function
 	 *
@@ -35,10 +70,12 @@ class Session
 	{
 		// we can't start sessions on command line
 		if (php_sapi_name() === 'cli') {
+			self::$error_str = '[SESSION] No sessions in php cli';
 			return false;
 		}
 		// if session are OFF
 		if (self::getSessionStatus() === PHP_SESSION_DISABLED) {
+			self::$error_str = '[SESSION] Sessions are disabled';
 			return false;
 		}
 		// session_status
@@ -59,6 +96,11 @@ class Session
 			}
 			// if set, set special session name
 			if (!empty($session_name)) {
+				// invalid session name, abort
+				if (!self::checkValidSessionName($session_name)) {
+					self::$error_str = '[SESSION] Invalid session name: ' . $session_name;
+					return false;
+				}
 				session_name($session_name);
 			}
 			// start session
@@ -66,6 +108,7 @@ class Session
 		}
 		// if we still have no active session
 		if (!self::checkActiveSession()) {
+			self::$error_str = '[SESSION] Failed to activate session';
 			return false;
 		}
 		return self::getSessionId();
@@ -95,7 +138,7 @@ class Session
 	 * Checks if there is an active session.
 	 * Does not check if we can have a session
 	 *
-	 * @return boolean True if there is an active session, else false
+	 * @return bool True if there is an active session, else false
 	 */
 	public static function checkActiveSession(): bool
 	{
@@ -106,6 +149,19 @@ class Session
 		}
 	}
 
+	/**
+	 * unlock the session file, so concurrent AJAX requests can be done
+	 * NOTE: after this has been called, no changes in _SESSION will be stored
+	 * NOTE: a new session with a different name can be started after this one is called
+	 * if problem, run ob_flush() and flush() too
+	 *
+	 * @return bool True und sucess, false on failure
+	 */
+	public static function writeClose(): bool
+	{
+		return session_write_close();
+	}
+
 	/**
 	 * get session status
 	 * PHP_SESSION_DISABLED if sessions are disabled.

www/lib/CoreLibs/DB/Extended/ArrayIO.php

@@ -43,7 +43,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 	/** @var string */
 	public $table_name; // the table_name
 	/** @var string */
-	public $pk_name; // the primary key from this table
+	public $pk_name = ''; // the primary key from this table
 	/** @var int|string|null */
 	public $pk_id; // the PK id
 
@@ -503,7 +503,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 			// max id, falls INSERT
 			$q = 'SELECT MAX(' . $this->pk_name . ') + 1 AS pk_id FROM ' . $this->table_name;
 			if (is_array($res = $this->dbReturnRow($q))) {
-				$pk_id = $res['pkd_id'];
+				$pk_id = $res['pk_id'];
 			} else {
 				$pk_id = 1;
 			}

www/lib/CoreLibs/DB/SQL/PgSQL.php

@@ -604,7 +604,7 @@ class PgSQL implements \CoreLibs\DB\SQL\SqlInterface\SqlFunctions
 			return '';
 		}
 		// extract element
-		$return_string = pg_version($this->dbh)[$parameter] ?? '';
+		$return_string = (string)(pg_version($this->dbh)[$parameter] ?? '');
 		// for version, strip if requested
 		if (
 			in_array($parameter, ['server']) &&

www/lib/CoreLibs/Debug/Logging.php

@@ -365,7 +365,18 @@ class Logging
 		}
 		$fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename
 
-		$rpl_string = !$this->log_per_level ? '' : '_' . $level; // if request to write to one file
+		// write per level
+		$rpl_string = !$this->log_per_level ? '' :
+			// normalize level, replace all non alphanumeric characters with -
+			'_' . (
+				// if return is only - then set error string
+				preg_match(
+					"/^-+$/",
+					$level_string = preg_replace("/[^A-Za-z0-9-_]/", '-', $level) ?? ''
+				) ?
+					'INVALID-LEVEL-STRING' :
+					$level_string
+			);
 		$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
 		// set per class, but don't use get_class as we will only get self
 		$rpl_string = !$this->log_per_class ? '' : '_'
@@ -401,10 +412,10 @@ class Logging
 
 	/**
 	 * Temporary method to read all class variables for testing purpose
-	 * @param string $name
-	 * @return mixed       can be anything, bool, string, int, array
+	 * @param  string $name what variable to return
+	 * @return mixed        can be anything, bool, string, int, array
 	 */
-	public function getSetting(string $name): mixed
+	public function getSetting(string $name) //:mixed DOES not work with PHP 7.4
 	{
 		// for debug purpose only
 		return $this->{$name};

www/lib/CoreLibs/Language/Encoding.php

@@ -5,7 +5,7 @@
  * Language\Encoding::__mbMimeEncode -> Convert\MimeEncode::__mbMimeEncode
  * Langauge\Encoding::checkConvertEncoding -> Check\Encoding::checkConvertEncoding
  * Langauge\Encoding::setErrorChar -> Check\Encoding::setErrorChar
- * Langauge\Encoding::getErrorChar -> Encoding::getErrorChar
+ * Langauge\Encoding::getErrorChar -> Check\Encoding::getErrorChar
  * Langauge\Encoding::convertEncoding -> Convert\Encoding::convertEncoding
  */
 

www/lib/CoreLibs/Language/L10n.php

@@ -14,7 +14,7 @@
 *	__  : returns string (translated or original if not found)
 *	__n : plural string
 *   __p : string with context
-*   __pb: string with context and plural
+*   __np: string with context and plural
 *
 * HISTORY:
 * 2022/4/15  (cs) drop all old folder layout support, new folder base
@@ -34,6 +34,8 @@ class L10n
 {
 	/** @var string the current locale */
 	private $locale = '';
+	/** @var string the SET locale as WHERE the domain file is */
+	private $locale_set = '';
 	/** @var string the default selected/active domain */
 	private $domain = '';
 	/** @var array<string,array<string,GetTextReader>> locale > domain = translator */
@@ -77,7 +79,7 @@ class L10n
 	public function __construct(
 		string $locale = '',
 		string $domain = '',
-		string $path = '',
+		string $path = ''
 	) {
 		// auto load language only if at least locale and domain is set
 		if (!empty($locale) && !empty($domain)) {
@@ -141,6 +143,7 @@ class L10n
 		// store old settings
 		$old_mofile = $this->mofile;
 		$old_lang = $this->locale;
+		$old_lang_set = $this->locale_set;
 		$old_domain = $this->domain;
 		$old_base_locale_path = $this->base_locale_path;
 		$old_base_content_path = $this->base_content_path;
@@ -172,6 +175,7 @@ class L10n
 				. $this->base_content_path
 				. $domain . '.mo';
 			if (file_exists($this->mofile)) {
+				$this->locale_set = $_locale;
 				break;
 			}
 		}
@@ -202,6 +206,7 @@ class L10n
 			// else fall back to the old ones
 			$this->mofile = $old_mofile;
 			$this->locale = $old_lang;
+			$this->locale_set = $old_lang_set;
 			$this->domain = $old_domain;
 			$this->base_locale_path = $old_base_locale_path;
 			$this->base_content_path = $old_base_content_path;
@@ -454,7 +459,7 @@ class L10n
 	}
 
 	/**
-	 * get current set locale
+	 * get current set locale (want locale)
 	 *
 	 * @return string
 	 */
@@ -463,6 +468,16 @@ class L10n
 		return $this->locale;
 	}
 
+	/**
+	 * current set locale where mo file is located
+	 *
+	 * @return string
+	 */
+	public function getLocaleSet(): string
+	{
+		return $this->locale_set;
+	}
+
 	/**
 	 * get current set language
 	 *
@@ -601,7 +616,7 @@ class L10n
 	 * @param  int    $number  number value
 	 * @return string
 	 */
-	public function __pn(string $context, string $single, string $plural, int $number): string
+	public function __np(string $context, string $single, string $plural, int $number): string
 	{
 		if ($this->l10n === null) {
 			return $number > 1 ? $plural : $single;

www/lib/CoreLibs/Language/l10n_functions.php

@@ -1,8 +1,16 @@
 <?php
 
+/*********************************************************************
+* Original: https://github.com/phpmyadmin/motranslator
+* Has the same function names, but uses a different base system
+* setlocale -> setLocale
+* bindtextdomain -> setTextDomain
+* textdomain -> setDomain
+*********************************************************************/
+
 declare(strict_types=1);
 
-use CoreLibs\Language\L10n;
+use CoreLibs\Language\L10n as Loader;
 
 /**
  * Sets a requested locale.
@@ -12,9 +20,9 @@ use CoreLibs\Language\L10n;
  *
  * @return string Set or current locale
  */
-function __setlocale(int $category, string $locale): string
+function _setlocale(int $category, string $locale): string
 {
-	return L10n::getInstance()->setLocale($locale);
+	return Loader::getInstance()->setLocale($locale);
 }
 
 /**
@@ -23,9 +31,9 @@ function __setlocale(int $category, string $locale): string
  * @param string $domain Domain name
  * @param string $path   Path where to find locales
  */
-function __bindtextdomain(string $domain, string $path): void
+function _bindtextdomain(string $domain, string $path): void
 {
-	L10n::getInstance()->setTextDomain($domain, $path);
+	Loader::getInstance()->setTextDomain($domain, $path);
 }
 
 /**
@@ -39,7 +47,7 @@ function __bindtextdomain(string $domain, string $path): void
  * @param string $domain  Domain where to set character set
  * @param string $codeset Character set to set
  */
-function __bind_textdomain_codeset(string $domain, string $codeset): void
+function _bind_textdomain_codeset(string $domain, string $codeset): void
 {
 }
 
@@ -48,9 +56,9 @@ function __bind_textdomain_codeset(string $domain, string $codeset): void
  *
  * @param string $domain Domain name
  */
-function __textdomain(string $domain): void
+function _textdomain(string $domain): void
 {
-	L10n::getInstance()->setDomain($domain);
+	Loader::getInstance()->setDomain($domain);
 }
 
 /**
@@ -60,9 +68,9 @@ function __textdomain(string $domain): void
  *
  * @return string translated string (or original, if not found)
  */
-function __gettext(string $msgid): string
+function _gettext(string $msgid): string
 {
-	return L10n::getInstance()->getTranslator()->gettext(
+	return Loader::getInstance()->getTranslator()->gettext(
 		$msgid
 	);
 }
@@ -76,7 +84,7 @@ function __gettext(string $msgid): string
  */
 function __(string $msgid): string
 {
-	return L10n::getInstance()->getTranslator()->gettext(
+	return Loader::getInstance()->getTranslator()->gettext(
 		$msgid
 	);
 }
@@ -90,9 +98,9 @@ function __(string $msgid): string
  *
  * @return string translated plural form
  */
-function __ngettext(string $msgid, string $msgidPlural, int $number): string
+function _ngettext(string $msgid, string $msgidPlural, int $number): string
 {
-	return L10n::getInstance()->getTranslator()->ngettext(
+	return Loader::getInstance()->getTranslator()->ngettext(
 		$msgid,
 		$msgidPlural,
 		$number
@@ -107,9 +115,9 @@ function __ngettext(string $msgid, string $msgidPlural, int $number): string
  *
  * @return string translated plural form
  */
-function __pgettext(string $msgctxt, string $msgid): string
+function _pgettext(string $msgctxt, string $msgid): string
 {
-	return L10n::getInstance()->getTranslator()->pgettext(
+	return Loader::getInstance()->getTranslator()->pgettext(
 		$msgctxt,
 		$msgid
 	);
@@ -125,9 +133,9 @@ function __pgettext(string $msgctxt, string $msgid): string
  *
  * @return string translated plural form
  */
-function __npgettext(string $msgctxt, string $msgid, string $msgidPlural, int $number): string
+function _npgettext(string $msgctxt, string $msgid, string $msgidPlural, int $number): string
 {
-	return L10n::getInstance()->getTranslator()->npgettext(
+	return Loader::getInstance()->getTranslator()->npgettext(
 		$msgctxt,
 		$msgid,
 		$msgidPlural,
@@ -143,9 +151,9 @@ function __npgettext(string $msgctxt, string $msgid, string $msgidPlural, int $n
  *
  * @return string translated string (or original, if not found)
  */
-function __dgettext(string $domain, string $msgid): string
+function _dgettext(string $domain, string $msgid): string
 {
-	return L10n::getInstance()->getTranslator('', '', $domain)->gettext(
+	return Loader::getInstance()->getTranslator('', '', $domain)->gettext(
 		$msgid
 	);
 }
@@ -160,9 +168,9 @@ function __dgettext(string $domain, string $msgid): string
  *
  * @return string translated plural form
  */
-function __dngettext(string $domain, string $msgid, string $msgidPlural, int $number): string
+function _dngettext(string $domain, string $msgid, string $msgidPlural, int $number): string
 {
-	return L10n::getInstance()->getTranslator('', '', $domain)->ngettext(
+	return Loader::getInstance()->getTranslator('', '', $domain)->ngettext(
 		$msgid,
 		$msgidPlural,
 		$number
@@ -178,9 +186,9 @@ function __dngettext(string $domain, string $msgid, string $msgidPlural, int $nu
  *
  * @return string translated plural form
  */
-function __dpgettext(string $domain, string $msgctxt, string $msgid): string
+function _dpgettext(string $domain, string $msgctxt, string $msgid): string
 {
-	return L10n::getInstance()->getTranslator('', '', $domain)->pgettext(
+	return Loader::getInstance()->getTranslator('', '', $domain)->pgettext(
 		$msgctxt,
 		$msgid
 	);
@@ -197,9 +205,9 @@ function __dpgettext(string $domain, string $msgctxt, string $msgid): string
  *
  * @return string translated plural form
  */
-function __dnpgettext(string $domain, string $msgctxt, string $msgid, string $msgidPlural, int $number): string
+function _dnpgettext(string $domain, string $msgctxt, string $msgid, string $msgidPlural, int $number): string
 {
-	return L10n::getInstance()->getTranslator('', '', $domain)->npgettext(
+	return Loader::getInstance()->getTranslator('', '', $domain)->npgettext(
 		$msgctxt,
 		$msgid,
 		$msgidPlural,

www/lib/CoreLibs/Template/SmartyExtend.php

@@ -32,6 +32,8 @@ class SmartyExtend extends \Smarty
 	/** @var string */
 	public $lang;
 	/** @var string */
+	public $locale_set;
+	/** @var string */
 	public $lang_short;
 	/** @var string */
 	public $domain;
@@ -164,16 +166,22 @@ class SmartyExtend extends \Smarty
 		parent::__construct();
 		// iinit lang
 		$this->l10n = $l10n;
-		// opt load functions so we can use legacy init for smarty run perhaps
-		$this->l10n->loadFunctions();
 		// parse and read, legacy stuff
 		$this->encoding = $locale['encoding'];
 		$this->lang = $locale['lang'];
 		// get first part from lang
 		$this->lang_short = explode('_', $locale['lang'])[0];
 		$this->domain = $this->l10n->getDomain();
+		$this->locale_set = $this->l10n->getLocaleSet();
 		$this->lang_dir = $this->l10n->getBaseLocalePath();
 
+		// opt load functions so we can use legacy init for smarty run perhaps
+		\CoreLibs\Language\L10n::loadFunctions();
+		_setlocale(LC_MESSAGES, $locale['locale']);
+		_textdomain($this->domain);
+		_bindtextdomain($this->domain, $this->lang_dir);
+		_bind_textdomain_codeset($this->domain, $this->encoding);
+
 		// register smarty variable
 		$this->registerPlugin('modifier', 'getvar', [&$this, 'getTemplateVars']);
 
@@ -307,16 +315,24 @@ class SmartyExtend extends \Smarty
 		}
 		// javascript translate data as template for auto translate
 		if (empty($this->TEMPLATE_TRANSLATE)) {
-			$this->TEMPLATE_TRANSLATE = 'jsTranslate_' . $this->lang . '.tpl';
+			$this->TEMPLATE_TRANSLATE = 'jsTranslate_'
+				. $this->locale_set . '.' . $this->encoding
+				. '.tpl';
 		} else {
 			// we assume we have some fixed set
 			// we must add _<$this->lang>
 			// if .tpl, put before .tpl
 			// if not .tpl, add _<$this->lang>.tpl
 			if (strpos($this->TEMPLATE_TRANSLATE, '.tpl')) {
-				$this->TEMPLATE_TRANSLATE = str_replace('.tpl', '_' . $this->lang . '.tpl', $this->TEMPLATE_TRANSLATE);
+				$this->TEMPLATE_TRANSLATE = str_replace(
+					'.tpl',
+					'-' . $this->locale_set . '.' . $this->encoding . '.tpl',
+					$this->TEMPLATE_TRANSLATE
+				);
 			} else {
-				$this->TEMPLATE_TRANSLATE .= '_' . $this->lang . '.tpl';
+				$this->TEMPLATE_TRANSLATE .= '_'
+					. $this->locale_set . '.' . $this->encoding
+					. '.tpl';
 			}
 		}
 		// if we can't find it, dump it

www/lib/Error.Handling.php

@@ -32,7 +32,8 @@ function MyErrorHandler(
 	int $line,
 	array $context = []
 ): bool {
-	if (!(error_reporting() & $type) && SHOW_ALL_ERRORS == false) {
+	/** @phpstan-ignore-next-line cannot check show all errors constant */
+	if (!(error_reporting() & $type) && SHOW_ALL_ERRORS === false) {
 		// This error code is not included in error_reporting
 		return false;
 	}

www/lib/smarty-4.1.0/libs/plugins/block.t.php

@@ -3,30 +3,19 @@
 /**
  * smarty-gettext.php - Gettext support for smarty
  *
- * ------------------------------------------------------------------------- *
- * This library is free software; you can redistribute it and/or             *
- * modify it under the terms of the GNU Lesser General Public                *
- * License as published by the Free Software Foundation; either              *
- * version 2.1 of the License, or (at your option) any later version.        *
- *                                                                           *
- * This library is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU         *
- * Lesser General Public License for more details.                           *
- *                                                                           *
- * You should have received a copy of the GNU Lesser General Public          *
- * License along with this library; if not, write to the Free Software       *
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA *
- * ------------------------------------------------------------------------- *
- *
  * To register as a smarty block function named 't', use:
  *   $smarty->register_block('t', 'smarty_translate');
  *
+ * NOTE: native php support for conext sensitive does not exist
+ * Those jumps are disabled
+ *
  * @package	smarty-gettext
  * @version	$Id: block.t.php 4738 2022-05-06 01:28:48Z clemens $
  * @link	http://smarty-gettext.sf.net/
  * @author	Sagi Bashari <sagi@boom.org.il>
  * @copyright 2004 Sagi Bashari
+ * @copyright Elan Ruusamäe
+ * @copyright Clemens Schwaighofer
  */
 
 /**
@@ -39,7 +28,7 @@
  */
 function smarty_gettext_strarg($str/*, $varargs... */)
 {
-	$tr = array();
+	$tr = [];
 	$p = 0;
 
 	$nargs = func_num_args();
@@ -68,14 +57,18 @@ function smarty_gettext_strarg($str/*, $varargs... */)
  *   - escape - sets escape mode:
  *       - 'html' for HTML escaping, this is the default.
  *       - 'js' for javascript escaping.
+ *       - 'url' for url escaping.
  *       - 'no'/'off'/0 - turns off escaping
  *   - plural - The plural version of the text (2nd parameter of ngettext())
  *   - count - The item count for plural mode (3rd parameter of ngettext())
+ *   - domain - Textdomain to be used, default if skipped (dgettext() instead of gettext())
+ *   - context - gettext context. reserved for future use.
+ *
  */
 
 // cs modified: __ calls instead of direct gettext calls
 
-function smarty_block_t($params, $text, $template, &$repeat)
+function smarty_block_t($params, $text)
 {
 	if (!isset($text)) {
 		return $text;
@@ -101,11 +94,75 @@ function smarty_block_t($params, $text, $template, &$repeat)
 		}
 	}
 
+	// get domain param
+	if (isset($params['domain'])) {
+		$domain = $params['domain'];
+		unset($params['domain']);
+	} else {
+		$domain = null;
+	}
+
+	// get context param
+	if (isset($params['context'])) {
+		$context = $params['context'];
+		unset($params['context']);
+	} else {
+		$context = null;
+	}
+
 	// use plural if required parameters are set
 	if (isset($count) && isset($plural)) {
-		$text = $template->l10n->__ngettext($text, $plural, $count);
+		if (isset($domain) && isset($context)) {
+			if (is_callable('_dnpgettext')) {
+				$text = _dnpgettext($domain, $context, $text, $plural, $count);
+			}/*  elseif (is_callable('dnpgettext')) {
+				$text = dnpgettext($domain, $context, $text, $plural, $count);
+			} */
+		} elseif (isset($domain)) {
+			if (is_callable('_dngettext')) {
+				$text = _dngettext($domain, $text, $plural, $count);
+			} elseif (is_callable('dngettext')) {
+				$text = dngettext($domain, $text, $plural, $count);
+			}
+		} elseif (isset($context)) {
+			if (is_callable('_npgettext')) {
+				$text = _npgettext($context, $text, $plural, $count);
+			}/*  elseif (is_callable('npgettext')) {
+				$text = npgettext($context, $text, $plural, $count);
+			} */
+		} else {
+			if (is_callable('_ngettext')) {
+				$text = _ngettext($text, $plural, $count);
+			} elseif (is_callable('ngettext')) {
+				$text = ngettext($text, $plural, $count);
+			}
+		}
 	} else { // use normal
-		$text = $template->l10n->__($text);
+		if (isset($domain) && isset($context)) {
+			if (is_callable('_dpgettext')) {
+				$text = _dpgettext($domain, $context, $text);
+			}/*  elseif (is_callable('dpgettext')) {
+				$text = dpgettext($domain, $context, $text);
+			} */
+		} elseif (isset($domain)) {
+			if (is_callable('_dgettext')) {
+				$text = _dgettext($domain, $text);
+			} elseif (is_callable('dpgettext')) {
+				$text = dgettext($domain, $text);
+			}
+		} elseif (isset($context)) {
+			if (is_callable('_pgettext')) {
+				$text = _pgettext($context, $text);
+			}/*  elseif (is_callable('pgettext')) {
+				$text = pgettext($context, $text);
+			} */
+		} else {
+			if (is_callable('_gettext')) {
+				$text = _gettext($text);
+			} elseif (is_callable('gettext')) {
+				$text = gettext($text);
+			}
+		}
 	}
 
 	// run strarg if there are parameters
@@ -115,6 +172,7 @@ function smarty_block_t($params, $text, $template, &$repeat)
 
 	switch ($escape) {
 		case 'html':
+			// default
 			$text = nl2br(htmlspecialchars($text));
 			break;
 		case 'javascript':
@@ -122,13 +180,29 @@ function smarty_block_t($params, $text, $template, &$repeat)
 			// javascript escape
 			$text = strtr(
 				$text,
-				array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/')
+				[
+					'\\' => '\\\\',
+					"'" => "\\'",
+					'"' => '\\"',
+					"\r" => '\\r',
+					"\n" => '\\n',
+					'</' => '<\/'
+				]
 			);
 			break;
 		case 'url':
 			// url escape
 			$text = urlencode($text);
 			break;
+		// below is a list for explicit OFF
+		case 'no':
+		case 'off':
+		case 'false':
+		case '0':
+		case 0:
+			// explicit OFF
+		default:
+			break;
 	}
 
 	return $text;