[PHP-CVS] cvs: php-src /ext/interbase interbase.c

[Ard Biesheuvel]

abies           Sun May 30 12:41:28 2004 EDT

  Modified files:              
    /php-src/ext/interbase      interbase.c 
  Log:
  Fix HTML/table layout in info() entry
  
  
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.218&r2=1.219&ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.218 php-src/ext/interbase/interbase.c:1.219
--- php-src/ext/interbase/interbase.c:1.218     Sun May 30 12:20:24 2004
+++ php-src/ext/interbase/interbase.c   Sun May 30 12:41:28 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c,v 1.218 2004/05/30 16:20:24 abies Exp $ */
+/* $Id: interbase.c,v 1.219 2004/05/30 16:41:28 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,7 +28,7 @@
 
 #include "php.h"
 
-#define FILE_REVISION "$Revision: 1.218 $"
+#define FILE_REVISION "$Revision: 1.219 $"
 
 #if HAVE_IBASE
 
@@ -37,6 +37,7 @@
 #include "ext/standard/md5.h"
 #include "php_interbase.h"
 #include "php_ibase_includes.h"
+#include "SAPI.h"
 
 #include <time.h>
 
@@ -420,13 +421,16 @@
 }
 /* }}} */
 
-static ZEND_INI_DISP(php_ibase_password_displayer_cb)
+/* TODO this function should be part of either Zend or PHP API */
+static PHP_INI_DISP(php_ibase_password_displayer_cb)
 {
-       if ((type == ZEND_INI_DISPLAY_ORIG && ini_entry->orig_value) 
-                       || (type != ZEND_INI_DISPLAY_ORIG && ini_entry->value)) {
-               ZEND_PUTS("********");
+       if ((type == PHP_INI_DISPLAY_ORIG && ini_entry->orig_value) 
+                       || (type == PHP_INI_DISPLAY_ACTIVE && ini_entry->value)) {
+               PUTS("********");
+       } else if (!sapi_module.phpinfo_as_text) {
+               PUTS("<i>no value</i>");
        } else {
-               ZEND_PUTS("no value");
+               PUTS("no value");
        }
 }
 
@@ -569,10 +573,10 @@
                php_info_print_table_row(2, "Run-time Client Library Version", s);
        } while (0);
 #endif                 
+       php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();
 
-       php_info_print_table_end();
 }
 /* }}} */
 

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