Fix DEFAULT_ENCODING that it is string

- remove not used code
- reorder defines for possible clean up targets
- TARGET and HOST_NAME are set early
HOST NAME is set right at the top
TARGET is set after site configs is read
- add more $_ENV reads
DEFAULT_ACL_LEVEL
LOCALE (encoding is read from locale which should be in the format of nn_CT.ENCODING, eg en_US.UTF-8), falls back to UTF-8
ADMIN.STYLESHEET
ADMIN.JAVASCRIPT

.eslintrc.js

@@ -1,43 +0,0 @@
-module.exports = {
-	'env': {
-		'browser': true,
-		'es6': true,
-		'commonjs': true,
-		'jquery': true
-	},
-	'extends': 'eslint:recommended',
-	'parserOptions': {
-		'ecmaVersion': 6
-	},
-	'rules': {
-		'indent': [
-			'error',
-			'tab',
-			{
-				'SwitchCase': 1
-			}
-		],
-		'linebreak-style': [
-			'error',
-			'unix'
-		],
-		'quotes': [
-			'error',
-			'single'
-		],
-		'semi': [
-			'error',
-			'always'
-		],
-		'no-console': 'off',
-		'no-unused-vars': [
-			'error', {
-				'vars': 'all',
-				'args': 'after-used',
-				'ignoreRestSiblings': false
-			}
-		],
-		// Requires eslint >= v8.14.0
-		'no-constant-binary-expression': 'error'
-	}
-};

.gitignore

@@ -5,3 +5,5 @@ vendor/
 tools/
 www/composer.lock
 www/vendor
+**/.env
+**/.target

4dev/tests/AAASetupData/requests/http_requests.php

@@ -48,7 +48,7 @@ header("Content-Type: application/json; charset=UTF-8");
 if (!empty($http_headers['HTTP_AUTHORIZATION']) && !empty($http_headers['HTTP_RUNAUTHTEST'])) {
 	header("HTTP/1.1 401 Unauthorized");
 	print buildContent($http_headers, '{"code": 401, "content": {"Error": "Not Authorized"}}');
-	exit;
+	exit(1);
 }
 
 // if server request type is get set file_get to null -> no body
@@ -57,7 +57,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") {
 } elseif (($file_get = file_get_contents('php://input')) === false) {
 	header("HTTP/1.1 404 Not Found");
 	print buildContent($http_headers, '{"code": 404, "content": {"Error": "file_get_contents failed"}}');
-	exit;
+	exit(1);
 }
 
 print buildContent($http_headers, $file_get);

4dev/tests/ACL/CoreLibsACLLoginTest.php

@@ -152,7 +152,6 @@ final class CoreLibsACLLoginTest extends TestCase
 		// TARGET
 		define('TARGET', 'test');
 		// LOGIN DB SCHEMA
-		// define('LOGIN_DB_SCHEMA', '');
 
 		// SHOULD SET
 		// DEFAULT_ACL_LEVEL (d80)

4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php

@@ -926,48 +926,114 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 	public function daysIntervalProvider(): array
 	{
 		return [
-			'valid interval /, not named array' => [
+			// normal and format tests
-				'2020/1/1',
+			'valid interval / not named array' => [
-				'2020/1/30',
+				'input_a' => '2020/1/1',
-				false,
+				'input_b' => '2020/1/30',
-				[29, 22, 8],
+				'return_named' => false, // return_named
+				'include_end_date' => true, // include_end_date
+				'exclude_start_date' => false, // exclude_start_date
+				'expected' => [30, 22, 8, false],
 			],
-			'valid interval /, named array' => [
+			'valid interval / named array' => [
-				'2020/1/1',
+				'input_a' => '2020/1/1',
-				'2020/1/30',
+				'input_b' => '2020/1/30',
-				true,
+				'return_named' => true,
-				['overall' => 29, 'weekday' => 22, 'weekend' => 8],
+				'include_end_date' => true,
+				'exclude_start_date' => false,
+				'expected' => ['overall' => 30, 'weekday' => 22, 'weekend' => 8, 'reverse' => false],
 			],
-			'valid interval -' => [
+			'valid interval with "-"' => [
-				'2020-1-1',
+				'input_a' => '2020-1-1',
-				'2020-1-30',
+				'input_b' => '2020-1-30',
-				false,
+				'return_named' => false,
-				[29, 22, 8],
+				'include_end_date' => true,
-			],
+				'exclude_start_date' => false,
-			'valid interval switched' => [
+				'expected' => [30, 22, 8, false],
-				'2020/1/30',
-				'2020/1/1',
-				false,
-				[28, 0, 0],
 			],
 			'valid interval with time' => [
-				'2020/1/1 12:12:12',
+				'input_a' => '2020/1/1 12:12:12',
-				'2020/1/30 13:13:13',
+				'input_b' => '2020/1/30 13:13:13',
-				false,
+				'return_named' => false,
-				[28, 21, 8],
+				'include_end_date' => true,
+				'exclude_start_date' => false,
+				'expected' => [30, 22, 8, false],
 			],
+			// invalid
 			'invalid dates' => [
-				'abc',
+				'input_a' => 'abc',
-				'xyz',
+				'input_b' => 'xyz',
-				false,
+				'return_named' => false,
-				[0, 0, 0]
+				'include_end_date' => true,
+				'exclude_start_date' => false,
+				'expected' => [0, 0, 0, false]
 			],
-			// this test will take a long imte
+			// this test will take a long time
 			'out of bound dates' => [
-				'1900-1-1',
+				'input_a' => '1900-1-1',
-				'9999-12-31',
+				'input_b' => '9999-12-31',
-				false,
+				'return_named' => false,
-				[2958463,2113189,845274],
+				'include_end_date' => true,
+				'exclude_start_date' => false,
+				'expected' => [2958463, 2113189, 845274, false],
+			],
+			// tests for include/exclude
+			'exclude end date' => [
+				'input_b' => '2020/1/1',
+				'input_a' => '2020/1/30',
+				'return_named' => false,
+				'include_end_date' => false,
+				'exclude_start_date' => false,
+				'expected' => [29, 21, 8, false],
+			],
+			'exclude start date' => [
+				'input_b' => '2020/1/1',
+				'input_a' => '2020/1/30',
+				'return_named' => false,
+				'include_end_date' => true,
+				'exclude_start_date' => true,
+				'expected' => [29, 21, 8, false],
+			],
+			'exclude start and end date' => [
+				'input_b' => '2020/1/1',
+				'input_a' => '2020/1/30',
+				'return_named' => false,
+				'include_end_date' => false,
+				'exclude_start_date' => true,
+				'expected' => [28, 20, 8, false],
+			],
+			// reverse
+			'reverse: valid interval' => [
+				'input_a' => '2020/1/30',
+				'input_b' => '2020/1/1',
+				'return_named' => false,
+				'include_end_date' => true,
+				'exclude_start_date' => false,
+				'expected' => [30, 22, 8, true],
+			],
+			'reverse: exclude end date' => [
+				'input_a' => '2020/1/30',
+				'input_b' => '2020/1/1',
+				'return_named' => false,
+				'include_end_date' => false,
+				'exclude_start_date' => false,
+				'expected' => [29, 21, 8, true],
+			],
+			'reverse: exclude start date' => [
+				'input_a' => '2020/1/30',
+				'input_b' => '2020/1/1',
+				'return_named' => false,
+				'include_end_date' => true,
+				'exclude_start_date' => true,
+				'expected' => [29, 21, 8, true],
+			],
+			'reverse: exclude start and end date' => [
+				'input_a' => '2020/1/30',
+				'input_b' => '2020/1/1',
+				'return_named' => false,
+				'include_end_date' => false,
+				'exclude_start_date' => true,
+				'expected' => [28, 20, 8, true],
 			],
 		];
 	}
@@ -982,19 +1048,27 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 	 *
 	 * @param string $input_a
 	 * @param string $input_b
-	 * @param bool   $flag
+	 * @param bool   $return_named
-	 * @param array $expected
+	 * @param array  $expected
 	 * @return void
 	 */
 	public function testCalcDaysInterval(
 		string $input_a,
 		string $input_b,
-		bool $flag,
+		bool $return_named,
+		bool $include_end_date,
+		bool $exclude_start_date,
 		$expected
 	): void {
 		$this->assertEquals(
 			$expected,
-			\CoreLibs\Combined\DateTime::calcDaysInterval($input_a, $input_b, $flag)
+			\CoreLibs\Combined\DateTime::calcDaysInterval(
+				$input_a,
+				$input_b,
+				return_named:$return_named,
+				include_end_date:$include_end_date,
+				exclude_start_date:$exclude_start_date
+			)
 		);
 	}
 
@@ -1187,7 +1261,38 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				'2023-07-03',
 				'2023-07-27',
 				true
-			]
+			],
+			// reverse
+			'reverse: no weekend' => [
+				'2023-07-04',
+				'2023-07-03',
+				false
+			],
+			'reverse: start weekend sat' => [
+				'2023-07-04',
+				'2023-07-01',
+				true
+			],
+			'reverse: start weekend sun' => [
+				'2023-07-04',
+				'2023-07-02',
+				true
+			],
+			'reverse: end weekend sat' => [
+				'2023-07-08',
+				'2023-07-03',
+				true
+			],
+			'reverse: end weekend sun' => [
+				'2023-07-09',
+				'2023-07-03',
+				true
+			],
+			'reverse: long period > 6 days' => [
+				'2023-07-27',
+				'2023-07-03',
+				true
+			],
 		];
 	}
 

4dev/tests/UrlRequests/CoreLibsUrlRequestsCurlTest.php

@@ -969,44 +969,76 @@ final class CoreLibsUrlRequestsCurlTest extends TestCase
 			"query" => ["foo-get" => "bar"]
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: get response code not matching");
-		$this->assertEquals(
+		if (PHP_VERSION_ID >= 80400) {
-			'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+			$this->assertEquals(
-			. '"HTTP_FIRST_CALL":"get","HTTP_ACCEPT":"*\/*",'
+				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-			. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1","HTTP_FIRST_CALL":"get",'
-			. '"REQUEST_TYPE":"GET",'
+				. '"HTTP_ACCEPT":"*\/*"},"REQUEST_TYPE":"GET","PARAMS":{"foo-get":"bar"},"BODY":null}',
-			. '"PARAMS":{"foo-get":"bar"},"BODY":null}',
+				$response['content'],
-			$response['content'],
+				'multi call: get content not matching'
-			'multi call: get content not matching'
+			);
-		);
+		} else {
+			$this->assertEquals(
+				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+				. '"HTTP_FIRST_CALL":"get","HTTP_ACCEPT":"*\/*",'
+				. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"REQUEST_TYPE":"GET",'
+				. '"PARAMS":{"foo-get":"bar"},"BODY":null}',
+				$response['content'],
+				'multi call: get content not matching'
+			);
+		}
 		// post
 		$response = $curl->post($this->url_basic, [
 			"headers" => ["second-call" => "post"],
 			"body" => ["foo-post" => "baz"]
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: post response code not matching");
-		$this->assertEquals(
+		if (PHP_VERSION_ID >= 80400) {
-			'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+			$this->assertEquals(
-			. '"HTTP_SECOND_CALL":"post","HTTP_ACCEPT":"*\/*",'
+				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-			. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-			. '"REQUEST_TYPE":"POST",'
+				. '"HTTP_SECOND_CALL":"post","HTTP_ACCEPT":"*\/*"},'
-			. '"PARAMS":[],"BODY":{"foo-post":"baz"}}',
+				. '"REQUEST_TYPE":"POST","PARAMS":[],"BODY":{"foo-post":"baz"}}',
-			$response['content'],
+				$response['content'],
-			'multi call: post content not matching'
+				'multi call: post content not matching'
-		);
+			);
+		} else {
+			$this->assertEquals(
+				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+				. '"HTTP_SECOND_CALL":"post","HTTP_ACCEPT":"*\/*",'
+				. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"REQUEST_TYPE":"POST",'
+				. '"PARAMS":[],"BODY":{"foo-post":"baz"}}',
+				$response['content'],
+				'multi call: post content not matching'
+			);
+		}
 		// delete
 		$response = $curl->delete($this->url_basic, [
 			"headers" => ["third-call" => "delete"],
 		]);
 		$this->assertEquals("200", $response["code"], "multi call: delete response code not matching");
-		$this->assertEquals(
+		if (PHP_VERSION_ID >= 80400) {
-			'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+			$this->assertEquals(
-			. '"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*",'
+				'{"HEADERS":{"HTTP_HOST":"soba.egplusww.jp",'
-			. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
-			. '"REQUEST_TYPE":"DELETE",'
+				. '"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*"},'
-			. '"PARAMS":[],"BODY":[]}',
+				. '"REQUEST_TYPE":"DELETE","PARAMS":[],"BODY":[]}',
-			$response['content'],
+				$response['content'],
-			'multi call: delete content not matching'
+				'multi call: delete content not matching'
-		);
+			);
+		} else {
+			$this->assertEquals(
+				'{"HEADERS":{"HTTP_USER_AGENT":"CoreLibsUrlRequestCurl\/1",'
+				. '"HTTP_THIRD_CALL":"delete","HTTP_ACCEPT":"*\/*",'
+				. '"HTTP_HOST":"soba.egplusww.jp"},'
+				. '"REQUEST_TYPE":"DELETE",'
+				. '"PARAMS":[],"BODY":[]}',
+				$response['content'],
+				'multi call: delete content not matching'
+			);
+		}
 	}
 
 	// MARK: auth header set via config

eslint.config.mjs

@@ -0,0 +1,59 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+
+/*
+module.exports = {
+	// in globals block
+	'extends': 'eslint:recommended',
+	'parserOptions': {
+		'ecmaVersion': 6
+	},
+	// rules copied
+};
+*/
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+	{languageOptions: {
+		globals: {
+			...globals.browser,
+			...globals.jquery
+		}
+	}},
+	pluginJs.configs.recommended,
+	{
+		'rules': {
+			'indent': [
+				'error',
+				'tab',
+				{
+					'SwitchCase': 1
+				}
+			],
+			'linebreak-style': [
+				'error',
+				'unix'
+			],
+			// 'quotes': [
+			// 	'error',
+			// 	'single'
+			// ],
+			'semi': [
+				'error',
+				'always'
+			],
+			'no-console': 'off',
+			'no-unused-vars': [
+				'error', {
+					'vars': 'all',
+					'args': 'after-used',
+					'ignoreRestSiblings': false
+				}
+			],
+			// Requires eslint >= v8.14.0
+			'no-constant-binary-expression': 'error'
+		}
+	}
+];
+
+// __END__

jsconfig.json

@@ -1,9 +1,11 @@
+// https://www.typescriptlang.org/tsconfig/#compilerOptions
 {
 	"compilerOptions": {
 		"module": "ESNext",
 		"moduleResolution": "Node",
 		"target": "ES2020",
 		"jsx": "react",
+		"checkJs": true,
 		"allowImportingTsExtensions": true,
 		"strictNullChecks": true,
 		"strictFunctionTypes": true

package.json

@@ -0,0 +1,17 @@
+{
+	"name": "core-libraries",
+	"version": "9.26.8",
+	"main": "",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"author": "Clemens Schwaighofer",
+	"license": "",
+	"description": "Core Libraries",
+	"devDependencies": {
+		"@eslint/js": "^9.20.0",
+		"esbuild": "^0.25.0",
+		"eslint": "^9.20.1",
+		"globals": "^15.15.0"
+	}
+}

phpstan-bootstrap.php

@@ -10,5 +10,6 @@ $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
 define('BASE_NAME', '');
 define('SITE_DOMAIN', '');
 define('HOST_NAME', 'soba.tokyo.tequila.jp');
+define('DEFAULT_ENCODING', 'en_US.UTF-8');
 
 // __END__

www/admin/UrlRequests.target.php

@@ -52,7 +52,7 @@ header("Content-Type: application/json; charset=UTF-8");
 if (!empty($http_headers['HTTP_AUTHORIZATION']) && !empty($http_headers['HTTP_RUNAUTHTEST'])) {
 	header("HTTP/1.1 401 Unauthorized");
 	print buildContent($http_headers, '{"code": 401, "content": {"Error": "Not Authorized"}}');
-	exit;
+	exit(1);
 }
 
 // if server request type is get set file_get to null -> no body
@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") {
 } elseif (($file_get = file_get_contents('php://input')) === false) {
 	header("HTTP/1.1 404 Not Found");
 	print buildContent($http_headers, '{"code": 404, "content": {"Error": "file_get_contents failed"}}');
-	exit;
+	exit(1);
 }
 // str_replace('\"', '"', trim($file_get, '"'));
 

www/admin/class_test.datetime.php

@@ -268,7 +268,9 @@ foreach ($compare_datetimes as $compare_datetime) {
 	print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: "
 		. (string)DateTime::compareDateTime($compare_datetime[0], $compare_datetime[1]) . "<br>";
 }
+
 print "<hr>";
+print "<h2>calcDaysInterval</h2>";
 $compare_dates = [
 	[ '2021-05-01', '2021-05-10', ],
 	[ '2021-05-10', '2021-05-01', ],
@@ -279,9 +281,21 @@ foreach ($compare_dates as $compare_date) {
 	print "CALCDAYSINTERVAL: $compare_date[0] = $compare_date[1]: "
 		. DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1])) . "<br>";
 	print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: "
-		. DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true)) . "<br>";
+		. DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], return_named:true)) . "<br>";
+	print "CALCDAYSINTERVAL(EXCLUDE END): $compare_date[0] = $compare_date[1]: "
+		. Dgs::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], include_end_date:false));
+	print "CALCDAYSINTERVAL(EXCLUDE START): $compare_date[0] = $compare_date[1]: "
+		. Dgs::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], exclude_start_date:true));
+	print "CALCDAYSINTERVAL(EXCLUDE END, EXCLUDE START): $compare_date[0] = $compare_date[1]: "
+		. Dgs::printAr(DateTime::calcDaysInterval(
+			$compare_date[0],
+			$compare_date[1],
+			include_end_date:false,
+			exclude_start_date:true
+		));
 }
 print "<hr>";
+print "<h2>setWeekdayNameFromIsoDow</h2>";
 // test date conversion
 $dow = 2;
 print "DOW[$dow]: " . DateTime::setWeekdayNameFromIsoDow($dow) . "<br>";
@@ -297,26 +311,25 @@ $date = '2022-70-242';
 print "DATE-dow[$date];invalid: " . DateTime::setWeekdayNameFromDate($date) . "<br>";
 print "DATE-dow[$date],long;invalid: " . DateTime::setWeekdayNameFromDate($date, true) . "<br>";
 print "DOW-date[$date];invalid: " . DateTime::setWeekdayNumberFromDate($date) . "<br>";
-print "<hr>";
-// check date range includes a weekend
-// does not:
-$start_date = '2023-07-03';
-$end_date = '2023-07-05';
-print "Has Weekend: " . $start_date . " ~ " . $end_date . ": "
-	. Dgs::prBl(DateTime::dateRangeHasWeekend($start_date, $end_date)) . "<br>";
-$start_date = '2023-07-03';
-$end_date = '2023-07-10';
-print "Has Weekend: " . $start_date . " ~ " . $end_date . ": "
-	. Dgs::prBl(DateTime::dateRangeHasWeekend($start_date, $end_date)) . "<br>";
-$start_date = '2023-07-03';
-$end_date = '2023-07-31';
-print "Has Weekend: " . $start_date . " ~ " . $end_date . ": "
-	. Dgs::prBl(DateTime::dateRangeHasWeekend($start_date, $end_date)) . "<br>";
-$start_date = '2023-07-01';
-$end_date = '2023-07-03';
-print "Has Weekend: " . $start_date . " ~ " . $end_date . ": "
-	. Dgs::prBl(DateTime::dateRangeHasWeekend($start_date, $end_date)) . "<br>";
 
+print "<hr>";
+print "<h2>dateRangeHasWeekend</h2>";
+// check date range includes a weekend
+$has_weekend_list = [
+	['2023-07-03', '2023-07-05'],
+	['2023-07-03', '2023-07-10'],
+	['2023-07-03', '2023-07-31'],
+	['2023-07-01', '2023-07-03'],
+	['2023-07-01', '2023-07-01'],
+	['2023-07-01', '2023-07-02'],
+	['2023-06-30', '2023-07-01'],
+	['2023-06-30', '2023-06-30'],
+	['2023-07-01', '2023-06-30'],
+];
+foreach ($has_weekend_list as $days) {
+	print "Has Weekend: " . $days[0] . " ~ " . $days[1] . ": "
+		. Dgs::prBl(DateTime::dateRangeHasWeekend($days[0], $days[1])) . "<br>";
+}
 
 print "</body></html>";
 

www/admin/layout/javascript/edit.jq.js

@@ -1,8 +1,6 @@
 /* general edit javascript */
 /* jquery version */
 
-/* jshint esversion: 11 */
-
 /* global i18n */
 
 // debug set
