check_return_code function

web/delete/backup/index.php

@@ -5,24 +5,17 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
-
-    if (!empty($_GET['backup'])) {
-        $v_username = escapeshellarg($user);
-        $v_backup = escapeshellarg($_GET['backup']);
-        exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
-    }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
-    unset($output);
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
-//}
+if (!empty($_GET['backup'])) {
+    $v_username = escapeshellarg($user);
+    $v_backup = escapeshellarg($_GET['backup']);
+    exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
+}
+check_return_code($return_var,$output);
+unset($output);
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/delete/cron/index.php

@@ -5,24 +5,17 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
-
-    if (!empty($_GET['job'])) {
-        $v_username = escapeshellarg($user);
-        $v_job = escapeshellarg($_GET['job']);
-        exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
-    }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
-    unset($output);
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
-//}
+if (!empty($_GET['job'])) {
+    $v_username = escapeshellarg($user);
+    $v_job = escapeshellarg($_GET['job']);
+    exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
+}
+check_return_code($return_var,$output);
+unset($output);
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/delete/db/index.php

@@ -5,24 +5,17 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
-
-    if (!empty($_GET['database'])) {
-        $v_username = escapeshellarg($user);
-        $v_database = escapeshellarg($_GET['database']);
-        exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
-    }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
-    unset($output);
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
-//}
+if (!empty($_GET['database'])) {
+    $v_username = escapeshellarg($user);
+    $v_database = escapeshellarg($_GET['database']);
+    exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
+}
+check_return_code($return_var,$output);
+unset($output);
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/delete/dns/index.php

@@ -5,53 +5,44 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
+// Delete as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
-    // DNS domain
-    if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
-        $v_username = escapeshellarg($user);
-        $v_domain = escapeshellarg($_GET['domain']);
-        exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
-        unset($output);
+// DNS domain
+if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
+    $v_username = escapeshellarg($user);
+    $v_domain = escapeshellarg($_GET['domain']);
+    exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
 
-        $back = $_SESSION['back'];
-        if (!empty($back)) {
-            header("Location: ".$back);
-            exit;
-        }
-        header("Location: /list/dns/");
+    $back = $_SESSION['back'];
+    if (!empty($back)) {
+        header("Location: ".$back);
         exit;
     }
+    header("Location: /list/dns/");
+    exit;
+}
 
-    // DNS record
-    if ((!empty($_GET['domain'])) && (!empty($_GET['record_id'])))  {
-        $v_username = escapeshellarg($user);
-        $v_domain = escapeshellarg($_GET['domain']);
-        $v_record_id = escapeshellarg($_GET['record_id']);
-        exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
-        unset($output);
-        $back = $_SESSION['back'];
-        if (!empty($back)) {
-            header("Location: ".$back);
-            exit;
-        }	
-        header("Location: /list/dns/?domain=".$_GET['domain']);
+// DNS record
+if ((!empty($_GET['domain'])) && (!empty($_GET['record_id'])))  {
+    $v_username = escapeshellarg($user);
+    $v_domain = escapeshellarg($_GET['domain']);
+    $v_record_id = escapeshellarg($_GET['record_id']);
+    exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
+    $back = $_SESSION['back'];
+    if (!empty($back)) {
+        header("Location: ".$back);
         exit;
     }
-//}
+    header("Location: /list/dns/?domain=".$_GET['domain']);
+    exit;
+}
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/delete/ip/index.php

@@ -10,12 +10,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_ip = escapeshellarg($_GET['ip']);
         exec (VESTA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-        if ($return_var == 4) $error = __('IP address is in use');
-        $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 
 }

web/delete/mail/index.php

@@ -5,52 +5,43 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
+// Delete as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
-    // Mail domain
-    if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
-        $v_username = escapeshellarg($user);
-        $v_domain = escapeshellarg($_GET['domain']);
-        exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
-        unset($output);
-        $back = $_SESSION['back'];
-        if (!empty($back)) {
-            header("Location: ".$back);
-            exit;
-        }
-        header("Location: /list/mail/");
+// Mail domain
+if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
+    $v_username = escapeshellarg($user);
+    $v_domain = escapeshellarg($_GET['domain']);
+    exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
+    $back = $_SESSION['back'];
+    if (!empty($back)) {
+        header("Location: ".$back);
         exit;
     }
+    header("Location: /list/mail/");
+    exit;
+}
 
