Ticket #1196: client.patch

gui/client/add_mail_acc.php

@@ -2 +2 @@
-/**
- * ispCP ω (OMEGA) a Virtual Hosting Control System
- *
- 
- 
- 
-       
-     
+
+
+
+
+
- *
- * @license
- *   This program is free software; you can redistribute it and/or modify it under
@@ -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\"" : "",
-'] === 'normal'
-'] === 'forward'
+_normal']
+_forward']
-                    'FORWARD_LIST' => $f_list));
-    }
-}
@@ -219 +219 @@
-    } else {
-        $mail_acc = $mail_acc_tmp;
-    }
-
+
+
+
-    $mail_addr = '';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SQL_QUERY;
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SQL_QUERY;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SQL_QUERY;
-
-        $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $mail_type, $sub_id));
-
-        $mail_forward = implode(',', $mail_accs);
-    }
-
-    if ($rs->fields['cnt'] > 0) {
@@ -356 +352 @@
-             sub_id,
-             status,
-             mail_auto_respond,
+             mail_auto_respond_text,
-             mail_addr)
-        VALUES
-
+, ?
-SQL_QUERY;
-
-    $rs = exec_query($sql, $query, array($mail_acc,
@@ -369 +366 @@
-            $sub_id,
-            $cfg['ITEM_ADD_STATUS'],
-            $mail_auto_respond,
-
+
+
-
-    write_log($_SESSION['user_logged'] . ": add new mail account: " . $mail_addr);
-    set_page_message(tr('Mail account scheduled for addition!'));

gui/client/delete_mail_acc.php

@@ -65 +65 @@
-$res = exec_query($sql, $query, array($delete_id));
-$data = $res->FetchRow();
-
-$data['mail_type'] == MT_NORMAL_MAIL || $data['mail_type'] == MT_NORMAL_FORWARD
+preg_match(MT_NORMAL_MAIL, $data['mail_type']) || preg_match(MT_NORMAL_FORWARD, $data['mail_type'])
-        /* mail to normal domain */
-        // global $domain_name;
-        $mail_name = $data['mail_acc'] . '@' . $_SESSION['user_logged']; //$domain_name;
-$data['mail_type'] == MT_ALIAS_MAIL || $data['mail_type'] == MT_ALIAS_FORWARD
+preg_match(MT_ALIAS_MAIL, $data['mail_type']) || preg_match(MT_ALIAS_FORWARD, $data['mail_type'])
-        /* mail to domain alias*/
-        $res_tmp = exec_query($sql, "select alias_name from domain_aliasses where alias_id=?", array($data['sub_id']));
-        $dat_tmp = $res_tmp->FetchRow();
-        $mail_name = $data['mail_acc'] . '@' . $dat_tmp['alias_name'];
-$data['mail_type'] == MT_SUBDOM_MAIL || $data['mail_type'] == MT_SUBDOM_FORWARD
+preg_match(MT_SUBDOM_MAIL, $data['mail_type']) || preg_match(MT_SUBDOM_FORWARD, $data['mail_type'])
-        /* mail to subdomain*/
-        $res_tmp = exec_query($sql, "select subdomain_name from subdomain where subdomain_id=?", array($data['sub_id']));
-        $dat_tmp = $res_tmp->FetchRow();

gui/client/disable_mail_arsp.php

@@ -66 +66 @@
-            mail_users
-        set
-            status = ?,
-_no_
+0
-        where
-            mail_id = ?
-SQL_QUERY;

gui/client/edit_mail_acc.php

