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

Update m_bro.php 

Gestion des archives dont l'extension est .bz, .bz2, .Z, .tgz, tbz ou tbz2 
Si on a réussi à traiter l'archive, on n'essaye pas de la traiter une nouvelle fois.
Dans le cas de l'utilisation de la commande tar, on utilise plutôt les id proprietaire et groupe des fichiers plutot que le nom des proprietaires et groupes des fichiers avec l'option --numeric-owner
This commit is contained in:
asso-infini 2016-02-15 21:16:22 +01:00
parent ea3371ae34
commit 76895cf5fe
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;
}
$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
// need to specify the compression format
echo "<p>" . _("Uncompressing through TAR") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$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\">";
$cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1";
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\">";
$cmd = "gunzip " . escapeshellarg($file) . " 2>&1";
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>";
if ($ret) {
$err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file);