@@ -18,6 +16,21 @@ if (!DEBUG) {
 var GL_OB_S = 100;
 var GL_OB_BASE = 100;
 
+/**
+ * Gets html element or throws an error
+ * @param {string} el_id Element ID to get
+ * @returns {HTMLElement}
+ * @throws Error
+ */
+function loadEl(el_id)
+{
+	let el = document.getElementById(el_id);
+	if (el === null) {
+		throw new Error('Cannot find: ' + el_id);
+	}
+	return el;
+}
+
 /**
  * opens a popup window with winName and given features (string)
  * @param {String} theURL   the url
@@ -156,6 +169,18 @@ function goToPos(element, offset = 0, duration = 500, base = 'body,html') // esl
 	}
 }
 
+/**
+ * go to element, scroll
+ * non jquery
+ * @param {string} target
+*/
+function goTo(target) // eslint-disable-line no-unused-vars
+{
+	loadEl(target).scrollIntoView({
+		behavior: 'smooth'
+	});
+}
+
 /**
  * uses the i18n object created in the translation template
  * that is filled from gettext in PHP
@@ -402,9 +427,9 @@ function keyInObject(key, object)
 
 /**
  * returns matching key of value
- * @param  {Object} obj   object to search value in
+ * @param  {Object} object object to search value in
- * @param  {Mixed}  value any value (String, Number, etc)
+ * @param  {Mixed}  value  any value (String, Number, etc)
- * @return {String}       the key found for the first matching value
+ * @return {String}        the key found for the first matching value
  */
 function getKeyByValue(object, value) // eslint-disable-line no-unused-vars
 {
@@ -416,9 +441,9 @@ function getKeyByValue(object, value) // eslint-disable-line no-unused-vars
 
 /**
  * returns true if value is found in object with a key
- * @param  {Object}  obj   object to search value in
+ * @param  {Object}  object object to search value in
- * @param  {Mixed}   value any value (String, Number, etc)
+ * @param  {Mixed}   value  any value (String, Number, etc)
- * @return {Boolean}       true on value found, false on not found
+ * @return {Boolean}        true on value found, false on not found
  */
 function valueInObject(object, value) // eslint-disable-line no-unused-vars
 {
@@ -533,22 +558,20 @@ function errorCatch(err)
 	if (err.stack) {
 		// only FF
 		if (err.lineNumber) {
-			console.log('ERROR[%s:%s] %s', err.name, err.lineNumber, err.message);
+			console.error('ERROR[%s:%s] ', err.name, err.lineNumber, err);
 		} else if (err.line) {
 			// only Safari
-			console.log('ERROR[%s:%s] %s', err.name, err.line, err.message);
+			console.error('ERROR[%s:%s] ', err.name, err.line, err);
 		} else {
-			console.log('ERROR[%s] %s', err.name, err.message);
+			console.error('ERROR[%s] ', err.name, err);
 		}
-		// stack trace
-		console.log('ERROR[stack] %s', err.stack);
 	} else if (err.number) {
 		// IE
-		console.log('ERROR[%s:%s] %s', err.name, err.number, err.message);
+		console.error('ERROR[%s:%s] %s', err.name, err.number, err.message);
-		console.log('ERROR[description] %s', err.description);
+		console.error('ERROR[description] %s', err.description);
 	} else {
 		// the rest
-		console.log('ERROR[%s] %s', err.name, err.message);
+		console.error('ERROR[%s] %s', err.name, err.message);
 	}
 }
 
@@ -800,7 +823,7 @@ function showOverlayBoxLayers(el_id) // eslint-disable-line no-unused-vars
  * else just set zIndex to the new GL_OB_S value
  * @param {String} el_id Target to hide layer
  */
-function hideOverlayBoxLayers(el_id)
+function hideOverlayBoxLayers(el_id='')
 {
 	// console.log('HIDE overlaybox: %s', GL_OB_S);
 	// remove on layer
@@ -1113,7 +1136,9 @@ function phfa(list) // eslint-disable-line no-unused-vars
 function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '') // eslint-disable-line no-unused-vars
 {
 	// wrapper to new call
-	return html_options_block(name, data, selected, false, options_only, return_string, sort);
+	return html_options_block(
+		name, data, selected, 0, options_only, return_string, sort
+	);
 }
 
 /**
@@ -1135,8 +1160,9 @@ function html_options(name, data, selected = '', options_only = false, return_st
  * @param  {String}  [onchange='']         onchange trigger call, default unset
  * @return {String}                        html with build options block
  */
-function html_options_block(name, data, selected = '', multiple = 0, options_only = false, return_string = false, sort = '', onchange = '')
+function html_options_block(
-{
+	name, data, selected = '', multiple = 0, options_only = false, return_string = false, sort = '', onchange = ''
+) {
 	var content = [];
 	var element_select;
 	var select_options = {};
@@ -1173,7 +1199,8 @@ function html_options_block(name, data, selected = '', multiple = 0, options_onl
 		// basic options init
 		options = {
 			'label': value,
-			'value': key
+			'value': key,
+			'selected': ''
 		};
 		// add selected if matching
 		if (multiple == 0 && !Array.isArray(selected) && selected == key) {
@@ -1184,7 +1211,7 @@ function html_options_block(name, data, selected = '', multiple = 0, options_onl
 			options.selected = '';
 		}
 		// create the element option
-		element_option = cel('option', '', value, '', options);
+		element_option = cel('option', '', value, [], options);
 		// attach it to the select element
 		ael(element_select, element_option);
 	}
@@ -1236,7 +1263,7 @@ function html_options_refill(name, data, sort = '') // eslint-disable-line no-un
 		[].forEach.call(document.querySelectorAll('#' + name + ' :checked'), function(elm) {
 			option_selected = elm.value;
 		});
-		document.getElementById(name).innerHTML = '';
+		loadEl(name).innerHTML = '';
 		for (const key of data_list) {
 			value = data[key];
 			// console.log('add [%s]  options: key: %s, value: %s', name, key, value);
@@ -1247,7 +1274,7 @@ function html_options_refill(name, data, sort = '') // eslint-disable-line no-un
 			if (key == option_selected) {
 				element_option.selected = true;
 			}
-			document.getElementById(name).appendChild(element_option);
+			loadEl(name).appendChild(element_option);
 		}
 	}
 }
@@ -1311,7 +1338,7 @@ function parseQueryString(query = '', return_key = '') // eslint-disable-line no
  *                                        all parameters are returned
  * @param  {String}        [query='']     different query string to parse, if not
  *                                        set (default) the current window href is used
- * @param  {Bool}          [single=false] if set to true then only the first found
+ * @param  {Boolean}       [single=false] if set to true then only the first found
  *                                        will be returned
  * @return {Object|Array|String}          if search is empty, object, if search is set
  *                                        and only one entry, then string, else array
@@ -1323,7 +1350,7 @@ function getQueryStringParam(search = '', query = '', single = false) // eslint-
 		query = window.location.href;
 	}
 	const url = new URL(query);
-	let param = '';
+	let param = null;
 	if (search) {
 		let _params = url.searchParams.getAll(search);
 		if (_params.length == 1 || single === true) {

www/configs/.target.example

@@ -0,0 +1,3 @@
+# target can be live, stage, test, dev
+# this overrides the SITE set "location" entry
+TARGET=

www/configs/config.master.php

@@ -78,42 +78,11 @@ define('TEMPLATES_C', 'templates_c' . DIRECTORY_SEPARATOR);
 // template base
 define('TEMPLATES', 'templates' . DIRECTORY_SEPARATOR);
 
-/************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
+/************* HASH / ACL DEFAULT *************/
 // default hash type
 define('DEFAULT_HASH', 'sha256');
 // default acl level
-define('DEFAULT_ACL_LEVEL', 80);
+define('DEFAULT_ACL_LEVEL', $ENV['DEFAULT_ACL_LEVEL'] ?? 80);
-// SSL host name
-// define('SSL_HOST', $_ENV['SSL_HOST'] ?? '');
-// error page strictness, Default is 3
-// 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
-// 2: if template not found, do not search, show error template
-// 3: if default template is not found, show error template, do not fall back to default tree
-// 4: very strict, even on normal fixable errors through error
-// define('ERROR_STRICT', 3);
-// allow page caching in general, set to 'false' if you do debugging or development!
-// define('ALLOW_SMARTY_CACHE', false);
-// cache life time, in second', default here is 2 days (172800s)
-// -1 is never expire cache
-// define('SMARTY_CACHE_LIFETIME', -1);
-
-/************* LOGOUT ********************/
-// logout target
-define('LOGOUT_TARGET', '');
-
-/************* AJAX / ACCESS *************/
-// ajax request type
-define('AJAX_REQUEST_TYPE', 'POST');
-// what AJAX type to use
-define('USE_PROTOTYPE', false);
-define('USE_SCRIPTACULOUS', false);
-define('USE_JQUERY', true);
-
-/************* LAYOUT WIDTHS *************/
-define('PAGE_WIDTH', '100%');
-define('CONTENT_WIDTH', '100%');
-// the default template name
-define('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 
 /************* OVERALL CONTROL NAMES *************/
 // BELOW has HAS to be changed
@@ -136,24 +105,15 @@ define('COMPILE_ID', 'COMPILE_' . BASE_NAME . '_' . SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
 // default lang + encoding
-define('DEFAULT_LOCALE', 'en_US.UTF-8');
+define('DEFAULT_LOCALE', $_ENV['LOCALE'] ?? 'en_US.UTF-8');
 // default web page encoding setting
-define('DEFAULT_ENCODING', 'UTF-8');
+define('DEFAULT_ENCODING', (string)array_pad(explode('.', DEFAULT_LOCALE, 2), 2, 'UTF-8')[1]);
 
-/************* QUEUE TABLE *************/
+/************* HOST NAME *****************/
-// if we have a dev/live system
+// get the name without the port
-// set_live is a per page/per item
+list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
-// live_queue is a global queue system
+// set HOST name
-// define('QUEUE', 'live_queue');
+define('HOST_NAME', $HOST_NAME);
-
-/************* DB PATHS (PostgreSQL) *****************/
-// schema names, can also be defined per <DB INFO>
-define('PUBLIC_SCHEMA', 'public');
-define('DEV_SCHEMA', 'public');
-define('TEST_SCHEMA', 'public');
-define('LIVE_SCHEMA', 'public');
-define('GLOBAL_DB_SCHEMA', '');
-define('LOGIN_DB_SCHEMA', '');
 
 /************* CORE HOST SETTINGS *****************/
 if (file_exists(BASE . CONFIGS . 'config.host.php')) {
@@ -162,6 +122,14 @@ if (file_exists(BASE . CONFIGS . 'config.host.php')) {
 if (!isset($SITE_CONFIG)) {
 	$SITE_CONFIG = [];
 }
+// BAIL ON MISSING MASTER SITE CONFIG
+if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
+	throw new \InvalidArgumentException(
+		'Missing SITE_CONFIG entry for: "' . HOST_NAME . '". Contact Administrator'
+	);
+}
+// set target first
+define('TARGET', $_ENV['TARGET'] ?? $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
 /************* DB ACCESS *****************/
 if (file_exists(BASE . CONFIGS . 'config.db.php')) {
 	require BASE . CONFIGS . 'config.db.php';
@@ -175,17 +143,6 @@ if (file_exists(BASE . CONFIGS . 'config.path.php')) {
 }
 
 /************* MASTER INIT *****************/
-// live frontend pages
-// ** missing live domains **
-// get the name without the port
-[$HOST_NAME] = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
-// set HOST name
-define('HOST_NAME', $HOST_NAME);
-// BAIL ON MISSING MASTER SITE CONFIG
-if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
-	echo 'Missing SITE_CONFIG entry for: "' . HOST_NAME . '". Contact Administrator';
-	exit;
-}
 // BAIL ON MISSING DB CONFIG:
 // we have either no db selction for this host but have db config entries
 // or we have a db selection but no db config as array or empty
@@ -200,8 +157,9 @@ if (
 		empty($DB_CONFIG[$SITE_CONFIG[HOST_NAME]['db_host']]))
 	)
 ) {
-	echo 'No matching DB config found for: "' . HOST_NAME . '". Contact Administrator';
+	throw new \InvalidArgumentException(
-	exit;
+		'No matching DB config found for: "' . HOST_NAME . '". Contact Administrator'
+	);
 }
 // set SSL on
 $is_secure = false;
@@ -235,35 +193,31 @@ define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? [
 ]);
 // because we can't change constant, but we want to for db debug flag
 $GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
-// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
-// override for login and global schemas
-// where the edit* tables are
-// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA);
-// where global tables are that are used by all schemas (eg queue tables for online, etc)
-// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA);
 // debug settings, site lang, etc
-define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
 define('DEBUG_LEVEL', $SITE_CONFIG[HOST_NAME]['debug_level'] ?? 'debug');
 define('SITE_LOCALE', $SITE_CONFIG[HOST_NAME]['site_locale'] ?? DEFAULT_LOCALE);
 define('SITE_DOMAIN', str_replace(DIRECTORY_SEPARATOR, '', CONTENT_PATH));
 define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCODING);
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
-// paths
-// define('CSV_PATH', $PATHS[TARGET]['csv_path'] ?? '');
-// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? '');
-// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? '');
 
+// NOTE: everything below is smarty related and should be removed from here
 /************* GENERAL PAGE TITLE ********/
 define('G_TITLE', $_ENV['G_TITLE'] ?? '');
-
+/************* LAYOUT WIDTHS *************/
+define('PAGE_WIDTH', $_ENV['SMARTY.PAGE_WIDTH'] ?? '100%');
+define('CONTENT_WIDTH', $_ENV['SMARTY.CONTENT_WIDTH'] ?? '100%');
+// the default template name
+define('MASTER_TEMPLATE_NAME', $_ENV['MASTER_TEMPLATE_NAME'] ?? 'main_body.tpl');
+/************* JS LIBRARIES *************/
+define('USE_PROTOTYPE', false);
+define('USE_SCRIPTACULOUS', false);
+define('USE_JQUERY', true);
 /************ STYLE SHEETS / JS **********/
-define('ADMIN_STYLESHEET', 'edit.css');
+define('ADMIN_STYLESHEET', $_ENV['ADMIN.STYLESHEET'] ?? 'edit.css');
-define('ADMIN_JAVASCRIPT', 'edit.js');
+define('ADMIN_JAVASCRIPT', $_ENV['ADMIN.JAVASCRIPT'] ?? 'edit.js');
 define('STYLESHEET', $_ENV['STYLESHEET'] ?? 'frontend.css');
 define('JAVASCRIPT', $_ENV['JAVASCRIPT'] ?? 'frontend.js');
-
 // anything optional
 /************* INTERNAL ******************/
 // any other global definitons in the config.other.php

www/configs/config.other.php

@@ -15,6 +15,12 @@ define('EDIT_BASE_STYLESHEET', 'edit.css');
 
 // define('SOME_ID', <SOME VALUE>);
 
+/************* QUEUE TABLE *************/
+// if we have a dev/live system
+// set_live is a per page/per item
+// live_queue is a global queue system
+// define('QUEUE', 'live_queue');
+
 /************* CONVERT *******************/
 // this only needed if the external thumbnail create is used
 $paths = [

www/configs/config.path.php

@@ -35,4 +35,9 @@ define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
 	],
 ];*/
 
+// paths
+// define('CSV_PATH', $PATHS[TARGET]['csv_path'] ?? '');
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? '');
+// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? '');
+
 // __END__

www/configs/config.php

@@ -53,6 +53,11 @@ for (
 		\gullevek\dotEnv\DotEnv::readEnvFile(
 			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH
 		);
+		// load target file if it exists
+		\gullevek\dotEnv\DotEnv::readEnvFile(
+			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH,
+			'.target'
+		);
 		// load master config file that loads all other config files
 		require $__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
 		break;

www/lib/CoreLibs/ACL/Login.php

@@ -423,14 +423,9 @@ class Login
 
 		// LOGOUT TARGET
 		if (!isset($options['logout_target'])) {
-			if (defined('LOGOUT_TARGET')) {
+			// defaults to ''
-				trigger_error(
+			$options['logout_target'] = '';
-					'loginMainCall: LOGOUT_TARGET should not be used',
+			$this->logout_target = $options['logout_target'];
-					E_USER_DEPRECATED
-				);
-				$options['logout_target'] = LOGOUT_TARGET;
-				$this->logout_target = $options['logout_target'];
-			}
 		}
 
 		// *** PASSWORD SETTINGS
@@ -1560,6 +1555,7 @@ class Login
 				'uid' => $unit['uid'],
 				'cuuid' => $unit['cuuid'],
 				'level' => $this->default_acl_list[$this->acl['unit'][$ea_cuid]]['name'] ?? -1,
+				'level_number' => $this->acl['unit'][$ea_cuid],
 				'default' => $unit['default'],
 				'data' => $unit['data'],
 				'additional_acl' => $unit['additional_acl']
@@ -2538,7 +2534,7 @@ HTML;
 				$this->login_user_id,
 				-1,
 				$login_user_id_changed
-			);
+			) ?? '';
 			// flag unclean input data
 			if ($login_user_id_changed > 0) {
 				$this->login_user_id_unclear = true;

www/lib/CoreLibs/Admin/EditBase.php

@@ -76,7 +76,7 @@ class EditBase
 		);
 		if ($this->form->mobile_phone) {
 			echo "I am sorry, but this page cannot be viewed by a mobile phone";
-			exit;
+			exit(1);
 		}
 		// $this->log->debug('POST', $this->log->prAr($_POST));
 	}

