X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=ca717caefcd302f74cafb432584e850c26ace91c;hb=9f4ffc38746c7d23beb7b48ba342dd0cc8e8b19a;hp=ff2ea3c5b0e54d303be1d5006ff063da2afe8086;hpb=074e8daef75c2b729e75f350b52935a6b7ecfba8;p=timetracker.git

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index ff2ea3c5..ca717cae 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -245,7 +245,6 @@ class ttImportHelper {
     if ($name == 'LOG_ITEM' && $this->canImport) {
       $this->logMap[$this->currentElement['ID']] =
         ttTimeHelper::insert(array(
-          'timestamp' => $this->currentElement['TIMESTAMP'],
           'user_id' => $this->userMap[$this->currentElement['USER_ID']],
           'date' => $this->currentElement['DATE'],
           'start' => $this->currentElement['START'],
@@ -322,6 +321,7 @@ class ttImportHelper {
         'chclient' => (int) $this->currentElement['SHOW_CLIENT'],
         'chinvoice' => (int) $this->currentElement['SHOW_INVOICE'],
         'chpaid' => (int) $this->currentElement['SHOW_PAID'],
+        'chip' => (int) $this->currentElement['SHOW_IP'],
         'chproject' => (int) $this->currentElement['SHOW_PROJECT'],
         'chstart' => (int) $this->currentElement['SHOW_START'],
         'chduration' => (int) $this->currentElement['SHOW_DURATION'],
@@ -371,13 +371,13 @@ class ttImportHelper {
     // If the file is compressed - uncompress it.
     if ($compressed) {
       if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->getKey('error.sys'));
+        $this->errors->add($i18n->get('error.sys'));
         return;
       }
       unlink($_FILES['xmlfile']['tmp_name']);
     } else {
       if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->getKey('error.upload'));
+        $this->errors->add($i18n->get('error.upload'));
         return;
       }
     }
@@ -397,7 +397,7 @@ class ttImportHelper {
           xml_get_current_line_number($parser)));
       }
       if (!$this->canImport) {
-        $this->errors->add($i18n->getKey('error.user_exists'));
+        $this->errors->add($i18n->get('error.user_exists'));
         break;
       }
     }