added functions to edit hours in hh:mm and save them in decimal

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index f93d47f..8035be4 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
@@ -48,22 +45,48 @@ function format_int($str) {
        return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
-function format_decimal($str) {
+function format_decimals($str) {
+       $str = ereg_replace('[^0-9]', '', $str);
+       return ereg_replace('^([0-9])0*', '\1', $str);
+}
+
+function _format_positive_decimal($str) {
        $str = ereg_replace('[^0-9.]', '', $str);
        $pos = strpos($str, '.');
        if($pos !== false) {
                $str = str_replace('.', '', $str);
                if($pos == 0) {
-                       return '0.' . $str;
+                       return '0.' . format_decimals($str);
                } elseif($pos == strlen($str)) {
-                       return $str;
+                       return format_int($str);
                } else {
-                       return substr($str, 0, $pos) . '.' . substr($str, $pos);
+                       return format_int(substr($str, 0, $pos)) . '.' . format_decimals(substr($str, $pos));
                }
        }
+       return format_int($str);
+}
+
+function format_positive_decimal($str) {
+       $str = _format_positive_decimal($str);
+       if($str === '0.0') {
+               $str = '0';
+       }
        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 = '-' . $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);
@@ -146,8 +169,14 @@ function format_email($str) {
 }
 
 function format_url($str) {
-       # FIXME
-       return format_oneline($str);
+       # FIXME check for TLD? encode special chars?
+       $str = trim(format_oneline($str));
+       if($str !== '') {
+               if(strpos($str, ':') === false) {
+                       $str = 'http://' . $str;
+               }
+       }
+       return $str;
 }
 
 function format_money($str, $display_cents = true) {
@@ -189,6 +218,42 @@ function format_mdy_to_ymd($str) {
        return mdy_to_ymd(format_oneline($str));
 }
 
+# takes any of: HH  :MM  HH:MM
+# returns decimal number of hours
+#
+# You probably want to use format_hours() instead because it handles hours with a decimal point.
+function format_hours_minutes($str) {
+       if(strlen($str) == 0) {
+               return $str;
+       }
+       $pos = strpos($str, ':');
+       if($pos === false) {
+               $hours = format_int_0($str);
+               $minutes = 0;
+       } elseif($pos == 0) {
+               $hours = 0;
+               $minutes = format_int_0($str);
+       } else {
+               $hours = format_int_0(substr($str, 0, $pos));
+               $minutes = format_int_0(substr($str, $pos + 1));
+       }
+       return $hours + ($minutes / 60.0);
+}
+
+# takes any of: HH  :MM  HH:MM  HH.hh(decimal hours)
+# returns decimal number of hours
+function format_hours($str) {
+       if(strlen($str) == 0) {
+               return $str;
+       }
+       if(strpos($str, ':') !== false) {
+               return format_hours_minutes($str);
+       } else {
+               return format_decimal($str);
+       }
+}
+
+
 function format_phone($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        $str = ereg_replace('^1*', '', $str);