kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #58 from asso-infini/patch-1 

Update m_bro.php to manager bz2
This commit is contained in:
Benjamin Sonntag 2016-02-24 16:11:03 +01:00
parent 1c049f6bc6 76895cf5fe
commit 9f8c2a8e1e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bureau/class/m_bro.php
View File

@ -659,23 +659,28 @@ class m_bro {
return 1; return 1;
} }
$lfile = strtolower($file); $lfile = strtolower($file);
if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z") { if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z" || substr($lfile, -4) == ".tgz" || substr($lfile, -4) == ".tbz" || substr($lfile, -5) == ".tbz2" ) {
// TODO new version of tar supports `tar xf ...` so there is no // TODO new version of tar supports `tar xf ...` so there is no
// need to specify the compression format // need to specify the compression format
echo "<p>" . _("Uncompressing through TAR") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through TAR") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$ret = 0; $ret = 0;
passthru("tar -xvf " . escapeshellarg($file) . " -C " . escapeshellarg($dest) . " 2>&1", $ret); passthru("tar -xvf " . escapeshellarg($file) . " --numeric-owner -C " . escapeshellarg($dest) . " 2>&1", $ret);
} }
if (substr($lfile, -4) == ".zip") { elseif (substr($lfile, -4) == ".zip") {
echo "<p>" . _("Uncompressing through UNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through UNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1"; $cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1";
passthru($cmd, $ret); passthru($cmd, $ret);
} }
if (substr($lfile, -3) == ".gz" && substr($lfile, -7) != ".tar.gz") { elseif (substr($lfile, -3) == ".gz" || substr($lfile, -2) == ".Z") {
echo "<p>" . _("Uncompressing through GUNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through GUNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "gunzip " . escapeshellarg($file) . " 2>&1"; $cmd = "gunzip " . escapeshellarg($file) . " 2>&1";
passthru($cmd, $ret); passthru($cmd, $ret);
} }
elseif (substr($lfile, -3) == ".bz" || substr($lfile, -4) == ".bz2") {
echo "<p>" . _("Uncompressing through bunzip2") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "bunzip2 " . escapeshellarg($file) . " 2>&1";
passthru($cmd, $ret);
}
echo "</pre>"; echo "</pre>";
if ($ret) { if ($ret) {
$err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file); $err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file);