X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=f63dfbaae343be3cea31262ad6f7398038b6c523;hb=9a2257958f77e293a6f49d741405521f02855896;hp=e96815831e4ee3d68932bb5c74d21a6bfb0e9b19;hpb=d98d81886649a863d0e902f7c4e63b1257217e1f;p=wfpl.git

diff --git a/format.php b/format.php
index e968158..f63dfba 100644
--- a/format.php
+++ b/format.php
@@ -33,8 +33,11 @@ function format_options($str, $name) {
 		die("Couldn't find options for \"$name\". Be sure to call pulldown().");
 	}
 
-	if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']))) {
-		return '';
+	foreach($GLOBALS[$name . '_options']['options'] as $keyval) {
+		list($key, $value) = $keyval;
+		if($str == $key) {
+			return $str;
+		}
 	}
 
 	return $str;
@@ -42,7 +45,7 @@ function format_options($str, $name) {
 
 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) {
@@ -78,12 +81,34 @@ function format_zip($str) {
 	return $str;
 }
 
-function format_filename($str) {
-	$str = strtolower($str);
-	$str = ereg_replace('[^a-z0-9_.-]', '_', $str);
+function format_filename($str, $allow_uppercase = false) {
+	if(!$allow_uppercase) {
+		$str = strtolower($str);
+	}
+	$str = ereg_replace('[^a-zA-Z0-9_.-]', '_', $str);
 	return ereg_replace('^[.-]', '_', $str);
 }
 
+function client_path_to_filename($path) {
+	$filename = ereg_replace(".*[:/\\]", '', $path);
+	return format_filename($filename, true);
+}
+
+
+function format_h_w_image($str) {
+	$fields = explode(' ', $str);
+	if(count($fields) != 3) {
+		return '';
+	}
+
+	list($width, $height, $filename) = $fields;
+	$width = format_int_0($width);
+	$height = format_int_0($height);
+	$filename = format_filename($filename);
+
+	return "$width $height $filename";
+}
+
 function format_varname($str) {
 	$str = strtolower($str);
 	$str = ereg_replace('[^a-z0-9_]', '_', $str);
@@ -109,7 +134,7 @@ function format_yesno($str) {
 
 function format_email($str) {
 	# FIXME
-	return format_oneline($str);
+	return trim(format_oneline($str));
 }
 
 function format_url($str) {
@@ -150,6 +175,12 @@ 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) {
+	require_once('code/wfpl/time.php');
+	return mdy_to_ymd(format_oneline($str));
+}
+
 function format_phone($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	$str = ereg_replace('^1*', '', $str);