cvs: /php4/ext/posix posix.c /php4/ext/standard basic_functions.c dl.c mail.c reg.c /php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c

cmv Wed Apr 5 14:43:04 2000 EDT Modified files: /php4/ext/posix posix.c /php4/ext/standard basic_functions.c dl.c mail.c reg.c /php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c Log: phpinfo() prettying Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.9 php4/ext/posix/posix.c:1.10 --- php4/ext/posix/posix.c:1.9 Thu Mar 30 14:56:32 2000 +++ php4/ext/posix/posix.c Wed Apr 5 14:43:02 2000 @@ -27,10 +27,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.9 2000/03/30 22:56:32 andi Exp $ */ +/* $Id: posix.c,v 1.10 2000/04/05 21:43:02 cmv Exp $ */ #include "php.h" +#include "ext/standard/info.h" #if !defined(PHP_API_VERSION) || PHP_API_VERSION < 19990421 #include "internal_functions.h" #endif @@ -134,7 +135,9 @@ static PHP_MINFO_FUNCTION(posix) { - PUTS("$Revision: 1.9 $\n"); + php_info_print_table_start(); + php_info_print_table_row(2, "Revision", "$Revision: 1.10 $"); + php_info_print_table_end(); } /* {{{ proto int posix_kill(int pid, int sig) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.179 php4/ext/standard/basic_functions.c:1.180 --- php4/ext/standard/basic_functions.c:1.179 Wed Mar 29 09:33:44 2000 +++ php4/ext/standard/basic_functions.c Wed Apr 5 14:43:02 2000 @@ -23,6 +23,7 @@ #include "php_ini.h" #include "internal_functions_registry.h" #include "php_standard.h" +#include "ext/standard/info.h" #include "zend_operators.h" #include <stdarg.h> #include <stdlib.h> @@ -708,9 +709,11 @@ PHP_MINFO_FUNCTION(basic) { + php_info_print_table_start(); PHP_MINFO(regex)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); PHP_MINFO(dl)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); PHP_MINFO(mail)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); + php_info_print_table_end(); PHP_MINFO(assert)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); } Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.34 php4/ext/standard/dl.c:1.35 --- php4/ext/standard/dl.c:1.34 Thu Mar 30 04:55:59 2000 +++ php4/ext/standard/dl.c Wed Apr 5 14:43:02 2000 @@ -21,6 +21,7 @@ #include "php.h" #include "dl.h" #include "php_globals.h" +#include "ext/standard/info.h" #ifdef HAVE_LIBDL #include <stdlib.h> @@ -181,7 +182,7 @@ PHP_MINFO_FUNCTION(dl) { - PUTS("Dynamic Library support enabled<br>.\n"); + php_info_print_table_row(2, "Dynamic Library Support", "enabled"); } #else Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.20 php4/ext/standard/mail.c:1.21 --- php4/ext/standard/mail.c:1.20 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/mail.c Wed Apr 5 14:43:02 2000 @@ -16,12 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.20 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: mail.c,v 1.21 2000/04/05 21:43:02 cmv Exp $ */ #include <stdlib.h> #include <ctype.h> #include <stdio.h> #include "php.h" +#include "ext/standard/info.h" #if !defined(PHP_WIN32) #include "build-defs.h" #endif @@ -135,9 +136,9 @@ PHP_MINFO_FUNCTION(mail) { #ifdef PHP_WIN32 - PUTS("Internal Sendmail support for Windows 4"); + php_info_print_table_row(2, "Internal Sendmail Support for Windows 4", "enabled"); #else - php_printf("Path to sendmail: <tt>%s</tt>", INI_STR("sendmail_path")); + php_info_print_table_row(2, "Path to sendmail", INI_STR("sendmail_path") ); #endif } Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.33 php4/ext/standard/reg.c:1.34 --- php4/ext/standard/reg.c:1.33 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/reg.c Wed Apr 5 14:43:02 2000 @@ -17,12 +17,13 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.33 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: reg.c,v 1.34 2000/04/05 21:43:02 cmv Exp $ */ #include <stdio.h> #include "php.h" #include "php_string.h" #include "reg.h" +#include "ext/standard/info.h" #if 0 zend_module_entry regexp_module_entry = { @@ -107,9 +108,9 @@ PHP_MINFO_FUNCTION(regex) { #if HSREGEX - PUTS("Bundled regex library enabled<br>\n"); + php_info_print_table_row(2, "Regex Library", "Bundled library enabled"); #else - PUTS("System regex library enabled<br>\n"); + php_info_print_table_row(2, "Regex Library", "System library enabled"); #endif } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.50 php4/ext/xml/xml.c:1.51 --- php4/ext/xml/xml.c:1.50 Tue Apr 4 08:42:05 2000 +++ php4/ext/xml/xml.c Wed Apr 5 14:43:03 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.50 2000/04/04 15:42:05 thies Exp $ */ +/* $Id: xml.c,v 1.51 2000/04/05 21:43:03 cmv Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -25,8 +25,8 @@ #include "php_xml.h" #include "zend_variables.h" #include "ext/standard/php_string.h" +#include "ext/standard/info.h" - #if HAVE_LIBEXPAT # if !(WIN32|WINNT) @@ -218,7 +218,10 @@ PHP_MINFO_FUNCTION(xml) { - PUTS("XML support active"); + + php_info_print_table_start(); + php_info_print_table_row(2, "XML Support", "active"); + php_info_print_table_end(); } Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.10 php4/ext/yp/yp.c:1.11 --- php4/ext/yp/yp.c:1.10 Mon Mar 6 10:41:18 2000 +++ php4/ext/yp/yp.c Wed Apr 5 14:43:03 2000 @@ -15,9 +15,10 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.10 2000/03/06 18:41:18 ssb Exp $ */ +/* $Id: yp.c,v 1.11 2000/04/05 21:43:03 cmv Exp $ */ #include "php.h" +#include "ext/standard/info.h" #if HAVE_YP @@ -176,6 +177,8 @@ /* }}} */ PHP_MINFO_FUNCTION(yp) { - PUTS("Compiled with YP Support."); + php_info_print_table_start(); + php_info_print_table_row(2, "YP Support", "enabled"); + php_info_print_table_end(); } #endif /* HAVE_YP */ Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.36 php4/ext/zlib/zlib.c:1.37 --- php4/ext/zlib/zlib.c:1.36 Sun Mar 12 07:47:33 2000 +++ php4/ext/zlib/zlib.c Wed Apr 5 14:43:03 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.36 2000/03/12 15:47:33 sas Exp $ */ +/* $Id: zlib.c,v 1.37 2000/04/05 21:43:03 cmv Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -39,6 +39,7 @@ #include "ext/standard/head.h" #include "safe_mode.h" #include "ext/standard/php_standard.h" +#include "ext/standard/info.h" #include "php_zlib.h" #include "fopen-wrappers.h" #if HAVE_PWD_H @@ -141,11 +142,11 @@ PHP_MINFO_FUNCTION(zlib) { - PUTS("Zlib support active (compiled with "); - PUTS(ZLIB_VERSION); - PUTS(", linked with "); - PUTS((char *)zlibVersion()); - PUTS(")."); + php_info_print_table_start(); + php_info_print_table_row(2, "ZLib Support", "enabled"); + php_info_print_table_row(2, "Compiled Version", ZLIB_VERSION ); + php_info_print_table_row(2, "Linked Version", (char *)zlibVersion() ); + php_info_print_table_end(); } static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char **opened_path);