holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the parameter substitution. Will now take parameters named either 'p1' or 'p_1'.

Browse Source
This commit is contained in:
skeeter 2002-01-12 22:12:40 +00:00
parent 8bc7d387ce
commit 27e9b9af70
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,15 @@
$str = 'p_'.$counter; $str = 'p_'.$counter;
if(isset($parms[$str]) && !empty($parms[$str])) if(isset($parms[$str]) && !empty($parms[$str]))
{ {
$parray[] = $parms[$str]; $parray[$counter] = $parms[$str];
}
else
{
$str = 'p'.$counter;
if(isset($parms[$str]) && !empty($parms[$str]))
{
$parray[$counter] = $parms[$str];
}
} }
} }
$fname = $parms['file']; $fname = $parms['file'];
@ -63,6 +71,14 @@
{ {
$this->msg = trim($etext); $this->msg = trim($etext);
} }
@reset($parray);
while( list($key,$val) = each( $parray ) )
{
$this->msg = preg_replace( "/%$key/", "'".$val."'", $this->msg );
}
@reset($parray);
$this->timestamp = time(); $this->timestamp = time();
$this->parms = $parray; $this->parms = $parray;
$this->ismsg = $parms['ismsg']; $this->ismsg = $parms['ismsg'];

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

@ -134,7 +134,7 @@
."', '". $err->severity . "'" ."', '". $err->severity . "'"
.", '". $err->code . "'" .", '". $err->code . "'"
.", '". $db->db_addslashes($err->msg) . "'" .", '". $db->db_addslashes($err->msg) . "'"
.", '". $db->db_addslashes(implode('|',$err->parms)). "'" .", '". $db->db_addslashes((count($err->parms) > 1?implode('|',$err->parms):$err->parms[1])). "'"
.", '". $err->fname . "'" .", '". $err->fname . "'"
.", " . intval($err->line) .", " . intval($err->line)
.")" .")"