From be11d75f16647221692c8efddfa91fb21d50defa Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 25 Apr 2013 21:22:14 +0200 Subject: [PATCH 1/2] Hide hosts, usernames and passwords when displaying calls to *_connect functions in the backtrace --- libraries/Error.class.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 059fbca11b..1c25a4911a 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -300,9 +300,20 @@ class PMA_Error extends PMA_Message 'require', 'require_once', ); + $connect_functions = array( + 'mysql_connect', + 'mysql_pconnect', + 'mysqli_connect', + 'mysqli_real_connect', + 'PMA_DBI_connect', + 'PMA_DBI_real_connect', + ); if (in_array($function, $include_functions)) { $retval .= PMA_Error::relPath($arg); + } elseif (in_array($function, $connect_functions) + && getType($arg) === 'string') { + $retval .= getType($arg) . ' ********'; } elseif (is_scalar($arg)) { $retval .= getType($arg) . ' ' . htmlspecialchars($arg); } else { From 14cadcbb30bf1ffb8e9a6bdcda24c4296b522328 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 25 Apr 2013 21:50:14 +0200 Subject: [PATCH 2/2] Apply PEAR coding standard to multiline elseif --- libraries/Error.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 1c25a4911a..e2c013328a 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -312,7 +312,8 @@ class PMA_Error extends PMA_Message if (in_array($function, $include_functions)) { $retval .= PMA_Error::relPath($arg); } elseif (in_array($function, $connect_functions) - && getType($arg) === 'string') { + && getType($arg) === 'string' + ) { $retval .= getType($arg) . ' ********'; } elseif (is_scalar($arg)) { $retval .= getType($arg) . ' ' . htmlspecialchars($arg);