-    // Mail account
-    if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
-        $v_username = escapeshellarg($user);
-        $v_domain = escapeshellarg($_GET['domain']);
-        $v_account = escapeshellarg($_GET['account']);
-        exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-                $_SESSION['error_msg'] = $error;
-        }
-        unset($output);
-        $back = $_SESSION['back'];
-        if (!empty($back)) {
-	    header("Location: ".$back);
-            exit;
-	}
-        header("Location: /list/mail/?domain=".$_GET['domain']);
+// Mail account
+if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
+    $v_username = escapeshellarg($user);
+    $v_domain = escapeshellarg($_GET['domain']);
+    $v_account = escapeshellarg($_GET['account']);
+    exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
+    $back = $_SESSION['back'];
+    if (!empty($back)) {
+        header("Location: ".$back);
         exit;
     }
-//}
+    header("Location: /list/mail/?domain=".$_GET['domain']);
+    exit;
+}
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/delete/package/index.php

@@ -10,11 +10,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_package = escapeshellarg($_GET['package']);
         exec (VESTA_CMD."v-delete-user-package ".$v_package, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 }
 

web/delete/user/index.php

@@ -10,11 +10,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v-delete-user ".$v_username, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($_SESSION['look']);
     unset($output);
 }

web/delete/web/index.php

@@ -5,46 +5,34 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-    // Delete as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=$_GET['user'];
-    }
+// Delete as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=$_GET['user'];
+}
 
 if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
     exec (VESTA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 
     // DNS
-    if ($return_var == 0) {
+    if (empty($_SESSION['error_msg'])) {
         exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         if ($lreturn_var == 0 ) {
             exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                if (empty($error)) $error = __('Error: vesta did not return any output.');
-                $_SESSION['error_msg'] = $error;
-            }
+            check_return_code($return_var,$output);
             unset($output);
         }
     }
 
     // Mail
-    if ($return_var == 0) {
+    if (empty($_SESSION['error_msg'])) {
         exec (VESTA_CMD."v-list-mail-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         if ($lreturn_var == 0 ) {
             exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                    if (empty($error)) $error = __('Error: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-            }
+            check_return_code($return_var,$output);
             unset($output);
         }
     }

web/suspend/cron/index.php

@@ -14,11 +14,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_job = escapeshellarg($_GET['job']);
         exec (VESTA_CMD."v-suspend-cron-job ".$v_username." ".$v_job, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 }
 

web/suspend/db/index.php

@@ -15,13 +15,8 @@ if ($_SESSION['user'] == 'admin') {
         $v_database = escapeshellarg($_GET['database']);
         exec (VESTA_CMD."v-suspend-database ".$v_username." ".$v_database, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
-
 }
 
 $back = $_SESSION['back'];

web/suspend/dns/index.php

@@ -15,11 +15,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v-suspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
+        check_return_code($return_var,$output);
         unset($output);
         $back = $_SESSION['back'];
         if (!empty($back)) {
@@ -36,11 +32,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v-suspend-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
+        check_return_code($return_var,$output);
         unset($output);
         $back = $_SESSION['back'];
         if (!empty($back)) {
@@ -49,9 +41,7 @@ if ($_SESSION['user'] == 'admin') {
         }
         header("Location: /list/dns/?domain=".$_GET['domain']);
         exit;
-
     }
-
 }
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/suspend/mail/index.php

@@ -15,11 +15,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v-suspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
+        check_return_code($return_var,$output);
         unset($output);
         $back=getenv("HTTP_REFERER");
         if (!empty($back)) {
@@ -36,14 +32,10 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_account = escapeshellarg($_GET['account']);
         exec (VESTA_CMD."v-suspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        }
+        check_return_code($return_var,$output);
         unset($output);
-	$back = $_SESSION['back'];
-	    if (!empty($back)) {
+        $back = $_SESSION['back'];
+            if (!empty($back)) {
             header("Location: ".$back);
             exit;
         }

web/suspend/user/index.php

@@ -11,13 +11,8 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v-suspend-user ".$v_username, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
-
 }
 
 $back = $_SESSION['back'];

web/suspend/web/index.php

@@ -15,11 +15,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v-suspend-web-domain ".$v_username." ".$v_domain, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 }
 

web/unsuspend/cron/index.php

@@ -14,11 +14,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_job = escapeshellarg($_GET['job']);
         exec (VESTA_CMD."v-unsuspend-cron-job ".$v_username." ".$v_job, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 
 }

web/unsuspend/db/index.php

@@ -13,6 +13,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_database = escapeshellarg($_GET['database']);
         exec (VESTA_CMD."v-unsuspend-database ".$v_username." ".$v_database, $output, $return_var);
+        check_return_code($return_var,$output);
         unset($output);
     }
 }

web/unsuspend/user/index.php

@@ -11,11 +11,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v-unsuspend-user ".$v_username, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 }
 

web/unsuspend/web/index.php

@@ -14,11 +14,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v-unsuspend-web-domain ".$v_username." ".$v_domain, $output, $return_var);
     }
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = __('Error: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-    }
+    check_return_code($return_var,$output);
     unset($output);
 }