X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=7b68ba7ce881f6f534b45647f415f6aa87cce7c3;hb=187a16b0ffee5ae6af51b010ff90a194048d3457;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..7b68ba7c 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -124,7 +124,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,6 +137,8 @@ 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'],
@@ -330,6 +332,7 @@ class ttImportHelper {
         'chfinish' => (int) $this->currentElement['SHOW_END'],
         'chnote' => (int) $this->currentElement['SHOW_NOTE'],
         'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
+        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
         'group_by' => $this->currentElement['GROUP_BY'],
         'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
     }
@@ -343,7 +346,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 +437,46 @@ 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')) {
+      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+      return $group_id;
+    }
+    return false;
+  }
+
   // insertMonthlyQuota - a helper function to insert a monthly quota.
   private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
     $mdb2 = getConnection();