X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttOrgImportHelper.class.php;h=ebb5febd2d76e45e2a02641b7a379587efa18767;hb=109089e858e28200e714a790883c236230b3922f;hp=b5a28c8e85909423bbc274ed4b876efed0f5807c;hpb=f58ab716cb0cc4b8be8e48723b345bfab29697a6;p=timetracker.git

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index b5a28c8e..ebb5febd 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,13 +27,8 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttRoleHelper');
 import('ttTaskHelper');
-import('ttClientHelper');
 import('ttInvoiceHelper');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-import('ttFavReportHelper');
 
 // ttOrgImportHelper class is used to import organization data from an XML file
 // prepared by ttOrgExportHelper and consisting of nested groups with their info.
@@ -63,7 +58,7 @@ class ttOrgImportHelper {
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
-    $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
+    $this->top_role_id = $this->getTopRole();
   }
 
   // startElement - callback handler for opening tags in XML.
@@ -155,7 +150,7 @@ class ttOrgImportHelper {
 
       if ($name == 'ROLE') {
         // We get here when processing <role> tags for the current group.
-        $role_id = ttRoleHelper::insert(array(
+        $role_id = $this->insertRole(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -636,7 +631,7 @@ class ttOrgImportHelper {
     $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 .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
     $sql = 'insert into tt_groups '.$columns.$values;
@@ -695,7 +690,7 @@ class ttOrgImportHelper {
     $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
     $paid = (int) $fields['paid'];
-    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
       " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
@@ -725,11 +720,7 @@ class ttOrgImportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_projects', 'id');
 
     // Insert binds into tt_project_task_binds table.
     if (is_array($tasks)) {
@@ -745,6 +736,29 @@ class ttOrgImportHelper {
     return $last_id;
   }
 
+  // insertRole - inserts a role into tt_roles table.
+  private function insertRole($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $fields['name'];
+    $rank = (int) $fields['rank'];
+    $description = $fields['description'];
+    $rights = $fields['rights'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_roles (group_id, org_id, name, rank, description, rights, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = $mdb2->lastInsertID('tt_roles', 'id');
+    return $last_id;
+  }
+
   // The insertClient function inserts a new client as well as client to project binds.
   private function insertClient($fields)
   {
@@ -770,11 +784,7 @@ class ttOrgImportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_clients', 'id');
 
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
@@ -818,13 +828,8 @@ class ttOrgImportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "select last_insert_id() as last_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-
-    $val = $res->fetchRow();
-    return $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id');
+    return $last_id;
   }
 
   // insertNotification function inserts a new notification into database.
@@ -886,11 +891,7 @@ class ttOrgImportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_custom_fields', 'id');
     return $last_id;
   }
 
@@ -909,11 +910,7 @@ class ttOrgImportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_custom_field_options', 'id');
     return $last_id;
   }
 
@@ -950,7 +947,7 @@ class ttOrgImportHelper {
       ", ".$mdb2->quote($invoice_id).
       ", ".$mdb2->quote($comment).
       ", $billable, $paid".
-      ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$mdb2->quote($user->id).
+      ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$user->id.
       ", ". $mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
@@ -979,4 +976,19 @@ class ttOrgImportHelper {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getTopRole returns top role id.
+  private function getTopRole() {
+    $mdb2 = getConnection();
+
+    $sql = "select id from tt_roles where group_id = 0 and rank = ".MAX_RANK." and status = 1";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val['id'])
+        return $val['id'];
+    }
+    return false;
+  }
 }