X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=format.php;h=f93d47f4ad102ed1a5dd86616b3badee991eb188;hb=3746445139a650d2ffdc9fc8099af9645fcb2308;hp=d058631cdd1885c881c44a5a5d755f409b0f153d;hpb=b7394a3a8379c423f6293fd343e6e4ef32d990ed;p=wfpl.git

diff --git a/format.php b/format.php
index d058631..f93d47f 100644
--- a/format.php
+++ b/format.php
@@ -81,12 +81,20 @@ 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) {
@@ -116,8 +124,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';
@@ -169,6 +185,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));
 }