X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/7051fc8c0f68618bbaff5f8bb48d3478ce93836a..7af7d601282b0ea3138d05c300163e18e121ec32:/WEB-INF/lib/ttOrgImportHelper.class.php

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index e6401915..c70d2580 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -26,7 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
 import('ttUserHelper');
 import('ttProjectHelper');
 import('ttTaskHelper');
@@ -53,21 +52,44 @@ class ttOrgImportHelper {
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_parent_group_id = null; // Current parent group id as we parse the file.
                                        // Set when we create a new group.
+  // Entities for current group.
+  var $currentGroupRoles = array(); // Array of arrays of role properties.
+  // var $currentGroupUsers = array(); // Array of arrays of user properties.
+
+  // Entity maps for current group. They map XML ids with database ids.
+  var $currentGroupRoleMap = array(); // Maps role ids from XML to their database ids.
+  //var $userMap       = array(); // User ids.
+  //var $projectMap    = array(); // Project ids.
+  //var $taskMap       = array(); // Task ids.
+  //var $clientMap     = array(); // Client ids.
+  //var $invoiceMap    = array(); // Invoice ids.
 
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
-  // startElement - callback handler for opening tag of an XML element.
-  // In this function we assign passed in attributes to currentElement.
+  // startElement - callback handler for opening tag of an XML element in the file.
   function startElement($parser, $name, $attrs) {
+/*
     if ($name == 'GROUP'
       || $name == 'USER') {
       $this->currentElement = $attrs;
     }
     $this->currentTag = $name;
+*/
+    // First pass. We only check user logins for potential collisions with existing.
+    if ($this->firstPass) {
+      if ($name == 'USER' && $this->canImport) {
+        if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($attrs['LOGIN'])) {
+          // We have a login collision, cannot import any data.
+          $this->canImport = false;
+        }
+      }
+      //$this->currentTag = '';
+    }
 
+    // Second pass processing. We import data here, one tag at a time.
     if (!$this->firstPass && $this->canImport) {
       $mdb2 = getConnection();
 
@@ -92,44 +114,23 @@ class ttOrgImportHelper {
         // Set current parent group.
         $this->current_parent_group_id = $group_id;
       }
-    }
-  }
 
-  // endElement - callback handler for the closing tag of an XML element.
-  // When we are here, currentElement is an array of the element attributes (as set in startElement).
-  // Here we do the actual import of data into the database.
-  function endElement($parser, $name) {
-    // During first pass we only check user logins.
-    if ($this->firstPass) {
-      if ($name == 'USER' && $this->canImport) {
-        if ('' != $this->currentElement['STATUS'] && ttUserHelper::getUserByLogin($this->currentElement['LOGIN'])) {
-          // We have a login collision, cannot import any data.
-          $this->canImport = false;
-        }
+      if ($name == 'ROLES') {
+        // If we get here, we have to recycle both $currentGroupRoles and $currentGroupRoleMap.
+        unset($this->currentGroupRoles);
+        unset($this->currentGroupRoleMap);
+        $this->currentGroupRoles = array();
+        $this->currentGroupRoleMap = array();
+        // Both arrays are now empty.
+        // They will get reconstructed after processing of <role> elements in XML. See below.
       }
-      $this->currentTag = '';
-    }
 
-    // During second pass we import data.
-    if (!$this->firstPass && $this->canImport) {
-      // Nothing is done here, see startElement for second pass.
-    }
-  }
-
-  // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
-  function dataElement($parser, $data) {
-    if ($this->currentTag == 'NAME'
-      || $this->currentTag == 'DESCRIPTION'
-      || $this->currentTag == 'LABEL'
-      || $this->currentTag == 'VALUE'
-      || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS'
-      || $this->currentTag == 'ALLOW_IP'
-      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
-      if (isset($this->currentElement[$this->currentTag]))
-        $this->currentElement[$this->currentTag] .= trim($data);
-      else
-        $this->currentElement[$this->currentTag] = trim($data);
+      if ($name == 'ROLE') {
+        // We get here when processing a <role> tag for the current group.
+        // Add new role to $this->currentGroupRoles and a mapping to $this->currentGroupRoleMap.
+        $this->currentGroupRoles[$this->currentElement['ID']] = $this->currentElement;
+      $this->currentElement = array();
+      }
     }
   }
 
@@ -167,8 +168,7 @@ class ttOrgImportHelper {
     // Initialize XML parser.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', 'endElement');
-    xml_set_character_data_handler($parser, 'dataElement');
+    xml_set_element_handler($parser, 'startElement', false);
 
     // We need to parse the file 2 times:
     //   1) First pass: determine if import is possible - there must be no login collisions.
@@ -201,8 +201,7 @@ class ttOrgImportHelper {
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', 'endElement');
-    xml_set_character_data_handler($parser, 'dataElement');
+    xml_set_element_handler($parser, 'startElement', false);
 
     // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
     $file = fopen($filename, 'r');