Add "Success" to message logging levels, fixes for PHP 8.4, other preg_match fixes

The Logger/MessageLevel gets "success" as level 110 to something a bit
heigher than "ok" which is the general "OK" for anything ending without
an error. The "success" is currently only used in file uploads with the
java script ajax file uploader

Fix any "type $var = null" with correctly "?type $var = null" for PHP 8.4 (phphan)

Fix preg match no return catches for DB IO compare version and for language
look up.

4dev/bin/create_mo.sh

@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
 
-BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
 # Assume script is in 4dev/bin
 base_folder="${BASE_FOLDER}../../www/";
 
 # locale gettext po to mo translator master
-for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do
-	file=$(basename $file .po);
+for file in "${base_folder}"../4dev/locale/*.po; do
+	[[ -e "$file" ]] || break
+	file=$(basename "$file" .po);
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
 	echo "- Translate language file '${file}' for locale '${locale}' and domain '${domain}':";
 	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
 		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
 	fi;
-	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}../4dev/locale/${locale}-${domain}.po;
+	msgfmt -o "${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo" "${base_folder}../4dev/locale/${locale}-${domain}.po";
 done;
 
 # __END__

4dev/bin/mo_to_js.sh

@@ -2,16 +2,18 @@
 
 # read source mo files and writes target js files in object form
 
-# check for ARG 1 is "mv"
-# then move the files directly and don't do manual check (don't create temp files)
-FILE_MOVE=0;
-if [ "${1}" = "mv" ]; then
+# check for ARG 1 is "no-move"
+# then do not move the files directly for manual check
+FILE_MOVE=1;
+if [ "${1}" = "no-move" ]; then
+	echo "+++ CREATE TEMPORARY FILES +++";
+	FILE_MOVE=0;
+else
 	echo "*** Direct write ***";
-	FILE_MOVE=1;
 fi;
 
 target='';
-BASE_FOLDER=$(dirname $(readlink -f $0))"/";
+BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
 # Assume script is in 4dev/bin
 base_folder="${BASE_FOLDER}../../www/";
 po_folder='../4dev/locale/'
@@ -26,7 +28,7 @@ if [ "${target}" == '' ]; then
 	echo "*** Non smarty ***";
 	TEXTDOMAINDIR=${base_folder}${mo_folder}.
 	# default is admin
-	TEXTDOMAIN=admin;
+	TEXTDOMAIN="admin";
 fi;
 js_folder="${TEXTDOMAIN}/layout/javascript/";
 
@@ -44,15 +46,16 @@ if [ ${error} -eq 1 ]; then
 fi;
 
 # 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}";
+for file in "${base_folder}"../4dev/locale/*.po; do
+	[[ -e "$file" ]] || break
+	file=$(basename "$file" .po);
 	locale=$(echo "${file}" | cut -d "-" -f 1);
 	domain=$(echo "${file}" | cut -d "-" -f 2);
+	echo "- Translate language file '${file}' for locale '${locale}' and domain '${domain}':";
 	if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then
 		mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/";
 	fi;
-	msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}${po_folder}${locale}-${domain}.po;
+	msgfmt -o "${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo" "${base_folder}${po_folder}${locale}-${domain}.po";
 done;
 
 rx_msgid_empty="^msgid \"\"";
@@ -62,7 +65,7 @@ rx_msgstr="^msgstr \""
 # quick copy string at the end
 quick_copy='';
 
-for language in ${language_list[*]}; do
+for language in "${language_list[@]}"; do
 	# I don't know which one must be set, but I think at least LANGUAGE
 	case ${language} in
 		ja)
@@ -79,7 +82,8 @@ for language in ${language_list[*]}; do
 	esac;
 	# write only one for language and then symlink files
 	template_file=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##//" | sed -e "s/##LANGUAGE##/${LANG}/");
-	original_file=$(echo ${template_file} | sed -e 's/\.TMP//g');
+	# original_file=$(echo ${template_file} | sed -e 's/\.TMP//g');
+	original_file=${template_file//.TMP/};
 	if [ "${FILE_MOVE}" -eq 0 ]; then
 		file=${target_folder}${template_file};
 	else
@@ -88,16 +92,18 @@ for language in ${language_list[*]}; do
 	echo "===> Write translation file ${file}";
 	echo ". = normal, : = escape, x = skip";
 	# init line [aka don't touch this file]
-	echo "// AUTO FILL, changes will be overwritten" > $file;
-	echo "// source: ${suffix}, language: ${language}" >> $file;
-	echo "// Translation strings in the format" >> $file;
-	echo "// \"Original\":\"Translated\""$'\n' >> $file;
-	echo "var i18n = {" >> $file;
+	echo "// AUTO FILL, changes will be overwritten" > "$file";
+	{
+		echo "// source: ${suffix}, language: ${language}";
+		echo "// Translation strings in the format";
+		echo "// \"Original\":\"Translated\""$'\n'
+		echo "var i18n = {"
+	}  >> "$file"
 	# translations stuff
 	# read the po file
 	pos=0; # do we add a , for the next line
 	cat "${base_folder}${po_folder}${language}-${TEXTDOMAIN}.po" |
-	while read str; do
+	while read -r str; do
 		# echo "S: ${str}";
 		# skip empty
 		if [[ "${str}" =~ ${rx_msgid_empty} ]]; then
@@ -112,12 +118,13 @@ for language in ${language_list[*]}; do
 			str_source=$(echo "${str}" | sed -e "s/^msgid \"//" | sed -e "s/\"$//");
 			# close right side, if not last add ,
 			if [ "${pos}" -eq 1 ]; then
-				echo -n "," >> $file;
+				echo -n "," >> "$file";
 			fi;
 			# all " inside string need to be escaped
-			str_source=$(echo "${str_source}" | sed -e 's/"/\\"/g');
+			# str_source=$(echo "${str_source}" | sed -e 's/"/\\"/g');
+			str_source=${str_source//\"/\\\"}
 			# fix with proper layout
-			echo -n "\"$str_source\":\"$(TEXTDOMAINDIR=${TEXTDOMAINDIR} LANGUAGE=${language} LANG=${LANG} gettext ${TEXTDOMAIN} "${str_source}")\"" >> $file;
+			echo -n "\"$str_source\":\"$(TEXTDOMAINDIR=${TEXTDOMAINDIR} LANGUAGE=${language} LANG=${LANG} gettext "${TEXTDOMAIN}" "${str_source}")\"" >> "$file";
 			pos=1;
 		elif [[ "${str}" =~ ${rx_msgstr} ]]; then
 			# open right side (ignore)
@@ -128,8 +135,8 @@ for language in ${language_list[*]}; do
 		fi;
 	done;
 
-	echo "" >> $file;
-	echo "};" >> $file;
+	echo "" >> "$file";
+	echo "};" >> "$file";
 	echo " [DONE]";
 
 	# on no move
@@ -140,19 +147,19 @@ for language in ${language_list[*]}; do
 	fi;
 
 	# symlink to master file
-	for suffix in ${source_list[*]}; do
+	for suffix in "${source_list[@]}"; do
 		# symlink with full lang name
 		symlink_file[0]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANG}/" | sed -e 's/\.TMP//g');
 		# create second one with lang (no country) + encoding
 		symlink_file[1]=$(echo ${template_file_stump} | sed -e "s/##SUFFIX##/${suffix}_/" | sed -e "s/##LANGUAGE##/${LANGUAGE}\.${ENCODING}/" | sed -e 's/\.TMP//g');
-		for template_file in ${symlink_file[@]}; do
+		for template_file in "${symlink_file[@]}"; do
 		# if this is not symlink, create them
 			if [ ! -h "${template_file}" ]; then
 				echo "Create symlink: ${template_file}";
 				# symlik to original
-				cd "${target_folder}";
+				cd "${target_folder}" || exit;
 				ln -sf "${original_file}" "${template_file}";
-				cd - >/dev/null;
+				cd - >/dev/null || exit;
 			fi;
 		done;
 	done;

4dev/tests/Convert/CoreLibsConvertStringsTest.php

@@ -13,6 +13,8 @@ use PHPUnit\Framework\TestCase;
  */
 final class CoreLibsConvertStringsTest extends TestCase
 {
+	private const DATA_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+
 	/**
 	 * Undocumented function
 	 *
@@ -330,6 +332,52 @@ final class CoreLibsConvertStringsTest extends TestCase
 			\CoreLibs\Convert\Strings::stripMultiplePathSlashes($input)
 		);
 	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function providerStripUTF8BomBytes(): array
+	{
+		return [
+			"utf8-bom" => [
+				"file" => "UTF8BOM.csv",
+				"expect" => "Asset Type,Epic,File Name\n",
+			],
+			"utf8" => [
+				"file" => "UTF8.csv",
+				"expect" => "Asset Type,Epic,File Name\n",
+			],
+		];
+	}
+
+	/**
+	 * test utf8 bom remove
+	 *
+	 * @covers ::stripUTF8BomBytes
+	 * @dataProvider providerStripUTF8BomBytes
+	 * @testdox stripUTF8BomBytes $file will be $expected [$_dataName]
+	 *
+	 * @param  string $file
+	 * @param  string $expected
+	 * @return void
+	 */
+	public function testStripUTF8BomBytes(string $file, string $expected): void
+	{
+		// load sample file
+		if (!is_file(self::DATA_FOLDER . $file)) {
+			$this->markTestSkipped('File: ' . $file . ' could not be opened');
+		}
+		$file = file_get_contents(self::DATA_FOLDER . $file);
+		if ($file === false) {
+			$this->markTestSkipped('File: ' . $file . ' could not be read');
+		}
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Convert\Strings::stripUTF8BomBytes($file)
+		);
+	}
 }
 
 // __END__

