- Changed phpinfo() to list modules that have no info function

ChangeLog

@@ -2,6 +2,7 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ??? ?? 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)

ext/standard/info.c

@@ -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 @@ PHPAPI void php_print_info(int flag)
 	}
 
 	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) {

php4.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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"

php4dll.dsp

@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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"