X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=fdb.php;h=55504645da6191a839c3c0b0d388974fd1ece9ed;hp=30c7798fdb7d0daf8cd5fdbc7d771ccd2462c703;hb=062d46e16429f2e55573567518cb01c83b319ac4;hpb=85bb9b0d8edc94ba469ee4c225407b5d1a1ef993

diff --git a/fdb.php b/fdb.php
index 30c7798..5550464 100644
--- a/fdb.php
+++ b/fdb.php
@@ -2,21 +2,18 @@
 
 #  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 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 code to use a web-writeable directory full of files as a
@@ -32,8 +29,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 +39,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);
 }