makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10057] Use a class for error collection.

Browse source 
Replaced error collection functions with a class for a cleaner
implementation.

PHPBB3-10057
This commit is contained in:
Oleg Pudeyev 2011-03-02 06:35:25 -05:00
parent a4100fe709
commit 17693c2802
2 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/db/postgres.php
View file

@ -85,7 +85,8 @@ class dbal_postgres extends dbal
{ {
return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?'); return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?');
} }
phpbb_start_error_collection(); $collector = new phpbb_error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW); $this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
} }
else else
@ -94,11 +95,12 @@ class dbal_postgres extends dbal
{ {
return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?'); return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?');
} }
phpbb_start_error_collection(); $collector = new phpbb_error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW); $this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
} }
$errors = phpbb_stop_error_collection(); $collector->uninstall();
if ($this->db_connect_id) if ($this->db_connect_id)
{ {
@ -114,7 +116,7 @@ class dbal_postgres extends dbal
return $this->db_connect_id; return $this->db_connect_id;
} }
$errors = phpbb_format_collected_errors($errors); $errors = $collector->format_errors();
return $this->sql_error($errors); return $this->sql_error($errors);
} }

70
phpBB/includes/functions.php
View file

@ -3928,48 +3928,48 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
return false; return false;
} }
function phpbb_error_collection_handler($errno, $msg_text, $errfile, $errline) class phpbb_error_collector
{ {
global $phpbb_collected_errors; var $errors;
$phpbb_collected_errors[count($phpbb_collected_errors)-1][] = array($errno, $msg_text, $errfile, $errline);
}
function phpbb_start_error_collection() function phpbb_error_collector()
{
global $phpbb_collected_errors;
if (!isset($phpbb_collected_errors))
{ {
$phpbb_collected_errors = array(); $this->errors = array();
} }
$phpbb_collected_errors[] = array();
set_error_handler('phpbb_error_collection_handler');
}
function phpbb_stop_error_collection() function install()
{
global $phpbb_collected_errors;
restore_error_handler();
$errors = array_pop($phpbb_collected_errors);
return $errors;
}
function phpbb_format_collected_errors($errors)
{
$text = '';
foreach ($errors as $error)
{ {
if (!empty($text)) set_error_handler(array(&$this, 'error_handler'));
{ }
$text .= "<br />\n";
} function uninstall()
list($errno, $msg_text, $errfile, $errline) = $error; {
$text .= "Errno $errno: $msg_text"; restore_error_handler();
if (defined('DEBUG')) }
{
$text .= " at $errfile line $errline"; function error_handler($errno, $msg_text, $errfile, $errline)
} {
$this->errors[] = array($errno, $msg_text, $errfile, $errline);
}
function format_errors()
{
$text = '';
foreach ($this->errors as $error)
{
if (!empty($text))
{
$text .= "<br />\n";
}
list($errno, $msg_text, $errfile, $errline) = $error;
$text .= "Errno $errno: $msg_text";
if (defined('DEBUG'))
{
$text .= " at $errfile line $errline";
}
}
return $text;
} }
return $text;
} }
/** /**