4dev/tests/Convert/data/UTF8.csv

@@ -0,0 +1 @@
+Asset Type,Epic,File Name

4dev/tests/Convert/data/UTF8BOM.csv

@@ -0,0 +1 @@
+Asset Type,Epic,File Name

4dev/tests/Get/CoreLibsGetSystemTest.php

@@ -216,6 +216,29 @@ final class CoreLibsGetSystemTest extends TestCase
 			);
 		}
 	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::getIpAddresses
+	 * @testdox getIpAddresses check
+	 *
+	 * @return void
+	 */
+	public function testGetIpAddresses()
+	{
+		// response must have "REMOTE_ADDR" entry, others are optional
+		// NOTE: we have no IP addresses on command line
+		$this->assertTrue(
+			true,
+			"We do not have REMOTE_ADDR on command line"
+		);
+		// $this->assertContains(
+		// 	'REMOTE_ADDR',
+		// 	array_keys(\CoreLibs\Get\System::getIpAddresses()),
+		// 	'failed REMOTE_ADDR assert'
+		// );
+	}
 }
 
 // __END__

4dev/tests/Logging/CoreLibsLoggingErrorMessagesTest.php

@@ -39,6 +39,11 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase
 				'str' => 'OK',
 				'expected' => 'ok',
 			],
