From 0b3a1849b93a1284f6b38a3ccea36bb28786eb2e Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 18 Feb 2019 20:38:32 +0100 Subject: [PATCH 1/4] Add the LOGLEVEL_INFO constant to avoid Use of undefined constant warnings So far only used in two places, but it needs to be defined to changed there: - server/lib/classes/db_mysql.inc.php - interface/lib/classes/db_mysql.inc.php --- install/tpl/config.inc.php.master | 1 + interface/lib/config.inc.php | 1 + 2 files changed, 2 insertions(+) diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index 02a7b2f65c..a9f08e15b0 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -173,6 +173,7 @@ $conf['start_session'] = true; define('LOGLEVEL_DEBUG',0); define('LOGLEVEL_WARN',1); define('LOGLEVEL_ERROR',2); +define('LOGLEVEL_INFO',3); //** include a local config-file if there is one //** IMPORTANT!!! diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index 3c534f3f21..1b8b368a21 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -162,5 +162,6 @@ $conf['start_session'] = true; define('LOGLEVEL_DEBUG', 0); define('LOGLEVEL_WARN', 1); define('LOGLEVEL_ERROR', 2); +define('LOGLEVEL_INFO',3); ?> -- GitLab From ab25ad16f391cfd9a955153aa9856a9b9a5d7317 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 21 Feb 2019 14:51:48 +0100 Subject: [PATCH 2/4] Revert "Add the LOGLEVEL_INFO constant to avoid Use of undefined constant warnings" This reverts commit 0b3a1849b93a1284f6b38a3ccea36bb28786eb2e. --- install/tpl/config.inc.php.master | 1 - interface/lib/config.inc.php | 1 - 2 files changed, 2 deletions(-) diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index a9f08e15b0..02a7b2f65c 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -173,7 +173,6 @@ $conf['start_session'] = true; define('LOGLEVEL_DEBUG',0); define('LOGLEVEL_WARN',1); define('LOGLEVEL_ERROR',2); -define('LOGLEVEL_INFO',3); //** include a local config-file if there is one //** IMPORTANT!!! diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index 1b8b368a21..3c534f3f21 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -162,6 +162,5 @@ $conf['start_session'] = true; define('LOGLEVEL_DEBUG', 0); define('LOGLEVEL_WARN', 1); define('LOGLEVEL_ERROR', 2); -define('LOGLEVEL_INFO',3); ?> -- GitLab From e6674bf828ec12482905eb1ac055b2071b623710 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 21 Feb 2019 14:57:32 +0100 Subject: [PATCH 3/4] Purge LOGLEVEL_INFO as it was not defined --- interface/lib/classes/db_mysql.inc.php | 4 ++-- server/lib/classes/db_mysql.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index c4764cb555..3650a5bafd 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -514,7 +514,7 @@ class db public function escape($sString) { global $app; if(!is_string($sString) && !is_numeric($sString)) { - $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_INFO); + $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_DEBUG); //$sAddMsg = getDebugBacktrace(); $app->log($sAddMsg, LOGLEVEL_DEBUG); $sString = ''; @@ -523,7 +523,7 @@ class db $cur_encoding = mb_detect_encoding($sString); if($cur_encoding != "UTF-8") { if($cur_encoding != 'ASCII') { - if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_INFO); + if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_DEBUG); if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding); else $sString = mb_convert_encoding($sString, 'UTF-8'); } diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index b03ad55676..7aa47f058c 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -514,7 +514,7 @@ class db public function escape($sString) { global $app; if(!is_string($sString) && !is_numeric($sString)) { - $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_INFO); + $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_DEBUG); //$sAddMsg = getDebugBacktrace(); $app->log($sAddMsg, LOGLEVEL_DEBUG); $sString = ''; @@ -523,7 +523,7 @@ class db $cur_encoding = mb_detect_encoding($sString); if($cur_encoding != "UTF-8") { if($cur_encoding != 'ASCII') { - if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_INFO); + if(is_object($app) && method_exists($app, 'log')) $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_DEBUG); if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding); else $sString = mb_convert_encoding($sString, 'UTF-8'); } -- GitLab From 99758371b59e988a5e33c917afc414570205ac0b Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 21 Feb 2019 15:05:48 +0100 Subject: [PATCH 4/4] comment a debug line that tries to log an undefined variable. --- interface/lib/classes/db_mysql.inc.php | 2 +- server/lib/classes/db_mysql.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 3650a5bafd..7d7b568980 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -516,7 +516,7 @@ class db if(!is_string($sString) && !is_numeric($sString)) { $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_DEBUG); //$sAddMsg = getDebugBacktrace(); - $app->log($sAddMsg, LOGLEVEL_DEBUG); + //$app->log($sAddMsg, LOGLEVEL_DEBUG); $sString = ''; } diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 7aa47f058c..0bae3f92d3 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -516,7 +516,7 @@ class db if(!is_string($sString) && !is_numeric($sString)) { $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_DEBUG); //$sAddMsg = getDebugBacktrace(); - $app->log($sAddMsg, LOGLEVEL_DEBUG); + //$app->log($sAddMsg, LOGLEVEL_DEBUG); $sString = ''; } -- GitLab