Merge pull request #2004 from Admidio/configurable-discspace-path

Author: MightyMCoder

install/db_scripts/preferences.php

@@ -36,6 +36,7 @@
     'system_url_imprint' => '',
     'system_url_data_protection' => '',
     'password_min_strength' => '1',
+    'path_for_calculating_disk_usage' => '',
 
     // Theme
     'theme' => 'simple',

languages/en.xml

@@ -177,6 +177,8 @@
   <string name="ORG_PASSWORD_MIN_STRENGTH_MID">Middle</string>
   <string name="ORG_PASSWORD_MIN_STRENGTH_NO">None</string>
   <string name="ORG_PASSWORD_MIN_STRENGTH_VERY_HIGH">Very high</string>
+  <string name="ORG_PATH_FOR_CALCULATING_DISK_USAGE">Path for calculating disk usage</string>
+  <string name="ORG_PATH_FOR_CALCULATING_DISK_USAGE_DESC">The path to the folder for calculating the disk usage. This is used in the system information to calculate the disk usage of the Admidio installation. The path can be defined as an absolute path or as a relative path to the Admidio main directory. If the path is left blank, the disk usage will be calculated for the server\'s root directory. (default: empty)</string>
   <string name="ORG_PIXEL">Pixel</string>
   <string name="ORG_PROFILE_FIELDS">Profile fields</string>
   <string name="ORG_REFUSE_REGISTRATION">Notification on refusal of registration</string>

src/UI/Presenter/PreferencesPresenter.php

@@ -618,6 +618,12 @@ public function createCommonForm(): string
             (bool) $formValues['system_browser_update_check'],
             array('helpTextId' => 'ORG_BROWSER_UPDATE_CHECK_DESC')
         );
+        $formCommon->addInput(
+            'path_for_calculating_disk_usage',
+            $gL10n->get('ORG_PATH_FOR_CALCULATING_DISK_USAGE'),
+            $formValues['path_for_calculating_disk_usage'],
+            array('maxLength' => 250, 'helpTextId' => 'ORG_PATH_FOR_CALCULATING_DISK_USAGE_DESC')
+        );
         $formCommon->addSubmitButton(
             'adm_button_save_common',
             $gL10n->get('SYS_SAVE'),
@@ -2456,7 +2462,7 @@ public function createSsoForm(): string
      */
     public function createSystemInformationForm(): string
     {
-        global $gL10n, $gDb, $gLogger, $gDebug, $gImportDemoData, $gSystemComponent;
+        global $gL10n, $gDb, $gLogger, $gDebug, $gImportDemoData, $gSystemComponent, $gSettingsManager;
 
         // Admidio Version and Update
         $component = new ComponentUpdate($gDb);
@@ -2554,7 +2560,18 @@ public function createSystemInformationForm(): string
         $this->assignSmartyVariable('importModeText', $importModeText);
 
         try {
-            $diskSpace = FileSystemUtils::getDiskSpace();
+            if ($gSettingsManager->has('path_for_calculating_disk_usage') && !empty($gSettingsManager->get('path_for_calculating_disk_usage'))) {
+                $pathForCalculatingDiskUsage = $gSettingsManager->get('path_for_calculating_disk_usage');
+                // if it's a relative path, we have to add the Admidio base path, otherwise we would calculate the disk usage for the whole system root if the relative path is empty or just the wrong path if its not empty
+                if (!str_starts_with($pathForCalculatingDiskUsage, '/') && !str_starts_with($pathForCalculatingDiskUsage, '\\')) {
+                    $pathForCalculatingDiskUsage = ADMIDIO_PATH . DIRECTORY_SEPARATOR . $pathForCalculatingDiskUsage;
+                }
+                if (is_dir($pathForCalculatingDiskUsage)) {
+                    $diskSpace = FileSystemUtils::getDiskSpace($pathForCalculatingDiskUsage);
+                }
+            } else {
+                $diskSpace = FileSystemUtils::getDiskSpace();
+            }
             $progressBarClass = '';
 
             $diskUsagePercent = round(($diskSpace['used'] / $diskSpace['total']) * 100, 1);

themes/simple/templates/preferences/preferences.common.tpl

@@ -13,6 +13,7 @@
     {include 'sys-template-parts/form.input.tpl' data=$elements['system_url_imprint']}
     {include 'sys-template-parts/form.checkbox.tpl' data=$elements['system_js_editor_enabled']}
     {include 'sys-template-parts/form.checkbox.tpl' data=$elements['system_browser_update_check']}
+    {include 'sys-template-parts/form.input.tpl' data=$elements['path_for_calculating_disk_usage']}
     {include 'sys-template-parts/form.button.tpl' data=$elements['adm_button_save_common']}
     <div class="form-alert" style="display: none;">&nbsp;</div>
 </form>