@@ -65 +65 @@
-        } else {
-                $mail_acc = $rs->fields['mail_acc'];
-                $domain_id = $rs->fields['domain_id'];
-
+_list
-                $mail_forward = $rs->fields['mail_forward'];
-                $sub_id = $rs->fields['sub_id'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-                $mail_forward = $rs->fields['mail_forward'];
@@ -114 +120 @@
-                $mail_acc = decode_idna($mail_acc);
-                $maildomain = decode_idna($maildomain);
-                $tpl->assign(array('EMAIL_ACCOUNT' => $mail_acc . "@" . $maildomain,
-
-
+
+
+
-                                'MAIL_ID' => $mail_id));
-
-
+
+
+
+
-                        $tpl->assign('FORWARD_MAIL', '');
+                $tpl -> parse('NORMAL_MAIL', '.normal_mail');
+            } else if ($mail_forward === '_no_') {
+                        $tpl->assign(array('ACTION' => 'update_pass',
+                                                                'FORWARD_MAIL' => '',
+                                                                'FORWARD_MAIL_CHECKED' => '',
+                                                                'FORWARD_LIST' => '',
+                                                                'FORWARD_LIST_ENABLED' => 'disabled="disabled"'));
-                        $tpl->parse('NORMAL_MAIL', '.normal_mail');
-                } else {
-"update_forward"));
-$tpl->assign('NORMAL_MAIL', ''
+'update_forward',
+                                       'NORMAL_MAIL' => '')
-                        $tpl->parse('FORWARD_MAIL', '.forward_mail');
-                }
-        }
@@ -133 +149 @@
-        if (!isset($_POST['uaction'])) {
-                return;
-        }
-$_POST['uaction'] != 'update_pass'
+preg_match('/update_pass/', $_POST['uaction']) == 0
-                return;
-        }
+        if (preg_match('/update_forward/', $_POST['uaction']) == 1 || isset($_POST['mail_forward'])) {
+                // The user only wants to update the forward list, not the password
+                if ($_POST['pass'] === '' || $_POST['pass_rep'] === '') {
+                        return;
+                }
+        }
-
-        $pass = escapeshellcmd($_POST['pass']);
-        $pass_rep = escapeshellcmd($_POST['pass_rep']);
@@ -170 +192 @@
-
-                $rs = exec_query($sql, $query, array($pass, $status, $mail_id));
-
-                send_request();
-                set_page_message(tr("Mail were updated successfully!"));
-                write_log($_SESSION['user_logged'] . ": change mail account password: $mail_account");
-
-
-
+
+
+
+
+
+
-        }
-}
-
@@ -183 +207 @@
-        if (!isset($_POST['uaction'])) {
-                return;
-        }
-$_POST['uaction'] != 'update_forward'
+preg_match('/update_forward/', $_POST['uaction']) == 0 && !isset($_POST['mail_forward'])
-                return;
-        }
-
@@ -192 +216 @@
-        $forward_list = clean_input($_POST['forward_list']);
-        $mail_accs = array();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                $mail_accs[] = $value;
-        }
-
+        }
+        
-        global $cfg;
-        $status = $cfg['ITEM_CHANGE_STATUS'];
-
@@ -217 +273 @@
-              mail_users
-          set
-              mail_forward = ?,
+              mail_type = ?,
-              status = ?
-          where
-              mail_id = ?
-SQL_QUERY;
-
-implode(',', $mail_accs)
+$forward_list, $mail_type
-
-        send_request();
-        write_log($_SESSION['user_logged'] . ": change mail forward: $mail_account");
+        set_page_message(tr("Mail were updated successfully!"));
-        header("Location: email_accounts.php");
-        die();
-}
@@ -259 +317 @@
-                'TR_SAVE' => tr('Save'),
-                'TR_PASSWORD' => tr('Password'),
-                'TR_PASSWORD_REPEAT' => tr('Repeat password'),
+                'TR_FORWARD_MAIL' => tr('Forward mail'),
+        'TR_FORWARD_TO' => tr('Forward to'),
+        'TR_FWD_HELP' => tr("Separate multiple email addresses with a line-break."),
-                'TR_EDIT' => tr('Edit')));
-
-gen_page_message($tpl);

gui/client/edit_mail_arsp.php

@@ -64 +64 @@
-        if ($read_from_db) {
-                $query = <<<SQL_QUERY
-                        SELECT
-
+_text
-                        FROM
-                                mail_users
-                        WHERE
@@ -73 +73 @@
-                $rs = exec_query($sql, $query, array($mail_id));
-                $mail_name = $rs->fields['mail_acc'];
-
-
+_text
-                return;
-        } else {
-                $arsp_message = clean_input($_POST['arsp_message']);
@@ -94 +94 @@
-                mail_users
-            set
-                status = ?,
-
+_text
-            where
-                mail_id = ?
-SQL_QUERY;

gui/client/email_accounts.php

@@ -47 +47 @@
-function gen_user_mail_auto_respond(&$tpl, $mail_id, $mail_type, $mail_status, $mail_auto_respond) {
-        global $cfg;
-
-$
+
-                if ($mail_status === $cfg['ITEM_OK_STATUS']) {
-= '_no_'
+ 0
-                                $tpl->assign(
-                                        array('AUTO_RESPOND_DISABLE' => tr('Enable'),
-                                                'AUTO_RESPOND_DISABLE_SCRIPT' => "enable_mail_arsp.php?id=$mail_id",
@@ -97 +97 @@
-          AND
-            sub_id = 0
-          AND
-= 'normal_mail' OR mail_type  = 'normal_forward
+LIKE '%normal_mail%' OR mail_type  LIKE '%normal_forward%
-        ORDER BY
-
-
+
+
+
-SQL_QUERY;
-
-        $rs = exec_query($sql, $dmn_query, array($dmn_id));
@@ -121 +122 @@
-
-                        $show_dmn_name = decode_idna($dmn_name);
-
+                        $mail_types = explode(',', $rs->fields['mail_type']);
+                        
+                        $mail_type = '';
+                        
+                        foreach ($mail_types as $type) {
+                            $mail_type .= user_trans_mail_type($type) . '<br \>';
+                        }
+
-                        $tpl->assign(
-                                array('MAIL_ACC' => $mail_acc . "@" . $show_dmn_name,
-user_trans_mail_type($rs->fields['mail_type'])
+$mail_type
-                                        'MAIL_STATUS' => translate_dmn_status($rs->fields['status']),
-                                        'MAIL_ACTION' => $mail_action,
-                                        'MAIL_ACTION_SCRIPT' => $mail_action_script,
@@ -165 +174 @@
-          AND
-            t2.domain_id = ?
-          AND
-= 'subdom_mail' OR t2.mail_type = 'subdom_forward
+LIKE '%subdom_mail%' OR t2.mail_type LIKE '%subdom_forward%
-          AND
-            t1.subdomain_id = t2.sub_id
-        ORDER BY
-type DE
-                       t2.mail_acc A
+acc A
+            t2.mail_type DE
-SQL_QUERY;
-
-        $rs = exec_query($sql, $sub_query, array($dmn_id, $dmn_id));
@@ -194 +203 @@
-
-                        $show_dmn_name = decode_idna($dmn_name);
-
+                        $mail_types = explode(',', $rs->fields['mail_type']);
+                        
+                        $mail_type = '';
+                        
+                        foreach ($mail_types as $type) {
+                            $mail_type .= user_trans_mail_type($type) . '<br \>';
+                        }
+
-                        $tpl->assign(
-                                array('MAIL_ACC' => $mail_acc . "@" . $show_sub_name . "." . $show_dmn_name,
-user_trans_mail_type($rs->fields['mail_type'])
+$mail_type
-                                        'MAIL_STATUS' => translate_dmn_status($rs->fields['status']),
-                                        'MAIL_ACTION' => $mail_action,
-                                        'MAIL_ACTION_SCRIPT' => $mail_action_script,
@@ -240 +257 @@
-          AND
-            t1.alias_id = t2.sub_id
-          AND
-= 'alias_mail' OR t2.mail_type = 'alias_forward
+LIKE '%alias_mail%' OR t2.mail_type LIKE '%alias_forward%
-        ORDER BY
-type DE
-                       t2.mail_acc A
+acc A
+            t2.mail_type DE
-SQL_QUERY;
-
-        $rs = exec_query($sql, $als_query, array($dmn_id, $dmn_id));
@@ -266 +283 @@
-
-                        $show_als_name = decode_idna($rs->fields['als_name']);
-
+                        $mail_types = explode(',', $rs->fields['mail_type']);
+                        
+                        $mail_type = '';
+                        
+                        foreach ($mail_types as $type) {
+                            $mail_type .= user_trans_mail_type($type) . '<br \>';
+                        }
+
-                        $tpl->assign(
-                                array('MAIL_ACC' => $mail_acc . "@" . $show_als_name,
-user_trans_mail_type($rs->fields['mail_type'])
+$mail_type
-                                        'MAIL_STATUS' => translate_dmn_status($rs->fields['status']),
-                                        'MAIL_ACTION' => $mail_action,
-                                        'MAIL_ACTION_SCRIPT' => $mail_action_script,

gui/client/enable_mail_arsp.php

@@ -77 +77 @@
-                mail_users
-            set
-                status = ?,
-
+
+
-            where
-                mail_id = ?
-SQL_QUERY;
@@ -106 +107 @@
-                header("Location: email_accounts.php");
-                exit(0);
-        } else {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
-