phan and phpstan fixes for hash uses in CoreLibs

Add new constant: STANDARD_HASH for sha256
Deprecate DEFAULT_HASH is now STANDARD_HASH_SHORT

Deprecated
__sha1Short:
replace with __crc32b with the default parameter use_sha false
replace with sha1Short if use_sha is true

__hash:
replace with hashShort if default hash type
replace with hash for all others with new default STANDARD_HASH

__hashLong:
replace with hashLong

New:
hashShort: returns STANDARD_HASH_SHORT which is __hash default type
hashStd: returns STANDARD_HASH sha256
hash: switches to STANDARD_HASH as default type

4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php

@@ -1068,8 +1068,32 @@ final class CoreLibsCombinedDateTimeTest extends TestCase
 				return_named:$return_named,
 				include_end_date:$include_end_date,
 				exclude_start_date:$exclude_start_date
-			)
+			),
+			'call calcDaysInterval'
 		);
+		if ($return_named) {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Combined\DateTime::calcDaysIntervalNamedIndex(
+					$input_a,
+					$input_b,
+					include_end_date:$include_end_date,
+					exclude_start_date:$exclude_start_date
+				),
+				'call calcDaysIntervalNamedIndex'
+			);
+		} else {
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Combined\DateTime::calcDaysIntervalNumIndex(
+					$input_a,
+					$input_b,
+					include_end_date:$include_end_date,
+					exclude_start_date:$exclude_start_date
+				),
+				'call calcDaysIntervalNamedIndex'
+			);
+		}
 	}
 
 	/**

4dev/tests/Convert/CoreLibsConvertByteTest.php

@@ -40,7 +40,7 @@ final class CoreLibsConvertByteTest extends TestCase
 				4 => '1.00 KB',
 				5 => '1.02KiB',
 			],
-			'invalud string number' => [
+			'invalid string number' => [
 				0 => '1024 MB',
 				1 => '1024 MB',
 				2 => '1024 MB',

4dev/tests/Create/CoreLibsCreateHashTest.php

@@ -114,6 +114,22 @@ final class CoreLibsCreateHashTest extends TestCase
 		];
 	}
 
+	/**
+	 * Undocumented function
+	 *
+	 * @return array
+	 */
+	public function hashStandardProvider(): array
+	{
+		$hash_source = 'Some String Text';
+		return [
+			'Long Hash check: ' . \CoreLibs\Create\Hash::STANDARD_HASH => [
+				$hash_source,
+				hash(\CoreLibs\Create\Hash::STANDARD_HASH, $hash_source)
+			],
+		];
+	}
+
 	/**
 	 * Undocumented function
 	 *
@@ -136,9 +152,13 @@ final class CoreLibsCreateHashTest extends TestCase
 	/**
 	 * Undocumented function
 	 *
+	 * phpcs:disable Generic.Files.LineLength
 	 * @covers ::__sha1Short
+	 * @covers ::__crc32b
+	 * @covers ::sha1Short
 	 * @dataProvider sha1ShortProvider
-	 * @testdox __sha1Short $input will be $expected (crc32b) and $expected_sha1 (sha1 short) [$_dataName]
+	 * @testdox __sha1Short/__crc32b/sha1short $input will be $expected (crc32b) and $expected_sha1 (sha1 short) [$_dataName]
+	 * phpcs:enable Generic.Files.LineLength
 	 *
 	 * @param string $input
 	 * @param string $expected
@@ -149,16 +169,29 @@ final class CoreLibsCreateHashTest extends TestCase
 		// uses crc32b
 		$this->assertEquals(
 			$expected,
-			\CoreLibs\Create\Hash::__sha1Short($input)
+			\CoreLibs\Create\Hash::__sha1Short($input),
+			'__sha1Short depreacted'
 		);
 		$this->assertEquals(
 			$expected,
-			\CoreLibs\Create\Hash::__sha1Short($input, false)
+			\CoreLibs\Create\Hash::__sha1Short($input, false),
+			'__sha1Short (false) depreacted'
+		);
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Hash::__crc32b($input),
+			'__crc32b'
 		);
 		// sha1 type
 		$this->assertEquals(
 			$expected_sha1,
-			\CoreLibs\Create\Hash::__sha1Short($input, true)
+			\CoreLibs\Create\Hash::__sha1Short($input, true),
+			'__sha1Short (true) depreacted'
+		);
+		$this->assertEquals(
+			$expected_sha1,
+			\CoreLibs\Create\Hash::sha1Short($input),
+			'sha1Short'
 		);
 	}
 
@@ -166,8 +199,10 @@ final class CoreLibsCreateHashTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::__hash
+	 * @covers ::hashShort
+	 * @covers ::hashShort
 	 * @dataProvider hashProvider
-	 * @testdox __hash $input with $hash_type will be $expected [$_dataName]
+	 * @testdox __hash/hashShort/hash $input with $hash_type will be $expected [$_dataName]
 	 *
 	 * @param string $input
 	 * @param string|null $hash_type
@@ -179,12 +214,24 @@ final class CoreLibsCreateHashTest extends TestCase
 		if ($hash_type === null) {
 			$this->assertEquals(
 				$expected,
-				\CoreLibs\Create\Hash::__hash($input)
+				\CoreLibs\Create\Hash::__hash($input),
+				'__hash'
+			);
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Create\Hash::hashShort($input),
+				'hashShort'
 			);
 		} else {
 			$this->assertEquals(
 				$expected,
-				\CoreLibs\Create\Hash::__hash($input, $hash_type)
+				\CoreLibs\Create\Hash::__hash($input, $hash_type),
+				'__hash with hash type'
+			);
+			$this->assertEquals(
+				$expected,
+				\CoreLibs\Create\Hash::hash($input, $hash_type),
+				'hash with hash type'
 			);
 		}
 	}
@@ -193,8 +240,9 @@ final class CoreLibsCreateHashTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @covers ::__hashLong
+	 * @covers ::hashLong
 	 * @dataProvider hashLongProvider
-	 * @testdox __hashLong $input will be $expected [$_dataName]
+	 * @testdox __hashLong/hashLong $input will be $expected [$_dataName]
 	 *
 	 * @param string $input
 	 * @param string $expected
@@ -206,6 +254,52 @@ final class CoreLibsCreateHashTest extends TestCase
 			$expected,
 			\CoreLibs\Create\Hash::__hashLong($input)
 		);
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Hash::hashLong($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::hash
+	 * @covers ::hashStd
+	 * @dataProvider hashStandardProvider
+	 * @testdox hash/hashStd $input will be $expected [$_dataName]
+	 *
+	 * @param string $input
+	 * @param string $expected
+	 * @return void
+	 */
+	public function testHashStandard(string $input, string $expected): void
+	{
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Hash::hashStd($input)
+		);
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Hash::hash($input)
+		);
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @covers ::hash
+	 * @testdox hash with invalid type [$_dataName]
+	 *
+	 * @return void
+	 */
+	public function testInvalidHashType(): void
+	{
+		$hash_source = 'Some String Text';
+		$expected = hash(\CoreLibs\Create\Hash::STANDARD_HASH, $hash_source);
+		$this->assertEquals(
+			$expected,
+			\CoreLibs\Create\Hash::hash($hash_source, 'DOES_NOT_EXIST')
+		);
 	}
 }
 

