composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	setup/modelfactory.class.inc.php
#	setup/setuputils.class.inc.php
This commit is contained in:
Pierre Goiffon
2024-03-13 09:27:06 +01:00
parent 289ca7b505 986c24d777
commit a337ef3d88
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/applicationextension.inc.php
View File

@@ -2037,8 +2037,16 @@ class RestUtils
elseif (is_string($key))
{
// OQL
$oSearch = DBObjectSearch::FromOQL($key);
}
try {
$oSearch = DBObjectSearch::FromOQL($key);
} catch (Exception $e) {
throw new CoreOqlException('Query failed to execute', [
'query' => $key,
'exception_class' => get_class($e),
'exception_message' => $e->getMessage(),
]);
}
}
else
{
throw new Exception("Wrong format for key");

11
setup/modelfactory.class.inc.php
View File

@@ -952,10 +952,13 @@ class ModelFactory
$this->aDictKeys[$sLanguageCode][$sCode] = $oXmlEntry;
}
}
}
catch (Exception $e) {
throw new Exception('Failed to load dictionary file "'.$sPHPFile.'", reason: '.$e->getMessage());
}
} catch (Exception|Error $e) // Error can occurs on eval() calls
{
throw new DictException('Failed to load dictionary file "' . $sPHPFile . '"', [
'exception_class' => get_class($e),
'exception_msg' => $e->getMessage(),
]);
}
}
catch (Exception $e) {

11
setup/setuputils.class.inc.php
View File

@@ -988,9 +988,18 @@ class SetupUtils
return $f;
}
/**
* @param float $fBytes size in raw bytes, for example 162594750464.0
* @return string formatted string, for example "161.62 GB"
*
* @link https://en.wiktionary.org/wiki/byte byte and not Byte
* @link https://en.wikipedia.org/wiki/Kilobyte kB and not KB (IEC 80000-13)
* @link https://en.wiktionary.org/wiki/petabyte petabyte PB
* @link https://en.wiktionary.org/wiki/exabyte exabyte EB
*/
public static function HumanReadableSize($fBytes)
{
$aSizes = array('bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'HB');
$aSizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
$index = 0;
while (($fBytes > 1000) && ($index < count($aSizes))) {
$index++;