Explorar o código

added error message dialog

Serghey Rodin %!s(int64=13) %!d(string=hai) anos
pai
achega
3f5617c0a6

+ 2 - 2
func/main.sh

@@ -194,7 +194,7 @@ is_object_suspended() {
         spnd=$(grep "$2='$3'" $USER_DATA/$1.conf|grep "SUSPENDED='yes'")
         spnd=$(grep "$2='$3'" $USER_DATA/$1.conf|grep "SUSPENDED='yes'")
     fi
     fi
     if [ -z "$spnd" ]; then
     if [ -z "$spnd" ]; then
-        echo "Error: $3 is not suspended"
+        echo "Error: $1 $3 is not suspended"
         log_event "$E_SUSPENDED" "$EVENT"
         log_event "$E_SUSPENDED" "$EVENT"
         exit $E_SUSPENDED
         exit $E_SUSPENDED
     fi
     fi
@@ -208,7 +208,7 @@ is_object_unsuspended() {
         spnd=$(grep "$2='$3'" $USER_DATA/$1.conf|grep "SUSPENDED='yes'")
         spnd=$(grep "$2='$3'" $USER_DATA/$1.conf|grep "SUSPENDED='yes'")
     fi
     fi
     if [ ! -z "$spnd" ]; then
     if [ ! -z "$spnd" ]; then
-        echo "Error: $3 is suspended"
+        echo "Error: $1 $3 is already suspended"
         log_event "$E_UNSUSPENDED" "$EVENT"
         log_event "$E_UNSUSPENDED" "$EVENT"
         exit $E_UNSUSPENDED
         exit $E_UNSUSPENDED
     fi
     fi

+ 7 - 1
web/delete/backup/index.php

@@ -10,8 +10,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_backup = escapeshellarg($_GET['backup']);
         $v_backup = escapeshellarg($_GET['backup']);
         exec (VESTA_CMD."v_delete_user_backup ".$v_username." ".$v_backup, $output, $return_var);
         exec (VESTA_CMD."v_delete_user_backup ".$v_username." ".$v_backup, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 //}
 //}
 
 
 header("Location: /list/backup/");
 header("Location: /list/backup/");

+ 7 - 1
web/delete/cron/index.php

@@ -10,8 +10,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_job = escapeshellarg($_GET['job']);
         $v_job = escapeshellarg($_GET['job']);
         exec (VESTA_CMD."v_delete_cron_job ".$v_username." ".$v_job, $output, $return_var);
         exec (VESTA_CMD."v_delete_cron_job ".$v_username." ".$v_job, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 //}
 //}
 
 
 header("Location: /list/cron/");
 header("Location: /list/cron/");

+ 7 - 1
web/delete/db/index.php

@@ -10,8 +10,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_database = escapeshellarg($_GET['database']);
         $v_database = escapeshellarg($_GET['database']);
         exec (VESTA_CMD."v_delete_database ".$v_username." ".$v_database, $output, $return_var);
         exec (VESTA_CMD."v_delete_database ".$v_username." ".$v_database, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 //}
 //}
 
 
 header("Location: /list/db/");
 header("Location: /list/db/");

+ 12 - 0
web/delete/dns/index.php

@@ -11,6 +11,11 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
         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);
         unset($output);
         header("Location: /list/dns/");
         header("Location: /list/dns/");
         exit;
         exit;
@@ -22,6 +27,13 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_delete_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
         exec (VESTA_CMD."v_delete_dns_domain_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);
+
         unset($output);
         unset($output);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         exit;
         exit;

+ 7 - 1
web/delete/ip/index.php

@@ -9,8 +9,14 @@ if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['ip'])) {
     if (!empty($_GET['ip'])) {
         $v_ip = escapeshellarg($_GET['ip']);
         $v_ip = escapeshellarg($_GET['ip']);
         exec (VESTA_CMD."v_delete_sys_ip ".$v_ip, $output, $return_var);
         exec (VESTA_CMD."v_delete_sys_ip ".$v_ip, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 }
 }
 
 
 header("Location: /list/ip/");
 header("Location: /list/ip/");

+ 10 - 0
web/delete/mail/index.php

@@ -11,6 +11,11 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
         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);
         unset($output);
         header("Location: /list/mail/");
         header("Location: /list/mail/");
         exit;
         exit;
@@ -22,6 +27,11 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_account = escapeshellarg($_GET['account']);
         $v_account = escapeshellarg($_GET['account']);
         exec (VESTA_CMD."v_delete_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         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);
         unset($output);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         exit;
         exit;

+ 6 - 1
web/delete/package/index.php

@@ -9,8 +9,13 @@ if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['package'])) {
     if (!empty($_GET['package'])) {
         $v_package = escapeshellarg($_GET['package']);
         $v_package = escapeshellarg($_GET['package']);
         exec (VESTA_CMD."v_delete_user_package ".$v_package, $output, $return_var);
         exec (VESTA_CMD."v_delete_user_package ".$v_package, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/package/");
 header("Location: /list/package/");

+ 6 - 1
web/delete/user/index.php

@@ -9,8 +9,13 @@ if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['user'])) {
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_delete_user ".$v_username, $output, $return_var);
         exec (VESTA_CMD."v_delete_user ".$v_username, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/user/");
 header("Location: /list/user/");

+ 16 - 0
web/delete/web/index.php

@@ -9,6 +9,11 @@ if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
     $v_domain = escapeshellarg($_GET['domain']);
     exec (VESTA_CMD."v_delete_web_domain ".$v_username." ".$v_domain, $output, $return_var);
     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;
+    }
     unset($output);
     unset($output);
 
 
     // DNS
     // DNS
@@ -16,6 +21,11 @@ if (!empty($_GET['domain'])) {
         exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         if ($lreturn_var == 0 ) {
         if ($lreturn_var == 0 ) {
             exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
             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);
             unset($output);
         }
         }
     }
     }
@@ -25,6 +35,12 @@ if (!empty($_GET['domain'])) {
         exec (VESTA_CMD."v_list_mail_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         exec (VESTA_CMD."v_list_mail_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
         if ($lreturn_var == 0 ) {
         if ($lreturn_var == 0 ) {
             exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
             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);
         }
         }
     }
     }
 }
 }

+ 6 - 1
web/suspend/cron/index.php

@@ -10,8 +10,13 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_job = escapeshellarg($_GET['job']);
         $v_job = escapeshellarg($_GET['job']);
         exec (VESTA_CMD."v_suspend_cron_job ".$v_username." ".$v_job, $output, $return_var);
         exec (VESTA_CMD."v_suspend_cron_job ".$v_username." ".$v_job, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/cron/");
 header("Location: /list/cron/");

+ 7 - 1
web/suspend/db/index.php

@@ -10,8 +10,14 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_database = escapeshellarg($_GET['database']);
         $v_database = escapeshellarg($_GET['database']);
         exec (VESTA_CMD."v_suspend_database ".$v_username." ".$v_database, $output, $return_var);
         exec (VESTA_CMD."v_suspend_database ".$v_username." ".$v_database, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 }
 }
 
 
 header("Location: /list/db/");
 header("Location: /list/db/");

+ 10 - 0
web/suspend/dns/index.php

@@ -11,6 +11,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_suspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
         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;
+        }
         unset($output);
         unset($output);
         header("Location: /list/dns/");
         header("Location: /list/dns/");
         exit;
         exit;
@@ -22,6 +27,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_suspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
         exec (VESTA_CMD."v_suspend_dns_domain_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);
         unset($output);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         exit;
         exit;

+ 10 - 0
web/suspend/mail/index.php

@@ -11,6 +11,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_suspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
         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;
+        }
         unset($output);
         unset($output);
         header("Location: /list/mail/");
         header("Location: /list/mail/");
         exit;
         exit;
@@ -22,6 +27,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_account = escapeshellarg($_GET['account']);
         $v_account = escapeshellarg($_GET['account']);
         exec (VESTA_CMD."v_suspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         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;
+        }
         unset($output);
         unset($output);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         exit;
         exit;

+ 7 - 1
web/suspend/user/index.php

@@ -10,8 +10,14 @@ if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['user'])) {
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_suspend_user ".$v_username, $output, $return_var);
         exec (VESTA_CMD."v_suspend_user ".$v_username, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 }
 }
 
 
 header("Location: /list/user/");
 header("Location: /list/user/");

+ 6 - 1
web/suspend/web/index.php

@@ -10,8 +10,13 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_suspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
         exec (VESTA_CMD."v_suspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/web/");
 header("Location: /list/web/");

+ 1 - 1
web/templates/admin/list_web.html

@@ -76,7 +76,7 @@ foreach ($data as $key => $value) {
 <tr class="data-row">
 <tr class="data-row">
     <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
     <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
         <table class="data-col1">
         <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
+            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
             <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
             <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
 
 

+ 23 - 0
web/templates/admin/menu_backup.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_cron.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_db.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 24 - 0
web/templates/admin/menu_dns.html

@@ -1,3 +1,27 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
+
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_dns_rec.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_ip.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_log.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 24px 0 31px 6px">
     <td width="142px" style="padding: 24px 0 31px 6px">

+ 23 - 0
web/templates/admin/menu_mail.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_mail_acc.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_packages.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 23 - 0
web/templates/admin/menu_rrd.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr >
 <tr >
     <td style="padding: 19px 0 16px 22px">
     <td style="padding: 19px 0 16px 22px">

+ 23 - 0
web/templates/admin/menu_stats.html

@@ -1,3 +1,26 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 24px 0 31px 6px">
     <td width="142px" style="padding: 24px 0 31px 6px">

+ 24 - 0
web/templates/admin/menu_user.html

@@ -1,3 +1,27 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
+
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">

+ 27 - 2
web/templates/admin/menu_web.html

@@ -1,9 +1,34 @@
+<?php
+    if (!empty($_SESSION['error_msg'])) {
+?>
+        <script type="text/javascript">
+            $(function() {
+                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                $( "#dialog-message" ).dialog({
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+            });
+        </script>
+        <div id="dialog-message" title="Error">
+        <p><?php echo $_SESSION['error_msg'] ?>.</p>
+        </div>
+<?php
+        unset($_SESSION['error_msg']);
+    }
+?>
+<form action="/mass-domain/">
 <table class="sub-menu">
 <table class="sub-menu">
 <tr>
 <tr>
     <td width="142px" style="padding: 16px 0 16px 6px">
     <td width="142px" style="padding: 16px 0 16px 6px">
     <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
     <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
+    <td>
+<a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px" name="action">
         <option>apply to selected</option>
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>rebuild</option>
         <option>suspend</option>
         <option>suspend</option>

+ 7 - 1
web/unsuspend/cron/index.php

@@ -10,8 +10,14 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_job = escapeshellarg($_GET['job']);
         $v_job = escapeshellarg($_GET['job']);
         exec (VESTA_CMD."v_unsuspend_cron_job ".$v_username." ".$v_job, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_cron_job ".$v_username." ".$v_job, $output, $return_var);
-        unset($output);
     }
     }
+    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);
+
 }
 }
 
 
 header("Location: /list/cron/");
 header("Location: /list/cron/");

+ 10 - 0
web/unsuspend/dns/index.php

@@ -11,6 +11,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_unsuspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_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);
         unset($output);
         header("Location: /list/dns/");
         header("Location: /list/dns/");
         exit;
         exit;
@@ -23,6 +28,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_unsuspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_dns_domain_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);
         unset($output);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         header("Location: /list/dns/?domain=".$_GET['domain']);
         exit;
         exit;

+ 10 - 0
web/unsuspend/mail/index.php

@@ -11,6 +11,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_unsuspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_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);
         unset($output);
         header("Location: /list/mail/");
         header("Location: /list/mail/");
         exit;
         exit;
@@ -22,6 +27,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_account = escapeshellarg($_GET['account']);
         $v_account = escapeshellarg($_GET['account']);
         exec (VESTA_CMD."v_unsuspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_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);
         unset($output);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         header("Location: /list/mail/?domain=".$_GET['domain']);
         exit;
         exit;

+ 6 - 1
web/unsuspend/user/index.php

@@ -10,8 +10,13 @@ if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['user'])) {
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_unsuspend_user ".$v_username, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_user ".$v_username, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/user/");
 header("Location: /list/user/");

+ 6 - 1
web/unsuspend/web/index.php

@@ -10,8 +10,13 @@ if ($_SESSION['user'] == 'admin') {
         $v_username = escapeshellarg($user);
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_unsuspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
         exec (VESTA_CMD."v_unsuspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
-        unset($output);
     }
     }
+    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);
 }
 }
 
 
 header("Location: /list/web/");
 header("Location: /list/web/");