cvs: php-src(PHP_5_0) /ext/standard credits.c

johannes Tue Sep 20 18:19:49 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard credits.c Log: - MFH: Remove HTML fragments from phpcredits() in CLI mode http://cvs.php.net/diff.php/php-src/ext/standard/credits.c?r1=1.32.2.1&r2=1.32.2.2&ty=u Index: php-src/ext/standard/credits.c diff -u php-src/ext/standard/credits.c:1.32.2.1 php-src/ext/standard/credits.c:1.32.2.2 --- php-src/ext/standard/credits.c:1.32.2.1 Mon Aug 9 17:53:19 2004 +++ php-src/ext/standard/credits.c Tue Sep 20 18:19:49 2005 @@ -17,10 +17,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: credits.c,v 1.32.2.1 2004/08/09 21:53:19 andi Exp $ */ +/* $Id: credits.c,v 1.32.2.2 2005/09/20 22:19:49 johannes Exp $ */ #include "php.h" #include "info.h" +#include "SAPI.h" #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors) @@ -28,11 +29,15 @@ */ PHPAPI void php_print_credits(int flag TSRMLS_DC) { - if (flag & PHP_CREDITS_FULLPAGE) { + if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) { php_print_info_htmlhead(TSRMLS_C); } - PUTS("<h1>PHP Credits</h1>\n"); + if (!sapi_module.phpinfo_as_text) { + PUTS("<h1>PHP Credits</h1>\n"); + } else { + PUTS("PHP Credits\n"); + } if (flag & PHP_CREDITS_GROUP) { /* Group */ @@ -46,7 +51,11 @@ if (flag & PHP_CREDITS_GENERAL) { /* Design & Concept */ php_info_print_table_start(); - php_info_print_table_header(1, "Language Design &amp; Concept"); + if (!sapi_module.phpinfo_as_text) { + php_info_print_table_header(1, "Language Design &amp; Concept"); + } else { + php_info_print_table_header(1, "Language Design & Concept"); + } php_info_print_table_row(1, "Andi Gutmans, Rasmus Lerdorf, Zeev Suraski"); php_info_print_table_end(); @@ -108,7 +117,7 @@ php_info_print_table_end(); } - if (flag & PHP_CREDITS_FULLPAGE) { + if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) { PUTS("</div></body></html>\n"); } }