Do the same for edit web

jaapmarcus · jaapmarcus · commit fb72c0626636 · 2021-04-30T09:18:18.000Z
diff --git a/web/add/mail/index.php b/web/add/mail/index.php
@@ -95,7 +95,7 @@
         }
     }
     
-    if (!empty($_SESSION['IMAP_SYSTEM'])) {
+    if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {
         if (empty($_POST['v_webmail'])) {
             if (empty($_SESSION['error_msg'])) {
             exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php
@@ -236,12 +236,14 @@
         }
     }
     
-    if (empty($_POST['v_webmail'])) {
-        if (empty($_SESSION['error_msg'])) {
-        exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
-        check_return_code($return_var,$output);
-        $v_webmail = "";
-        unset($output);
+    if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {
+        if (empty($_POST['v_webmail'])) {
+            if (empty($_SESSION['error_msg'])) {
+            exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
+            check_return_code($return_var,$output);
+            $v_webmail = "";
+            unset($output);
+            }
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- if (!empty($_SESSION['IMAP_SYSTEM'])) {`
	`98`	`+ if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {`
`99`	`99`	`if (empty($_POST['v_webmail'])) {`
`100`	`100`	`if (empty($_SESSION['error_msg'])) {`
`101`	`101`	`exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);`
Original file line number	Diff line number	Diff line change
`@@ -236,12 +236,14 @@`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
`239`		`- if (empty($_POST['v_webmail'])) {`
`240`		`- if (empty($_SESSION['error_msg'])) {`
`241`		`- exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);`
`242`		`- check_return_code($return_var,$output);`
`243`		`- $v_webmail = "";`
`244`		`- unset($output);`
	`239`	`+ if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {`
	`240`	`+ if (empty($_POST['v_webmail'])) {`
	`241`	`+ if (empty($_SESSION['error_msg'])) {`
	`242`	`+ exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);`
	`243`	`+ check_return_code($return_var,$output);`
	`244`	`+ $v_webmail = "";`
	`245`	`+ unset($output);`
	`246`	`+ }`
`245`	`247`	`}`
`246`	`248`	`}`
`247`	`249`