+			'success' => [
+				'level' => 'success',
+				'str' => 'SUCCESS',
+				'expected' => 'success',
+			],
 			'info' => [
 				'level' => 'info',
 				'str' => 'INFO',

phpstan.neon

@@ -39,9 +39,9 @@ parameters:
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		- # in the class_test tree we allow deprecated calls
-			message: "#^Call to deprecated method #"
-			path: %currentWorkingDirectory%/www/admin/class_test.*.php
+		# - # in the class_test tree we allow deprecated calls
+		# 	message: "#^Call to deprecated method #"
+		# 	path: %currentWorkingDirectory%/www/admin/class_test.*.php
 		# - '#Expression in empty\(\) is always falsy.#'
 		# -
 		# 	message: '#Reflection error: [a-zA-Z0-9\\_]+ not found.#'

www/admin/class_test.html.php

@@ -42,6 +42,7 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $string = "Something < = > Other <br> Next line and Quotes '\"";
 echo "String: <pre>$string</pre><br>";
+$log->debug('HTMLENT', Html::htmlent($string));
 print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . " (" . htmlentities($string) . ")<br>";
 print "REMOVELB: " . Html::htmlent($string) . ": " . $_html->removeLB($string) . "<br>";
 $date_str = [2021, 5, 1, 11, 10];

www/admin/class_test.php

@@ -178,7 +178,7 @@ $log->debug('SOME MARK', 'Some error output');
 print "EDIT ACCESS ID: " . $backend->edit_access_id . "<br>";
 if (is_object($login)) {
 	//	print "ACL: <br>".$backend->print_ar($login->loginGetAcl())."<br>";
-	$log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::dumpVar($login->loginGetAcl()));
+	// $log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::dumpVar($login->loginGetAcl()));
 	//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
 	//	print "DEFAULT ACL: <br>".$backend->print_ar($login->default_acl_list)."<br>";
 	// $result = array_flip(

www/admin/class_test.system.php

@@ -41,7 +41,7 @@ print "GETPAGENAME(0): " . System::getPageName() . "<br>";
 print "GETPAGENAME(1): " . System::getPageName(System::NO_EXTENSION) . "<br>";
 print "GETPAGENAME(2): " . System::getPageName(System::FULL_PATH) . "<br>";
 print "System::getPageNameArray():<br>";
-print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "<br>";
+print "GETPAGENAMEARRAY: " . DgS::printAr(System::getPageNameArray()) . "<br>";
 // seting errro codes file upload
 print "System::fileUploadErrorMessage():<br>";
 print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "<br>";
@@ -51,4 +51,6 @@ print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
 print "System::checkCLI():<br>";
 print "Are we in an CLI: " . (System::checkCLI() ? 'Yes' : 'No') . "<br>";
 
+print "Get Addresses: " . DgS::printAr(System::getIpAddresses()) . "<br>";
+
 print "</body></html>";

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

@@ -1,7 +1,7 @@
 /* general edit javascript */
 /* jquery version */
 
-/* jshint esversion: 6 */
+/* jshint esversion: 11 */
 
 /* global i18n */
 
@@ -931,7 +931,7 @@ function rel(base) // eslint-disable-line no-unused-vars
 /**
  * searches and removes style from css array
  * @param  {Object} _element element to work one
- * @param  {String css      style sheet to remove (name)
+ * @param  {String} css      style sheet to remove (name)
  * @return {Object}          returns full element
  */
 function rcssel(_element, css)

www/composer.lock

@@ -38,16 +38,16 @@
         },
         {
             "name": "gullevek/dotenv",
-            "version": "v2.0.8",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gullevek/dotEnv.git",
-                "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e"
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/e29f9fcd8853a09bb89b0eb8ee555b754ecee36e",
-                "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e",
+                "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/b9feacaded4e48effff9da7d1173752aef3dc27f",
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f",
                 "shasum": ""
             },
             "require": {
@@ -86,9 +86,9 @@
             ],
             "support": {
                 "issues": "https://github.com/gullevek/dotEnv/issues",
-                "source": "https://github.com/gullevek/dotEnv/tree/v2.0.8"
+                "source": "https://github.com/gullevek/dotEnv/tree/v2.1.0"
             },
