From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 18 Apr 2011 03:43:23 +0000 (-0400)
Subject: tar.php better and configurable tmpdir
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=commitdiff_plain;h=4112c956c82b436e1eb0214026fc2bf16f2f2bcf

tar.php better and configurable tmpdir
---

diff --git a/tar.php b/tar.php
index 2535a90..e7beedb 100644
--- a/tar.php
+++ b/tar.php
@@ -38,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) == ' ->') {
@@ -65,13 +73,13 @@ 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