From f54ca9d66b525ec1cd7076744c8a022e8b4b488d Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Thu, 8 Nov 2018 19:01:42 +0000 Subject: [PATCH] Resuming work on new import - renamed a class. --- ...tImportHelper2.class.php => ttOrgImportHelper.class.php} | 6 +++--- WEB-INF/templates/footer.tpl | 2 +- import.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename WEB-INF/lib/{ttImportHelper2.class.php => ttOrgImportHelper.class.php} (97%) diff --git a/WEB-INF/lib/ttImportHelper2.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php similarity index 97% rename from WEB-INF/lib/ttImportHelper2.class.php rename to WEB-INF/lib/ttOrgImportHelper.class.php index 5de6d8c5..cce763da 100644 --- a/WEB-INF/lib/ttImportHelper2.class.php +++ b/WEB-INF/lib/ttOrgImportHelper.class.php @@ -38,10 +38,10 @@ import('ttFavReportHelper'); import('ttExpenseHelper'); import('ttRoleHelper'); -// ttImportHelper2 - this class is a future replacement for ttImportHelper. +// ttOrgImportHelper - this class is a future replacement for ttImportHelper. // Currently, it is work in progress. // When done, it should handle import of complex groups consisting of other groups. -class ttImportHelper2 { +class ttOrgImportHelper { var $errors = null; // Errors go here. Set in constructor by reference. var $currentElement = array(); // Current element of the XML file we are parsing. @@ -82,7 +82,7 @@ class ttImportHelper2 { // During second pass we import data. if (!$this->firstPass && $this->canImport) { - // TODO: write code here. + // TODO: write code here. Nothing is imported currently. } } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 73feb65a..d459f13a 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.12.4389 | Copyright © Anuko | +  Anuko Time Tracker 1.18.12.4390 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/import.php b/import.php index 3e375c98..235924ac 100644 --- a/import.php +++ b/import.php @@ -28,7 +28,7 @@ require_once('initialize.php'); import('ttImportHelper'); -import('ttImportHelper2'); +import('ttOrgImportHelper'); import('form.Form'); // Access check. @@ -44,7 +44,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get( if ($request->isPost()) { if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { - $import = new ttImportHelper2($err); + $import = new ttOrgImportHelper($err); } else { $import = new ttImportHelper($err); } -- 2.20.1