From 0a9a28c5d355b9737fb0657737ab5121594d8130 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 15 Sep 2015 00:03:56 +0200
Subject: Only (re)start ntopng after GeoIP update if not (re)installing the
 package

Also, use $post consistently in topng_validate_input().
---
 config/ntopng/ntopng.inc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntopng.inc b/config/ntopng/ntopng.inc
index 1f1c737a..27b484c1 100644
--- a/config/ntopng/ntopng.inc
+++ b/config/ntopng/ntopng.inc
@@ -173,7 +173,7 @@ function ntopng_sync_package() {
 			start_service("ntopng");
 			sleep(20);
 		}
-	} elseif (!($g['booting']))  {
+	} elseif (!($g['booting'])) {
 		ntopng_services_stop();
 		if ($ntopng_config['enable'] == "on") {
 			start_service("ntopng");
@@ -273,10 +273,13 @@ function ntopng_update_geoip() {
 
 	ntopng_fixup_geoip();
 
-	$ntopng_config = $config['installedpackages']['ntopng']['config'][0];
-	ntopng_services_stop();
-	if ($ntopng_config['enable'] == "on") {
-		start_service("ntopng");
+	/* Do not (re)start services on package (re)install, only on manual GeoIP updates via the GUI */
+	if ($_POST['Submit'] == "Update GeoIP Data") {
+		$ntopng_config = $config['installedpackages']['ntopng']['config'][0];
+		ntopng_services_stop();
+		if ($ntopng_config['enable'] == "on") {
+			start_service("ntopng");
+		}
 	}
 }
 
@@ -351,10 +354,10 @@ function ntopng_flush_historical_data() {
 }
 
 function ntopng_validate_input($post, &$input_errors) {
-	if (empty($_POST['redis_password']) || empty($_POST['redis_passwordagain'])) {
+	if (empty($post['redis_password']) || empty($post['redis_passwordagain'])) {
 		$input_errors[] = "You must provide (and confirm) ntopng's password.";
 	}
-	if ((strlen($_POST['redis_password']) < 5) || (strlen($_POST['redis_passwordagain']) < 5)) {
+	if ((strlen($post['redis_password']) < 5) || (strlen($post['redis_passwordagain']) < 5)) {
 		$input_errors[] = "Password must have at least 5 characters.";
 	}
 	if ($post['redis_password'] != $post['redis_passwordagain']) {
-- 
cgit v1.2.3