[PHPLIB-DEV] cvs commit From: negro (phplib-dev <email protected>)
Date: 10/26/99

From: negro
Date: Tue Oct 26 14:52:09 1999
Modified files:
      php-lib/CHANGES
      php-lib/php/oohforms.inc
      php-lib/php/session.inc

Log message:
Corrections to backslash escaping in regexps. Now they should behave
correctly and give no warning.

Index: php-lib/CHANGES
diff -u php-lib/CHANGES:1.112 php-lib/CHANGES:1.113
--- php-lib/CHANGES:1.112 Tue Oct 26 10:31:11 1999
+++ php-lib/CHANGES Tue Oct 26 14:51:37 1999
@@ -1,4 +1,8 @@
-$Id: CHANGES,v 1.112 1999/10/26 08:31:11 kk Exp $
+$Id: CHANGES,v 1.113 1999/10/26 12:51:37 negro Exp $
+
+26-Oct-1999 kk
+ - Corrections to backslash escaping in regexps. Now they should behave
+ correctly and give no warning.
 
 26-Oct-1999 kk
   - Current CVS bundled and released as 7.2.
Index: php-lib/php/oohforms.inc
diff -u php-lib/php/oohforms.inc:1.17 php-lib/php/oohforms.inc:1.18
--- php-lib/php/oohforms.inc:1.17 Sun Oct 24 16:39:31 1999
+++ php-lib/php/oohforms.inc Tue Oct 26 14:51:38 1999
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1998 by Jay Bloodworth
  *
- * $Id: oohforms.inc,v 1.17 1999/10/24 14:39:31 kk Exp $
+ * $Id: oohforms.inc,v 1.18 1999/10/26 12:51:38 negro Exp $
  */
 
 class of_element {
@@ -241,7 +241,7 @@
     // harm in $this->elements
     # Original match
     # if (preg_match("/(\w+)\[(d+)\]/i", $el[name], $regs)) {
- if (ereg("([a-zA-Z_]+)\[([0-9]+)\]", $el["name"], $regs)) {
+ if (ereg("([a-zA-Z_]+)\\[([0-9]+)\\]", $el["name"], $regs)) {
        $el["name"] = sprintf("%s{%s}", $regs[1], $regs[2]);
        $el["multiple"] = true;
     }
@@ -262,7 +262,7 @@
     // see add_element: translate $foo[int] to $foo{int}
 # Original pattern
 # if (preg_match("/(w+)\[(\d+)\]/i", $name, $regs) {
- if (ereg("([a-zA-Z_]+)\[([0-9]+)\]", $name, $regs)) {
+ if (ereg("([a-zA-Z_]+)\\[([0-9]+)\\]", $name, $regs)) {
        $org_name = $name;
        $name = sprintf("%s{%s}", $regs[1], $regs[2]);
        $flag_nametranslation = true;
Index: php-lib/php/session.inc
diff -u php-lib/php/session.inc:1.46 php-lib/php/session.inc:1.47
--- php-lib/php/session.inc:1.46 Tue Oct 26 12:59:38 1999
+++ php-lib/php/session.inc Tue Oct 26 14:51:38 1999
@@ -5,7 +5,7 @@
  * Copyright (c) 1998,1999 SH Online Dienst GmbH
  * Boris Erdmann, Kristian Koehntopp
  *
- * $Id: session.inc,v 1.46 1999/10/26 10:59:38 kk Exp $
+ * $Id: session.inc,v 1.47 1999/10/26 12:51:38 negro Exp $
  *
  */
 
@@ -262,7 +262,7 @@
         $str .= "\$$prefix = array(); ";
         while ( "array" == $l ) {
           ## Structural recursion
- $this->serialize($prefix."['".ereg_replace("([\\\\'])", "\\\\1", $k)."']", &$str);
+ $this->serialize($prefix."['".ereg_replace("([\\'])", "\\\\1", $k)."']", &$str);
           eval("\$l = gettype(list(\$k)=each(\$$prefix));");
         }
 
@@ -394,7 +394,7 @@
       } else {
         header("Status: 302 Moved Temporarily");
         $this->get_id($sid);
- $this->mode = $this->fallback_mode;
+ $this->mode = $this->fallback_mode;
         if( isset($HTTPS) && $HTTPS == 'on' ){
         ## You will need to fix suexec as well, if you use Apache and CGI PHP
           $PROTOCOL='https';

-
PHPLIB Developers Mailing List. Send messages to <phplib-dev <email protected>>.
To unsubscribe, send "unsubscribe" to <phplib-dev-request <email protected>> in
the body, not the subject, of your message.