[Fmsystem-commits] [15290]

[nelson . guerra]

Revision: 15290
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15290
Author:   nelson224
Date:     2016-06-15 01:24:39 +0000 (Wed, 15 Jun 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiimport.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uiimport.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport.inc.php       
2016-06-14 13:13:09 UTC (rev 15289)
+++ branches/dev-syncromind-2/property/inc/class.uiimport.inc.php       
2016-06-15 01:24:39 UTC (rev 15290)
@@ -684,14 +684,23 @@
                                return false;
                        }
                }
+               
+               private function _xml2array ( $xmlObject, $out = array () )
+               {
+                       foreach ( (array) $xmlObject as $index => $node )
+                       {
+                               $out[$index] = ( is_object($node) || 
is_array($node) ) ? $this->_xml2array ( $node ) : $node;
+                       }
+                       
+                       return $out;
+               }
 
                protected function getxmldata( $path, $get_identificator = true 
)
                {
-                       phpgw::import_class('phpgwapi.xmlhelper');
+                       $xml = simplexml_load_file($path);
+                       $out = $this->_xml2array($xml);
 
-                       $result = phpgwapi_xmlhelper::xml2assoc($path);
-
-                       return $result;
+                       return $out;
                }
                
                protected function getcsvdata( $path, $get_identificator = true 
)