added function-backtrace to db-error-messages

This commit is contained in:
Ralf Becker 2003-10-16 16:59:31 +00:00
parent cb12c82707
commit 94a2f4e043
3 changed files with 21 additions and 3 deletions

View File

@ -330,6 +330,7 @@
{ {
printf("<br><b>Line:</b> %s",$line); printf("<br><b>Line:</b> %s",$line);
} }
printf("<br><b>Function:</b> %s\n",function_backtrace());
if ($this->Halt_On_Error != "report") if ($this->Halt_On_Error != "report")
{ {

View File

@ -430,6 +430,7 @@
{ {
printf("<br><b>Line:</b> %s",$line); printf("<br><b>Line:</b> %s",$line);
} }
printf("<br><b>Function:</b> %s\n",function_backtrace());
if ($this->Halt_On_Error != "report") if ($this->Halt_On_Error != "report")
{ {

View File

@ -65,11 +65,11 @@
. $this->ifadd("'".$Password."'", 'password='); . $this->ifadd("'".$Password."'", 'password=');
if ($GLOBALS['phpgw_info']['server']['db_persistent']) if ($GLOBALS['phpgw_info']['server']['db_persistent'])
{ {
$this->Link_ID=pg_pconnect($cstr); $this->Link_ID = pg_pconnect($cstr);
} }
else else
{ {
$this->Link_ID=pg_connect($cstr); $this->Link_ID = pg_connect($cstr);
} }
if (! $this->Link_ID) if (! $this->Link_ID)
@ -437,6 +437,15 @@
} }
} }
if ($this->xmlrpc || $this->soap)
{
$s .= sprintf("Function/Module: %s\n",function_backtrace());
}
else
{
$s .= sprintf("<br><b>Function/Module:</b> %s\n",function_backtrace());
}
if ($this->Halt_On_Error == 'yes') if ($this->Halt_On_Error == 'yes')
{ {
if (! $this->xmlrpc && ! $this->soap) if (! $this->xmlrpc && ! $this->soap)
@ -456,7 +465,14 @@
else else
{ {
echo $s; echo $s;
$GLOBALS['phpgw']->common->phpgw_exit(True); if (is_object($GLOBALS['phpgw']->common))
{
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
else
{
exit();
}
} }
} }