X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=5d7c2bb0af35a875a9de4a931fc623ef886b638d;hb=5e7ba7c884bd114678e6308a7447e646dee7f838;hp=85a90a228805d3df90c544aeb0b5178d7d4586c7;hpb=d0e10623d1c7660c216a1bc5a1050b4507ff560f;p=wfpl.git

diff --git a/format.php b/format.php
index 85a90a2..5d7c2bb 100644
--- a/format.php
+++ b/format.php
@@ -37,7 +37,7 @@ function format_options($str, $name) {
 		}
 	}
 
-	return $str;
+	return '';
 }
 
 function format_int($str) {
@@ -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';
@@ -292,6 +292,7 @@ function format_dollars($str) {
 
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
+	if($str == '') return '';
 	require_once('code/wfpl/time.php');
 	return mdy_to_ymd(format_oneline($str));
 }