diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php index 6a276278ac..32848eb343 100644 --- a/core/src/core/classes/class.AJXP_Utils.php +++ b/core/src/core/classes/class.AJXP_Utils.php @@ -704,7 +704,8 @@ public static function convertBytes($value) return intval($value); } else { $value_length = strlen($value); - $qty = substr($value, 0, $value_length - 1); + $value = str_replace(",",".", $value); + $qty = floatval(substr($value, 0, $value_length - 1)); $unit = strtolower(substr($value, $value_length - 1)); switch ($unit) { case 'k': diff --git a/core/src/core/classes/class.AJXP_VarsFilter.php b/core/src/core/classes/class.AJXP_VarsFilter.php index 2a52a505fe..a40ae32474 100644 --- a/core/src/core/classes/class.AJXP_VarsFilter.php +++ b/core/src/core/classes/class.AJXP_VarsFilter.php @@ -33,7 +33,7 @@ class AJXP_VarsFilter * Calls the vars.filter hooks. * @static * @param $value - * @param AbstractAjxpUser $resolveUser + * @param AbstractAjxpUser|String $resolveUser * @return mixed|string */ public static function filter($value, $resolveUser = null) @@ -41,7 +41,12 @@ public static function filter($value, $resolveUser = null) if (is_string($value) && strpos($value, "AJXP_USER")!==false) { if (AuthService::usersEnabled()) { if($resolveUser != null){ - $value = str_replace("AJXP_USER", $resolveUser->getId(), $value); + if(is_string($resolveUser)){ + $resolveUserId = $resolveUser; + } else { + $resolveUserId = $resolveUser->getId(); + } + $value = str_replace("AJXP_USER", $resolveUserId, $value); }else{ $loggedUser = AuthService::getLoggedUser(); if ($loggedUser != null) { @@ -62,7 +67,11 @@ public static function filter($value, $resolveUser = null) if (is_string($value) && strpos($value, "AJXP_GROUP_PATH")!==false) { if (AuthService::usersEnabled()) { if($resolveUser != null){ - $loggedUser = $resolveUser; + if(is_string($resolveUser) && AuthService::userExists($resolveUser)){ + $loggedUser = ConfService::getConfStorageImpl()->createUserObject($resolveUser); + }else{ + $loggedUser = $resolveUser; + } }else{ $loggedUser = AuthService::getLoggedUser(); }