[Phpgroupware-cvs] felamimail/inc class.bofelamimail.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/25 18:03:36

Modified files:
        inc            : class.bofelamimail.inc.php 

Log message:
        notice

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23

Patches:
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.bofelamimail.inc.php  23 Feb 2007 19:40:41 -0000      1.22
+++ class.bofelamimail.inc.php  25 Feb 2007 18:03:36 -0000      1.23
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bofelamimail.inc.php,v 1.22 2007/02/23 19:40:41 sigurdne 
Exp $ */
+       /* $Id: class.bofelamimail.inc.php,v 1.23 2007/02/25 18:03:36 sigurdne 
Exp $ */
 
        class bofelamimail
        {
@@ -594,7 +594,7 @@
                                for($i=0; $i<count($displayHeaders); $i++)
                                {
                                        $header = 
imap_fetch_overview($this->mbox,$displayHeaders[$i]['uid'],FT_UID);
-                                       if (count($header[0]) == 0)
+                                       if (@count($header[0]) == 0)
                                        {
                                                
$caching->removeFromCache($displayHeaders[$i]['uid']);
                                                $removedMessages++;
@@ -620,7 +620,7 @@
                                #$rawHeader = 
imap_fetchheader($this->mbox,$displayHeaders[$i]['uid'],FT_UID);
                                #$headers = 
$this->sofelamimail->fetchheader($rawHeader);
                                
-                               $retValue['header'][$count]['subject'] = 
$this->decode_header($header[0]->subject);
+                               $retValue['header'][$count]['subject'] = 
isset($header[0]->subject)?$this->decode_header($header[0]->subject):'';
                                $retValue['header'][$count]['sender_name']      
= $this->decode_header($displayHeaders[$i]['sender_name']);
                                $retValue['header'][$count]['sender_address']   
= $this->decode_header($displayHeaders[$i]['sender_address']);
                                $retValue['header'][$count]['to_name']          
= $this->decode_header($displayHeaders[$i]['to_name']);
@@ -776,13 +776,10 @@
                                        default:
                                        //      $newPart = 
stripslashes(trim(imap_body($this->mbox, $_uid, FT_UID)));
                                                $newPart = 
imap_body($this->mbox, $_uid, FT_UID);
-                                               
if(isset($structure->parameters) && is_array($structure->parameters))
-                                               {
-                                                       
if(strtolower($structure->parameters['value'] != 'utf-8'))
+                                               
if(isset($structure->parameters) && !is_object($structure->parameters[0]) && 
$structure->parameters['value'] != 'utf-8')
                                                        {
                                                                $newPart = 
utf8_encode($newPart);
                                                        }
-                                               }
                                                else
                                                {
                                                        $parameters = 
get_object_vars($structure->parameters); // fix this