From: Marcus Boerger <helly@php.net>
Date: Fri, 4 Jan 2008 16:10:49 +0000 (+0000)
Subject: - Fix module info for bz2
X-Git-Tag: RELEASE_2_0_0a1~1034
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95a9f1faf6646b2b052ef09ad77d59b93501375a;p=php

- Fix module info for bz2
- Differentiate enabled, disabled and unavailable
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 10fef66eab..c68edf4165 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -4907,52 +4907,39 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
 	php_info_print_table_row(2, "Phar EXT version", PHAR_EXT_VERSION_STR);
 	php_info_print_table_row(2, "Phar API version", PHAR_API_VERSION_STR);
 	php_info_print_table_row(2, "CVS revision", "$Revision$");
-	php_info_print_table_row(2, "Phar-based phar archives", 
-		"enabled");
-	php_info_print_table_row(2, "Tar-based phar archives", 
-		"enabled");
+	php_info_print_table_row(2, "Phar-based phar archives", "enabled");
+	php_info_print_table_row(2, "Tar-based phar archives", "enabled");
 #if HAVE_PHAR_ZIP
-	php_info_print_table_row(2, "ZIP-based phar archives", 
-		"enabled");
+	php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
 #else
-	php_info_print_table_row(2, "ZIP-based phar archives", 
-		"disabled");
+	php_info_print_table_row(2, "ZIP-based phar archives", "unavailable");
 #endif
 #if HAVE_ZLIB
 	if (phar_has_zlib) {
-		php_info_print_table_row(2, "gzip compression", 
-			"enabled");
+		php_info_print_table_row(2, "gzip compression", "enabled");
 	} else {
-		php_info_print_table_row(2, "gzip compression", 
-			"disabled");
+		php_info_print_table_row(2, "gzip compression", "disabled");
 	}
 #else
-	php_info_print_table_row(2, "gzip compression", 
-		"disabled");
+	php_info_print_table_row(2, "gzip compression", "unavailable");
 #endif
 #if HAVE_BZ2
-	if (phar_has_bz2 ) {
-		php_info_print_table_row(2, "bzip2 compression", 
-			"disabled");
+	if (phar_has_bz2) {
+		php_info_print_table_row(2, "bzip2 compression", "enabled");
 	} else {
-		php_info_print_table_row(2, "bzip2 compression", 
-			"enabled");
+		php_info_print_table_row(2, "bzip2 compression", "disabled (install pecl/bz2)");
 	}
 #else
-	php_info_print_table_row(2, "bzip2 compression", 
-		"disabled");
+	php_info_print_table_row(2, "bzip2 compression", "unavailable (install pecl/bz2)");
 #endif
 #if HAVE_GNUPGLIB
-        if (phar_has_gnupg) {
-		php_info_print_table_row(2, "GPG signature", 
-			"enabled");
+  if (phar_has_gnupg) {
+		php_info_print_table_row(2, "GPG signature", "enabled");
 	} else {
-		php_info_print_table_row(2, "GPG signature", 
-			"disabled (install pecl/gnupg)");
+		php_info_print_table_row(2, "GPG signature", "disabled (install pecl/gnupg)");
 	}
 #else
-	php_info_print_table_row(2, "GPG signature", 
-		"disabled");
+	php_info_print_table_row(2, "GPG signature", "unavailable (install pecl/gnupg)");
 #endif
 	php_info_print_table_end();