Tracking: Remove previously added SYS_VAR_DIR (use SYMFONY_SYS_PATH) and improve language variables

Author: ywarnier

assets/locales/en_US.json

@@ -1477,4 +1477,4 @@
     "Job": "Job",
     "Modified prompt": "Modified prompt",
     "Saved in Documents": "Saved in Documents"
-}
+}

public/main/inc/ajax/statistics.ajax.php

@@ -4,6 +4,7 @@
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Helpers\ChamiloHelper;
+use League\Flysystem\FilesystemOperator;
 
 /**
  * Responses to AJAX calls.
@@ -1447,15 +1448,29 @@
         if (api_is_windows_os()) {
             $message = get_lang('The space used on disk cannot be measured properly on Windows-based systems.');
         } else {
-            $dir = api_get_path(SYS_VAR_PATH);
-            $du = exec('du -sh '.$dir, $err);
+            // @TODO Scanning the var folder should be done through oneup_flysystem
+            /** @var FilesystemOperator $assetFS */
+            //$assetFS = Container::$container->get('oneup_flysystem.asset_filesystem');
+            /** @var FilesystemOperator $resourceFS */
+            //$resourceFS = Container::$container->get('oneup_flysystem.resource_filesystem');
+            /** @var FilesystemOperator $themesFS */
+            //$themesFS = Container::$container->get('oneup_flysystem.themes_filesystem');
+            /** @var FilesystemOperator $pluginsFS */
+            //$pluginsFS = Container::$container->get('oneup_flysystem.plugins_filesystem');
+
+            $dir = api_get_path(SYMFONY_SYS_PATH).'var/';
+            $du = exec('du -s '.$dir, $err);
             list($size, $none) = explode("\t", $du);
+            $size = round($size / (1024*1024), 1);
             unset($none);
-            $limit = 0;
-            if (isset($_configuration[$accessUrlId]['hosting_limit_disk_space'])) {
-                $limit = $_configuration[$accessUrlId]['hosting_limit_disk_space'];
+            $limit = '';
+            $url = api_get_access_url($accessUrlId)['url'];
+            if (!empty($_configuration[$accessUrlId]['hosting_limit_disk_space'])) {
+                $limit = round($_configuration[$accessUrlId]['hosting_limit_disk_space'] / (1024), 1);
+                $message = sprintf(get_lang('Total space used by portal %s is %sGB (limit is set to %sGB)'), $url, $size, $limit);
+            } else {
+                $message = sprintf(get_lang('Total space used by %s is %sGB'), $url, $size);
             }
-            $message = sprintf(get_lang('Total space used by portal %s limit is %s MB'), $size, $limit);
         }
         echo Display::tag('H5', $message, ['style' => 'margin-bottom: 25px;']);
         break;

public/main/inc/lib/api.lib.php

@@ -350,7 +350,6 @@
 define('WEB_PLUGIN_PATH', 'WEB_PLUGIN_PATH');
 define('WEB_PLUGIN_ASSET_PATH', 'WEB_PLUGIN_ASSET_PATH');
 define('SYS_ARCHIVE_PATH', 'SYS_ARCHIVE_PATH');
-define('SYS_VAR_PATH', 'SYS_VAR_PATH');
 define('WEB_ARCHIVE_PATH', 'WEB_ARCHIVE_PATH');
 define('LIBRARY_PATH', 'LIBRARY_PATH');
 define('CONFIGURATION_PATH', 'CONFIGURATION_PATH');
@@ -763,7 +762,6 @@ function api_get_path($path = '', $configuration = [])
         SYS_CSS_PATH => $root_sys.'public/build/css/',
         SYS_PLUGIN_PATH => $root_sys.'public/plugin/',
         SYS_ARCHIVE_PATH => Container::$container ? Container::getCacheDir() : $root_sys.'var/cache/',
-        SYS_VAR_PATH => Container::$container ? Container::getVarDir() : $root_sys.'var/',
         SYS_TEST_PATH => $root_sys.'tests/',
         SYS_TEMPLATE_PATH => $root_sys.'public/main/template/',
         SYS_PUBLIC_PATH => $root_sys.'public/',

translations/messages.ar.po

@@ -19428,9 +19428,6 @@ msgstr "ازالة قاعدة البيانات القديمة"
 msgid "Remove old tables"
 msgstr "ازالة الجداول القديمة"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "مجموع المساحة المستخدمة من قبل النظام %s الحد الاقصى هو %s MB"
-
 msgid "Event message management"
 msgstr "ادارة رسالة الحدث"
 

translations/messages.ast_ES.po

@@ -19415,9 +19415,6 @@ msgstr "Eliminar base de datos antigua"
 msgid "Remove old tables"
 msgstr "Eliminar tables antiguas"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "Espaciu total usáu pol portal %s llimitáu a %s MB"
-
 msgid "Event message management"
 msgstr "Xestión de mensaxes d'eventos"
 

translations/messages.bg.po

@@ -19415,9 +19415,6 @@ msgstr "Изтриване на стара база данни"
 msgid "Remove old tables"
 msgstr "Изтриване на стари таблици"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "Общо заето място от портала %s лимит %s MB"
-
 msgid "Event message management"
 msgstr "Управление на съобщения за събития"
 

translations/messages.bn_BD.po

@@ -19410,9 +19410,6 @@ msgstr "পুরানো ডাটাবেস মুছুন"
 msgid "Remove old tables"
 msgstr "পুরানো টেবিল মুছুন"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "পোর্টাল %s দ্বারা ব্যবহৃত মোট স্থান %s MB সীমা"
-
 msgid "Event message management"
 msgstr "ঘটনা বার্তা ব্যবস্থাপনা"
 

translations/messages.bo_CN.po

@@ -19410,9 +19410,6 @@ msgstr ""
 msgid "Remove old tables"
 msgstr ""
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr ""
-
 msgid "Event message management"
 msgstr ""
 

translations/messages.bs_BA.po

@@ -19410,9 +19410,6 @@ msgstr "Ukloni staru bazu podataka"
 msgid "Remove old tables"
 msgstr "Ukloni stare tabele"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "Ukupno prostora korišteno od portala %s limit je %s MB"
-
 msgid "Event message management"
 msgstr "Upravljanje porukama događaja"
 

translations/messages.ca_ES.po

@@ -19428,9 +19428,6 @@ msgstr "Elimina la base de dades antiga"
 msgid "Remove old tables"
 msgstr "Elimina les taules antigues"
 
-msgid "Total space used by portal %s limit is %s MB"
-msgstr "Espai tot utilitzat pel portal %s el límit és de %s MB"
-
 msgid "Event message management"
 msgstr "Administració d'esdeveniments"