Ticket #1243: mail2.patch

gui/client/add_mail_acc.php

@@ -65 +65 @@
-                    'MAIL_DMN_CHECKED' => ($_POST['dmn_type'] === 'dmn') ? "checked=\"checked\"" : "",
-                    'MAIL_ALS_CHECKED' => ($_POST['dmn_type'] === 'als') ? "checked=\"checked\"" : "",
-                    'MAIL_SUB_CHECKED' => ($_POST['dmn_type'] === 'sub') ? "checked=\"checked\"" : "",
-$_POST['mail_type_normal']
-$_POST['mail_type_forward']
+isset($_POST['mail_type_normal'])
+isset($_POST['mail_type_forward'])
-                    'FORWARD_LIST' => $f_list));
-    }
-}
@@ -223 +223 @@
-    $mail_auto_respond_text = '';
-    $mail_addr = '';
-
-$_POST['mail_type_normal'] || $_POST['mail_type_forward']
-$_POST['mail_type_normal']
+isset($_POST['mail_type_normal']) || isset($_POST['mail_type_forward'])
+isset($_POST['mail_type_normal'])
-                        if ($_POST['dmn_type'] === 'dmn') {
-                                $mail_pass = $_POST['pass'];
-                                $mail_forward = '_no_';
@@ -269 +269 @@
-                        }
-                }
-
-$_POST['mail_type_forward']
+isset($_POST['mail_type_forward'])
-                        if ($_POST['dmn_type'] === 'dmn') {
-                                $mail_type[] = 'normal_forward';
-                                $sub_id = '0';
@@ -369 +369 @@
-}
-
-function check_mail_acc_data(&$sql, $dmn_id, $dmn_name) {
-$_POST['mail_type'] != 'forward'
+isset($_POST['mail_type_normal'])
-        $pass = escapeshellcmd($_POST['pass']);
-        $pass_rep = escapeshellcmd($_POST['pass_rep']);
-    }
@@ -379 +379 @@
-        return;
-    }
-
-$_POST['mail_type'] === 'normal'
+isset($_POST['mail_type_normal'])
-        if (!isset($pass) || $pass == null || !isset($pass_rep) || $pass_rep == null) {
-            set_page_message(tr('Password data is missing!'));
-            return;
@@ -406 +406 @@
-        return;
-    }
-
-$_POST['mail_type'] === 'forward'
+isset($_POST['mail_type_forward'])
-        set_page_message(tr('Forward list is empty!'));
-        return;
-    }