Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / tar.php

diff --git a/tar.php b/tar.php
index bba514e..d5f7021 100644 (file)
--- a/tar.php
+++ b/tar.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2006 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 is for making a tar archive out of some strings you pass. See
@@ -40,7 +30,7 @@ function write_file($name, $data) {
 #    $extra: (optional) a function to be called right before tar-ing.
 function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false) {
        if(!$tmpdir) {
-               if($GLOBALS['wfpl_tmpdir']) {
+               if(isset($GLOBALS['wfpl_tmpdir']) && $GLOBALS['wfpl_tmpdir']) {
                        $tmpdir = $GLOBALS['wfpl_tmpdir'];
                } else {
                        $tmpdir = 'tmp';
@@ -51,7 +41,7 @@ function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false)
        $tmpdir .= '/' . sprintf('%08x%08x', mt_rand(), mt_rand());
        mkdir($tmpdir);
 
-       $dirname = ereg_replace('[^a-z0-9_-]', '', $dirname);
+       $dirname = preg_replace('|[^a-z0-9_-]|i', '', $dirname);
        if($dirname == '') $dirname = 'foo';
        mkdir("$tmpdir/$dirname");
        foreach($files as $filename => $file_data) {
@@ -61,12 +51,12 @@ function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false)
                } else {
                        $link = false;
                }
-               $filename_fixed = ereg_replace('[^a-zA-Z0-9_.-]', '', $filename);
+               $filename_fixed = preg_replace('|[^a-z0-9_.-]|i', '', $filename);
                if($filename != $filename_fixed) {
                        die("Invalid filename for tar archive");
                }
                if($link) {
-                       $target = ereg_replace('[^a-zA-Z0-9_./-]', '', $file_data);
+                       $target = preg_replace('|[^a-z0-9_./-]|i', '', $file_data);
                        system("/bin/ln -s $file_data \"$tmpdir/$dirname/$filename\"");
                } else {
                        write_file("$tmpdir/$dirname/$filename", $file_data);