Ongoing refactoring on decoupling import.

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 328eabefbd5b7a52c35b9dec04717c2bfebda6ec..060a7c1d8b919d8ef5459206c5ca2491b5b32f1d 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,13 +27,8 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');

-import('ttRoleHelper');

 import('ttTaskHelper');
 import('ttTaskHelper');

-import('ttClientHelper');

 import('ttInvoiceHelper');
 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.
 
 // 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;
   // 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.
   }
 
   // startElement - callback handler for opening tags in XML.


@@ -981,4 +976,20 @@ class ttOrgImportHelper {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

+
+  // getTopRole returns top role id.
+  private function getTopRole() {
+    global $user;
+    $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;
+  }

 }
 }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0b4dd2b45c972460d3da187e9524458fee4b1ee3..f0d3ff542333d54f5d98a95dda14d1f25d8a7c8e 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4546 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4547 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>