Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 81878eb..6b14ad7 100644 (file)
--- a/format.php
+++ b/format.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2005 Jason Woofenden
-#
-#  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 program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This file contains basic encodings
@@ -42,21 +32,21 @@ function format_options($str, $name) {
 }
 
 function format_int($str) {
-       $str = ereg_replace('[^0-9]', '', $str);
-       return ereg_replace('^0*([0-9])', '\1', $str);
+       $str = preg_replace('|[^0-9]|', '', $str);
+       return preg_replace('|^0*([0-9])|', '\1', $str);
 }
 
 # format the digits after the decimal point
 function format_decimals($str) {
-       $str = ereg_replace('[^0-9]', '', $str);
+       $str = preg_replace('|[^0-9]|', '', $str);
        if(strlen($str)) {
-               $str = substr($str, 0, 1) . ereg_replace('0*$', '', substr($str, 1));
+               $str = substr($str, 0, 1) . preg_replace('|0*$|', '', substr($str, 1));
        }
        return $str;
 }
 
 function _format_positive_decimal($str) {
-       $str = ereg_replace('[^0-9.]', '', $str);
+       $str = preg_replace('|[^0-9.]|', '', $str);
        $pos = strpos($str, '.');
        if($pos !== false) {
                $str = str_replace('.', '', $str);
@@ -80,7 +70,7 @@ function format_positive_decimal($str) {
 }
 
 function format_decimal($str) {
-       $str = ereg_replace('[^0-9.-]', '', $str);
+       $str = preg_replace('|[^0-9.-]|', '', $str);
        if(substr($str, 0, 1) == '-') {
                $str = format_positive_decimal(substr($str, 1));
                if($str !== '' && $str !== '0') {
@@ -103,7 +93,7 @@ function format_int_0($str) {
 
 # USA zip codes
 function format_zip($str) {
-       $str = ereg_replace('[^0-9]', '', $str);
+       $str = preg_replace('|[^0-9]|', '', $str);
        if(strlen($str) > 5) {
                return substr($str, 0, 5) . '-' . substr($str, 5);
        }
@@ -114,20 +104,20 @@ 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);
+       $str = preg_replace('|[^a-z0-9_.-]|i', '_', $str);
+       return preg_replace('|^[.-]|', '_', $str);
 }
 
 function format_path($str, $allow_uppercase = false) {
        if(!$allow_uppercase) {
                $str = strtolower($str);
        }
-       $str = ereg_replace('[^a-zA-Z0-9_./-]', '_', $str);
-       return ereg_replace('^[.-]', '_', $str);
+       $str = preg_replace('|[^a-z0-9_./-]|i', '_', $str);
+       return preg_replace('|^[.-]|', '_', $str);
 }
 
 function client_path_to_filename($path) {
-       $filename = ereg_replace(".*[:/\\]", '', $path);
+       $filename = preg_replace("|.*[:/\\\\]|", '', $path);
        return format_filename($filename, true);
 }
 
@@ -352,11 +342,11 @@ function format_hours($str) {
 # takes eg 12:23am
 # returns decimal number of hours since midnight
 function format_12hr_to_hours($str) {
-       if(eregi('noon', $str)) {
+       if(preg_match('|noon|i', $str) === 1) {
                return 12;
        }
        $hours = format_hours($str);
-       if($hours < 12 && eregi('p', $str)) {
+       if($hours < 12 && preg_match('|p|i', $str) === 1) {
                $hours += 12;
        }
        return $hours;
@@ -364,8 +354,8 @@ function format_12hr_to_hours($str) {
 
 
 function format_phone($str) {
-       $str = ereg_replace('[^0-9]', '', $str);
-       $str = ereg_replace('^1*', '', $str);
+       $str = preg_replace('|[^0-9]|', '', $str);
+       $str = preg_replace('|^1*|', '', $str);
        $len = strlen($str);
        $output = '';
 
@@ -393,5 +383,3 @@ function format_phone($str) {
 
        return $output;
 }
-
-?>