clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Show version and ini entries as default module info.

Browse Source
This commit is contained in:
Marcus Boerger 2008-12-30 19:10:22 +00:00
parent a4d74dc48f
commit a4cd3369a4
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/standard/info.c
View File

@ -194,26 +194,29 @@ static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC
}
/* }}} */
PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{ */
PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* {{{ */
{
if (module->info_func) {
if (zend_module->info_func || zend_module->version) {
if (!sapi_module.phpinfo_as_text) {
php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name);
php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name);
} else {
php_info_print_table_start();
php_info_print_table_header(1, module->name);
php_info_print_table_header(1, zend_module->name);
php_info_print_table_end();
}
module->info_func(module TSRMLS_CC);
if (zend_module->info_func) {
zend_module->info_func(zend_module TSRMLS_CC);
} else {
php_info_print_table_start();
php_info_print_table_row(2, "Version", zend_module->version);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
}
} else {
if (!sapi_module.phpinfo_as_text) {
php_info_printf("<tr>");
php_info_printf("<td>");
php_info_printf("%s", module->name);
php_info_printf("</td></tr>\n");
php_info_printf("<tr><td>%s</td></tr>\n", zend_module->name);
} else {
php_info_printf("%s", module->name);
php_info_printf("\n");
php_info_printf("%s\n", zend_module->name);
}
}
}
@ -221,7 +224,7 @@ PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{ */
static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* {{{ */
{
if (module->info_func) {
if (module->info_func || module->version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@ -230,7 +233,7 @@ static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* {{{
static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /* {{{ */
{
if (!module->info_func) {
if (!module->info_func && !module->version) {
php_info_print_module(module TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;
@ -862,7 +865,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
SECTION("Additional Modules");
php_info_print_table_start();
php_info_print_table_header(1, "Module Name");
php_info_print_table_header(2, "Module Name");
zend_hash_apply(&sorted_registry, (apply_func_t) _display_module_info_def TSRMLS_CC);
php_info_print_table_end();