Fixed format_decimal() to support negative numbers

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 1586ff0..395835d 100644 (file)
--- 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;
@@ -42,10 +42,10 @@ 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) {
+function format_positive_decimal($str) {
        $str = ereg_replace('[^0-9.]', '', $str);
        $pos = strpos($str, '.');
        if($pos !== false) {
@@ -61,6 +61,19 @@ function format_decimal($str) {
        return $str;
 }
 
+function format_decimal($str) {
+       $str = ereg_replace('[^0-9.-]', '', $str);
+       if(substr($str, 0, 1) == '-') {
+               $str = format_positive_decimal(substr($str, 1));
+               if($str !== '' && $str !== '0' && $str != '0.0') {
+                       $str = '-' . $str;
+               }
+               return $str;
+       } else {
+               return format_positive_decimal($str);
+       }
+}
+
 # return 0 of there's no digits
 function format_int_0($str) {
        $str = format_int($str);
@@ -78,12 +91,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 +134,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 +152,7 @@ function format_yesno($str) {
 
 function format_email($str) {
        # FIXME
-       return format_oneline($str);
+       return trim(format_oneline($str));
 }
 
 function format_url($str) {
@@ -152,6 +195,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));
 }