[Phpgroupware-cvs] CVS: phpgwapi/inc class.error.inc.php,1.9,1.10 class.errorlog.inc.php,1.10,1.11

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18275/phpgwapi/inc

Modified Files:
        class.error.inc.php class.errorlog.inc.php 
Log Message:
Fixed the parameter substitution.  Will now take parameters named either 'p1' 
or 'p_1'.

Index: class.error.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.error.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.error.inc.php 30 Dec 2001 17:00:54 -0000      1.9
--- class.error.inc.php 12 Jan 2002 22:12:40 -0000      1.10
***************
*** 49,53 ****
                                if(isset($parms[$str]) && !empty($parms[$str]))
                                {
!                                       $parray[] = $parms[$str];
                                }
                        }
--- 49,61 ----
                                if(isset($parms[$str]) && !empty($parms[$str]))
                                {
!                                       $parray[$counter] = $parms[$str];
!                               }
!                               else
!                               {
!                                       $str = 'p'.$counter;
!                                       if(isset($parms[$str]) && 
!empty($parms[$str]))
!                                       {
!                                               $parray[$counter] = 
$parms[$str];
!                                       }
                                }
                        }
***************
*** 64,67 ****
--- 72,83 ----
                                $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->parms = $parray;

Index: class.errorlog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.errorlog.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.errorlog.inc.php      28 Dec 2001 05:32:59 -0000      1.10
--- class.errorlog.inc.php      12 Jan 2002 22:12:40 -0000      1.11
***************
*** 135,139 ****
                                        .", '". $err->code . "'"
                                        .", '". $db->db_addslashes($err->msg) . 
"'"
!                                       .", '". 
$db->db_addslashes(implode('|',$err->parms)). "'"
                                        .", '". $err->fname . "'"
                                        .", " . intval($err->line)
--- 135,139 ----
                                        .", '". $err->code . "'"
                                        .", '". $db->db_addslashes($err->msg) . 
"'"
!                                       .", '". 
$db->db_addslashes((count($err->parms) > 
1?implode('|',$err->parms):$err->parms[1])). "'"
                                        .", '". $err->fname . "'"
                                        .", " . intval($err->line)