Ticket #747: mail_addr-diff-add_mail_acc.txt
|
File mail_addr-diff-add_mail_acc.txt, 2.2 kB
(added by joximu, 1 year ago)
|
my patch for client/add_mail_acc.php, r823 or sth. around this...
|
| Line | |
|---|
| 1 |
--- add_mail_acc.php_org 2007-09-23 18:21:49.000000000 +0200 |
|---|
| 2 |
+++ add_mail_acc.php 2007-10-05 01:35:13.000000000 +0200 |
|---|
| 3 |
@@ -219,6 +219,7 @@ |
|---|
| 4 |
|
|---|
| 5 |
$status = $cfg['ITEM_ADD_STATUS']; |
|---|
| 6 |
$mail_auto_respond = '_no_'; |
|---|
| 7 |
+ $mail_addr = ''; |
|---|
| 8 |
|
|---|
| 9 |
if ($_POST['mail_type'] === 'normal') { |
|---|
| 10 |
if ($_POST['dmn_type'] === 'dmn') { |
|---|
| 11 |
@@ -226,18 +227,24 @@ |
|---|
| 12 |
$mail_forward = '_no_'; |
|---|
| 13 |
$mail_type = 'normal_mail'; |
|---|
| 14 |
$sub_id = '0'; |
|---|
| 15 |
+ $rs = exec_query($sql, 'SELECT `domain_name` FROM `domain` WHERE `domain_id` = ?', array($domain_id)); |
|---|
| 16 |
+ $mail_addr = $mail_acc.'@'.$rs->fields['domain_name']; |
|---|
| 17 |
} |
|---|
| 18 |
else if ($_POST['dmn_type'] === 'sub') { |
|---|
| 19 |
$mail_pass = $_POST['pass']; |
|---|
| 20 |
$mail_forward = '_no_'; |
|---|
| 21 |
$mail_type = 'subdom_mail'; |
|---|
| 22 |
$sub_id = $_POST['sub_id']; |
|---|
| 23 |
+ $rs = exec_query($sql, 'SELECT `t1`.`subdomain_name`, `t2`.`domain_name` FROM `subdomain` `t1`, `domain` `t2` WHERE `t1`.`subdomain_id` = ? AND `t2`.`domain_id` = ?', array($sub_id, $domain_id)); |
|---|
| 24 |
+ $mail_addr = $mail_acc.'@'.$rs->fields['subdomain_name'].'.'.$rs->fields['domain_name']; |
|---|
| 25 |
} |
|---|
| 26 |
else if ($_POST['dmn_type'] === 'als') { |
|---|
| 27 |
$mail_pass = $_POST['pass']; |
|---|
| 28 |
$mail_forward = '_no_'; |
|---|
| 29 |
$mail_type = 'alias_mail'; |
|---|
| 30 |
$sub_id = $_POST['als_id']; |
|---|
| 31 |
+ $rs = exec_query($sql, 'SELECT `alias_name` FROM `domain_aliasses` WHERE `alias_id` = ? AND `domain_id` = ?', array($sub_id, $domain_id)); |
|---|
| 32 |
+ $mail_addr = $mail_acc.'@'.$rs->fields['alias_name']; |
|---|
| 33 |
} else { |
|---|
| 34 |
set_page_message(tr('Unknown domain type')); |
|---|
| 35 |
return ; |
|---|
| 36 |
@@ -324,9 +331,10 @@ |
|---|
| 37 |
mail_type, |
|---|
| 38 |
sub_id, |
|---|
| 39 |
status, |
|---|
| 40 |
- mail_auto_respond) |
|---|
| 41 |
+ mail_auto_respond, |
|---|
| 42 |
+ mail_addr) |
|---|
| 43 |
VALUES |
|---|
| 44 |
- (?, ?, ?, ?, ?, ?, ?, ?) |
|---|
| 45 |
+ (?, ?, ?, ?, ?, ?, ?, ?, ?) |
|---|
| 46 |
SQL_QUERY; |
|---|
| 47 |
|
|---|
| 48 |
$rs = exec_query($sql, $query, array($mail_acc, |
|---|
| 49 |
@@ -336,7 +344,8 @@ |
|---|
| 50 |
$mail_type, |
|---|
| 51 |
$sub_id, |
|---|
| 52 |
$status, |
|---|
| 53 |
- $mail_auto_respond)); |
|---|
| 54 |
+ $mail_auto_respond, |
|---|
| 55 |
+ $mail_addr)); |
|---|
| 56 |
|
|---|
| 57 |
if ($_POST['dmn_type'] === 'als') { |
|---|
| 58 |
$query = <<<SQL_QUERY |
|---|
|
