cvs: php4 /ext/imap config.m4 php_imap.c

sniper Sat May 5 23:14:12 2001 EDT Modified files: /php4/ext/imap config.m4 php_imap.c Log: Beutify phpinfo() output. Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.28 php4/ext/imap/config.m4:1.29 --- php4/ext/imap/config.m4:1.28 Sat May 5 22:39:16 2001 +++ php4/ext/imap/config.m4 Sat May 5 23:14:12 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.28 2001/05/06 05:39:16 sniper Exp $ +dnl $Id: config.m4,v 1.29 2001/05/06 06:14:12 sniper Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then AC_DEFINE(HAVE_IMAP2000, 1, [ ]) @@ -90,6 +90,7 @@ 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) Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.75 php4/ext/imap/php_imap.c:1.76 --- php4/ext/imap/php_imap.c:1.75 Sat May 5 22:38:46 2001 +++ php4/ext/imap/php_imap.c Sat May 5 23:14:12 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.75 2001/05/06 05:38:46 sniper Exp $ */ +/* $Id: php_imap.c,v 1.76 2001/05/06 06:14:12 sniper Exp $ */ #define IMAP41 @@ -387,11 +387,19 @@ 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(); }