[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard credits.c

[Johannes Schl]

johannes                Tue Sep 20 18:20:30 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /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.21.2.6.2.1&r2=1.21.2.6.2.2&ty=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.21.2.6.2.1 
php-src/ext/standard/credits.c:1.21.2.6.2.2
--- php-src/ext/standard/credits.c:1.21.2.6.2.1 Thu Aug 11 17:37:59 2005
+++ php-src/ext/standard/credits.c      Tue Sep 20 18:20:30 2005
@@ -17,10 +17,11 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: credits.c,v 1.21.2.6.2.1 2005/08/11 21:37:59 helly Exp $ */
+/* $Id: credits.c,v 1.21.2.6.2.2 2005/09/20 22:20:30 johannes Exp $ */
 
 #include "php.h"
 #include "info.h"
+#include "SAPI.h"
 
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, 
authors)
 
@@ -30,11 +31,15 @@
 {
        TSRMLS_FETCH();
 
-       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 */
@@ -48,7 +53,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();
 
@@ -110,7 +119,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");
        }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php