cvs: Zend / zend_ini.c

zeev Tue Sep 3 06:05:38 2002 EDT Modified files: /Zend zend_ini.c Log: Commit the 2nd part of Jan's patch, to support non-HTML messages Index: Zend/zend_ini.c diff -u Zend/zend_ini.c:1.20 Zend/zend_ini.c:1.21 --- Zend/zend_ini.c:1.20 Tue Sep 3 05:58:04 2002 +++ Zend/zend_ini.c Tue Sep 3 06:05:38 2002 @@ -28,6 +28,8 @@ static HashTable *registered_zend_ini_directives; +#define NO_VALUE_PLAINTEXT "no value" +#define NO_VALUE_HTML "<i>no value</i>" /* * hash_apply functions @@ -308,15 +310,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 = NO_VALUE_HTML; + display_string_length = sizeof(NO_VALUE_HTML)-1; + } else { + display_string = NO_VALUE_PLAINTEXT; + display_string_length = sizeof(NO_VALUE_PLAINTEXT)-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 = NO_VALUE_HTML; + display_string_length = sizeof(NO_VALUE_HTML)-1; + } else { + display_string = NO_VALUE_PLAINTEXT; + display_string_length = sizeof(NO_VALUE_PLAINTEXT)-1; + } } ZEND_WRITE(display_string, display_string_length); } @@ -354,9 +366,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(NO_VALUE_HTML); + } else { + ZEND_PUTS(NO_VALUE_PLAINTEXT); + } } }