README.md

@@ -114,3 +114,11 @@ Add `.libs` to the master .gitingore
 ### Update phpunit
 
 On a version update the old phpunit folder in .libs has to be removed and the new version extracted again
+
+## Javascript
+
+The original edit.js javascript functions are now in utils.js or utils.min.js.
+
+The development for thos files is located in a different repository
+
+https://[service]/CodeBlocks/javascript-utils

www/admin/class_test.datetime.php

@@ -473,7 +473,10 @@ function intervalStringFormatDeprecated(
 		// print "-> V: $value | $part, $time_name | I: " . is_int($value) . " | F: " . is_float($value)
 		// 	. " | " . ($value != 0 ? 'Not zero' : 'ZERO') . "<br>";
 		// var_dump($skip_last_zero);
-		if ($value != 0 || $skip_zero === false || $skip_last_zero === false) {
+		if (
+			is_numeric($value) &&
+			($value != 0 || $skip_zero === false || $skip_last_zero === false)
+		) {
 			if ($part == 'f') {
 				if ($truncate_nanoseconds === true) {
 					$value = round($value, 3);

www/admin/class_test.db.php

@@ -76,41 +76,41 @@ $db->dbResetEncoding();
 
 // empty calls, none of the below should fail
 //
-$db->dbGetCursor();
+$foo = $db->dbGetCursor();
 //
-$db->dbGetCursorExt();
+$foo = $db->dbGetCursorExt();
 //
-$db->dbGetCursorPos('SELECT foo', ['bar']);
+$foo = $db->dbGetCursorPos('SELECT foo', ['bar']);
 //
-$db->dbGetCursorNumRows('SELECT foo', ['bar']);
+$foo = $db->dbGetCursorNumRows('SELECT foo', ['bar']);
 //
-$db->dbGetInsertPKName();
+$foo = $db->dbGetInsertPKName();
 //
-$db->dbGetInsertPK();
+$foo = $db->dbGetInsertPK();
 //
-$db->dbGetReturningExt();
+$foo = $db->dbGetReturningExt();
-$db->dbGetReturningExt('foo');
+$foo = $db->dbGetReturningExt('foo');
-$db->dbGetReturningExt('foo', 0);
+$foo = $db->dbGetReturningExt('foo', 0);
-$db->dbGetReturningExt(pos:0);
+$foo = $db->dbGetReturningExt(pos:0);
 //
-$db->dbGetReturningArray();
+$foo = $db->dbGetReturningArray();
 //
-$db->dbGetNumRows();
+$foo = $db->dbGetNumRows();
 //
-$db->dbGetNumFields();
+$foo = $db->dbGetNumFields();
 //
-$db->dbGetFieldNames();
+$foo = $db->dbGetFieldNames();
 //
-$db->dbGetFieldTypes();
+$foo = $db->dbGetFieldTypes();
 //
-$db->dbGetFieldNameTypes();
+$foo = $db->dbGetFieldNameTypes();
 //
-$db->dbGetFieldName(0);
+$foo = $db->dbGetFieldName(0);
 //
-$db->dbGetFieldType(0);
+$foo = $db->dbGetFieldType(0);
-$db->dbGetFieldType('foo');
+$foo = $db->dbGetFieldType('foo');
 //
-$db->dbGetPrepareCursorValue('foo', 'bar');
+$foo = $db->dbGetPrepareCursorValue('foo', 'bar');
 
 // TEST CACHE READS
 

www/admin/class_test.hash.php

@@ -38,9 +38,11 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 
 $to_crc = 'Some text block';
 // static
-print "S::__CRC32B: $to_crc: " . $hash_class::__crc32b($to_crc) . "<br>";
+print "S::__CRC32B: $to_crc: " . Hash::__crc32b($to_crc) . "<br>";
-print "S::__SHA1SHORT(off): $to_crc: " . $hash_class::__sha1short($to_crc) . "<br>";
+// print "S::__SHA1SHORT(off): $to_crc: " . Hash::__sha1short($to_crc) . "<br>";
-print "S::__SHA1SHORT(on): $to_crc: " . $hash_class::__sha1short($to_crc, true) . "<br>";
+print "S::hashShort(__sha1Short replace): $to_crc: " . Hash::hashShort($to_crc) . "<br>";
+// print "S::__SHA1SHORT(on): $to_crc: " . Hash::__sha1short($to_crc, true) . "<br>";
+print "S::sha1Short(__sha1Short replace): $to_crc: " . Hash::sha1Short($to_crc) . "<br>";
 print "S::__hash(d): " . $to_crc . "/"
 	. Hash::STANDARD_HASH_SHORT . ": " . $hash_class::__hash($to_crc) . "<br>";
 foreach (['adler32', 'fnv132', 'fnv1a32', 'joaat', 'sha512'] as $__hash_c) {
@@ -53,13 +55,16 @@ echo "<hr>";
 $text = 'Some String Text';
 $type = 'crc32b';
 print "Hash: " . $type . ": " . hash($type, $text) . "<br>";
-print "Class: " . $type . ": " . Hash::__hash($text, $type) . "<br>";
+// print "Class (old): " . $type . ": " . Hash::__hash($text, $type) . "<br>";
+print "Class (new): " . $type . ": " . Hash::hash($text, $type) . "<br>";
 
 echo "<hr>";
-print "<br>CURRENT STANDARD_HASH_SHORT: " . Hash::STANDARD_HASH_SHORT . "<br>";
+print "CURRENT STANDARD_HASH_SHORT: " . Hash::STANDARD_HASH_SHORT . "<br>";
-print "<br>CURRENT STANDARD_HASH_LONG: " . Hash::STANDARD_HASH_LONG . "<br>";
+print "CURRENT STANDARD_HASH_LONG: " . Hash::STANDARD_HASH_LONG . "<br>";
-print "HASH SHORT: " . $to_crc . ": " . Hash::__hash($to_crc) . "<br>";
+print "CURRENT STANDARD_HASH: " . Hash::STANDARD_HASH . "<br>";
-print "HASH LONG: " . $to_crc . ": " . Hash::__hashLong($to_crc) . "<br>";
+print "HASH SHORT: " . $to_crc . ": " . Hash::hashShort($to_crc) . "<br>";
+print "HASH LONG: " . $to_crc . ": " . Hash::hashLong($to_crc) . "<br>";
+print "HASH DEFAULT: " . $to_crc . ": " . Hash::hashStd($to_crc) . "<br>";
 
 // print "UNIQU ID SHORT : " . Hash::__uniqId() . "<br>";
 // print "UNIQU ID LONG : " . Hash::__uniqIdLong() . "<br>";

www/admin/class_test.session.php

@@ -86,8 +86,10 @@ if (!isset($_SESSION['counter'])) {
 $_SESSION['counter']++;
 print "[READ] A " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 $_SESSION[$var] = $value;
+/** @phpstan-ignore-next-line nullCoalesce.offset */
 print "[READ] B " . $var . ": " . ($_SESSION[$var] ?? '{UNSET}') . "<br>";
 print "[READ] Confirm " . $var . " is " . $value . ": "
+/** @phpstan-ignore-next-line equal.alwaysTrue, nullCoalesce.offset */
 	. (($_SESSION[$var] ?? '') == $value ? 'Matching' : 'Not matching') . "<br>";
 
 // test set wrappers methods

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

@@ -1,5 +1,9 @@
-/* general edit javascript */
+/*
-/* jquery version */
+general edit javascript
+jquery version
+*/
+
+/** @deprecated Do not use this anymore, use utils.js or utils.min.js */
 
 /* global i18n */
 
@@ -21,6 +25,7 @@ var GL_OB_BASE = 100;
  * @param {string} el_id Element ID to get
  * @returns {HTMLElement}
  * @throws Error
+ * @deprecated use utils.js
  */
 function loadEl(el_id)
 {
@@ -36,6 +41,7 @@ function loadEl(el_id)
  * @param {String} theURL   the url
  * @param {String} winName  window name
  * @param {Object} features popup features
+ * @deprecated use utils.js
  */
 function pop(theURL, winName, features) // eslint-disable-line no-unused-vars
 {
@@ -46,6 +52,7 @@ function pop(theURL, winName, features) // eslint-disable-line no-unused-vars
 /**
  * automatically resize a text area based on the amount of lines in it
  * @param {string} ta_id element id
+ * @deprecated use utils.js
  */
 function expandTA(ta_id) // eslint-disable-line no-unused-vars
 {
@@ -71,6 +78,7 @@ function expandTA(ta_id) // eslint-disable-line no-unused-vars
 /**
  * wrapper to get the real window size for the current browser window
  * @return {Object} object with width/height
+ * @deprecated use utils.js
  */
 function getWindowSize()
 {
@@ -86,6 +94,7 @@ function getWindowSize()
 /**
  * wrapper to get the correct scroll offset
  * @return {Object} object with x/y px
+ * @deprecated use utils.js
  */
 function getScrollOffset()
 {
@@ -101,6 +110,7 @@ function getScrollOffset()
 /**
  * wrapper to get the correct scroll offset for opener page (from popup)
  * @return {Object} object with x/y px
+ * @deprecated use utils.js
  */
 function getScrollOffsetOpener() // eslint-disable-line no-unused-vars
 {
@@ -118,6 +128,7 @@ function getScrollOffsetOpener() // eslint-disable-line no-unused-vars
  * @param {String}  id   element to center
  * @param {Boolean} left if true centers to the middle from the left
  * @param {Boolean} top  if true centers to the middle from the top
+ * @deprecated use utils.js
  */
 function setCenter(id, left, top)
 {
@@ -155,6 +166,7 @@ function setCenter(id, left, top)
  * @param {Number} [offset=0]         offset from top, default is 0 (px)
  * @param {Number} [duration=500]     animation time, default 500ms
  * @param {String} [base='body,html'] base element for offset scroll
+ * @deprecated use utils.js
  */
 function goToPos(element, offset = 0, duration = 500, base = 'body,html') // eslint-disable-line no-unused-vars
 {
@@ -173,6 +185,7 @@ function goToPos(element, offset = 0, duration = 500, base = 'body,html') // esl
  * go to element, scroll
  * non jquery
  * @param {string} target
+ * @deprecated use utils.js
 */
 function goTo(target) // eslint-disable-line no-unused-vars
 {
@@ -186,6 +199,7 @@ function goTo(target) // eslint-disable-line no-unused-vars
  * that is filled from gettext in PHP
  * @param  {String} string text to translate
  * @return {String}        translated text (based on PHP selected language)
+ * @deprecated use utils.js
  */
 function __(string)
 {
@@ -202,37 +216,70 @@ function __(string)
  * First, checks if it isn't implemented yet.
  * @param  {String} String.prototype.format string with elements to be replaced
  * @return {String}                         Formated string
+ * @deprecated use utils.js
  */
 if (!String.prototype.format) {
 	String.prototype.format = function()
 	{
-		var args = arguments;
+		console.error('[DEPRECATED] use formatString');
-		return this.replace(/{(\d+)}/g, function(match, number)
+		return formatString(this, arguments);
-		{
+	};
-			return typeof args[number] != 'undefined' ?
+}
-				args[number] :
+
-				match
+/**
-			;
+ * simple sprintf formater for replace
-		});
+ * usage: "{0} is cool, {1} is not".format("Alpha", "Beta");
+ * First, checks if it isn't implemented yet.
+ * @param  {String} string String with {..} entries
+ * @param  {...any} args   List of replacement
+ * @returns {String}       Escaped string
+ * @deprecated use utils.js
+ */
+function formatString(string, ...args)
+{
+	return string.replace(/{(\d+)}/g, function(match, number)
+	{
+		return typeof args[number] != 'undefined' ?
+			args[number] :
+			match
+		;
+	});
+}
+
+/**
+ * round to digits (float)
+ * @param  {Number}  Number.prototype.round Float type number to round
+ * @param  {Number} prec                   Precision to round to
+ * @return {Float}                         Rounded number
+ * @deprecated use utils.js
+ */
+if (Number.prototype.round) {
+	Number.prototype.round = function (prec) {
+		console.error('[DEPRECATED] use roundPrecision');
+		return roundPrecision(this, prec);
 	};
 }
 
 /**
  * round to digits (float)
- * @param  {Float}  Number.prototype.round Float type number to round
+ * @param  {Number} number    Float type number to round
- * @param  {Number} prec                   Precision to round to
+ * @param  {Number} precision Precision to round to
- * @return {Float}                         Rounded number
+ * @return {Number}           Rounded number
+ * @deprecated use utils.js
  */
-if (Number.prototype.round) {
+function roundPrecision(number, precision)
-	Number.prototype.round = function (prec) {
+{
-		return Math.round(this * Math.pow(10, prec)) / Math.pow(10, prec);
+	if (!isNaN(number) || !isNaN(precision)) {
-	};
+		return number;
+	}
+	return Math.round(number * Math.pow(10, precision)) / Math.pow(10, precision);
 }
 
 /**
  * formats flat number 123456 to 123,456
  * @param  {Number} x number to be formated
  * @return {String}   formatted with , in thousands
+ * @deprecated use utils.js
  */
 function numberWithCommas(x) // eslint-disable-line no-unused-vars
 {
@@ -245,6 +292,7 @@ function numberWithCommas(x) // eslint-disable-line no-unused-vars
  * converts line breaks to br
  * @param  {String} string any string
  * @return {String}        string with <br>
+ * @deprecated use utils.js
  */
 function convertLBtoBR(string) // eslint-disable-line no-unused-vars
 {
@@ -253,51 +301,78 @@ function convertLBtoBR(string) // eslint-disable-line no-unused-vars
 
 /**
  * escape HTML string
- * @param  {String} !String.prototype.escapeHTML HTML data string to be escaped
+ * @param  {String} String.prototype.escapeHTML HTML data string to be escaped
- * @return {String}                              escaped string
+ * @return {String}                             escaped string
+ * @deprecated use utils.js
  */
 if (!String.prototype.escapeHTML) {
 	String.prototype.escapeHTML = function() {
-		return this.replace(/[&<>"'/]/g, function (s) {
+		console.error('[DEPRECATED] use escapeHtml');
-			var entityMap = {
+		return escapeHtml(this);
-				'&': '&amp;',
-				'<': '&lt;',
-				'>': '&gt;',
-				'"': '&quot;',
-				'\'': '&#39;',
-				'/': '&#x2F;'
-			};
-
-			return entityMap[s];
-		});
 	};
 }
 
 /**
  * unescape a HTML encoded string
- * @param  {String} !String.prototype.unescapeHTML data with escaped entries
+ * @param  {String} String.prototype.unescapeHTML data with escaped entries
- * @return {String}                                HTML formated string
+ * @return {String}                               HTML formated string
+ * @deprecated use utils.js
  */
 if (!String.prototype.unescapeHTML) {
 	String.prototype.unescapeHTML = function() {
-		return this.replace(/&[#\w]+;/g, function (s) {
+		console.error('[DEPRECATED] use unescapeHtml');
-			var entityMap = {
+		return unescapeHtml(this);
-				'&amp;': '&',
-				'&lt;': '<',
-				'&gt;': '>',
-				'&quot;': '"',
-				'&#39;': '\'',
-				'&#x2F;': '/'
-			};
-
-			return entityMap[s];
-		});
 	};
 }
 
+/**
+ * Escapes HTML in string
+ * @param {String} string Text to escape HTML in
+ * @returns {String}
+ * @deprecated use utils.js
+ */
+function escapeHtml(string)
+{
+	return string.replace(/[&<>"'/]/g, function (s) {
+		var entityMap = {
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;',
+			'"': '&quot;',
+			'\'': '&#39;',
+			'/': '&#x2F;'
+		};
+
+		return entityMap[s];
+	});
+}
+
+/**
+ * Unescape a HTML encoded string
+ * @param {String} string Text to unescape HTML in
+ * @returns {String}
+ * @deprecated use utils.js
+ */
+function unescapeHtml(string)
+{
+	return string.replace(/&[#\w]+;/g, function (s) {
+		var entityMap = {
+			'&amp;': '&',
+			'&lt;': '<',
+			'&gt;': '>',
+			'&quot;': '"',
+			'&#39;': '\'',
+			'&#x2F;': '/'
+		};
+
+		return entityMap[s];
+	});
+}
+
 /**
  * returns current timestamp (unix timestamp)
  * @return {Number} timestamp (in milliseconds)
+ * @deprecated use utils.js
  */
 function getTimestamp() // eslint-disable-line no-unused-vars
 {
@@ -310,6 +385,7 @@ function getTimestamp() // eslint-disable-line no-unused-vars
  * i.e. 0-255 -> '00'-'ff'
  * @param  {Number} dec decimal string
  * @return {String}     hex encdoded number
+ * @deprecated use utils.js
  */
 function dec2hex(dec)
 {
@@ -321,6 +397,7 @@ function dec2hex(dec)
  * only works on mondern browsers
  * @param  {Number} len length of unique id string
  * @return {String}     random string in length of len
+ * @deprecated use utils.js
  */
 function generateId(len) // eslint-disable-line no-unused-vars
 {
@@ -334,6 +411,7 @@ function generateId(len) // eslint-disable-line no-unused-vars
  * works on all browsers
  * after many runs it will create duplicates
  * @return {String} not true random string
+ * @deprecated use utils.js
  */
 function randomIdF() // eslint-disable-line no-unused-vars
 {
@@ -347,6 +425,7 @@ function randomIdF() // eslint-disable-line no-unused-vars
  * @param  {Number} min minimum int number inclusive
  * @param  {Number} max maximumg int number inclusive
  * @return {Number}     Random number
+ * @deprecated use utils.js
  */
 function getRandomIntInclusive(min, max) // eslint-disable-line no-unused-vars
 {
@@ -360,6 +439,7 @@ function getRandomIntInclusive(min, max) // eslint-disable-line no-unused-vars
  * check if name is a function
  * @param  {string}  name Name of function to check if exists
  * @return {Boolean}      true/false
+ * @deprecated use utils.js
  */
 function isFunction(name) // eslint-disable-line no-unused-vars
 {
@@ -379,6 +459,7 @@ function isFunction(name) // eslint-disable-line no-unused-vars
  * @param  {mixed}  context      context (window or first namespace)
  *                               hidden next are all the arguments
  * @return {mixed}               Return values from functon
+ * @deprecated use utils.js
  */
 function executeFunctionByName(functionName, context /*, args */) // eslint-disable-line no-unused-vars
 {
@@ -395,6 +476,7 @@ function executeFunctionByName(functionName, context /*, args */) // eslint-disa
  * checks if a variable is an object
  * @param  {Mixed}   val possible object
  * @return {Boolean}     true/false if it is an object or not
+ * @deprecated use utils.js
  */
 function isObject(val)
 {
@@ -408,6 +490,7 @@ function isObject(val)
  * get the length of an object (entries)
  * @param  {Object} object object to check
  * @return {Number} number of entry
+ * @deprecated use utils.js
  */
 function getObjectCount(object)
 {
@@ -419,6 +502,7 @@ function getObjectCount(object)
  * @param  {String}  key    key name
  * @param  {Object}  object object to search key in
  * @return {Boolean}        true/false if key exists in object
+ * @deprecated use utils.js
  */
 function keyInObject(key, object)
 {
@@ -430,6 +514,7 @@ function keyInObject(key, object)
  * @param  {Object} object object to search value in
  * @param  {Mixed}  value  any value (String, Number, etc)
  * @return {String}        the key found for the first matching value
+ * @deprecated use utils.js
  */
 function getKeyByValue(object, value) // eslint-disable-line no-unused-vars
 {
@@ -444,6 +529,7 @@ function getKeyByValue(object, value) // eslint-disable-line no-unused-vars
  * @param  {Object}  object object to search value in
  * @param  {Mixed}   value  any value (String, Number, etc)
  * @return {Boolean}        true on value found, false on not found
+ * @deprecated use utils.js
  */
 function valueInObject(object, value) // eslint-disable-line no-unused-vars
 {
@@ -459,6 +545,7 @@ function valueInObject(object, value) // eslint-disable-line no-unused-vars
  * or if JSON.parse(JSON.stringify(obj)) is failing
  * @param  {Object} inObject Object to copy
  * @return {Object}          Copied Object
+ * @deprecated use utils.js
  */
 function deepCopyFunction(inObject)
 {
@@ -482,6 +569,7 @@ function deepCopyFunction(inObject)
  * checks if a DOM element actually exists
  * @param  {String}  id Element id to check for
  * @return {Boolean}    true if element exists, false on failure
+ * @deprecated use utils.js
  */
 function exists(id)
 {
@@ -493,6 +581,7 @@ function exists(id)
  * currently precision is fixed, if dynamic needs check for max/min precision
  * @param  {Number} bytes bytes in int
  * @return {String}       string in GB/MB/KB
+ * @deprecated use utils.js
  */
 function formatBytes(bytes) // eslint-disable-line no-unused-vars
 {
@@ -509,6 +598,7 @@ function formatBytes(bytes) // eslint-disable-line no-unused-vars
  * like formatBytes, but returns bytes for <1KB and not 0.n KB
  * @param  {Number} bytes bytes in int
  * @return {String}       string in GB/MB/KB
+ * @deprecated use utils.js
  */
 function formatBytesLong(bytes) // eslint-disable-line no-unused-vars
 {
@@ -521,6 +611,7 @@ function formatBytesLong(bytes) // eslint-disable-line no-unused-vars
  * Convert a string with B/K/M/etc into a byte number
  * @param  {String|Number} bytes Any string with B/K/M/etc
  * @return {String|Number}       A byte number, or original string as is
+ * @deprecated use utils.js
  */
 function stringByteFormat(bytes) // eslint-disable-line no-unused-vars
 {
@@ -551,6 +642,7 @@ function stringByteFormat(bytes) // eslint-disable-line no-unused-vars
 /**
  * prints out error messages based on data available from the browser
  * @param {Object} err error from try/catch block
+ * @deprecated use utils.js
  */
 function errorCatch(err)
 {
@@ -594,6 +686,7 @@ function errorCatch(err)
  * @param {String}  loc            location name for action indicator
  *                                 default empty. for console.log
  * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
+ * @deprecated use utils.js
  */
 function actionIndicator(loc, overlay = true) // eslint-disable-line no-unused-vars
 {
@@ -610,6 +703,7 @@ function actionIndicator(loc, overlay = true) // eslint-disable-line no-unused-v
  * @param {String}  loc            location name for action indicator
  *                                 default empty. for console.log
  * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
+ * @deprecated use utils.js
  */
 function actionIndicatorShow(loc, overlay = true)
 {
@@ -632,6 +726,7 @@ function actionIndicatorShow(loc, overlay = true)
  * @param {String}  loc            location name for action indicator
  *                                 default empty. for console.log
  * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
+ * @deprecated use utils.js
  */
 function actionIndicatorHide(loc, overlay = true)
 {
@@ -644,6 +739,7 @@ function actionIndicatorHide(loc, overlay = true)
 
 /**
  * shows the overlay box or if already visible, bumps the zIndex to 100
+ * @deprecated use utils.js
  */
 function overlayBoxShow()
 {
@@ -658,6 +754,7 @@ function overlayBoxShow()
 
 /**
  * hides the overlay box or if zIndex is 100 bumps it down to previous level
+ * @deprecated use utils.js
  */
 function overlayBoxHide()
 {
@@ -671,6 +768,7 @@ function overlayBoxHide()
 
 /**
  * position the overlay block box and shows it
+ * @deprecated use utils.js
  */
 function setOverlayBox() // eslint-disable-line no-unused-vars
 {
@@ -681,6 +779,7 @@ function setOverlayBox() // eslint-disable-line no-unused-vars
 
 /**
  * opposite of set, always hides overlay box
+ * @deprecated use utils.js
  */
 function hideOverlayBox() // eslint-disable-line no-unused-vars
 {
@@ -691,6 +790,7 @@ function hideOverlayBox() // eslint-disable-line no-unused-vars
 
 /**
  * the abort call, clears the action box and hides it and the overlay box
+ * @deprecated use utils.js
  */
 function ClearCall() // eslint-disable-line no-unused-vars
 {
@@ -712,6 +812,7 @@ function ClearCall() // eslint-disable-line no-unused-vars
  *   zIndex of 1000
  * - indicator is page centered
  * @param {String} loc ID string, only used for console log
+ * @deprecated use utils.js
  */
 function showActionIndicator(loc) // eslint-disable-line no-unused-vars
 {
@@ -750,6 +851,7 @@ function showActionIndicator(loc) // eslint-disable-line no-unused-vars
  * the overlayBox is not hidden but the zIndex
  * is set to this value
  * @param {String} loc ID string, only used for console log
+ * @deprecated use utils.js
  */
 function hideActionIndicator(loc) // eslint-disable-line no-unused-vars
 {
@@ -773,6 +875,7 @@ function hideActionIndicator(loc) // eslint-disable-line no-unused-vars
 /**
  * checks if overlayBox exists, if not it is
  * added as hidden item at the body end
+ * @deprecated use utils.js
  */
 function checkOverlayExists()
 {
@@ -790,6 +893,7 @@ function checkOverlayExists()
  * if not visible show and set zIndex to 10 (GL_OB_BASE)
  * if visible, add +1 to the GL_OB_S variable and
  * up zIndex by this value
+ * @deprecated use utils.js
  */
 function showOverlayBoxLayers(el_id) // eslint-disable-line no-unused-vars
 {
@@ -822,6 +926,7 @@ function showOverlayBoxLayers(el_id) // eslint-disable-line no-unused-vars
  * and set zIndex and GL_OB_S to 0
  * else just set zIndex to the new GL_OB_S value
  * @param {String} el_id Target to hide layer
+ * @deprecated use utils.js
  */
 function hideOverlayBoxLayers(el_id='')
 {
@@ -847,6 +952,7 @@ function hideOverlayBoxLayers(el_id='')
 
 /**
  * only for single action box
+ * @deprecated use utils.js
  */
 function clearCallActionBox() // eslint-disable-line no-unused-vars
 {
@@ -864,6 +970,7 @@ function clearCallActionBox() // eslint-disable-line no-unused-vars
  * @param  {Array}  [css=[]]     array for css tags
  * @param  {Object} [options={}] anything else (value, placeholder, OnClick, style)
  * @return {Object}              created element as an object
+ * @deprecated use utils.js
  */
 function cel(tag, id = '', content = '', css = [], options = {})
 {
@@ -884,6 +991,7 @@ function cel(tag, id = '', content = '', css = [], options = {})
  * @param  {Object} attach  the object to be attached
  * @param  {String} [id=''] optional id, if given search in base for this id and attach there
  * @return {Object}         "none", technically there is no return needed as it is global attach
+ * @deprecated use utils.js
  */
 function ael(base, attach, id = '')
 {
@@ -914,6 +1022,7 @@ function ael(base, attach, id = '')
  * @param  {Object}    base   object to where we attach the elements
  * @param  {...Object} attach attach 1..n: attach directly to the base element those attachments
  * @return {Object}           "none", technically there is no return needed, global attach
+ * @deprecated use utils.js
  */
 function aelx(base, ...attach)
 {
@@ -930,6 +1039,7 @@ function aelx(base, ...attach)
  * @param  {Object} base   object to where we attach the elements
  * @param  {Array}  attach array of objects to attach
  * @return {Object}        "none", technically there is no return needed, global attach
+ * @deprecated use utils.js
  */
 function aelxar(base, attach) // eslint-disable-line no-unused-vars
 {
@@ -944,6 +1054,7 @@ function aelxar(base, attach) // eslint-disable-line no-unused-vars
  * resets the sub elements of the base element given
  * @param  {Object} base cel created element
  * @return {Object}      returns reset base element
+ * @deprecated use utils.js
  */
 function rel(base) // eslint-disable-line no-unused-vars
 {
@@ -956,6 +1067,7 @@ function rel(base) // eslint-disable-line no-unused-vars
  * @param  {Object} _element element to work one
  * @param  {String} css      style sheet to remove (name)
  * @return {Object}          returns full element
+ * @deprecated use utils.js
  */
 function rcssel(_element, css)
 {
@@ -971,6 +1083,7 @@ function rcssel(_element, css)
  * @param  {Object} _element element to work on
  * @param  {String} css      style sheet to add (name)
  * @return {Object}         returns full element
+ * @deprecated use utils.js
  */
 function acssel(_element, css)
 {
@@ -988,6 +1101,7 @@ function acssel(_element, css)
  * @param  {String} rcss     style to remove (name)
  * @param  {String} acss     style to add (name)
  * @return {Object}          returns full element
+ * @deprecated use utils.js
  */
 function scssel(_element, rcss, acss) // eslint-disable-line no-unused-vars
 {
@@ -1000,6 +1114,7 @@ function scssel(_element, rcss, acss) // eslint-disable-line no-unused-vars
  * that can be inserted into the page
  * @param  {Object} tree object tree with dom element declarations
  * @return {String}      HTML string that can be used as innerHTML
+ * @deprecated use utils.js
  */
 function phfo(tree)
 {
@@ -1106,6 +1221,7 @@ function phfo(tree)
  * Is like tree.sub call
  * @param  {Array}  list Array of cel created objects
  * @return {String}      HTML String
+ * @deprecated use utils.js
  */
 function phfa(list) // eslint-disable-line no-unused-vars
 {
@@ -1132,6 +1248,7 @@ function phfa(list) // eslint-disable-line no-unused-vars
  * @param  {String}  [sort='']             if empty as is, else allowed 'keys',
  *                                         'values' all others are ignored
  * @return {String}                        html with build options block
+ * @deprecated use utils.js
  */
 function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '') // eslint-disable-line no-unused-vars
 {
@@ -1159,6 +1276,7 @@ function html_options(name, data, selected = '', options_only = false, return_st
  *                                         'values' all others are ignored
  * @param  {String}  [onchange='']         onchange trigger call, default unset
  * @return {String}                        html with build options block
+ * @deprecated use utils.js
  */
 function html_options_block(
 	name, data, selected = '', multiple = 0, options_only = false, return_string = false, sort = '', onchange = ''
@@ -1241,6 +1359,7 @@ function html_options_block(
  * @param {String} name      name/id
  * @param {Object} data      array of options
  * @param {String} [sort=''] if empty as is, else allowed 'keys', 'values'
+ * @deprecated use utils.js
  *                            all others are ignored
  */
 function html_options_refill(name, data, sort = '') // eslint-disable-line no-unused-vars
@@ -1289,6 +1408,7 @@ function html_options_refill(name, data, sort = '') // eslint-disable-line no-un
  * @param  {String}        [return_key=''] if set only returns this key entry
  *                                         or empty for none
  * @return {Object|String}                 parameter entry list
+ * @deprecated use utils.js
  */
 function parseQueryString(query = '', return_key = '') // eslint-disable-line no-unused-vars
 {
@@ -1343,6 +1463,7 @@ function parseQueryString(query = '', return_key = '') // eslint-disable-line no
  * @return {Object|Array|String}          if search is empty, object, if search is set
  *                                        and only one entry, then string, else array
  *                                        unless single is true
+ * @deprecated use utils.js
  */
 function getQueryStringParam(search = '', query = '', single = false) // eslint-disable-line no-unused-vars
 {
@@ -1380,6 +1501,7 @@ function getQueryStringParam(search = '', query = '', single = false) // eslint-
 // *** MASTER logout call
 /**
  * submits basic data for form logout
+ * @deprecated use utils.js
  */
 function loginLogout() // eslint-disable-line no-unused-vars
 {
@@ -1400,6 +1522,7 @@ function loginLogout() // eslint-disable-line no-unused-vars
  * @param {String} [header_id='mainHeader'] the target for the main element block
  *                                          if not set mainHeader is assumed
  *                                          this is the target div for the "loginRow"
+ * @deprecated use utils.js
  */
 function createLoginRow(login_string, header_id = 'mainHeader') // eslint-disable-line no-unused-vars
 {
@@ -1435,6 +1558,7 @@ function createLoginRow(login_string, header_id = 'mainHeader') // eslint-disabl
  * @param {String} [header_id='mainHeader'] the target for the main element block
  *                                          if not set mainHeader is assumed
  *                                          this is the target div for the "menuRow"
+ * @deprecated use utils.js
  */
 function createNavMenu(nav_menu, header_id = 'mainHeader') // eslint-disable-line no-unused-vars
 {

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

@@ -1,5 +1,11 @@
-/* general edit javascript */
+/*
-/* prototype version */
+general edit javascript
+prototype version
+*/
+
+/** @deprecated Do not use this anymore, use utils.js */
+
+throw new Error("Prototype Support is deprected, please switch to jquery and utils.js/utils.min.js");
 
 /* jshint esversion: 6 */
 
@@ -25,7 +31,7 @@ function pop(theURL, winName, features) {
 
 /**
  * automatically resize a text area based on the amount of lines in it
- * @param {[string} ta_id element id
+ * @param {string} ta_id element id
  */
 function expandTA(ta_id) {
 	var ta;

www/admin/layout/javascript/translateTest-ja_JP.UTF-8.js

@@ -0,0 +1,5 @@
+var i18n = {
+	"Original": "Translated"
+};
+
+// __END__

www/admin/test.javascript.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<head>
+	<title>JavaScript Test</title>
+	<script type="text/javascript" src="layout/javascript/jquery.min.js"></script>
+	<script type="text/javascript" src="layout/javascript/translateTest-ja_JP.UTF-8.js"></script>
+	<script type="text/javascript" src="layout/javascript/utils.min.js"></script>
+</head>
+<body>
+<div>
+	<h1>JavaScript tests</h1>
+	<div id="test-div">
+	</div>
+</div>
+</body>
+<script languagae="JavaScript">
+document.addEventListener('DOMContentLoaded', function() {
+	console.log('MAIN PAGE LOADED');
+	// console.log('Random: %o', mh.randomIdF());
+	console.log('Random: %o', randomIdF());
+	console.log("GW: %o", getWindowSize());
+	let bytes = 1021152;
+	console.log('FB: %o', formatBytes(bytes));
+	console.log('FBL: %o', formatBytesLong(bytes));
+	console.log('TR: %s', l10n.__('Original'));
+	console.log('TR: %s', l10n.__('Not exists'));
+
+	setCenter('test-div', true, true);
+	ClearCall();
+	overlayBoxShow();
+	actionIndicatorShow('testSmarty');
+	setTimeout(function() {
+		console.log('Waiting dummy ...');
+		actionIndicatorHide('testSmarty');
+		ClearCall();
+	}, 2000);
+});
+</script>

www/lib/CoreLibs/Basic.php

@@ -1024,8 +1024,12 @@ class Basic
 	 */
 	public function __sha1Short(string $string, bool $use_sha = false): string
 	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::__sha1Short()', E_USER_DEPRECATED);
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::sha1Short() or ::__crc32b()', E_USER_DEPRECATED);
-		return \CoreLibs\Create\Hash::__sha1Short($string, $use_sha);
+		if ($use_sha) {
+			return \CoreLibs\Create\Hash::sha1Short($string);
+		} else {
+			return \CoreLibs\Create\Hash::__crc32b($string);
+		}
 	}
 
 	/**
@@ -1040,8 +1044,8 @@ class Basic
 	 */
 	public function __hash(string $string, string $hash_type = 'adler32'): string
 	{
-		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::__hash()', E_USER_DEPRECATED);
+		trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::hash()', E_USER_DEPRECATED);
-		return \CoreLibs\Create\Hash::__hash($string, $hash_type);
+		return \CoreLibs\Create\Hash::hash($string, $hash_type);
 	}
 
 	// *** HASH FUNCTIONS END

www/lib/CoreLibs/Combined/DateTime.php

@@ -714,6 +714,66 @@ class DateTime
 		}
 	}
 
+	/**
+	 * wrapper for calcDaysInterval with numeric return only
+	 *
+	 * @param  string $start_date   valid start date (y/m/d)
+	 * @param  string $end_date     valid end date (y/m/d)
+	 * @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}
+	 */
+	public static function calcDaysIntervalNumIndex(
+		string $start_date,
+		string $end_date,
+		bool $include_end_date = true,
+		bool $exclude_start_date = false
+	): array {
+		$values = self::calcDaysInterval(
+			$start_date,
+			$end_date,
+			false,
+			$include_end_date,
+			$exclude_start_date
+		);
+		return [
+			$values[0] ?? 0,
+			$values[1] ?? 0,
+			$values[2] ?? 0,
+			$values[3] ?? false,
+		];
+	}
+
+	/**
+	 * wrapper for calcDaysInterval with named return only
+	 *
+	 * @param  string $start_date   valid start date (y/m/d)
+	 * @param  string $end_date     valid end date (y/m/d)
+	 * @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{overall:int,weekday:int,weekend:int,reverse:bool}
+	 */
+	public static function calcDaysIntervalNamedIndex(
+		string $start_date,
+		string $end_date,
+		bool $include_end_date = true,
+		bool $exclude_start_date = false
+	): array {
+		$values = self::calcDaysInterval(
+			$start_date,
+			$end_date,
+			true,
+			$include_end_date,
+			$exclude_start_date
+		);
+		return [
+			'overall' => $values['overall'] ?? 0,
+			'weekday' => $values['weekday'] ?? 0,
+			'weekend' => $values['weekend'] ?? 0,
+			'reverse' => $values['reverse'] ?? false,
+		];
+	}
+
 	/**
 	 * check if a weekend day (sat/sun) is in the given date range
 	 * Can have time too, but is not needed

www/lib/CoreLibs/Create/Hash.php

@@ -10,9 +10,14 @@ namespace CoreLibs\Create;
 
 class Hash
 {
+	/** @var string default short hash -> deprecated use STANDARD_HASH_SHORT */
 	public const DEFAULT_HASH = 'adler32';
+	/** @var string default long hash (40 chars) */
 	public const STANDARD_HASH_LONG = 'ripemd160';
+	/** @var string default short hash (8 chars) */
 	public const STANDARD_HASH_SHORT = 'adler32';
+	/** @var string this is the standard hash to use hashStd and hash (64 chars) */
+	public const STANDARD_HASH = 'sha256';
 
 	/**
 	 * checks php version and if >=5.2.7 it will flip the string
@@ -20,6 +25,7 @@ class Hash
 	 * hash returns false
 	 * preg_replace fails for older php version
 	 * Use __hash with crc32b or hash('crc32b', ...) for correct output
+	 * For future short hashes use hashShort() instead
 	 *
 	 * @param  string $string string to crc
 	 * @return string         crc32b hash (old type)
@@ -43,19 +49,31 @@ class Hash
 	 * replacement for __crc32b call
 	 *
 	 * @param  string $string  string to hash
-	 * @param  bool   $use_sha use sha instead of crc32b (default false)
+	 * @param  bool   $use_sha use sha1 instead of crc32b (default false)
 	 * @return string          hash of the string
+	 * @deprecated use __crc32b() for drop in replacement with default, or sha1Short() for use sha true
 	 */
 	public static function __sha1Short(string $string, bool $use_sha = false): string
 	{
 		if ($use_sha) {
-			// return only the first 9 characters
+			return self::sha1Short($string);
-			return substr(hash('sha1', $string), 0, 9);
 		} else {
 			return self::__crc32b($string);
 		}
 	}
 
+	/**
+	 * returns a short sha1
+	 *
+	 * @param  string $string  string to hash
+	 * @return string          hash of the string
+	 */
+	public static function sha1Short(string $string): string
+	{
+		// return only the first 9 characters
+		return substr(hash('sha1', $string), 0, 9);
+	}
+
 	/**
 	 * replacemend for __crc32b call (alternate)
 	 * defaults to adler 32
@@ -65,32 +83,81 @@ class Hash
 	 * @param  string $string    string to hash
 	 * @param  string $hash_type hash type (default adler32)
 	 * @return string            hash of the string
+	 * @deprecated use hashShort() of short hashes with adler 32 or hash() for other hash types
 	 */
 	public static function __hash(
 		string $string,
-		string $hash_type = self::DEFAULT_HASH
+		string $hash_type = self::STANDARD_HASH_SHORT
+	): string {
+		return self::hash($string, $hash_type);
+	}
+
+	/**
+	 * creates a hash over string if any valid hash given.
+	 * if no hash type set use sha256
+	 *
+	 * @param  string $string    string to ash
+	 * @param  string $hash_type hash type (default sha256)
+	 * @return string            hash of the string
+	 */
+	public static function hash(
+		string $string,
+		string $hash_type = self::STANDARD_HASH
 	): string {
-		// if not empty, check if in valid list
 		if (
 			empty($hash_type) ||
 			!in_array($hash_type, hash_algos())
 		) {
 			// fallback to default hash type if none set or invalid
-			$hash_type = self::DEFAULT_HASH;
+			$hash_type = self::STANDARD_HASH;
 		}
 		return hash($hash_type, $string);
 	}
 
 	/**
-	 * Wrapper function for standard long hashd
+	 * short hash with max length of 8, uses adler32
+	 *
+	 * @param  string $string string to hash
+	 * @return string         hash of the string
+	 */
+	public static function hashShort(string $string): string
+	{
+		return hash(self::STANDARD_HASH_SHORT, $string);
+	}
+
+	/**
+	 * Wrapper function for standard long hash
+	 *
+	 * @param string $string String to be hashed
+	 * @return string        Hashed string
+	 * @deprecated use hashLong()
+	 */
+	public static function __hashLong(string $string): string
+	{
+		return self::hashLong($string);
+	}
+
+	/**
+	 * Wrapper function for standard long hash, uses ripmd160
 	 *
 	 * @param string $string String to be hashed
 	 * @return string        Hashed string
 	 */
-	public static function __hashLong(string $string): string
+	public static function hashLong(string $string): string
 	{
 		return hash(self::STANDARD_HASH_LONG, $string);
 	}
+
+	/**
+	 * create standard hash basd on STANDAR_HASH, currently sha256
+	 *
+	 * @param  string $string string in
+	 * @return string         hash of the string
+	 */
+	public static function hashStd(string $string): string
+	{
+		return self::hash($string, self::STANDARD_HASH);
+	}
 }
 
 // __END__

www/lib/CoreLibs/DB/IO.php

@@ -4056,7 +4056,7 @@ class IO
 	 */
 	public function dbGetQueryHash(string $query, array $params = []): string
 	{
-		return Hash::__hashLong(
+		return Hash::hashLong(
 			$query . (
 				$params !== [] ?
 					'#' . json_encode($params) : ''

www/lib/CoreLibs/Output/ProgressBar.php

@@ -418,9 +418,7 @@ class ProgressBar
 		// if this is percent, we ignore anything, it is auto positioned
 		if ($this->label[$name]['type'] != 'percent') {
 			foreach (['top', 'left', 'width', 'height'] as $pos_name) {
-				if ($$pos_name !== false) {
+				$this->label[$name][$pos_name] = intval($$pos_name);
-					$this->label[$name][$pos_name] = intval($$pos_name);
-				}
 			}
 
 			if ($align != '') {