Changeset 1023 in subversion

Timestamp:

Feb 6, 2008 2:41:11 AM (5 years ago)

Author:

thomasb

Message:

Remember decision to display images for a certain message during session (#1484754)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (3 diffs)
• program/steps/mail/show.inc (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/02/06 (thomasb)
+----------
+- Remember decision to display images for a certain message during session (#1484754)
 
 2008/02/05 (thomasb)
@@ -9 +13 @@
 - Applied patch for updating page title (#1484727, #1484650)
 - Applied patch to prevent from purging inbox by uberlinuxguy (#1484449)
+- Applied patch to prevent bad header delimiters (#1484751)
 - Also send search request when deleting a contact (#1484620)
 - Add CSS hack for Safari

trunk/roundcubemail/program/steps/mail/func.inc

@@ -639 +639 @@
     $a_return_parts[] = &$structure;
     }
-
+    
   // message contains alternative parts
   else if ($message_ctype_primary=='multipart' && $message_ctype_secondary=='alternative' && is_array($structure->parts))
@@ -745 +745 @@
         $a_attachments = array_merge($a_attachments, $attachmnts);
         }
+        
+      // ignore "virtual" protocol parts
+      else if ($primary_type=='protocol')
+        continue;
 
       // part is file/attachment
@@ -862 +866 @@
     $attrib['id'] = 'rcmailMsgBody';
 
-  $safe_mode = intval($_GET['_safe']);
+  $safe_mode = $MESSAGE['is_safe'] || intval($_GET['_safe']);
   $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
   $out = '<div '. $attrib_str . ">\n";

trunk/roundcubemail/program/steps/mail/show.inc

@@ -43 +43 @@
       }
     }
+    
+  // check if safe flag is set
+  if ($MESSAGE['is_safe'] = intval($_GET['_safe']))
+    $_SESSION['safe_messages'][$MESSAGE['UID']] = true;
+  else if ($_SESSION['safe_messages'][$MESSAGE['UID']])
+    $MESSAGE['is_safe'] = 1;
 
   // calculate Etag for this request
@@ -59 +65 @@
     list($MESSAGE['parts'], $MESSAGE['attachments']) = rcmail_parse_message(
       $MESSAGE['structure'],
-      array('safe' => intval($_GET['_safe']),
+      array('safe' => $MESSAGE['is_safe'],
             'prefer_html' => $CONFIG['prefer_html'],
             'get_url' => $GET_URL.'&_part=%s')
@@ -73 +79 @@
   // give message uid to the client
   $OUTPUT->set_env('uid', $MESSAGE['UID']);
-  $OUTPUT->set_env('safemode', intval($_GET['_safe']));
+  $OUTPUT->set_env('safemode', $MESSAGE['is_safe']);
   
   // check for unset disposition notification