Re: Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend.h Zend zend.h

I am, I have to make some changes to it first... At 12:51 03/09/2002, Sebastian Bergmann wrote:

Sebastian Bergmann wrote:

sebastian               Tue Sep  3 05:41:41 2002 EDT

Modified files:

    /Zend       zend.h
    /ZendEngine2        zend.h

Log: Add html_errors to zend_utility_values. Patch by Jan Lehnardt <jan@php.net>. Someone please review/commit the rest of the patch. -- Sebastian Bergmann

  http://sebastian-bergmann.de/                 http://phpOpenTracker.de/

Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/ Content-Type: text/plain; charset=us-ascii name="patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch" Index: Zend/zend_ini.c =================================================================== RCS file: /repository/Zend/zend_ini.c,v retrieving revision 1.18 diff -u -r1.18 zend_ini.c

--- Zend/zend_ini.c     6 Jan 2002 15:21:09 -0000       1.18
+++ Zend/zend_ini.c     2 Sep 2002 19:59:12 -0000

@@ -308,15 +308,25 @@

                                display_string = ini_entry->orig_value;
                                display_string_length = ini_entry->orig_value_length;
                        } else {
-                               display_string = "<i>no value</i>";
-                               display_string_length = sizeof("<i>no value</i>")-1;
+                               if(zend_uv.html_errors) {
+                                       display_string = "<i>no value</i>";
+                                       display_string_length = sizeof("<i>no value</i>")-1;
+                               } else {
+                                       display_string = "no value";
+                                       display_string_length = sizeof("no value")-1;
+                               }
                        }
                } else if (ini_entry->value && ini_entry->value[0]) {
                        display_string = ini_entry->value;
                        display_string_length = ini_entry->value_length;
                } else {
-                       display_string = "<i>no value</i>";
-                       display_string_length = sizeof("<i>no value</i>")-1;
+                       if(zend_uv.html_errors) {
+                               display_string = "<i>no value</i>";
+                               display_string_length = sizeof("<i>no value</i>")-1;
+                       } else {
+                               display_string = "no value";
+                               display_string_length = sizeof("no value")-1;
+                       }
                }
                ZEND_WRITE(display_string, display_string_length);
        }

@@ -354,9 +364,17 @@

                value = NULL;
        }
        if (value) {
-               zend_printf("<font color=\"%s\">%s</font>", value, value);
+               if (zend_uv.html_errors) {
+                       zend_printf("<font color=\"%s\">%s</font>", value, value);
+               } else {
+                       ZEND_PUTS(value);
+               }
        } else {
-               ZEND_PUTS("<i>no value</i>;");
+               if (zend_uv.html_errors) {
+                       ZEND_PUTS("<i>no value</i>;");
+               } else {
+                       ZEND_PUTS("no value");
+               }
        }

} -- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php