Jelajahi Sumber

Fix bug with rejecting spam on edit mail domain (#2551)

Jaap Marcus 3 tahun lalu
induk
melakukan
0618a77be5
2 mengubah file dengan 14 tambahan dan 1 penghapusan
  1. 13 0
      web/edit/mail/index.php
  2. 1 1
      web/templates/pages/edit_mail.html

+ 13 - 0
web/edit/mail/index.php

@@ -212,6 +212,19 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
         }
         }
         unset($output);
         unset($output);
     }
     }
+    
+    if (!empty($_POST['v_reject']) && $v_antispam == "yes" && $v_reject != 'yes' ) {
+         exec(HESTIA_CMD."v-add-mail-domain-reject ".$user." ".$v_domain." yes", $output, $return_var);
+         check_return_code($return_var, $output);
+         $v_reject = 'yes';
+         unset($output);
+     }
+     if (empty($_POST['v_reject']) && $v_reject == 'yes' ) {
+          exec(HESTIA_CMD."v-delete-mail-domain-reject ".$user." ".$v_domain." yes", $output, $return_var);
+          check_return_code($return_var, $output);
+          $v_reject = '';
+          unset($output);
+      }
 
 
     // Change catchall address
     // Change catchall address
     if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
     if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {

+ 1 - 1
web/templates/pages/edit_mail.html

@@ -101,7 +101,7 @@
 								</td>
 								</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
-								<td class="vst-text input-label step-top">
+								<td class="vst-text input-label">
 									<label><input type="checkbox" size="20" class="vst-checkbox" name="v_reject" <?php if ($v_reject == 'yes') echo "checked=yes"; ?>><?=_('Reject spam');?></label>
 									<label><input type="checkbox" size="20" class="vst-checkbox" name="v_reject" <?php if ($v_reject == 'yes') echo "checked=yes"; ?>><?=_('Reject spam');?></label>
 								</td>
 								</td>
 							</tr>
 							</tr>