From 005584e2ed5f03a55934ff12ac060e72def7d230 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 30 Nov 2018 11:37:50 +0900 Subject: [PATCH] Remove old .htaccess php xdebug, test updates, fixes in admin header - remove all old php_value settings as they wont work with php-fpm - test check for removeLB - fix URL for Error handling include in admin header --- www/admin/.htaccess | 3 --- www/admin/various_class_test.php | 9 +++++++++ www/includes/admin_header.inc | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/www/admin/.htaccess b/www/admin/.htaccess index 8cd4a9dd..277bd298 100644 --- a/www/admin/.htaccess +++ b/www/admin/.htaccess @@ -1,6 +1,3 @@ -# php_value xdebug.profiler_output_dir /home/developer/xdebug/ -# php_value xdebug.profiler_output_name timestamp -# php_value xdebug.profiler_enable 0 # all .inc files are denied access from outside Require all denied diff --git a/www/admin/various_class_test.php b/www/admin/various_class_test.php index 4446af68..0076680b 100755 --- a/www/admin/various_class_test.php +++ b/www/admin/various_class_test.php @@ -17,6 +17,15 @@ print "BASE: ".BASE."
"; print "ROOT: ".ROOT."
"; print "HOST: ".$HOST_NAME." => DB HOST: ".$DB_HOST[$HOST_NAME]." => ".MAIN_DB."
"; +$text = 'I am some text +with some +line breaks +in there. Theis +is sucky'; + +print "LB remove: ".$base->removeLB($text)."
"; +print "LB remove: ".$base->removeLB($text, '##BR##')."
"; + // $test = array ( // 'A' => array ( // 'B' => array (), diff --git a/www/includes/admin_header.inc b/www/includes/admin_header.inc index 3be7fe5c..1ea4e13a 100644 --- a/www/includes/admin_header.inc +++ b/www/includes/admin_header.inc @@ -10,7 +10,7 @@ //------------------------------ variable init start // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-.log if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) { - include("../lib/Error.Handling.inc"); + include(BASE.LIBS."Error.Handling.inc"); } // predefine vars $lang = '';