clean up my urls

[wfpl.git] / tar.php

diff --git a/tar.php b/tar.php
index 342fc99..bba514e 100644 (file)
--- a/tar.php
+++ b/tar.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2006 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 is for making a tar archive out of some strings you pass. See
@@ -41,13 +38,21 @@ function write_file($name, $data) {
 #    $dirname: the name of the tar file (sans "tgz"). Also the name of the directory within.
 #    $files: a hash. The keys are the filenames, the values the file data
 #    $extra: (optional) a function to be called right before tar-ing.
-function make_tar($dirname, $files, $extra = '') {
-       $tmpdir = '/tmp/make_tar';
+function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false) {
+       if(!$tmpdir) {
+               if($GLOBALS['wfpl_tmpdir']) {
+                       $tmpdir = $GLOBALS['wfpl_tmpdir'];
+               } else {
+                       $tmpdir = 'tmp';
+               }
+       }
+
+       # user is choosing a very non-unique directory name, so make a random one to put it in
+       $tmpdir .= '/' . sprintf('%08x%08x', mt_rand(), mt_rand());
+       mkdir($tmpdir);
+
        $dirname = ereg_replace('[^a-z0-9_-]', '', $dirname);
        if($dirname == '') $dirname = 'foo';
-       if(!file_exists($tmpdir)) {
-               mkdir($tmpdir);
-       }
        mkdir("$tmpdir/$dirname");
        foreach($files as $filename => $file_data) {
                if(substr($filename, -3) == ' ->') {
@@ -68,23 +73,23 @@ function make_tar($dirname, $files, $extra = '') {
                }
        }
 
-       if(function_exists($extra)) {
-               $extra("$tmpdir/$dirname");
+       if($pre_archive_func && function_exists($pre_archive_func)) {
+               $pre_archive_func("$tmpdir/$dirname");
        }
 
        header("Content-type: application/x-gzip");
        passthru("tar -C $tmpdir -czf - $dirname/");
-       system("/bin/rm -rf '$tmpdir/$dirname'");
+       system('/bin/rm -rf ' . escapeshellarg($tmpdir));
 }
 
-# like make_tar above, except it includes a copy of code/wfpl
+# like make_tar above, except it includes a copy of wfpl
 function make_wfpl_tar($dirname, $files) {
        make_tar($dirname, $files, 'add_wfpl_dir');
 }
 
 function add_wfpl_dir($dir) {
        mkdir("$dir/code");
-       system("rsync -plr --exclude=\".git\" --exclude=\"*.swp\" 'code/wfpl/' '$dir/code/wfpl/'", $return_code);
+       system("rsync -plr --exclude=\".git\" --exclude=\"*.swp\" 'inc/wfpl/' '$dir/inc/wfpl/'", $return_code);
        if($return_code != 0) {
                die("ERROR: while trying to copy wfpl into archive: rsync returned $return_code");
        }