Removed old import and export classes.

anuko · Nov 16, 2018 · e61ac06 · e61ac06
1 parent b36d197
commit e61ac06
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 946 deletions.
diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -30,9 +30,8 @@
 import('ttTimeHelper');
 import('ttGroupExportHelper');
 
-// ttOrgExportHelper - this class is a future replacement for ttExportHelper.
-// Currently, it is work in progress.
-// When done, it should handle export of organizations containing multiple groups.
+// ttOrgExportHelper handles export of organizations consisting of multiple groups
+// into XML file for import (migrating) to another server.
 class ttOrgExportHelper {
 
   var $fileName = null; // Name of file with data.

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -32,6 +32,7 @@
 import('ttProjectHelper');
 import('ttClientHelper');
 import('ttInvoiceHelper');
+import('ttTimeHelper');
 import('ttCustomFieldHelper');
 import('ttExpenseHelper');
 import('ttFavReportHelper');

diff --git 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.14.4431 | 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.14.4432 | 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>

diff --git a/export.php b/export.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttExportHelper');
 import('ttOrgExportHelper');
 import('form.Form');
 
@@ -57,11 +56,7 @@
     $mime_type = 'application/x-bzip2';
   }
 
-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $exportHelper = new ttOrgExportHelper();
-//  } else {
-//      $exportHelper = new ttExportHelper();
-//  }
+  $exportHelper = new ttOrgExportHelper();
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);

diff --git a/import.php b/import.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttImportHelper');
 import('ttOrgImportHelper');
 import('form.Form');
 
@@ -43,12 +42,8 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $import = new ttOrgImportHelper($err);
-//  } else {
-//    $import = new ttImportHelper($err);
-//  }
-  $import->importXml();
+  $importHelper = new ttOrgImportHelper($err);
+  $importHelper->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost