Use 1-6 rather than 0-5 for IPsec logging levels, to stay away from complications of 0 due to PHP stupidity. Upgrade config to add 1 to any configured log levels. Default to 1 as log level where none is configured by the user. Ticket #5340

1 files changed, 17 insertions, 0 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 07c0df0..3b41251 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3647,6 +3647,23 @@ function upgrade_118_to_119() {
 			$ph1_entry['peerid_type'] = "any";	
 		}
 	}
+
+}
+
+function upgrade_119_to_120() {
+        global $config, $ipsec_loglevels;
+
+	if (!is_array($config['ipsec'])) {
+		return;
+	}
+
+	// add 1 to configured log levels as part of redmine #5340
+	foreach ($ipsec_loglevels as $lkey => $ldescr) {
+                if (isset($config['ipsec']['ipsec_{$lkey}'])) {
+                        $config['ipsec']['ipsec_{$lkey}'] = $config['ipsec']['ipsec_{$lkey}'] + 1;
+                }
+        }
+
 }
 
 ?>