extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Miles Lott 2001-12-28 05:32:59 +00:00
parent 31b533d00e
commit c51972cd16
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpgwapi/inc/class.error.inc.php
View File

@ -32,8 +32,8 @@
// Translate Message into Language
function langmsg()
{
return lang($this->msg,$this->parms);
}
return lang($this->msg,$this->parms);
}
function error($parms)
{
@ -56,13 +56,13 @@
$this->msg = trim($etext);
}
$this->timestamp = time();
$this->parms = $parray;
$this->ismsg = $parms['ismsg'];
$this->fname = $fname;
$this->line = $line;
$this->app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$this->parms = $parray;
$this->ismsg = $parms['ismsg'];
$this->fname = $fname;
$this->line = $line;
$this->app = $GLOBALS['phpgw_info']['flags']['currentapp'];
if (!$this->fname or !$this->line)
if (!$this->fname or !$this->line)
{
$GLOBALS['phpgw']->log->error(array(
'text'=>'W-PGMERR, Programmer failed to pass __FILE__ and/or __LINE__ in next log message',

52
phpgwapi/inc/class.errorlog.inc.php
View File

@ -17,7 +17,7 @@
/***************************\
* Instance Variables... *
\***************************/
var $errorstack = array();
var $errorstack = array();
var $public_functions = array(
'message',
'error',
@ -106,13 +106,14 @@
{
$db = $GLOBALS['phpgw']->db;
// $db->lock('phpgw_log');
$db->query ("insert into phpgw_log (log_date, log_user, log_app, log_severity) values "
."('". $GLOBALS['phpgw']->db->to_timestamp(time())
."','".$GLOBALS['phpgw']->session->account_id
."','".$GLOBALS['phpgw_info']['flags']['currentapp']."'"
.",'".$this->severity()."'"
.")"
,__LINE__,__FILE__);
$db->query("insert into phpgw_log (log_date, log_user, log_app, log_severity) values "
."('". $GLOBALS['phpgw']->db->to_timestamp(time())
."','".$GLOBALS['phpgw']->session->account_id
."','".$GLOBALS['phpgw_info']['flags']['currentapp']."'"
.",'".$this->severity()."'"
.")"
,__LINE__,__FILE__
);
$log_id = $db->get_last_insert_id('phpgw_log','log_id');
// $db->query('select max(log_id) as lid from phpgw_log');
@ -124,21 +125,22 @@
for ($i = 0; $i < count($errorstack); $i++)
{
$err = $errorstack[$i];
$db->query ("insert into phpgw_log_msg "
."(Log_msg_log_id, log_msg_seq_no, log_msg_date, log_msg_severity, "
."log_msg_code, log_msg_msg, log_msg_parms, log_msg_file, log_msg_line) values "
."(" . $log_id
."," . $i
.", '" . $GLOBALS['phpgw']->db->to_timestamp($err->timestamp)
."', '". $err->severity . "'"
.", '". $err->code . "'"
.", '". $db->db_addslashes($err->msg) . "'"
.", '". $db->db_addslashes(implode('|',$err->parms)). "'"
.", '". $err->fname . "'"
.", " . intval($err->line)
.")"
,__LINE__,__FILE__);
};
$db->query("insert into phpgw_log_msg "
."(Log_msg_log_id, log_msg_seq_no, log_msg_date, log_msg_severity, "
."log_msg_code, log_msg_msg, log_msg_parms, log_msg_file, log_msg_line) values "
."(" . $log_id
."," . $i
.", '" . $GLOBALS['phpgw']->db->to_timestamp($err->timestamp)
."', '". $err->severity . "'"
.", '". $err->code . "'"
.", '". $db->db_addslashes($err->msg) . "'"
.", '". $db->db_addslashes(implode('|',$err->parms)). "'"
.", '". $err->fname . "'"
.", " . intval($err->line)
.")"
,__LINE__,__FILE__
);
}
unset ($errorstack);
unset ($this->errorstack);
$this->errorstack = array();
@ -160,7 +162,7 @@
unset ($this->errorstack);
$this->errorstack = $new;
return true;
}
}
function astable()
{
@ -200,7 +202,7 @@
$html .= "\t\t<td>".$err->fname."</td>\n";
$html .= "\t\t<td>".$err->line."</td>\n";
$html .= "\t</tr>\n";
};
}
$html .= "</table>\n";
$html .= "</center>\n";