From 8be83a9e730f969fcb544220b7e51294d5775ff7 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 1 Jul 2015 02:22:43 +0300
Subject: [PATCH] fix for iptables restart on Debian/Ubuntu

---
 bin/v-list-sys-services       | 4 ++--
 web/bulk/service/index.php    | 6 +++---
 web/restart/service/index.php | 8 ++++++--
 web/start/service/index.php   | 8 ++++++--
 web/stop/service/index.php    | 8 ++++++--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services
index 4b5a8fc29..6aebca4ed 100755
--- a/bin/v-list-sys-services
+++ b/bin/v-list-sys-services
@@ -117,9 +117,9 @@ fi
 service=$DNS_SYSTEM
 if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then
     if [ "$service" == 'bind' ] || [ "$service" == 'bind9' ]; then
-        service='named'
+        proc_name='named'
     fi
-    get_srv_state $service
+    get_srv_state $service $proc_name
     str="$str\nNAME='$service' SYSTEM='dns server' STATE='$state' CPU='$cpu'"
     str="$str MEM='$mem' RTIME='$rtime'"
 fi
diff --git a/web/bulk/service/index.php b/web/bulk/service/index.php
index 3bcaacb85..70ce660c7 100644
--- a/web/bulk/service/index.php
+++ b/web/bulk/service/index.php
@@ -23,14 +23,14 @@ if ($_SESSION['user'] == 'admin') {
             break;
         case 'restart': $cmd='v-restart-service';
             break;
-        default: header("Location: /list/services/"); exit;
+        default: header("Location: /list/server/"); exit;
     }
 
     if ((!empty($_POST['system'])) && ($action == 'restart')) {
         exec (VESTA_CMD."v-restart-system yes", $output, $return_var);
         $_SESSION['error_srv'] = 'The system is going down for reboot NOW!';
         unset($output);
-        header("Location: /list/services/");
+        header("Location: /list/server/");
         exit;
     }
 
@@ -40,4 +40,4 @@ if ($_SESSION['user'] == 'admin') {
     }
 }
 
-header("Location: /list/services/");
+header("Location: /list/server/");
diff --git a/web/restart/service/index.php b/web/restart/service/index.php
index 4451aff91..5f42e5e5d 100644
--- a/web/restart/service/index.php
+++ b/web/restart/service/index.php
@@ -7,8 +7,12 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['srv'])) {
-        $v_service = escapeshellarg($_GET['srv']);
-        exec (VESTA_CMD."v-restart-service ".$v_service, $output, $return_var);
+        if ($_GET['srv'] == 'iptables') {
+            exec (VESTA_CMD."v-update-firewall", $output, $return_var);
+        } else {
+            $v_service = escapeshellarg($_GET['srv']);
+            exec (VESTA_CMD."v-restart-service ".$v_service, $output, $return_var);
+        }
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
diff --git a/web/start/service/index.php b/web/start/service/index.php
index 7309ab1b8..943019c4f 100644
--- a/web/start/service/index.php
+++ b/web/start/service/index.php
@@ -7,8 +7,12 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['srv'])) {
-        $v_service = escapeshellarg($_GET['srv']);
-        exec (VESTA_CMD."v-start-service ".$v_service, $output, $return_var);
+        if ($_GET['srv'] == 'iptables') {
+            exec (VESTA_CMD."v-update-firewall", $output, $return_var);
+        } else {
+            $v_service = escapeshellarg($_GET['srv']);
+            exec (VESTA_CMD."v-start-service ".$v_service, $output, $return_var);
+        }
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
diff --git a/web/stop/service/index.php b/web/stop/service/index.php
index ef16b5885..a151dc6d8 100644
--- a/web/stop/service/index.php
+++ b/web/stop/service/index.php
@@ -7,8 +7,12 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['srv'])) {
-        $v_service = escapeshellarg($_GET['srv']);
-        exec (VESTA_CMD."v-stop-service ".$v_service, $output, $return_var);
+        if ($_GET['srv'] == 'iptables') {
+            exec (VESTA_CMD."v-stop-firewall", $output, $return_var);
+        } else {
+            $v_service = escapeshellarg($_GET['srv']);
+            exec (VESTA_CMD."v-stop-service ".$v_service, $output, $return_var);
+        }
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);