diff options
| author | thomascube <thomas@roundcube.net> | 2006-09-01 13:53:23 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2006-09-01 13:53:23 +0000 |
| commit | 8cb245c2787fbcb7786349bfbc2379a51c73f8e6 (patch) | |
| tree | 0e7e07a550734fe0c32406e583f444b1f0d41ff2 | |
| parent | 3ea0e3202a73eb7efcbf0b825582a6d3504658aa (diff) | |
Correct creation of a message-id
| -rw-r--r-- | program/include/main.inc | 27 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 2 |
2 files changed, 20 insertions, 9 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index ecf53b52d..921494829 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -519,14 +519,7 @@ function rcmail_create_user($user, $host) if ($user_id = $DB->insert_id(get_sequence_name('users'))) { - $mail_domain = $host; - if (is_array($CONFIG['mail_domain'])) - { - if (isset($CONFIG['mail_domain'][$host])) - $mail_domain = $CONFIG['mail_domain'][$host]; - } - else if (!empty($CONFIG['mail_domain'])) - $mail_domain = $CONFIG['mail_domain']; + $mail_domain = rcmail_mail_domain($host); if ($user_email=='') $user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain); @@ -1646,6 +1639,24 @@ function rcmail_current_username($attrib) } +// return the mail domain configured for the given host +function rcmail_mail_domain($host) + { + global $CONFIG; + + $domain = $host; + if (is_array($CONFIG['mail_domain'])) + { + if (isset($CONFIG['mail_domain'][$host])) + $domain = $CONFIG['mail_domain'][$host]; + } + else if (!empty($CONFIG['mail_domain'])) + $domain = $CONFIG['mail_domain']; + + return $domain; + } + + // return code for the webmail login form function rcmail_login_form($attrib) { diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 30d59dbe3..375fc92d9 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -66,7 +66,7 @@ function rcmail_get_identity($id) if (strlen($_POST['_draft_saveid']) > 3) $olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST); -$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $_SESSION['imap_host']); +$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), rcmail_mail_domain($_SESSION['imap_host'])); $savedraft = !empty($_POST['_draft']) ? TRUE : FALSE; // remove all scripts and act as called in frame |