Minimize chance of race condition in session handling (#1485659, #1484678)

svncommit

2009-05-12 617b4f699f2e47991c50e05528b1f9ecbc3c3d9c

 program/steps/mail/show.inc

@@ -5,7 +5,7 @@
 | program/steps/mail/show.inc                                           |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
 | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -42,17 +42,8 @@
    
  $mbox_name = $IMAP->get_mailbox_name();
  
  // check known senders to display images
  if (!$MESSAGE->is_safe 
      && !empty($MESSAGE->sender['mailto'])
      && $RCMAIL->config->get('addrbook_show_images')
      && $MESSAGE->has_html_part()) {
    $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
    
    if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) {
      $MESSAGE->set_safe(true);
    }
  }
  // show images?
  rcmail_check_safe($MESSAGE);

  // calculate Etag for this request
  $etag = md5($MESSAGE->uid.$mbox_name.session_id()
@@ -84,7 +75,7 @@
  // check for unset disposition notification
  if ($MESSAGE->headers->mdn_to &&
      !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen &&
      $IMAP->check_permflag('MDNSENT') &&
      ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) &&
      $mbox_name != $CONFIG['drafts_mbox'] &&
      $mbox_name != $CONFIG['sent_mbox'])
  {
@@ -144,9 +135,11 @@
    }

  // mark message as read
  if (!$MESSAGE->headers->seen)
  if (!$MESSAGE->headers->seen) {
    $IMAP->set_flag($MESSAGE->uid, 'SEEN');
    $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, 'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE));
  }
}



@@ -204,7 +197,7 @@
  $msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages')));
  
  // add link to save sender in addressbook and reload message
  if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('addrbook_show_images')) {
  if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
    $msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
      Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
  }