Beutify phpinfo() output.

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 181b8d2aa45802dca390245a72a555da0009bf2b..da806fe6748c8728243831896a04988470feeff2 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -90,6 +90,7 @@ if test "$PHP_IMAP" != "no"; then
     fi
 
     if test "$PHP_KERBEROS" != "no"; then
+      AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
       PHP_ADD_LIBPATH($PHP_KERBEROS_LIBDIR, IMAP_SHARED_LIBADD)
       PHP_ADD_LIBRARY(com_err,, IMAP_SHARED_LIBADD)
       PHP_ADD_LIBRARY(k5crypto,, IMAP_SHARED_LIBADD)

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index a98dd192b1cfe5e40a295b6b2c987d1cfcd376a1..6b74bc7bf5b91cf4c554bd821fdab8f768a5b312 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -387,11 +387,19 @@ void mail_free_messagelist(MESSAGELIST **msglist)
 PHP_MINFO_FUNCTION(imap)
 {
        php_info_print_table_start();
-       php_info_print_table_row(2, "IMAP Support", "enabled");    
-#ifdef IMAP41
+       php_info_print_table_header(2, "IMAP Support", "enabled" );
+#if HAVE_IMAP2000
+       php_info_print_table_row(2, "IMAP c-Client Version", "2000");               
+#elif IMAP41
        php_info_print_table_row(2, "IMAP c-Client Version", "4.1");               
 #else
        php_info_print_table_row(2, "IMAP c-Client Version", "4.0"); 
+#endif
+#if HAVE_IMAP_SSL
+       php_info_print_table_row(2, "SSL Support", "enabled"); 
+#endif
+#if HAVE_IMAP_KRB
+       php_info_print_table_row(2, "Kerberos Support", "enabled"); 
 #endif
        php_info_print_table_end();
 }