X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=a4810110cece0762a0dc003b28b4fd251d984223;hb=860770c4a86811457b77e62f888920162d664d77;hp=bb349192976178ed3fc5541f3c35d5faff007ad6;hpb=a2093c37f91d34a3798c7a8f23f6c53baea8beb0;p=wfpl.git

diff --git a/format.php b/format.php
index bb34919..a481011 100644
--- a/format.php
+++ b/format.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2005 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file contains basic encodings
@@ -33,8 +30,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;
@@ -78,12 +78,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);
@@ -99,8 +121,16 @@ function format_unix($str) {
 	return unix_newlines($str);
 }
 
+function format_bool($str) {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 function format_yesno($str) {
-	if($str && $str != 'No') {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
 		return 'Yes';
 	} else {
 		return 'No';
@@ -109,12 +139,18 @@ function format_yesno($str) {
 
 function format_email($str) {
 	# FIXME
-	return format_oneline($str);
+	return trim(format_oneline($str));
 }
 
 function format_url($str) {
-	# FIXME
-	return format_oneline($str);
+	# FIXME check for TLD? encode special chars?
+	$str = trim(format_oneline($str));
+	if($str !== '') {
+		if(strpos($str, ':') === false) {
+			$str = 'http://' . $str;
+		}
+	}
+	return $str;
 }
 
 function format_money($str, $display_cents = true) {
@@ -152,6 +188,7 @@ 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');
 	return mdy_to_ymd(format_oneline($str));
 }