X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=17d0461a783be7933c15a1137d9dec887c4defe4;hb=93f76cafaeb914987e47efa22ad74ca435b02bfb;hp=0fbc88fe6ffcf24698735db7dadcefa85c781fbf;hpb=cd68b6037f8558fd98e07486282e2a25f9c4626b;p=wfpl.git

diff --git a/format.php b/format.php
index 0fbc88f..17d0461 100644
--- a/format.php
+++ b/format.php
@@ -21,7 +21,23 @@
 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
+function format_options($str, $name) {
+	if(!isset($GLOBALS[$name . '_options'])) {
+		die("Couldn't find options for \"$name\". Be sure to call pulldown().");
+	}
+
+	foreach($GLOBALS[$name . '_options']['options'] as $keyval) {
+		list($key, $value) = $keyval;
+		if($str == $key) {
+			return $str;
+		}
+	}
+
+	return '';
 }
 
 function format_int($str) {
@@ -56,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;
 }
@@ -162,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;
@@ -170,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';
@@ -277,13 +293,13 @@ 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');
+	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);
 }