Changeset 575 in subversion

Timestamp:

May 18, 2007 8:35:28 AM (6 years ago)

Author:

thomasb

Message:

Better refresh of message list; improved HTML mail display

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (2 diffs)
• steps/mail/func.inc (modified) (1 diff)
• steps/mail/list.inc (modified) (2 diffs)

trunk/roundcubemail/program/js/app.js

@@ -1245 +1245 @@
       {
       page = 1;
-      add_url += '&_refresh=1';
       this.env.current_page = page;
       if (this.message_list)
@@ -1251 +1250 @@
       this.show_contentframe(false);
       }
+    
+    if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
+      add_url += '&_refresh=1';
     
     this.select_folder(mbox, this.env.mailbox);

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

@@ -1208 +1208 @@
 
   // add comments arround html and other tags
-  $out = preg_replace(array('/(<\/?html[^>]*>)/i',
-                            '/(<\/?head[^>]*>)/i',
-                            '/(<title[^>]*>.*<\/title>)/Ui',
-                            '/(<\/?meta[^>]*>)/i'),
-                      '<!--\\1-->',
-                      $body);
-
-  $out = preg_replace(array('/(<body[^>]*>)/i',
-                            '/(<\/body>)/i'),
-                      array('<div class="rcmBody">',
+  $out = preg_replace(array(
+      '/(<!DOCTYPE.+)/i',
+      '/(<\/?html[^>]*>)/i',
+      '/(<\/?head[^>]*>)/i',
+      '/(<title[^>]*>.*<\/title>)/Ui',
+      '/(<\/?meta[^>]*>)/i'),
+    '<!--\\1-->',
+    $body);
+
+  $out = preg_replace(array('/<body([^>]*)>/i',
+                            '/<\/body>/i'),
+                      array('<div class="rcmBody"\\1>',
                             '</div>'),
                       $out);

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

@@ -38 +38 @@
 }
 
+$mbox_name = $IMAP->get_mailbox_name();
 
 // fetch message headers
-if ($count = $IMAP->messagecount())
+if ($count = $IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh'])))
   $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
 
-$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh']) ? TRUE : FALSE);
+$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh']));
 
 // update message count display
@@ -52 +53 @@
 
 // update mailboxlist
-$OUTPUT->command('set_unread_count', $IMAP->get_mailbox_name(), $unseen);
+$OUTPUT->command('set_unread_count', $mbox_name, $unseen);