cvs: /php4 ChangeLog php4.dsp php4dll.dsp /php4/ext/standard info.c

zeev Sat Aug 7 13:52:11 1999 EDT Modified files: /php4 ChangeLog php4.dsp php4dll.dsp /php4/ext/standard info.c Log: - Changed phpinfo() to list modules that have no info function Index: php4/ChangeLog diff -u php4/ChangeLog:1.42 php4/ChangeLog:1.43 --- php4/ChangeLog:1.42 Sat Aug 7 12:44:32 1999 +++ php4/ChangeLog Sat Aug 7 13:52:11 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Changed phpinfo() to list modules that have no info function (Zeev) - Modified array_walk() function so that the userland callback is passed a key and possible user data in addition to the value (Andrey) - Fixed ldap_search(), ldap_read() and ldap_list() (Zeev) Index: php4/php4.dsp diff -u php4/php4.dsp:1.15 php4/php4.dsp:1.16 --- php4/php4.dsp:1.15 Sat Jul 17 09:05:43 1999 +++ php4/php4.dsp Sat Aug 7 13:52:11 1999 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.11 php4/php4dll.dsp:1.12 --- php4/php4dll.dsp:1.11 Sat Jul 24 12:52:00 1999 +++ php4/php4dll.dsp Sat Aug 7 13:52:11 1999 @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.28 php4/ext/standard/info.c:1.29 --- php4/ext/standard/info.c:1.28 Sat Aug 7 11:50:26 1999 +++ php4/ext/standard/info.c Sat Aug 7 13:52:11 1999 @@ -37,11 +37,17 @@ #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors) -static int _display_module_info(php3_module_entry *module) +static int _display_module_info(zend_module_entry *module, void *arg) { - if (module->info_func) { + int show_info_func = *((int *) arg); + + if (show_info_func && module->info_func) { php_printf("<hr><h2>%s</h2>\n", module->name); module->info_func(module); + } else if (!show_info_func && !module->info_func) { + php_printf("<tr><td bgcolor=\"" PHP_CONTENTS_COLOR "\">"); + php_printf(module->name); + php_printf("</td><tr>\n"); } return 0; } @@ -123,7 +129,16 @@ } if (flag & PHP_INFO_MODULES) { - zend_hash_apply(&module_registry,(int (*)(void *)) _display_module_info); + int show_info_func; + + show_info_func = 1; + zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void *)) _display_module_info, &show_info_func); + + SECTION("Additional Modules"); + PUTS("<table border=5 width=\"600\">\n"); + show_info_func = 0; + zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void *)) _display_module_info, &show_info_func); + PUTS("</table>\n"); } if (flag & PHP_INFO_ENVIRONMENT) {