Bzip2 import

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1041 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index cb1e1be7a423fc9c3433249863ad6280abb143f1..93cb694c6df9841523905ac01c5eabe6d6c488ef 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -166,7 +166,10 @@ function get_file($key, $decompress = false) {
        if (!$file || $file["error"]) {
                return $file["error"];
        }
-       return file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]" : $file["tmp_name"]); //! may not be reachable because of open_basedir
+       return file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]"
+               : ($decompress && ereg('\\.bz2$', $file["name"]) ? "compress.bzip2://$file[tmp_name]"
+               : $file["tmp_name"]
+       )); //! may not be reachable because of open_basedir
 }
 
 function upload_error($error) {

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 79f4fea396636292ec70db763cfc7a6d576b58b7..440a7c1e7695c49c1f12e714309b37e8b5f373cf 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -10,7 +10,10 @@ page_header(lang('SQL command'), $error);
 if (!$error && $_POST) {
        $query = $_POST["query"];
        if ($_POST["webfile"]) {
-               $query = @file_get_contents(file_exists("adminer.sql") ? "adminer.sql" : "compress.zlib://adminer.sql.gz");
+               $query = @file_get_contents(file_exists("adminer.sql") ? "adminer.sql"
+                       : (file_exists("adminer.sql.gz") ? "compress.zlib://adminer.sql.gz"
+                       : "compress.bzip2://adminer.sql.bz2"
+               ));
        } elseif ($_POST["file"]) {
                $query = get_file("sql_file", true);
        }