fixed format_int() to remove leading zeros even when the number is all zeros (eg...

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 8979b26..bb34919 100644 (file)
--- a/format.php
+++ b/format.php
@@ -22,17 +22,60 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+       $str = str_replace('_', ' ', $str);
        $str = ucwords($str);
        return str_replace('Email', 'E-mail', $str);
 }
 
+# This function makes sure that $str is in the list of options, and returns "" otherwise
+function format_options($str, $name) {
+       if(!isset($GLOBALS[$name . '_options'])) {
+               die("Couldn't find options for \"$name\". Be sure to call pulldown().");
+       }
+
+       if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']))) {
+               return '';
+       }
+
+       return $str;
+}
+
 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) {
+       $str = ereg_replace('[^0-9.]', '', $str);
+       $pos = strpos($str, '.');
+       if($pos !== false) {
+               $str = str_replace('.', '', $str);
+               if($pos == 0) {
+                       return '0.' . $str;
+               } elseif($pos == strlen($str)) {
+                       return $str;
+               } else {
+                       return substr($str, 0, $pos) . '.' . substr($str, $pos);
+               }
+       }
+       return $str;
+}
+
+# return 0 of there's no digits
+function format_int_0($str) {
+       $str = format_int($str);
+       if($str == '') {
+               return '0';
+       }
+       return $str;
 }
 
 function format_zip($str) {
-       return ereg_replace('[^0-9]', '', $str);
+       $str = ereg_replace('[^0-9]', '', $str);
+       if(strlen($str) > 5) {
+               return substr($str, 0, 5) . '-' . substr($str, 5);
+       }
+       return $str;
 }
 
 function format_filename($str) {
@@ -107,6 +150,11 @@ 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) {
+       return mdy_to_ymd(format_oneline($str));
+}
+
 function format_phone($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        $str = ereg_replace('^1*', '', $str);