Skip to content
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
install/tpl/config.inc.php.master
View file @ 99758371
...@@ -173,7 +173,6 @@ $conf['start_session'] = true; ...@@ -173,7 +173,6 @@ $conf['start_session'] = true;
define('LOGLEVEL_DEBUG',0); define('LOGLEVEL_DEBUG',0);
define('LOGLEVEL_WARN',1); define('LOGLEVEL_WARN',1);
define('LOGLEVEL_ERROR',2); define('LOGLEVEL_ERROR',2);
define('LOGLEVEL_INFO',3);
//** include a local config-file if there is one //** include a local config-file if there is one
//** IMPORTANT!!! //** IMPORTANT!!!
......
interface/lib/classes/db_mysql.inc.php
View file @ 99758371
...@@ -514,16 +514,16 @@ class db ...@@ -514,16 +514,16 @@ class db
public function escape($sString) { public function escape($sString) {
global $app; global $app;
if(!is_string($sString) && !is_numeric($sString)) { 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(); //$sAddMsg = getDebugBacktrace();
$app->log($sAddMsg, LOGLEVEL_DEBUG); //$app->log($sAddMsg, LOGLEVEL_DEBUG);
$sString = ''; $sString = '';
} }
$cur_encoding = mb_detect_encoding($sString); $cur_encoding = mb_detect_encoding($sString);
if($cur_encoding != "UTF-8") { if($cur_encoding != "UTF-8") {
if($cur_encoding != 'ASCII') { 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); if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding);
else $sString = mb_convert_encoding($sString, 'UTF-8'); else $sString = mb_convert_encoding($sString, 'UTF-8');
} }
......
interface/lib/config.inc.php
View file @ 99758371
...@@ -162,6 +162,5 @@ $conf['start_session'] = true; ...@@ -162,6 +162,5 @@ $conf['start_session'] = true;
define('LOGLEVEL_DEBUG', 0); define('LOGLEVEL_DEBUG', 0);
define('LOGLEVEL_WARN', 1); define('LOGLEVEL_WARN', 1);
define('LOGLEVEL_ERROR', 2); define('LOGLEVEL_ERROR', 2);
define('LOGLEVEL_INFO',3);
?> ?>
server/lib/classes/db_mysql.inc.php
View file @ 99758371
...@@ -514,16 +514,16 @@ class db ...@@ -514,16 +514,16 @@ class db
public function escape($sString) { public function escape($sString) {
global $app; global $app;
if(!is_string($sString) && !is_numeric($sString)) { 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(); //$sAddMsg = getDebugBacktrace();
$app->log($sAddMsg, LOGLEVEL_DEBUG); //$app->log($sAddMsg, LOGLEVEL_DEBUG);
$sString = ''; $sString = '';
} }
$cur_encoding = mb_detect_encoding($sString); $cur_encoding = mb_detect_encoding($sString);
if($cur_encoding != "UTF-8") { if($cur_encoding != "UTF-8") {
if($cur_encoding != 'ASCII') { 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); if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding);
else $sString = mb_convert_encoding($sString, 'UTF-8'); else $sString = mb_convert_encoding($sString, 'UTF-8');
} }
......