thomascube
2006-09-01 8cb245c2787fbcb7786349bfbc2379a51c73f8e6
Correct creation of a message-id

2 files modified
29 ■■■■■ changed files
program/include/main.inc 27 ●●●● patch | view | raw | blame | history
program/steps/mail/sendmail.inc 2 ●●● patch | view | raw | blame | history
program/include/main.inc
@@ -519,14 +519,7 @@
  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 @@
  }
// 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)
  {
program/steps/mail/sendmail.inc
@@ -66,7 +66,7 @@
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