PUTS("[\"");
switch (zend_hash_get_current_key(Z_ARRVAL_PP(data), &string_key, &num_key, 0)) {
case HASH_KEY_IS_STRING:
- php_html_puts(string_key, strlen(string_key) TSRMLS_CC);
+ zend_html_puts(string_key, strlen(string_key));
break;
case HASH_KEY_IS_LONG:
php_printf("%ld", num_key);
tmp2 = **tmp;
zval_copy_ctor(&tmp2);
convert_to_string(&tmp2);
- php_html_puts(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC);
+ zend_html_puts(Z_STRVAL(tmp2), Z_STRLEN(tmp2));
zval_dtor(&tmp2);
} else {
- php_html_puts(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC);
+ zend_html_puts(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
}
PUTS(" </td></tr>\n");
zend_hash_move_forward(Z_ARRVAL_PP(data));
PUTS("?="ZEND_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"Zend logo\"></a>\n");
}
php_printf("This program makes use of the Zend Scripting Language Engine:<br />");
- php_html_puts(zend_version, strlen(zend_version) TSRMLS_CC);
+ zend_html_puts(zend_version, strlen(zend_version));
php_info_print_box_end();
efree(php_uname);
}
if (!row_element || !*row_element) {
php_printf(" ");
} else {
- php_html_puts(row_element, strlen(row_element) TSRMLS_CC);
+ zend_html_puts(row_element, strlen(row_element));
}
php_printf("%s</td>", (i==0?"</b>":""));
}
/* }}} */
-/* {{{ php_html_puts */
-#include "ext/standard/php_smart_str.h"
+/* {{{ php_html_puts */
+/* wrapper for backwards compatibility */
PHPAPI void php_html_puts(const char *str, uint size TSRMLS_DC)
{
- const char *end = str+size;
- const char *p = str;
- smart_str s = {0};
-
- while (p < end) {
- switch (*p) {
- case '\n':
- smart_str_appendl(&s, "<br />", sizeof("<br />")-1);
- break;
- case '<':
- smart_str_appendl(&s, "<", sizeof("<")-1);
- break;
- case '>':
- smart_str_appendl(&s, ">", sizeof(">")-1);
- break;
- case '&':
- smart_str_appendl(&s, "&", sizeof("&")-1);
- break;
- case ' ': {
- const char *nextchar = p+1, *prevchar = p-1;
-
- /* series of spaces should be converted to 's */
- if (((nextchar < end) && *nextchar==' ')
- || ((prevchar >= str) && *prevchar==' ')) {
- smart_str_appendl(&s, " ", sizeof(" ")-1);
- } else {
- smart_str_appendc(&s, ' ');
- }
- }
- break;
- case '\t':
- smart_str_appendl(&s, " ", sizeof(" ")-1);
- break;
- default:
- smart_str_appendc(&s, *p);
- }
- p++;
- }
-
- if (s.c) {
- PHPWRITE(s.c, s.len);
- smart_str_free(&s);
- }
+ zend_html_puts(str, size);
}
/* }}} */
display_string_length = sizeof("<i>no value</i>")-1;
}
if(esc_html) {
- php_html_puts(display_string, display_string_length TSRMLS_CC);
+ zend_html_puts(display_string, display_string_length);
} else {
PHPWRITE(display_string, display_string_length);
}
PHPAPI void php_handle_aborted_connection(void);
PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC);
-PHPAPI void php_html_puts(const char *str, uint siz TSRMLS_DC);
-
extern void php_call_shutdown_functions(void);
/* environment module */