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

diff --git a/format.php b/format.php
index 85a90a2..e0818fd 100644
--- a/format.php
+++ b/format.php
@@ -19,9 +19,10 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+	$str = preg_replace("/([a-z])([A-Z])/", "\\1 \\2", $str); # split words on camelCase
 	$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 +38,7 @@ function format_options($str, $name) {
 		}
 	}
 
-	return $str;
+	return '';
 }
 
 function format_int($str) {
@@ -72,8 +73,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;
 }
@@ -163,6 +164,7 @@ function format_image_w_h_thumb_w_h($str) {
 }
 
 function format_varname($str) {
+	$str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
 	$str = strtolower($str);
 	$str = ereg_replace('[^a-z0-9_]', '_', $str);
 	return ereg_replace('^[0-9]*', '', $str);
@@ -178,7 +180,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 +188,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,13 +294,14 @@ function format_dollars($str) {
 
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
-	require_once('code/wfpl/time.php');
+	if($str == '') return '';
+	require_once(__DIR__ . '/time.php');
 	return mdy_to_ymd(format_oneline($str));
 }
 
 # date is yyyy-mm-dd
 function format_ymd($str) {
-	require_once('code/wfpl/time.php');
+	require_once(__DIR__ . '/time.php');
 	list($year, $month, $day) = ymd_clean($str);
 	return sprintf('%04u-%02u-%02u', $year, $month, $day);
 }