summaryrefslogtreecommitdiff
path: root/ext/standard/info.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/info.c')
-rw-r--r--ext/standard/info.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c
index eb87281301..060c377f3e 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -30,7 +30,7 @@
#define PHP3_CONF_LONG(directive,value1,value2) \
- php3_printf("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\">%s</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td></tr>\n",directive,value1,value2);
+ php_printf("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\">%s</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td></tr>\n",directive,value1,value2);
#define SECTION(name) PUTS("<hr><h2>" name "</h2>\n")
@@ -40,7 +40,7 @@
static int _display_module_info(php3_module_entry *module)
{
if (module->info_func) {
- php3_printf("<hr><h2>%s</h2>\n", module->name);
+ php_printf("<hr><h2>%s</h2>\n", module->name);
module->info_func(module);
}
return 0;
@@ -77,21 +77,21 @@ PHPAPI void php_print_info(int flag)
#endif
- php3_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
+ php_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
PUTS("<hr><a href=\"http://www.php.net/\"><img src=\"");
if (SG(request_info).request_uri) {
PUTS(SG(request_info).request_uri);
}
PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" align=\"right\"></a>\n");
- php3_printf("System: %s<br>Build Date: %s\n<br>", php3_uname, __DATE__);
- php3_printf("php.ini path: %s<br>\n", CONFIGURATION_FILE_PATH);
+ php_printf("System: %s<br>Build Date: %s\n<br>", php3_uname, __DATE__);
+ php_printf("php.ini path: %s<br>\n", CONFIGURATION_FILE_PATH);
- php3_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
+ php_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
#ifdef ZTS
- php3_printf("ZTS is defined");
+ php_printf("ZTS is defined");
#else
- php3_printf("ZTS is undefined");
+ php_printf("ZTS is undefined");
#endif
/* Zend Engine */
PUTS("<hr><a href=\"http://www.zend.com/\"><img src=\"");
@@ -99,7 +99,7 @@ PHPAPI void php_print_info(int flag)
PUTS(SG(request_info).request_uri);
}
PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" align=\"right\"></a>\n");
- php3_printf("This program makes use of the Zend scripting language engine:<br><pre>%s</pre>", get_zend_version());
+ php_printf("This program makes use of the Zend scripting language engine:<br><pre>%s</pre>", get_zend_version());
PUTS("<hr>");
}
@@ -123,7 +123,7 @@ PHPAPI void php_print_info(int flag)
}
if (flag & PHP_INFO_MODULES) {
- _php3_hash_apply(&module_registry,(int (*)(void *)) _display_module_info);
+ zend_hash_apply(&module_registry,(int (*)(void *)) _display_module_info);
}
if (flag & PHP_INFO_ENVIRONMENT) {
@@ -153,76 +153,76 @@ PHPAPI void php_print_info(int flag)
PUTS("<table border=5 width=\"600\">\n");
php_info_print_table_header(2, "Variable", "Value");
- if (_php3_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) {
+ if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) {
php_info_print_table_row(2, "PHP_SELF", (*data)->value.str.val);
}
- if (_php3_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) {
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) {
php_info_print_table_row(2, "PHP_AUTH_TYPE", (*data)->value.str.val);
}
- if (_php3_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) {
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) {
php_info_print_table_row(2, "PHP_AUTH_USER", (*data)->value.str.val);
}
- if (_php3_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
php_info_print_table_row(2, "PHP_AUTH_PW", (*data)->value.str.val);
}
- if (_php3_hash_find(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), (void **) &data) != FAILURE) {
- _php3_hash_internal_pointer_reset((*data)->value.ht);
- while (_php3_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
+ if (zend_hash_find(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), (void **) &data) != FAILURE) {
+ zend_hash_internal_pointer_reset((*data)->value.ht);
+ while (zend_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
convert_to_string(*tmp);
PUTS("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>HTTP_GET_VARS[\"");
- switch (_php3_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
+ switch (zend_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
case HASH_KEY_IS_STRING:
PUTS(string_key);
efree(string_key);
break;
case HASH_KEY_IS_LONG:
- php3_printf("%ld",num_key);
+ php_printf("%ld",num_key);
break;
}
PUTS("\"]</b></td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">");
PUTS((*tmp)->value.str.val); /* This could be "Array" - too ugly to expand that for now */
PUTS("</td></tr>\n");
- _php3_hash_move_forward((*data)->value.ht);
+ zend_hash_move_forward((*data)->value.ht);
}
}
- if (_php3_hash_find(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), (void **) &data) != FAILURE) {
- _php3_hash_internal_pointer_reset((*data)->value.ht);
- while (_php3_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
+ if (zend_hash_find(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), (void **) &data) != FAILURE) {
+ zend_hash_internal_pointer_reset((*data)->value.ht);
+ while (zend_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
convert_to_string(*tmp);
PUTS("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>HTTP_POST_VARS[\"");
- switch (_php3_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
+ switch (zend_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
case HASH_KEY_IS_STRING:
PUTS(string_key);
efree(string_key);
break;
case HASH_KEY_IS_LONG:
- php3_printf("%ld",num_key);
+ php_printf("%ld",num_key);
break;
}
PUTS("\"]</b></td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">");
PUTS((*tmp)->value.str.val);
PUTS("</td></tr>\n");
- _php3_hash_move_forward((*data)->value.ht);
+ zend_hash_move_forward((*data)->value.ht);
}
}
- if (_php3_hash_find(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), (void **) &data) != FAILURE) {
- _php3_hash_internal_pointer_reset((*data)->value.ht);
- while (_php3_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
+ if (zend_hash_find(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), (void **) &data) != FAILURE) {
+ zend_hash_internal_pointer_reset((*data)->value.ht);
+ while (zend_hash_get_current_data((*data)->value.ht, (void **) &tmp) == SUCCESS) {
convert_to_string(*tmp);
PUTS("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>HTTP_COOKIE_VARS[\"");
- switch (_php3_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
+ switch (zend_hash_get_current_key((*data)->value.ht, &string_key, &num_key)) {
case HASH_KEY_IS_STRING:
PUTS(string_key);
efree(string_key);
break;
case HASH_KEY_IS_LONG:
- php3_printf("%ld",num_key);
+ php_printf("%ld",num_key);
break;
}
PUTS("\"]</b></td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">");
PUTS((*tmp)->value.str.val);
PUTS("</td></tr>\n");
- _php3_hash_move_forward((*data)->value.ht);
+ zend_hash_move_forward((*data)->value.ht);
}
}
PUTS("</table>\n");
@@ -335,15 +335,15 @@ PHPAPI void php_info_print_table_header(int num_cols, ...)
va_start(row_elements, num_cols);
- php3_printf("<tr>");
+ php_printf("<tr>");
for (i=0; i<num_cols; i++) {
row_element = va_arg(row_elements, char *);
if (!row_element || !*row_element) {
row_element = "&nbsp;";
}
- php3_printf("<th bgcolor=\"" PHP_HEADER_COLOR "\" valign=\"top\">%s</th>", row_element);
+ php_printf("<th bgcolor=\"" PHP_HEADER_COLOR "\" valign=\"top\">%s</th>", row_element);
}
- php3_printf("</tr>\n");
+ php_printf("</tr>\n");
va_end(row_elements);
}
@@ -358,17 +358,17 @@ PHPAPI void php_info_print_table_row(int num_cols, ...)
va_start(row_elements, num_cols);
- php3_printf("<tr>");
+ php_printf("<tr>");
for (i=0; i<num_cols; i++) {
row_element = va_arg(row_elements, char *);
if (!row_element || !*row_element) {
row_element = "&nbsp;";
}
- php3_printf("<td bgcolor=\"%s\" valign=\"top\">%s%s%s</td>",
+ php_printf("<td bgcolor=\"%s\" valign=\"top\">%s%s%s</td>",
color, (i==0?"<b>":""), row_element, (i==0?"</b>":""));
color = PHP_CONTENTS_COLOR;
}
- php3_printf("</tr>\n");
+ php_printf("</tr>\n");
va_end(row_elements);
}
View Lorry Controller Status