X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=7fa1e28309b549b6fe7b531fb97ae627079d0de5;hb=56f1fd19f2c9c72878395b3275f03f192ccca082;hp=b7c024d727f6560a5f66937a82df0d8b20a82e77;hpb=b20bc88bdf10d0599435f36bc8acd01b7a35c23c;p=timetracker.git

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index b7c024d7..7fa1e283 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -47,6 +47,7 @@ class ttImportHelper {
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $groupData      = array(); // Array of group data such as group name, etc.
+  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
   var $group_id       = null;    // New group id we are importing. It is created during the import operation.
   var $roles          = array(); // Array of arrays of role properties.
   var $users          = array(); // Array of arrays of user properties.
@@ -66,7 +67,7 @@ class ttImportHelper {
   var $logMap        = array(); // Time log ids.
 
   // Constructor.
-  function ttImportHelper(&$errors) {
+  function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
@@ -124,7 +125,7 @@ class ttImportHelper {
       // Now we can create a group.
       if ($this->canImport) {
         $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
-        $group_id = ttTeamHelper::insert(array(
+        $group_id = $this->createGroup(array(
           'name' => $this->groupData['NAME'],
           'currency' => $this->groupData['CURRENCY'],
           'decimal_mark' => $this->groupData['DECIMAL_MARK'],
@@ -137,18 +138,23 @@ class ttImportHelper {
           'task_required' => $this->groupData['TASK_REQUIRED'],
           'record_type' => $this->groupData['RECORD_TYPE'],
           'bcc_email' => $this->groupData['BCC_EMAIL'],
+          'allow_ip' => $this->groupData['ALLOW_IP'],
+          'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
           'plugins' => $this->groupData['PLUGINS'],
           'lock_spec' => $this->groupData['LOCK_SPEC'],
           'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
           'config' => $this->groupData['CONFIG']));
         if ($group_id) {
+          $this->org_id = $group_id;
           $this->group_id = $group_id;
 
           // Create roles.
           foreach ($this->roles as $key=>$role_item) {
             $role_id = ttRoleHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'name' => $role_item['NAME'],
+              'description' => $role_item['DESCRIPTION'],
               'rank' => $role_item['RANK'],
               'rights' => $role_item['RIGHTS'],
               'status' => $role_item['STATUS']));
@@ -159,6 +165,7 @@ class ttImportHelper {
             $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
             $user_id = ttUserHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'role_id' => $role_id,
               'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
               'name' => $user_item['NAME'],
@@ -177,6 +184,7 @@ class ttImportHelper {
       $this->taskMap[$this->currentElement['ID']] =
         ttTaskHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'status' => $this->currentElement['STATUS']));
@@ -191,17 +199,20 @@ class ttImportHelper {
       $this->projectMap[$this->currentElement['ID']] =
         ttProjectHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'tasks' => $mapped_tasks,
           'status' => $this->currentElement['STATUS']));
     }
     if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
-      ttUserHelper::insertBind(
-        $this->userMap[$this->currentElement['USER_ID']],
-        $this->projectMap[$this->currentElement['PROJECT_ID']],
-        $this->currentElement['RATE'],
-        $this->currentElement['STATUS']);
+      ttUserHelper::insertBind(array(
+        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+        'group_id' => $this->group_id,
+        'org_id' => $this->org_id,
+        'rate' => $this->currentElement['RATE'],
+        'status' => $this->currentElement['STATUS']));
     }
 
     if ($name == 'CLIENT' && $this->canImport) {
@@ -215,6 +226,7 @@ class ttImportHelper {
       $this->clientMap[$this->currentElement['ID']] =
         ttClientHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'address' => $this->currentElement['ADDRESS'],
           'tax' => $this->currentElement['TAX'],
@@ -231,10 +243,10 @@ class ttImportHelper {
       $this->invoiceMap[$this->currentElement['ID']] =
         ttInvoiceHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'discount' => $this->currentElement['DISCOUNT'],
           'status' => $this->currentElement['STATUS']));
     }
 
@@ -246,6 +258,8 @@ class ttImportHelper {
       $this->logMap[$this->currentElement['ID']] =
         ttTimeHelper::insert(array(
           'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+          'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'date' => $this->currentElement['DATE'],
           'start' => $this->currentElement['START'],
           'finish' => $this->currentElement['FINISH'],
@@ -290,6 +304,7 @@ class ttImportHelper {
       ttExpenseHelper::insert(array(
         'date' => $this->currentElement['DATE'],
         'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'group_id' => $this->group_id,
         'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
         'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
         'name' => $this->currentElement['NAME'],
@@ -330,7 +345,10 @@ class ttImportHelper {
         'chfinish' => (int) $this->currentElement['SHOW_END'],
         'chnote' => (int) $this->currentElement['SHOW_NOTE'],
         'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
-        'group_by' => $this->currentElement['GROUP_BY'],
+        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
+        'group_by1' => $this->currentElement['GROUP_BY1'],
+        'group_by2' => $this->currentElement['GROUP_BY2'],
+        'group_by3' => $this->currentElement['GROUP_BY3'],
         'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
     }
     $this->currentTag = '';
@@ -343,7 +361,9 @@ class ttImportHelper {
       || $this->currentTag == 'LABEL'
       || $this->currentTag == 'VALUE'
       || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS') {
+      || $this->currentTag == 'ADDRESS'
+      || $this->currentTag == 'ALLOW_IP'
+      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
       if (isset($this->currentElement[$this->currentTag]))
         $this->currentElement[$this->currentTag] .= trim($data);
       else
@@ -432,6 +452,53 @@ class ttImportHelper {
     return true;
   }
 
+  // createGroup function creates a new group.
+  private function createGroup($fields) {
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
+      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
+      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+
+    $values = ' values ('.$mdb2->quote(trim($fields['name']));
+    $values .= ', '.$mdb2->quote(trim($fields['currency']));
+    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
+    $values .= ', '.$mdb2->quote($fields['lang']);
+    $values .= ', '.$mdb2->quote($fields['date_format']);
+    $values .= ', '.$mdb2->quote($fields['time_format']);
+    $values .= ', '.(int)$fields['week_start'];
+    $values .= ', '.(int)$fields['tracking_mode'];
+    $values .= ', '.(int)$fields['project_required'];
+    $values .= ', '.(int)$fields['task_required'];
+    $values .= ', '.(int)$fields['record_type'];
+    $values .= ', '.$mdb2->quote($fields['bcc_email']);
+    $values .= ', '.$mdb2->quote($fields['allow_ip']);
+    $values .= ', '.$mdb2->quote($fields['password_complexity']);
+    $values .= ', '.$mdb2->quote($fields['plugins']);
+    $values .= ', '.$mdb2->quote($fields['lock_spec']);
+    $values .= ', '.(int)$fields['workday_minutes'];
+    $values .= ', '.$mdb2->quote($fields['config']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ')';
+
+    $sql = 'insert into tt_groups '.$columns.$values;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Update org_id with group_id.
+    // NOTE: Both export and import need an additional effort to properly operate on subgroups.
+    // Currently we are importing one group only, which becomes a top level group.
+    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return $group_id;
+  }
+
   // insertMonthlyQuota - a helper function to insert a monthly quota.
   private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
     $mdb2 = getConnection();