Преглед изворни кода

use helper function to simply code

Tim Fry пре 1 година
родитељ
комит
af4fdbeb60
1 измењених фајлова са 4 додато и 6 уклоњено
  1. 4 6
      maintenance.php

+ 4 - 6
maintenance.php

@@ -177,18 +177,16 @@ else {
 	foreach ($classes as $maintainer) {
 	foreach ($classes as $maintainer) {
 		$domain_settings = new settings(['database' => $database, 'domain_uuid' => $_SESSION['domain_uuid'] ?? $domain_uuid]);
 		$domain_settings = new settings(['database' => $database, 'domain_uuid' => $_SESSION['domain_uuid'] ?? $domain_uuid]);
 		//database retention days
 		//database retention days
-		$category = maintenance::get_database_category($maintainer);
-		$subcategory = maintenance::get_database_subcategory($maintainer);
-		$database_retention_days = $domain_settings->get($category, $subcategory, '');
+		$database_retention_days = maintenance::get_database_retention_days($domain_settings, $maintainer);
 		if (!empty($database_retention_days)) {
 		if (!empty($database_retention_days)) {
+			$category = maintenance::get_database_category($maintainer);
 			$maintenance_apps[$category]['database_maintenance'][$domain_uuid]['domain_setting_value'] = $database_retention_days;
 			$maintenance_apps[$category]['database_maintenance'][$domain_uuid]['domain_setting_value'] = $database_retention_days;
 			$maintenance_apps[$category]['database_maintenance'][$domain_uuid]['domain_setting_enabled'] = 'true';
 			$maintenance_apps[$category]['database_maintenance'][$domain_uuid]['domain_setting_enabled'] = 'true';
 		}
 		}
 		//filesystem retention days
 		//filesystem retention days
-		$category = maintenance::get_filesystem_category($maintainer);
-		$subcategory = maintenance::get_filesystem_subcategory($maintainer);
-		$filesystem_retention_days = $domain_settings->get($category, $subcategory, '');
+		$filesystem_retention_days = maintenance::get_filesystem_retention_days($domain_settings, $maintainer);
 		if (!empty($filesystem_retention_days)) {
 		if (!empty($filesystem_retention_days)) {
+			$category = maintenance::get_filesystem_category($maintainer);
 			$maintenance_apps[$category]['filesystem_maintenance'][$domain_uuid]['domain_setting_value'] = $filesystem_retention_days;
 			$maintenance_apps[$category]['filesystem_maintenance'][$domain_uuid]['domain_setting_value'] = $filesystem_retention_days;
 			$maintenance_apps[$category]['filesystem_maintenance'][$domain_uuid]['domain_setting_enabled'] = 'true';
 			$maintenance_apps[$category]['filesystem_maintenance'][$domain_uuid]['domain_setting_enabled'] = 'true';
 		}
 		}