Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / fdb.php

diff --git a/fdb.php b/fdb.php
index 30c7798..91892f9 100644 (file)
--- a/fdb.php
+++ b/fdb.php
@@ -1,22 +1,9 @@
 <?php
 
-#  Copyright (C) 2007 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 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 code to use a web-writeable directory full of files as a
@@ -32,8 +19,8 @@
 # fdb_set_dir() passing the path to that directory.
 
 
-require_once('code/wfpl/file.php');
-require_once('code/wfpl/binary.php');
+require_once(__DIR__.'/'.'file.php');
+require_once(__DIR__.'/'.'binary.php');
 
 # call this to set what directory is used to store the files
 function fdb_set_dir($dir) {
@@ -42,15 +29,15 @@ function fdb_set_dir($dir) {
 
 function fdb_get_dir() {
        if(!isset($GLOBALS['fdb_dir'])) {
-               die('you must call fdb_set_dir() before calling other functions in code/wfpl/fdb.php');
+               die('you must call fdb_set_dir() before calling other functions in wfpl/fdb.php');
        }
        return $GLOBALS['fdb_dir'];
 }
 
 
 function fdb_fix_key($key) {
-       $key = ereg_replace('[^a-z0-9.-]', '_', strtolower($key));
-       $key = ereg_replace('^[-.]', '_', strtolower($key));
+       $key = preg_replace('|[^a-z0-9.-]|', '_', strtolower($key));
+       $key = preg_replace('|^[-.]|', '_', strtolower($key));
        return substr($key, 0, 32);
 }
 
@@ -112,5 +99,3 @@ function fdb_delete($key) {
        }
        return false;
 }
-
-?>