tar plugin now supports utf8 (got rid of escapeshellarg function)
extra check to see if tar will work
This commit is contained in:
parent
7d72e379b1
commit
df6d932f35
|
@ -48,14 +48,19 @@ if ( ! is_dir($realDir) ) {
|
||||||
# change to the parent directory
|
# change to the parent directory
|
||||||
chdir(dirname($realDir));
|
chdir(dirname($realDir));
|
||||||
|
|
||||||
$filesarg = escapeshellarg(basename($realDir))."/*";
|
$filesarg = basename($realDir);
|
||||||
|
# same as escapeshellarg function but this supports utf8 regardless of locale
|
||||||
|
$filesarg = "'".str_replace("'", "'\\''", $filesarg)."'";
|
||||||
|
$filesarg = "$filesarg/*";
|
||||||
|
|
||||||
# compute and send content-length header
|
# compute and send content-length header
|
||||||
if ($SEND_CONTENT_LENGTH) {
|
if ($SEND_CONTENT_LENGTH) {
|
||||||
$out = exec("tar $TAR_FLAGS --totals -cf /dev/null $filesarg 2>&1");
|
$out = exec("tar $TAR_FLAGS --totals -cf /dev/null $filesarg 2>&1", $output, $ret);
|
||||||
preg_match('/^Total bytes written: ([0-9]+) /', $out, $matches);
|
preg_match('/^Total bytes written: ([0-9]+) /', $out, $matches);
|
||||||
$totalsize = $matches[1];
|
$totalsize = $matches[1];
|
||||||
|
|
||||||
|
($totalsize > 1000 and $ret === 0) or die("Could not tar: $filesarg. Try checking permissions.");
|
||||||
|
|
||||||
header("Content-Length: $totalsize");
|
header("Content-Length: $totalsize");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue