fixed format_bool() to actually format as bool

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index e968158..f93d47f 100644 (file)
--- 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);
@@ -99,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';
@@ -109,7 +142,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 +183,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);