X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=tar.php;h=bba514eeba611143c36da4257429218e2dbf17e8;hp=2535a90df8697703b0797b649718e838e12cbacb;hb=15459c86d0996ab3037b1738a8be6efd378c1258;hpb=856f805c6cbb6e712c662214f3b5821442f808a0

diff --git a/tar.php b/tar.php
index 2535a90..bba514e 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,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");
 	}