Merge branch '3.2.x' into nightly

Author: Dmytro Lukianenko

.gitignore

@@ -41,6 +41,7 @@
 # Composer
 /composer.phar
 
+/vendor
 !/vendor/index.html
 
 # IDE Helper
@@ -54,6 +55,7 @@ npm-debug.log
 
 #docker
 /docker/nginx/logs/*
+/.env
 
 # System
 ftpsync.settings

core/custom/define.php.example

@@ -6,7 +6,7 @@
  *      - SESSION_COOKIE_PATH
  *      - SESSION_COOKIE_DOMAIN
  *      - SESSION_COOKIE_NAME
- *      - MODX_CLASS
+ *      - EVO_CLASS
  *      - EVO_CORE_PATH
  *      - MODX_SITE_HOSTNAMES
  *      - MGR_DIR

core/functions/actions/files.php

@@ -160,7 +160,7 @@ function ls($curpath, array $options = [])
             echo '<tr>';
             echo '<td>' . $dirs_array[$i]['text'] . '</td>';
             echo '<td class="text-nowrap">' . evolutionCMS()->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
-            echo '<td class="text-right">' . nicesize($dirs_array[$i]['stats']['7']) . '</td>';
+            echo '<td class="text-right">' . niceSize($dirs_array[$i]['stats']['7']) . '</td>';
             echo '<td class="actions text-right">';
             echo $dirs_array[$i]['rename'];
             echo $dirs_array[$i]['delete'];
@@ -175,8 +175,8 @@ function ls($curpath, array $options = [])
             $filesizes += $files_array[$i]['stats']['7'];
             echo '<tr ' . markRow($files_array[$i]['file'], get_by_key($_REQUEST, 'path'), get_by_key($_REQUEST, 'mode')) . '>';
             echo '<td>' . $files_array[$i]['text'] . '</td>';
-            echo '<td class="text-nowrap">' . evolutionCMS()->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
-            echo '<td class="text-right">' . nicesize($files_array[$i]['stats']['7']) . '</td>';
+            echo '<td class="text-nowrap">' . evo()->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
+            echo '<td class="text-right">' . niceSize($files_array[$i]['stats']['7']) . '</td>';
             echo '<td class="actions text-right">';
             echo $files_array[$i]['unzip'];
             echo $files_array[$i]['view'];
@@ -425,7 +425,7 @@ function fileupload()
             if ($userfile['error'] == 0) {
                 $img = (strpos($userfile['type'],
                         'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
-                $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
+                $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . niceSize(filesize($userfile['tmp_name'])) . $img . '</p>';
             }
 
             $userfilename = $userfile['tmp_name'];

core/functions/helper.php

@@ -119,23 +119,44 @@ function is_cli()
     }
 }
 
-if (!function_exists('nicesize')) {
+if (!function_exists('niceSize')) {
     /**
-     * @param $size
-     * @return string
+     * Format file size in human-readable format.
+     *
+     * Converts bytes to appropriate unit (B, KB, MB, GB, TB) with proper rounding.
+     * Uses modern ISO/IEC 80000 standard formatting with uppercase units.
+     *
+     * @param int|float $size File size in bytes
+     * @return string Formatted file size with unit
+     *
+     * @example
+     * niceSize(1024); // "1 KB"
+     * niceSize(1048576); // "1 MB"
+     * niceSize(1536); // "1.5 KB"
+     * niceSize(0); // "0 B"
      */
-    function nicesize($size)
+    function niceSize($size)
     {
-        $sizes = array('Tb' => 1099511627776, 'Gb' => 1073741824, 'Mb' => 1048576, 'Kb' => 1024, 'b' => 1);
-        $precisions = count($sizes) - 1;
-        foreach ($sizes as $unit => $bytes) {
-            if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions).' '.$unit;
-            }
-            $precisions--;
+        $units = ['B', 'KB', 'MB', 'GB', 'TB'];
+        $unitIndex = 0;
+
+        while ($size >= 1024 && $unitIndex < count($units) - 1) {
+            $size /= 1024;
+            $unitIndex++;
         }
 
-        return '0 b';
+        return round($size, 2) . ' ' . $units[$unitIndex];
+    }
+}
+
+if (!function_exists('nicesize')) {
+    /**
+     * @deprecated since EVO 3.2.7, use niceSize()
+     * @TODO: will be delete EVO 3.5
+     */
+    function nicesize($size)
+    {
+        return niceSize($size);
     }
 }