From: Nik Okuntseff Date: Mon, 12 Nov 2018 14:42:20 +0000 (+0000) Subject: Rolling back old import-export due to a problem with undeclared entities during XML... X-Git-Tag: timetracker_1.19-1~650 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bea65bba9873151a4d31f944d90d9b93c72727b0;p=timetracker.git Rolling back old import-export due to a problem with undeclared entities during XML parsing. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index c79767d2..218053a7 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.12.4421 | Copyright © Anuko | +  Anuko Time Tracker 1.18.12.4422 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/export.php b/export.php index 2b52acae..cf3bccfa 100644 --- a/export.php +++ b/export.php @@ -57,11 +57,11 @@ if ($request->isPost()) { $mime_type = 'application/x-bzip2'; } - //if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { + if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { $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); diff --git a/import.php b/import.php index 78630866..235924ac 100644 --- 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()) { -// if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { + if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { $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