tobast/bizou
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tar plugin now supports utf8 (got rid of escapeshellarg function)

Browse source 
extra check to see if tar will work
This commit is contained in:
Marc MAURICE 2011-06-14 23:36:04 +02:00
parent 7d72e379b1
commit df6d932f35
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/tar/tar.php
View file

@ -48,14 +48,19 @@ if ( ! is_dir($realDir) ) {
# change to the parent directory
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
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);
$totalsize = $matches[1];
($totalsize > 1000 and $ret === 0) or die("Could not tar: $filesarg. Try checking permissions.");
header("Content-Length: $totalsize");
}