From 901157242e772effa16d362a3b29a54b7268e5ae Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 22 Mar 2016 10:10:20 +0000
Subject: [PATCH] blacklisting whole etemplate app and
importexport_widget_filter class (plus api, phpgwapi and setup, as they make
no sense at all), as they mess up autoloading ("PHP Fatal error: Class
EGroupware\Api\Etemplate\Widget\Transformer not found")
---
.../inc/class.importexport_helper_functions.inc.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/importexport/inc/class.importexport_helper_functions.inc.php b/importexport/inc/class.importexport_helper_functions.inc.php
index a2ba9ad70b..121692dfbf 100755
--- a/importexport/inc/class.importexport_helper_functions.inc.php
+++ b/importexport/inc/class.importexport_helper_functions.inc.php
@@ -50,9 +50,15 @@ class importexport_helper_functions {
* If you put appname => true, the whole app will be skipped.
*/
protected static $blacklist_files = array(
+ 'api' => true,
+ 'etemplate' => true,
+ 'setup' => true,
'news_admin' => array(
'class.news_admin_import.inc.php',
),
+ 'importexport' => array(
+ 'class.importexport_widget_filter.inc.php',
+ )
);
/**
@@ -743,10 +749,10 @@ class importexport_helper_functions {
$end = $weekstart + $eweek*7*24*60*60;
}
$end_param = $end - 24*60*60;
-
+
// Take 1 second off end to provide an inclusive range.for filtering
$end -= 1;
-
+
//echo __METHOD__."($value,$start,$end) today=".date('l, Y-m-d H:i',$today)." ==> <br />".date('l, Y-m-d H:i:s',$start)." <= date <= ".date('l, Y-m-d H:i:s',$end)."</p>\n";
return array('from' => $start, 'to' => $end);
}