Added TZ-fix for cyrus and mac os x mailserver aswell since these have been reported.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2852 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 1b7e27668e876d35eaac40a86d98d8184e90c2ed..7802bcfa01b7846508f1e3bd63d3937665e81c49 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -921,6 +921,7 @@ sub command19 {
     print "    uw         = University of Washington's IMAP server\n";
     print "    exchange   = Microsoft Exchange IMAP server\n";
     print "    courier    = Courier IMAP server\n";
+    print "    macosx     = Mac OS X Mailserver\n";
     print "    other      = Not one of the above servers\n";
     print "[$WHT$imap_server_type$NRM]: $WHT";
     $new_imap_server_type = <STDIN>;

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 39e0a7ed47daec1082c73903630e19e9806f9bfc..cfc49e00e796bbe1695feda2e51b62cbd6b242e8 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -420,7 +420,9 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
            if ($read_part{0} == '*') {
                if ($internaldate) {
                    if (preg_match ("/^.+INTERNALDATE\s+\"(.+)\".+/iUA",$read_part, $reg)) {
-                       if ($imap_server_type == 'courier') {
+                       if ( ($imap_server_type == 'courier')
+                           || ($imap_server_type == 'macosx')
+                           || ($imap_server_type == 'cyrus') ) {
                             /** If we use courier, 
                               *  We need to reformat the INTERNALDATE-string 
                               **/