X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=e34f4b3cda0f0d6310c3275ec56f504162e4090f;hb=e4b8789f2bfc73fe01549bab2ab390166ac9a514;hp=a6b0582fc2680a1b90c5a171efbb167a466f50be;hpb=bc76ce67d93f43c64e179a043800e500402dccbf;p=wfpl.git

diff --git a/format.php b/format.php
index a6b0582..e34f4b3 100644
--- a/format.php
+++ b/format.php
@@ -21,7 +21,7 @@
 function format_caption($str) {
 	$str = str_replace('_', ' ', $str);
 	$str = ucwords($str);
-	return str_replace('Email', 'E-mail', $str);
+	return $str;
 }
 
 # This function makes sure that $str is in the list of options, and returns "" otherwise
@@ -72,8 +72,8 @@ function _format_positive_decimal($str) {
 
 function format_positive_decimal($str) {
 	$str = _format_positive_decimal($str);
-	if($str === '0.0') {
-		$str = '0';
+	if(substr($str, -2) === '.0') {
+		$str = substr($str, 0, -2);
 	}
 	return $str;
 }
@@ -178,7 +178,7 @@ function format_unix($str) {
 }
 
 function format_bool($str) {
-	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
 		return 1;
 	} else {
 		return 0;
@@ -186,7 +186,7 @@ function format_bool($str) {
 }
 
 function format_yesno($str) {
-	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
 		return 'Yes';
 	} else {
 		return 'No';