X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=99a67b72a70210b00ad2223a33a8a6b858f6e4cc;hb=206f9ab762d9df2a262143dfa8b41f8ab3dfdcb0;hp=1bac60910ffdebe9cd4fa37439365549a9bf6e77;hpb=848c8a4d215f9cce1db0a7d37e733b5959b8210f;p=wfpl.git

diff --git a/format.php b/format.php
index 1bac609..99a67b7 100644
--- a/format.php
+++ b/format.php
@@ -21,19 +21,70 @@
 
 # This file contains basic encodings
 
+function format_caption($str) {
+	$str = str_replace('_', ' ', $str);
+	$str = ucwords($str);
+	return str_replace('Email', 'E-mail', $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 $str;
+}
+
 function format_int($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
-	return ereg_replace('^0*([1-9])', '\1', $str);
+	return ereg_replace('^0*([0-9])', '\1', $str);
+}
+
+function format_decimal($str) {
+	$str = ereg_replace('[^0-9.]', '', $str);
+	$pos = strpos($str, '.');
+	if($pos !== false) {
+		$str = str_replace('.', '', $str);
+		if($pos == 0) {
+			return '0.' . $str;
+		} elseif($pos == strlen($str)) {
+			return $str;
+		} else {
+			return substr($str, 0, $pos) . '.' . substr($str, $pos);
+		}
+	}
+	return $str;
+}
+
+# return 0 of there's no digits
+function format_int_0($str) {
+	$str = format_int($str);
+	if($str == '') {
+		return '0';
+	}
+	return $str;
 }
 
 function format_zip($str) {
-	return ereg_replace('[^0-9]', '', $str);
+	$str = ereg_replace('[^0-9]', '', $str);
+	if(strlen($str) > 5) {
+		return substr($str, 0, 5) . '-' . substr($str, 5);
+	}
+	return $str;
 }
 
 function format_filename($str) {
 	$str = strtolower($str);
 	$str = ereg_replace('[^a-z0-9_.-]', '_', $str);
-	return ereg_replace('^[0-9.-]*', '', $str);
+	return ereg_replace('^[.-]', '_', $str);
 }
 
 function format_varname($str) {
@@ -52,16 +103,16 @@ function format_unix($str) {
 }
 
 function format_yesno($str) {
-	if($str) {
-		return "Yes";
+	if($str && $str != 'No') {
+		return 'Yes';
 	} else {
-		return "No";
+		return 'No';
 	}
 }
 
 function format_email($str) {
 	# FIXME
-	return format_oneline($str);
+	return trim(format_oneline($str));
 }
 
 function format_url($str) {
@@ -102,6 +153,11 @@ function format_dollars($str) {
 	return format_money($str, false);
 }
 
+# date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
+function format_mdy_to_ymd($str) {
+	return mdy_to_ymd(format_oneline($str));
+}
+
 function format_phone($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	$str = ereg_replace('^1*', '', $str);