metaform: remove buggy unused code from fields parser

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 0058a44..17d0461 100644 (file)
--- a/format.php
+++ b/format.php
@@ -21,7 +21,7 @@
 function format_caption($str) {
        $str = str_replace('_', ' ', $str);
        $str = ucwords($str);
-       return str_replace('Email', 'E-mail', $str);
+       return $str;
 }
 
 # This function makes sure that $str is in the list of options, and returns "" otherwise
@@ -37,7 +37,7 @@ function format_options($str, $name) {
                }
        }
 
-       return $str;
+       return '';
 }
 
 function format_int($str) {
@@ -45,6 +45,7 @@ function format_int($str) {
        return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
+# format the digits after the decimal point
 function format_decimals($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        if(strlen($str)) {
@@ -71,8 +72,8 @@ function _format_positive_decimal($str) {
 
 function format_positive_decimal($str) {
        $str = _format_positive_decimal($str);
-       if($str === '0.0') {
-               $str = '0';
+       if(substr($str, -2) === '.0') {
+               $str = substr($str, 0, -2);
        }
        return $str;
 }
@@ -99,6 +100,7 @@ function format_int_0($str) {
        return $str;
 }
 
+# USA zip codes
 function format_zip($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        if(strlen($str) > 5) {
@@ -176,7 +178,7 @@ function format_unix($str) {
 }
 
 function format_bool($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 1;
        } else {
                return 0;
@@ -184,7 +186,7 @@ function format_bool($str) {
 }
 
 function format_yesno($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 'Yes';
        } else {
                return 'No';
@@ -290,13 +292,14 @@ 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');
+       if($str == '') return '';
+       require_once(__DIR__ . '/time.php');
        return mdy_to_ymd(format_oneline($str));
 }
 
 # date is yyyy-mm-dd
 function format_ymd($str) {
-       require_once('code/wfpl/time.php');
+       require_once(__DIR__ . '/time.php');
        list($year, $month, $day) = ymd_clean($str);
        return sprintf('%04u-%02u-%02u', $year, $month, $day);
 }