X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=5d7c2bb0af35a875a9de4a931fc623ef886b638d;hb=4df0be6e6debc3fbf1dfc6a4011cdf035a4cd47f;hp=a6b0582fc2680a1b90c5a171efbb167a466f50be;hpb=bc76ce67d93f43c64e179a043800e500402dccbf;p=wfpl.git diff --git a/format.php b/format.php index a6b0582..5d7c2bb 100644 --- a/format.php +++ b/format.php @@ -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';