X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=e34f4b3cda0f0d6310c3275ec56f504162e4090f;hb=6f87f35266423cf9292fa3d456821413a313e188;hp=12615cce5de1a0e02e52899da9b0e8160ef6bcbf;hpb=7a7284ccc3caba3bf7cf69e8fb806e4478bee0b1;p=wfpl.git

diff --git a/format.php b/format.php
index 12615cc..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
@@ -37,7 +37,7 @@ function format_options($str, $name) {
 		}
 	}
 
-	return $str;
+	return '';
 }
 
 function format_int($str) {
@@ -45,6 +45,7 @@ function format_int($str) {
 	return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
+# format the digits after the decimal point
 function format_decimals($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	if(strlen($str)) {
@@ -71,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;
 }
@@ -99,6 +100,7 @@ function format_int_0($str) {
 	return $str;
 }
 
+# USA zip codes
 function format_zip($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	if(strlen($str) > 5) {
@@ -146,7 +148,6 @@ function format_image_w_h($str) {
 function format_image_w_h_thumb_w_h($str) {
 	$fields = explode(' ', $str);
 	if(count($fields) != 6) {
-		die('count: ' . count($fields));
 		return '';
 	}
 
@@ -177,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;
@@ -185,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';
@@ -291,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));
 }