|
File 1335patch.txt, 0.8 kB
(added by kilburn, 5 months ago)
|
|
| Line | |
|---|
| 1 |
Index: gui/client/add_mail_acc.php |
|---|
| 2 |
=================================================================== |
|---|
| 3 |
--- gui/client/add_mail_acc.php (revision 1230) |
|---|
| 4 |
+++ gui/client/add_mail_acc.php (working copy) |
|---|
| 5 |
@@ -309,9 +309,10 @@ |
|---|
| 6 |
} |
|---|
| 7 |
$mail_forward = implode(',', $mail_accs); |
|---|
| 8 |
} |
|---|
| 9 |
+ |
|---|
| 10 |
+ $mail_type = implode(',', $mail_type); |
|---|
| 11 |
+ list($t_, $foo) = split('_', $mail_type, 2); |
|---|
| 12 |
|
|---|
| 13 |
- $mail_type = implode(',', $mail_type); |
|---|
| 14 |
- |
|---|
| 15 |
$check_acc_query = <<<SQL_QUERY |
|---|
| 16 |
SELECT |
|---|
| 17 |
COUNT(mail_id) AS cnt |
|---|
| 18 |
@@ -323,9 +324,11 @@ |
|---|
| 19 |
`domain_id` = ? |
|---|
| 20 |
AND |
|---|
| 21 |
`sub_id` = ? |
|---|
| 22 |
+ AND |
|---|
| 23 |
+ LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ? |
|---|
| 24 |
SQL_QUERY; |
|---|
| 25 |
|
|---|
| 26 |
- $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id)); |
|---|
| 27 |
+ $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id, $t_)); |
|---|
| 28 |
} |
|---|
| 29 |
|
|---|
| 30 |
if ($rs->fields['cnt'] > 0) { |
|---|
|