www/lib/CoreLibs/Basic.php

@@ -103,11 +103,7 @@ class Basic
 				'VIDEOS', 'DOCUMENTS', 'PDFS', 'BINARIES', 'ICONS', 'UPLOADS', 'CSV', 'JS',
 				'CSS', 'TABLE_ARRAYS', 'SMARTY', 'LANG', 'CACHE', 'TMP', 'LOG', 'TEMPLATES',
 				'TEMPLATES_C', 'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
-				'DEFAULT_ACL_LEVEL', 'LOGOUT_TARGET', 'PASSWORD_CHANGE', 'AJAX_REQUEST_TYPE',
+				'DB_CONFIG_NAME', 'DB_CONFIG', 'TARGET'
-				'USE_PROTOTYPE', 'USE_SCRIPTACULOUS', 'USE_JQUERY', 'PAGE_WIDTH',
-				'MASTER_TEMPLATE_NAME', 'PUBLIC_SCHEMA', 'TEST_SCHEMA', 'DEV_SCHEMA',
-				'LIVE_SCHEMA', 'DB_CONFIG_NAME', 'DB_CONFIG', 'TARGET', 'DEBUG',
-				'SHOW_ALL_ERRORS'
 			] as $constant
 		) {
 			if (!defined($constant)) {

www/lib/CoreLibs/Combined/DateTime.php

@@ -639,16 +639,26 @@ class DateTime
 	 *
 	 * @param  string $start_date   valid start date (y/m/d)
 	 * @param  string $end_date     valid end date (y/m/d)
-	 * @param  bool   $return_named return array type, false (default), true for named
+	 * @param  bool   $return_named [default=false] return array type, false (default), true for named
-	 * @return array<mixed>         0/overall, 1/weekday, 2/weekend
+	 * @param  bool   $include_end_date [default=true] include end date in calc
+	 * @param  bool   $exclude_start_date [default=false] include end date in calc
+	 * @return array{0:int,1:int,2:int,3:bool}|array{overall:int,weekday:int,weekend:int,reverse:bool}
+	 *                0/overall, 1/weekday, 2/weekend, 3/reverse
 	 */
 	public static function calcDaysInterval(
 		string $start_date,
 		string $end_date,
-		bool $return_named = false
+		bool $return_named = false,
+		bool $include_end_date = true,
+		bool $exclude_start_date = false
 	): array {
 		// pos 0 all, pos 1 weekday, pos 2 weekend
-		$days = [];
+		$days = [
+			0 => 0,
+			1 => 0,
+			2 => 0,
+			3 => false,
+		];
 		// if anything invalid, return 0,0,0
 		try {
 			$start = new \DateTime($start_date);
@@ -659,19 +669,30 @@ class DateTime
 					'overall' => 0,
 					'weekday' => 0,
 					'weekend' => 0,
+					'reverse' => false
 				];
 			} else {
-				return [0, 0, 0];
+				return $days;
 			}
 		}
 		// so we include the last day too, we need to add +1 second in the time
-		$end->setTime(0, 0, 1);
+		// if start is before end, switch dates and flag
-		// if end date before start date, only this will be filled
+		$days[3] = false;
-		$days[0] = $end->diff($start)->days;
+		if ($start > $end) {
-		$days[1] = 0;
+			$new_start = $end;
-		$days[2] = 0;
+			$end = $start;
+			$start = $new_start;
+			$days[3] = true;
+		}
 		// get period for weekends/weekdays
-		$period = new \DatePeriod($start, new \DateInterval('P1D'), $end);
+		$options = 0;
+		if ($include_end_date) {
+			$options |= \DatePeriod::INCLUDE_END_DATE;
+		}
+		if ($exclude_start_date) {
+			$options |= \DatePeriod::EXCLUDE_START_DATE;
+		}
+		$period = new \DatePeriod($start, new \DateInterval('P1D'), $end, $options);
 		foreach ($period as $dt) {
 			$curr = $dt->format('D');
 			if ($curr == 'Sat' || $curr == 'Sun') {
@@ -679,12 +700,14 @@ class DateTime
 			} else {
 				$days[1]++;
 			}
+			$days[0]++;
 		}
 		if ($return_named === true) {
 			return [
 				'overall' => $days[0],
 				'weekday' => $days[1],
 				'weekend' => $days[2],
+				'reverse' => $days[3],
 			];
 		} else {
 			return $days;
@@ -705,6 +728,13 @@ class DateTime
 	): bool {
 		$dd_start = new \DateTime($start_date);
 		$dd_end = new \DateTime($end_date);
+		// flip if start is after end
+		if ($dd_start > $dd_end) {
+			$new_start = $dd_end;
+			$dd_end = $dd_start;
+			$dd_start = $new_start;
+		}
+		// if start > end, flip
 		if (
 			// starts with a weekend
 			$dd_start->format('N') >= 6 ||

www/lib/CoreLibs/Convert/Html.php

@@ -10,9 +10,16 @@ namespace CoreLibs\Convert;
 
 class Html
 {
+	/** @var int */
 	public const SELECTED = 0;
+	/** @var int */
 	public const CHECKED = 1;
 
+	// TODO: check for not valid htmlentites encoding
+	// as of PHP 8.4: https://www.php.net/manual/en/function.htmlentities.php
+	/** @#var array<string> */
+	// public const VALID_HTMLENT_ENCODINGS = [];
+
 	/**
 	 * full wrapper for html entities
 	 *
@@ -22,14 +29,19 @@ class Html
 	 * encodes in UTF-8
 	 * does not double encode
 	 *
-	 * @param  mixed $string string to html encode
+	 * @param  mixed  $string string to html encode
-	 * @param  int   $flags [default: ENT_QUOTES | ENT_HTML5]
+	 * @param  int    $flags [default=ENT_QUOTES | ENT_HTML5]
+	 * @param  string $encoding [default=UTF-8]
 	 * @return mixed         if string, encoded, else as is (eg null)
 	 */
-	public static function htmlent(mixed $string, int $flags = ENT_QUOTES | ENT_HTML5): mixed
+	public static function htmlent(
-	{
+		mixed $string,
+		int $flags = ENT_QUOTES | ENT_HTML5,
+		string $encoding = 'UTF-8'
+	): mixed {
 		if (is_string($string)) {
-			return htmlentities($string, $flags, 'UTF-8', false);
+			// if not a valid encoding this will throw a warning and use UTF-8
+			return htmlentities($string, $flags, $encoding, false);
 		}
 		return $string;
 	}
@@ -37,7 +49,7 @@ class Html
 	/**
 	 * strips out all line breaks or replaced with given string
 	 * @param  string $string  string
-	 * @param  string $replace replace character, default ' '
+	 * @param  string $replace [default=' '] replace character
 	 * @return string          cleaned string without any line breaks
 	 */
 	public static function removeLB(string $string, string $replace = ' '): string

www/lib/CoreLibs/DB/IO.php

@@ -500,7 +500,7 @@ class IO
 			die('<!-- Cannot load db functions class for: ' . $this->db_type . ' -->');
 		}
 		// write to internal one, once OK
-		$this->db_functions = $db_functions;
+		$this->db_functions = $db_functions; /** @phan-suppress-current-line PhanPossiblyNullTypeMismatchProperty */
 
 		// connect to DB
 		if (!$this->__connectToDB()) {
@@ -1413,10 +1413,7 @@ class IO
 						$this->pk_name_table[$table] ?
 							$this->pk_name_table[$table] : 'NULL';
 				}
-				if (
+				if (!preg_match(self::REGEX_RETURNING, $this->query) && $this->pk_name != 'NULL') {
-					!preg_match(self::REGEX_RETURNING, $this->query) &&
-					$this->pk_name && $this->pk_name != 'NULL'
-				) {
 					// check if this query has a ; at the end and remove it
 					$__query = preg_replace("/(;\s*)$/", '', $this->query);
 					// must be query, if preg replace failed, use query as before
@@ -1426,7 +1423,7 @@ class IO
 				} elseif (
 					preg_match(self::REGEX_RETURNING, $this->query, $matches)
 				) {
-					if ($this->pk_name && $this->pk_name != 'NULL') {
+					if ($this->pk_name != 'NULL') {
 						// add the primary key if it is not in the returning set
 						if (!preg_match("/$this->pk_name/", $matches[1])) {
 							$this->query .= " , " . $this->pk_name;
@@ -2946,7 +2943,7 @@ class IO
 		$query_hash = $this->dbGetQueryHash($query, $params);
 		// clears cache for this query
 		if (empty($this->cursor_ext[$query_hash]['query'])) {
-			$this->__dbError(18, context: [
+			$this->__dbWarning(18, context: [
 				'query' => $query,
 				'params' => $params,
 				'hash' => $query_hash,

www/lib/CoreLibs/Language/GetLocale.php

@@ -50,7 +50,6 @@ class GetLocale
 				$locale = defined('SITE_LOCALE') && !empty(SITE_LOCALE) ?
 					SITE_LOCALE :
 					// else parse from default, if not 'en'
-					/** @phpstan-ignore-next-line DEFAULT_LOCALE could be empty */
 					(defined('DEFAULT_LOCALE') && !empty(DEFAULT_LOCALE) ?
 						DEFAULT_LOCALE : 'en');
 			}
@@ -97,8 +96,7 @@ class GetLocale
 				$encoding = defined('SITE_ENCODING') && !empty(SITE_ENCODING) ?
 					SITE_ENCODING :
 					// or default encoding, if not 'UTF-8'
-					/** @phpstan-ignore-next-line DEFAULT_LOCALE could be empty */
+					(defined('DEFAULT_ENCODING') ?
-					(defined('DEFAULT_ENCODING') && !empty(DEFAULT_ENCODING) ?
 						DEFAULT_ENCODING : 'UTF-8');
 			}
 		}