Commit 697ad2d1 authored by Ad Schellevis's avatar Ad Schellevis

move get_config_backup_count inline (single usage

parent 7fcb1be0
...@@ -341,10 +341,14 @@ function security_checks_disabled() ...@@ -341,10 +341,14 @@ function security_checks_disabled()
* remove old backups * remove old backups
*/ */
function cleanup_backups() { function cleanup_backups() {
global $g; global $g, $config;
$i = false; $i = false;
$revisions = get_config_backup_count(); if (isset($config['system']['backupcount']) && is_numeric($config['system']['backupcount']) && ($config['system']['backupcount'] >= 0)) {
$revisions = intval($config['system']['backupcount']);
} else {
$revisions = 30;
}
$cnf = OPNsense\Core\Config::getInstance(); $cnf = OPNsense\Core\Config::getInstance();
...@@ -407,14 +411,6 @@ function make_config_revision_entry($desc = null, $override_user = null) { ...@@ -407,14 +411,6 @@ function make_config_revision_entry($desc = null, $override_user = null) {
return $revision; return $revision;
} }
function get_config_backup_count() {
global $config, $g;
if (isset($config['system']['backupcount']) && is_numeric($config['system']['backupcount']) && ($config['system']['backupcount'] >= 0)) {
return intval($config['system']['backupcount']);
} else {
return 30;
}
}
function pfSense_clear_globals() { function pfSense_clear_globals() {
global $config, $FilterIfList, $GatewaysList, $filterdns, $aliases, $aliastable; global $config, $FilterIfList, $GatewaysList, $filterdns, $aliases, $aliastable;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment