[Fmsystem-commits] [17623]

[nelson . guerra]

Revision: 17623
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17623
Author:   nelson224
Date:     2018-01-17 18:49:20 -0500 (Wed, 17 Jan 2018)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English

Modified: branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English        
2018-01-17 23:49:06 UTC (rev 17622)
+++ branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English        
2018-01-17 23:49:20 UTC (rev 17623)
@@ -188,10 +188,14 @@
                {
                        // Build the header for the file (field list)
                        reset($this->export);
-                       while (list($name,$value)=each($this->export))
-                       {
+                       //while (list($name,$value)=each($this->export))
+                        if (is_array($this->export))
+                        {
+                            foreach($this->export as $name => $value)
+                            {
                                $entries .= $value . ',';
-                       }
+                            }
+                        }
                        $entries = substr($entries,0,-1);
                        $entries .= "\r\n";
 
@@ -200,10 +204,14 @@
                        for ($i=0;$i<count($this->ids);$i++)
                        {
                                reset($this->export);
-                               while (list($name,$value)=each($this->export))
-                               {
+                               //while (list($name,$value)=each($this->export))
+                                if (is_array($this->export))
+                                {
+                                    foreach($this->export as $name => $value)
+                                    {
                                        $entries .= '"'.$buffer[$i][$value] . 
'",';
-                               }
+                                    }
+                                }
                                $entries = substr($entries,0,-1);
                                $entries .= "\r\n";
                        }