-            "time": "2023-03-03T00:32:02+00:00"
+            "time": "2024-08-21T02:41:15+00:00"
         },
         {
             "name": "psr/log",

www/configs/config.host.php

@@ -24,35 +24,29 @@ declare(strict_types=1);
 // ];
 
 $__LOCAL_CONFIG = [
+	// db config selection
 	'db_host' => 'test',
+	// other db connections
+	// 'db_host_target' => '',
+	// 'db_host_other' => '',
+	// location flagging (test/dev/live) for debug output
 	'location' => 'test',
+	// show DEBUG override
 	'debug_level' => 'debug',
+	// site locale
 	'site_locale' => 'en_US.UTF-8',
+	// site encoding
 	'site_encoding' => 'UTF-8',
+	// enable/disable login override
 	'login_enabled' => true
 ];
 
 // each host has a different db_host
 $SITE_CONFIG = [
 	// development host
-	'soba.tokyo.tequila.jp' => [
-		// db config selection
-		'db_host' => 'test',
-		// other db connections
-		// 'db_host_target' => '',
-		// 'db_host_other' => '',
-		// location flagging (test/dev/live) for debug output
-		'location' => 'test',
-		// show DEBUG override
-		'debug_level' => 'debug',
-		// site locale
-		'site_locale' => 'en_US.UTF-8',
-		// site encoding
-		'site_encoding' => 'UTF-8',
-		// enable/disable login override
-		'login_enabled' => true
-	],
+	'soba.tokyo.tequila.jp' => $__LOCAL_CONFIG,
 	// 'other.host.com' => $__LOCAL_CONFIG
+	'soba.egplusww.jp' => $__LOCAL_CONFIG,
 	'soba-dev.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.teq.jp' => $__LOCAL_CONFIG,

www/configs/config.path.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore PSR1.Files.SideEffects
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -11,6 +11,20 @@
 
 declare(strict_types=1);
 
+// find trigger name "admin/" or "frontend/" in the getcwd() folder
+$folder = '';
+foreach (['admin', 'frontend'] as $_folder) {
+	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
+		$folder = $_folder;
+		break;
+	}
+}
+// if content path is empty, fallback is default
+if (empty($folder)) {
+	$folder = 'default';
+}
+define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
+
 // File and Folder paths
 // ID is TARGET (first array element)
 /*$PATHS = [

www/configs/config.php

@@ -1,4 +1,4 @@
-<?php // phpcs:ignore warning
+<?php // phpcs:ignore PSR1.Files.SideEffects
 
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -53,19 +53,6 @@ for (
 		\gullevek\dotEnv\DotEnv::readEnvFile(
 			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH
 		);
-		// find trigger name "admin/" or "frontend/" in the getcwd() folder
-		$folder = '';
-		foreach (['admin', 'frontend'] as $_folder) {
-			if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
-				$folder = $_folder;
-				break;
-			}
-		}
-		// if content path is empty, fallback is default
-		if (empty($folder)) {
-			$folder = 'default';
-		}
-		define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
 		// 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/Admin/Backend.php

@@ -504,9 +504,9 @@ class Backend
 		string $data,
 		string $key_name,
 		string $key_value,
-		string $associate = null,
-		string $file = null,
-		string $db_schema = null,
+		?string $associate = null,
+		?string $file = null,
+		?string $db_schema = null,
 	): void {
 		/** @var string $DB_SCHEMA check schema */
 		$DB_SCHEMA = 'public';

www/lib/CoreLibs/Basic.php

@@ -90,7 +90,7 @@ class Basic
 	 * @deprecated DO NOT USE Class\Basic anymore. Use dedicated logger and sub classes
 	 */
 	public function __construct(
-		\CoreLibs\Logging\Logging $log = null,
+		?\CoreLibs\Logging\Logging $log = null,
 		?string $session_name = null
 	) {
 		trigger_error('Class \CoreLibs\Basic is deprected', E_USER_DEPRECATED);

www/lib/CoreLibs/Convert/Extends/SetVarTypeMain.php

@@ -52,7 +52,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeStrMain(
 		mixed $val,
-		string $default = null,
+		?string $default = null,
 		bool $to_null = false
 	): ?string {
 		// int/float/string/bool/null, everything else is ignored
@@ -113,7 +113,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeIntMain(
 		mixed $val,
-		int $default = null,
+		?int $default = null,
 		bool $to_null = false
 	): ?int {
 		// if we can filter it to a valid int, we can convert it
@@ -167,7 +167,7 @@ class SetVarTypeMain
 	 */
 	protected static function makeFloatMain(
 		mixed $val,
-		float $default = null,
+		?float $default = null,
 		bool $to_null = false
 	): ?float {
 		if (

www/lib/CoreLibs/Convert/SetVarTypeNull.php

@@ -35,7 +35,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  string|null $default Default override value
 	 * @return string|null          Input value as string or default as string/null
 	 */
-	public static function makeStr(mixed $val, string $default = null): ?string
+	public static function makeStr(mixed $val, ?string $default = null): ?string
 	{
 		return SetVarTypeMain::makeStrMain($val, $default, true);
 	}
@@ -60,7 +60,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  int|null $default Default override value
 	 * @return int|null          Input value as int or default as int/null
 	 */
-	public static function makeInt(mixed $val, int $default = null): ?int
+	public static function makeInt(mixed $val, ?int $default = null): ?int
 	{
 		return SetVarTypeMain::makeIntMain($val, $default, true);
 	}
@@ -84,7 +84,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain
 	 * @param  float|null $default Default override value
 	 * @return float|null          Input value as float or default as float/null
 	 */
-	public static function makeFloat(mixed $val, float $default = null): ?float
+	public static function makeFloat(mixed $val, ?float $default = null): ?float
 	{
 		return SetVarTypeMain::makeFloatMain($val, $default, true);
 	}

www/lib/CoreLibs/Convert/Strings.php

@@ -134,6 +134,18 @@ class Strings
 			$path
 		) ?? $path;
 	}
+
+	/**
+	 * Remove UTF8 BOM Byte string from line
+	 * Note: this is often found in CSV files exported from Excel at the first row, first element
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public static function stripUTF8BomBytes(string $text): string
+	{
+		return trim($text, pack('H*', 'EFBBBF'));
+	}
 }
 
 // __END__

www/lib/CoreLibs/DB/IO.php

@@ -1896,7 +1896,12 @@ class IO
 		$matches = [];
 		// compare has =, >, < prefix, and gets stripped
 		// if the rest is not X.Y format then error
-		preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches);
+		if (!preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches)) {
+			$this->log->error('Could not regex match compare version string', [
+				"compare" => $compare
+			]);
+			return false;
+		}
 		$compare = $matches[1];
 		$to_master = $matches[2];
 		$to_minor = $matches[3];
@@ -1908,11 +1913,18 @@ class IO
 		}
 		// db_version can return X.Y.Z
 		// we only compare the first two
-		preg_match(
-			"/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/",
-			$this->dbVersion(),
-			$matches
-		);
+		if (
+			!preg_match(
+				"/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/",
+				$this->dbVersion(),
+				$matches
+			)
+		) {
+			$this->log->error('Could not regex match dbVersion string', [
+				"dbVersion" => $this->dbVersion()
+			]);
+			return false;
+		}
 		$master = $matches[1];
 		$minor = $matches[2];
 		$version = $master . ($minor < 10 ? '0' : '') . $minor;
@@ -2402,7 +2414,7 @@ class IO
 				// flag if we have cache data stored at the moment
 				'cached' => false,
 				// when fetch array or cache read returns false
-				// in loop read that means dbReturn retuns false without erro
+				// in loop read that means dbReturn retuns false without error
 				'finished' => false,
 				 // read from cache/db (pos == rows)
 				'read_finished' => false,

www/lib/CoreLibs/Get/System.php

@@ -116,6 +116,29 @@ class System
 			3
 		) === 'cli' ? true : false;
 	}
+
+	/**
+	 * Collect all IP addresses
+	 * REMOTE_ADDR, HTTP_X_FORWARD_FOR, CLIENT_IP
+	 * and retuns them in an array with index of io source
+	 * if address source has addresses with "," will add "-array" with these as array block
+	 *
+	 * @return array<string,string|array<string>>
+	 */
+	public static function getIpAddresses(): array
+	{
+		$ip_addr = [];
+		foreach (['REMOTE_ADDR', 'HTTP_X_FORWARDED_FOR', 'CLIENT_IP'] as $_ip_source) {
+			if (!empty($_SERVER[$_ip_source])) {
+				$ip_addr[$_ip_source] = $_SERVER[$_ip_source];
+				// same level as ARRAY IF there is a , inside
+				if (strstr($_SERVER[$_ip_source], ',') !== false) {
+					$ip_addr[$_ip_source . '-array'] = explode(',', $_SERVER[$_ip_source]);
+				}
+			}
+		}
+		return $ip_addr;
+	}
 }
 
 // __END__

www/lib/CoreLibs/Language/GetLocale.php

@@ -128,7 +128,7 @@ class GetLocale
 				$matches
 			)
 		) {
-			$lang = ($matches['lang'] ?? 'en')
+			$lang = $matches['lang']
 				// add country only if set
 				. (!empty($matches['country']) ? '_' . $matches['country'] : '');
 		} else {
@@ -235,7 +235,7 @@ class GetLocale
 				$matches
 			)
 		) {
-			$lang = ($matches['lang'] ?? 'en')
+			$lang = $matches['lang']
 				// add country only if set
 				. (!empty($matches['country']) ? '_' . $matches['country'] : '');
 		} else {

www/lib/CoreLibs/Logging/Logger/MessageLevel.php

@@ -14,6 +14,7 @@ namespace CoreLibs\Logging\Logger;
 enum MessageLevel: int
 {
 	case ok = 100;
+	case success = 110; // special for file uploads
 	case info = 200;
 	case notice = 250;
 	case warn = 300;
@@ -30,6 +31,7 @@ enum MessageLevel: int
 	{
 		return match (strtolower($name)) {
 			'ok' => self::ok,
+			'success' => self::success,
 			'info' => self::info,
 			'notice' => self::notice,
 			'warn', 'warning' => self::warn,

www/lib/CoreLibs/Output/Form/Elements.php

@@ -194,13 +194,13 @@ class Elements
 			"/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/",
 			function ($matches) {
 				return self::createEmail(
-					$matches[1] ?? '',
-					$matches[2] ?? '',
-					$matches[3] ?? '',
-					$matches[4] ?? '',
-					$matches[5] ?? '',
+					$matches[1],
+					$matches[2],
+					$matches[3],
+					$matches[4],
+					$matches[5],
 					$matches[7] ?? '',
-					$matches[9] ?? ''
+					$matches[9] ?? '',
 				);
 			},
 			$output

www/lib/CoreLibs/Template/HtmlBuilder/Block.php

@@ -19,7 +19,7 @@ use CoreLibs\Template\HtmlBuilder\General\HtmlBuilderExcpetion;
 class Block
 {
 	/**
-	 * Undocumented function
+	 * Create Element
 	 *
 	 * @param  string $tag
 	 * @param  string $id
@@ -86,7 +86,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Add multiple elements to the base element
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $base
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} ...$attach
@@ -101,7 +101,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Add multiple sub elements to the base element
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $sub
@@ -117,7 +117,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Remove all sub element entries
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @return array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}
@@ -131,7 +131,7 @@ class Block
 	// CSS Elements
 
 	/**
-	 * Undocumented function
+	 * Add css entry to the css entries
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  string ...$css
@@ -144,7 +144,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Remove a css entry entry from the css array
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $element
 	 * @param  string ...$css
@@ -157,7 +157,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Switch CSS entries
 	 * scssel (switch) is not supported
 	 * use rcssel -> acssel
 	 *
@@ -175,7 +175,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Build HTML from the content tree
 	 * alias phfo
 	 *
 	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $tree
@@ -231,7 +231,19 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
+	 * Alias for phfo
+	 *
+	 * @param  array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>} $tree
+	 * @param  bool         $add_nl [default=false]
+	 * @return string
+	 */
+	public static function phfo(array $tree, bool $add_nl = false): string
+	{
+		return self::buildHtml($tree, $add_nl);
+	}
+
+	/**
+	 * Build HTML elements from an array of elements
 	 * alias phfa
 	 *
 	 * @param  array<array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}> $list
@@ -248,8 +260,7 @@ class Block
 	}
 
 	/**
-	 * Undocumented function
-	 * wrapper for buildHtmlFromList
+	 * alias for buildHtmlFromList
 	 *
 	 * @param  array<array{tag:string,id:string,name:string,content:string,css:array<string>,options:array<string,string>,sub:array<mixed>}> $list                   array of Elements to build string from
 	 * @param  bool           $add_nl [default=false] Optional output string line break

www/lib/CoreLibs/Template/HtmlBuilder/Element.php

@@ -401,7 +401,7 @@ class Element
 	 * @param  bool         $add_nl [default=false] Optional output string line breaks
 	 * @return string                               HTML as string
 	 */
-	public function buildHtml(Element $tree = null, bool $add_nl = false): string
+	public function buildHtml(?Element $tree = null, bool $add_nl = false): string
 	{
 		// print "D01: " . microtime(true) . "<br>";
 		if ($tree === null) {
@@ -533,7 +533,7 @@ class Element
 	 * @return string                           build html as string
 	 * @deprecated Do not use, use Element->buildHtml() instead
 	 */
-	public static function printHtmlFromObject(Element $tree = null, bool $add_nl = false): string
+	public static function printHtmlFromObject(?Element $tree = null, bool $add_nl = false): string
 	{
 		// nothing ->bad
 		if ($tree === null) {

www/lib/CoreLibs/Template/SmartyExtend.php

@@ -203,7 +203,8 @@ class SmartyExtend extends \Smarty
 		_bind_textdomain_codeset($this->domain, $this->encoding);
 
 		// register smarty variable
-		$this->registerPlugin('modifier', 'getvar', [&$this, 'getTemplateVars']);
+		// $this->registerPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']);
+		$this->registerPlugin(self::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']);
 
 		$this->page_name = \CoreLibs\Get\System::getPageName();
 

www/vendor/composer/installed.json

@@ -35,17 +35,17 @@
         },
         {
             "name": "gullevek/dotenv",
-            "version": "v2.0.8",
-            "version_normalized": "2.0.8.0",
+            "version": "v2.1.0",
+            "version_normalized": "2.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gullevek/dotEnv.git",
-                "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e"
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/e29f9fcd8853a09bb89b0eb8ee555b754ecee36e",
-                "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e",
+                "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/b9feacaded4e48effff9da7d1173752aef3dc27f",
+                "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f",
                 "shasum": ""
             },
             "require": {
@@ -56,7 +56,7 @@
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9"
             },
-            "time": "2023-03-03T00:32:02+00:00",
+            "time": "2024-08-21T02:41:15+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -86,7 +86,7 @@
             ],
             "support": {
                 "issues": "https://github.com/gullevek/dotEnv/issues",
-                "source": "https://github.com/gullevek/dotEnv/tree/v2.0.8"
+                "source": "https://github.com/gullevek/dotEnv/tree/v2.1.0"
             },
             "install-path": "../gullevek/dotenv"
         },

www/vendor/composer/installed.php

@@ -29,9 +29,9 @@
             'dev_requirement' => false,
         ),
         'gullevek/dotenv' => array(
-            'pretty_version' => 'v2.0.8',
-            'version' => '2.0.8.0',
-            'reference' => 'e29f9fcd8853a09bb89b0eb8ee555b754ecee36e',
+            'pretty_version' => 'v2.1.0',
+            'version' => '2.1.0.0',
+            'reference' => 'b9feacaded4e48effff9da7d1173752aef3dc27f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../gullevek/dotenv',
             'aliases' => array(),

www/vendor/gullevek/dotenv/Readme.md

@@ -61,6 +61,29 @@ DOUBLE="I will be used"
 DOUBLE="This will be ignored"
 ```
 
+A prefix name can be set with `[PrefixName]`. Tne name rules are like for variables, but spaces
+are allowed, but will be converted to "_".
+The prefix is valid from the time set until the next prefix block appears or the file ends.
+
+Example
+
+```ini
+FOO="bar"
+FOOBAR="bar bar"
+[SecitonA]
+FOO="other bar"
+FOOBAR="other bar bar"
+```
+
+Will have environmen variables as
+
+```php
+$_ENV["FOO"];
+$_ENV["FOOBAR"];
+$_ENV["SecitonA.FOO"];
+$_ENV["SecitonA.FOOBAR"];
+```
+
 ## Development
 
 ### Phan

www/vendor/gullevek/dotenv/src/DotEnv.php

@@ -22,6 +22,9 @@ class DotEnv
      * if there are two variables with the same name only the first is used
      * variables are case sensitive
      *
+     * [] Grouping Block Name as prefix until next or end if set,
+     * space replaced by _, all other var rules apply
+     *
      * @param  string $path     Folder to file, default is __DIR__
      * @param  string $env_file What file to load, default is .env
      * @return int              -1 other error
@@ -56,10 +59,14 @@ class DotEnv
         $status = 1;
         $block = false;
         $var = '';
+        $prefix_name = '';
         while ($line = fgets($fp)) {
-            // main match for variable = value part
-            if (preg_match("/^\s*([\w_.]+)\s*=\s*((\"?).*)/", $line, $matches)) {
-                $var = $matches[1];
+            // [] block must be a single line, or it will be ignored
+            if (preg_match("/^\s*\[([\w_.\s]+)\]/", $line, $matches)) {
+                $prefix_name = preg_replace("/\s+/", "_", $matches[1]) . ".";
+            } elseif (preg_match("/^\s*([\w_.]+)\s*=\s*((\"?).*)/", $line, $matches)) {
+                // main match for variable = value part
+                $var = $prefix_name . $matches[1];
                 $value = $matches[2];
                 $quotes = $matches[3];
                 // write only if env is not set yet, and write only the first time