X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/42dcc17360038e8fdfdb3bbdc7983bf5fe727954..367baa10353d5f679e6e3c795ae9d35a275a24d9:/WEB-INF/lib/ttOrgImportHelper.class.php

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ff3376d3..b33901b2 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -247,6 +247,7 @@ class ttOrgImportHelper {
           'login' => $attrs['LOGIN'],
           'password' => $attrs['PASSWORD'],
           'rate' => $attrs['RATE'],
+          'quota_percent' => $attrs['QUOTA_PERCENT'],
           'email' => $attrs['EMAIL'],
           'status' => $attrs['STATUS']), false);
         if ($user_id) {
@@ -493,12 +494,33 @@ class ttOrgImportHelper {
     }
   }
 
-  // importXml - uncompresses the file, reads and parses its content. During parsing,
-  // startElement, endElement, and dataElement functions are called as many times as necessary.
-  // Actual import occurs in the endElement handler.
+  // importXml - uncompresses the file, reads and parses its content.
+  // It goes through the file 2 times.
+  //
+  // During 1st pass, it determines whether we can import data.
+  // In 1st pass, startElement function is called as many times as necessary.
+  //
+  // Actual import occurs during 2nd pass.
+  // In 2nd pass, startElement and endElement are called many times.
+  // We only use endElement to finish current group processing.
+  //
+  // The above allows us to export/import complex orgs with nested groups,
+  // while by design all data are in attributes of the elements (no CDATA).
+  //
+  // There is currently at least one problem with keeping all data in attributes:
+  // a vertical tab character 0xB anywhere breaks parsing, making import impossible.
+  // See https://github.com/sparklemotion/nokogiri/issues/1581 - looks like
+  // an XML standard thing. Apparently, other invalid characters break parsing too.
+  // This problem needs to be addressed at some point but how exactly without
+  // complicating export-import too much with CDATA and dataElement processing?
   function importXml() {
     global $i18n;
 
+    if (!$_FILES['xmlfile']['name']) {
+      $this->errors->add($i18n->get('error.upload'));
+      return; // There is nothing to do if we don't have a file.
+    }
+
     // Do we have a compressed file?
     $compressed = false;
     $file_ext = substr($_FILES['xmlfile']['name'], strrpos($_FILES['xmlfile']['name'], '.') + 1);
@@ -551,11 +573,11 @@ class ttOrgImportHelper {
     $this->firstPass = false; // We are done with 1st pass.
     xml_parser_free($parser);
     if ($file) fclose($file);
-    if (!$this->canImport) {
+    if ($this->errors->yes()) {
+      // Remove the file and exit if we have errors.
       unlink($filename);
       return;
     }
-    if ($this->errors->yes()) return; // Exit if we have errors.
 
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
@@ -754,7 +776,7 @@ class ttOrgImportHelper {
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
 
-    $columns = '(login, password, name, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by, status)';
+    $columns = '(login, password, name, group_id, org_id, role_id, client_id, rate, quota_percent, email, created, created_ip, created_by, status)';
 
     $values = 'values (';
     $values .= $mdb2->quote($fields['login']);
@@ -765,6 +787,7 @@ class ttOrgImportHelper {
     $values .= ', '.(int)$fields['role_id'];
     $values .= ', '.$mdb2->quote($fields['client_id']);
     $values .= ', '.$mdb2->quote($fields['rate']);
+    $values .= ', '.$mdb2->quote($fields['quota_percent']);
     $values .= ', '.$mdb2->quote($fields['email']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ', '.$mdb2->quote($fields['status']);