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

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Dave Hall <skwashd>     07/09/08 23:05:46

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

Log message:
        make it work with php5 - bug #21006

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

Patches:
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.bofelamimail.inc.php  26 Feb 2007 22:22:53 -0000      1.25
+++ class.bofelamimail.inc.php  8 Sep 2007 23:05:45 -0000       1.26
@@ -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.25 2007/02/26 22:22:53 sigurdne 
Exp $ */
+       /* $Id: class.bofelamimail.inc.php,v 1.26 2007/09/08 23:05:45 skwashd 
Exp $ */
 
        class bofelamimail
        {
@@ -463,9 +463,7 @@
                                }
                                        $folders["$folderNameIMAP"] = 
$displayName;
                                }
-                               #exit;
                                ksort($folders,SORT_STRING);
-                               reset($folders);
                                return $folders;
                        }
                        else
@@ -476,7 +474,7 @@
                                        $folders['INBOX'] = 'INBOX';
                                        return $folders;
                                }
-                               return false;
+                               return array();
                        }
                }
                
@@ -1001,7 +999,7 @@
                
                function parseMessage($_structure, $_partID = '')
                {
-                       #if ($_partID == '') _debug_array($_structure);
+                       //if ($_partID == '') _debug_array($_structure);
                        
                        switch ($_structure->type)
                        {
@@ -1015,9 +1013,10 @@
                                        $data["name"]           = 
lang("unknown");
                                        if(isset($_structure->parameters) && 
is_array($_structure->parameters))
                                        {
-                                               for ($lcv = 0; $lcv < 
count($_structure->parameters); $lcv++)
+                                               $cnt_params =  
count($_structure->parameters);
+                                               for ($lcv = 0; $lcv < 
$cnt_params; ++$lcv)
                                                {
-                                                       $param = 
$_structure->parameters[$lcv];
+                                                       $param = 
$_structure->parameters->$lcv;
                                                        
switch(strtolower($param->attribute))
                                                        {
                                                                case 'name':