Rolling back old import-export due to a problem with undeclared entities during XML...

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c79767d2b24ed085139e7256608d4d3ba84fc86c..218053a7a5f0fd7bb87ca28c23d445acdfd309b8 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.12.4421 | 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.12.4422 | 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>

diff --git a/export.php b/export.php
index 2b52acae0f0f24d95b5371a0afb43fe8b8dc4c66..cf3bccfa91f43f9b93c9380b9ec8ab2d5e96d589 100644 (file)
--- a/export.php
+++ b/export.php
@@ -57,11 +57,11 @@ if ($request->isPost()) {
     $mime_type = 'application/x-bzip2';
   }
 
     $mime_type = 'application/x-bzip2';
   }
 

-  //if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {

     $exportHelper = new ttOrgExportHelper();
     $exportHelper = new ttOrgExportHelper();

-  //} else {
-  //    $exportHelper = new ttExportHelper();
-  //}
+  } else {
+      $exportHelper = new ttExportHelper();
+  }

   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);
   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
index 78630866ba306b11012e2d5ab188d5b46c517a90..235924ac4803137a9a21c1360dbb4206017e882a 100644 (file)
--- a/import.php
+++ b/import.php
@@ -43,11 +43,11 @@ $form->addInput(array('type'=>'upload','name'=>'xmlfile','value'=>'browse','maxs
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {

-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {

     $import = new ttOrgImportHelper($err);
     $import = new ttOrgImportHelper($err);

-//  } else {
-//    $import = new ttImportHelper($err);
-//  }
+  } else {
+    $import = new ttImportHelper($err);
+  }

   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost
   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost