]> git.joonet.de Git - adminer.git/commitdiff
Customizable export
authorJakub Vrana <jakub@vrana.cz>
Fri, 29 Oct 2010 15:03:02 +0000 (17:03 +0200)
committerJakub Vrana <jakub@vrana.cz>
Fri, 29 Oct 2010 15:03:02 +0000 (17:03 +0200)
adminer/dump.inc.php
adminer/include/adminer.inc.php
adminer/include/bootstrap.inc.php
adminer/include/editing.inc.php
adminer/include/export.inc.php [deleted file]
adminer/select.inc.php
editor/include/adminer.inc.php
editor/include/export.inc.php [deleted file]

index c288fb0b62075ea54610c263dfb971304eea7378..e53885514deb427431448716821481ddbbc3f519 100644 (file)
@@ -7,7 +7,7 @@ if ($_POST) {
                $cookie .= "&$key=" . urlencode($_POST[$key]);
        }
        cookie("adminer_export", substr($cookie, 1));
-       $ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
+       $ext = $adminer->dumpHeaders(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
        $is_sql = ($_POST["format"] == "sql");
        if ($is_sql) {
                echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
@@ -73,9 +73,9 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
                                                        if ($ext == "tar") {
                                                                ob_start();
                                                        }
-                                                       dump_table($row["Name"], ($table ? $_POST["table_style"] : ""));
+                                                       $adminer->dumpTable($row["Name"], ($table ? $_POST["table_style"] : ""));
                                                        if ($data) {
-                                                               dump_data($row["Name"], $_POST["data_style"]);
+                                                               $adminer->dumpData($row["Name"], $_POST["data_style"]);
                                                        }
                                                        if ($is_sql && $_POST["triggers"]) {
                                                                $triggers = trigger_sql($row["Name"], $_POST["table_style"]);
@@ -94,7 +94,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
                                        }
                                }
                                foreach ($views as $view) {
-                                       dump_table($view, $_POST["table_style"], true);
+                                       $adminer->dumpTable($view, $_POST["table_style"], true);
                                }
                                if ($ext == "tar") {
                                        echo pack("x512");
index 7e183a7115ec4ebf06e3e86c7567e32a60353d6b..9973c13fc4f43906004aba1f497a57d4bba34e69 100644 (file)
@@ -501,6 +501,189 @@ document.getElementById('username').focus();
                return html_select("format", array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
        }
        
+       /** Export table structure
+       * @param string
+       * @param string
+       * @param bool
+       * @return null prints data
+       */
+       function dumpTable($table, $style, $is_view = false) {
+               if ($_POST["format"] != "sql") {
+                       echo "\xef\xbb\xbf"; // UTF-8 byte order mark
+                       if ($style) {
+                               dump_csv(array_keys(fields($table)));
+                       }
+               } elseif ($style) {
+                       $create = create_sql($table, $_POST["auto_increment"]);
+                       if ($create) {
+                               if ($style == "DROP+CREATE") {
+                                       echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . table($table) . ";\n";
+                               }
+                               if ($is_view) {
+                                       // remove DEFINER with current user
+                                       $create = preg_replace('~^([A-Z =]+) DEFINER=`' . str_replace("@", "`@`", logged_user()) . '`~', '\\1', $create); //! proper escaping of user
+                               }
+                               echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
+                       }
+                       if ($style == "CREATE+ALTER" && !$is_view) {
+                               // create procedure which iterates over original columns and adds new and removes old
+                               $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION";
+                               echo "DELIMITER ;;
+CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
+       DECLARE _column_name, _collation_name, after varchar(64) DEFAULT '';
+       DECLARE _column_type, _column_default text;
+       DECLARE _is_nullable char(3);
+       DECLARE _extra varchar(30);
+       DECLARE _column_comment varchar(255);
+       DECLARE done, set_after bool DEFAULT 0;
+       DECLARE add_columns text DEFAULT '";
+                               $fields = array();
+                               $after = "";
+                               foreach (get_rows($query) as $row) {
+                                       $default = $row["COLUMN_DEFAULT"];
+                                       $row["default"] = (isset($default) ? q($default) : "NULL");
+                                       $row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work
+                                       $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"])
+                                               . " $row[COLUMN_TYPE]"
+                                               . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
+                                               . (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
+                                               . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
+                                               . ($row["EXTRA"] ? " $row[EXTRA]" : "")
+                                               . ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
+                                               . ($after ? " AFTER " . idf_escape($after) : " FIRST")
+                                       );
+                                       echo ", ADD $row[alter]";
+                                       $fields[] = $row;
+                                       $after = $row["COLUMN_NAME"];
+                               }
+                               echo "';
+       DECLARE columns CURSOR FOR $query;
+       DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
+       SET @alter_table = '';
+       OPEN columns;
+       REPEAT
+               FETCH columns INTO _column_name, _column_default, _is_nullable, _collation_name, _column_type, _extra, _column_comment;
+               IF NOT done THEN
+                       SET set_after = 1;
+                       CASE _column_name";
+                       foreach ($fields as $row) {
+                               echo "
+                               WHEN " . q($row["COLUMN_NAME"]) . " THEN
+                                       SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
+                                       IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . q($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . q($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
+                                               SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
+                                       END IF;"; //! don't replace in comment
+                       }
+                       echo "
+                               ELSE
+                                       SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
+                                       SET set_after = 0;
+                       END CASE;
+                       IF set_after THEN
+                               SET after = _column_name;
+                       END IF;
+               END IF;
+       UNTIL done END REPEAT;
+       CLOSE columns;
+       IF @alter_table != '' OR add_columns != '' THEN
+               SET alter_command = CONCAT(alter_command, 'ALTER TABLE " . table($table) . "', SUBSTR(CONCAT(add_columns, @alter_table), 2), ';\\n');
+       END IF;
+END;;
+DELIMITER ;
+CALL adminer_alter(@adminer_alter);
+DROP PROCEDURE adminer_alter;
+
+";
+                               //! indexes
+                       }
+               }
+       }
+       
+       /** Export table data
+       * @param string
+       * @param string
+       * @param string query to execute, defaults to SELECT * FROM $table
+       * @return null prints data
+       */
+       function dumpData($table, $style, $select = "") {
+               global $connection, $jush;
+               $max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
+               if ($style) {
+                       if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
+                               echo truncate_sql($table) . ";\n";
+                       }
+                       $fields = fields($table);
+                       $result = $connection->query(($select ? $select : "SELECT * FROM " . table($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
+                       if ($result) {
+                               $insert = "";
+                               $buffer = "";
+                               while ($row = $result->fetch_assoc()) {
+                                       if ($_POST["format"] != "sql") {
+                                               dump_csv($row);
+                                       } else {
+                                               if (!$insert) {
+                                                       $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+                                               }
+                                               foreach ($row as $key => $val) {
+                                                       $row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
+                                               }
+                                               $s = implode(",\t", $row);
+                                               if ($style == "INSERT+UPDATE") {
+                                                       $set = array();
+                                                       foreach ($row as $key => $val) {
+                                                               $set[] = idf_escape($key) . " = $val";
+                                                       }
+                                                       echo "$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n";
+                                               } else {
+                                                       $s = ($max_packet ? "\n" : " ") . "($s)";
+                                                       if (!$buffer) {
+                                                               $buffer = $insert . $s;
+                                                       } elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length
+                                                               $buffer .= ",$s";
+                                                       } else {
+                                                               $buffer .= ";\n";
+                                                               echo $buffer;
+                                                               $buffer = $insert . $s;
+                                                       }
+                                               }
+                                       }
+                               }
+                               if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
+                                       $buffer .= ";\n";
+                                       echo $buffer;
+                               }
+                       }
+               }
+       }
+       
+       /** Send headers for export
+       * @param string
+       * @param bool
+       * @return string extension
+       */
+       function dumpHeaders($identifier, $multi_table = false) {
+               $filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
+               $output = $_POST["output"];
+               $ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
+               header("Content-Type: " .
+                       ($output == "bz2" ? "application/x-bzip" :
+                       ($output == "gz" ? "application/x-gzip" :
+                       ($ext == "tar" ? "application/x-tar" :
+                       ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
+               ))));
+               if ($output != "text") {
+                       header("Content-Disposition: attachment; filename=$filename.$ext" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
+               }
+               session_write_close();
+               if ($_POST["output"] == "bz2") {
+                       ob_start('bzcompress', 1e6);
+               }
+               if ($_POST["output"] == "gz") {
+                       ob_start('gzencode', 1e6);
+               }
+               return $ext;
+       }
+       
        /** Prints navigation after Adminer title
        * @param string can be "auth" if there is no database connection, "db" if there is no database selected, "ns" with invalid schema
        * @return null
index 003c91643b3a7bb06c767368ceeeffa61e8a5ba8..709668595a0302c071678e477f925926e4ef7060 100644 (file)
@@ -71,7 +71,6 @@ include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 include "./include/connect.inc.php";
 include "./include/editing.inc.php";
-include "./include/export.inc.php";
 
 session_cache_limiter(""); // to allow restarting session
 if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
index cf4ba18bce1197c5dd9d9fabed4a479c2d017fa2..a26d15946e171bb2438500a42854767a0a319a69 100644 (file)
@@ -333,3 +333,18 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
        }
        return $dropped;
 }
+
+/** Get string to add a file in TAR
+* @param string
+* @param string
+* @return string
+*/
+function tar_file($filename, $contents) {
+       $return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct(strlen($contents)), decoct(time()));
+       $checksum = 8*32; // space for checksum itself
+       for ($i=0; $i < strlen($return); $i++) {
+               $checksum += ord($return{$i});
+       }
+       $return .= sprintf("%06o", $checksum) . "\0 ";
+       return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
+}
diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
deleted file mode 100644 (file)
index 250557b..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-function tar_file($filename, $contents) {
-       $return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct(strlen($contents)), decoct(time()));
-       $checksum = 8*32; // space for checksum itself
-       for ($i=0; $i < strlen($return); $i++) {
-               $checksum += ord($return{$i});
-       }
-       $return .= sprintf("%06o", $checksum) . "\0 ";
-       return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
-}
-
-function dump_table($table, $style, $is_view = false) {
-       if ($_POST["format"] != "sql") {
-               echo "\xef\xbb\xbf"; // UTF-8 byte order mark
-               if ($style) {
-                       dump_csv(array_keys(fields($table)));
-               }
-       } elseif ($style) {
-               $create = create_sql($table, $_POST["auto_increment"]);
-               if ($create) {
-                       if ($style == "DROP+CREATE") {
-                               echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . table($table) . ";\n";
-                       }
-                       if ($is_view) {
-                               // remove DEFINER with current user
-                               $create = preg_replace('~^([A-Z =]+) DEFINER=`' . str_replace("@", "`@`", logged_user()) . '`~', '\\1', $create); //! proper escaping of user
-                       }
-                       echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
-               }
-               if ($style == "CREATE+ALTER" && !$is_view) {
-                       // create procedure which iterates over original columns and adds new and removes old
-                       $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION";
-                       echo "DELIMITER ;;
-CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
-       DECLARE _column_name, _collation_name, after varchar(64) DEFAULT '';
-       DECLARE _column_type, _column_default text;
-       DECLARE _is_nullable char(3);
-       DECLARE _extra varchar(30);
-       DECLARE _column_comment varchar(255);
-       DECLARE done, set_after bool DEFAULT 0;
-       DECLARE add_columns text DEFAULT '";
-                       $fields = array();
-                       $after = "";
-                       foreach (get_rows($query) as $row) {
-                               $default = $row["COLUMN_DEFAULT"];
-                               $row["default"] = (isset($default) ? q($default) : "NULL");
-                               $row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work
-                               $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"])
-                                       . " $row[COLUMN_TYPE]"
-                                       . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
-                                       . (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
-                                       . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
-                                       . ($row["EXTRA"] ? " $row[EXTRA]" : "")
-                                       . ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
-                                       . ($after ? " AFTER " . idf_escape($after) : " FIRST")
-                               );
-                               echo ", ADD $row[alter]";
-                               $fields[] = $row;
-                               $after = $row["COLUMN_NAME"];
-                       }
-                       echo "';
-       DECLARE columns CURSOR FOR $query;
-       DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-       SET @alter_table = '';
-       OPEN columns;
-       REPEAT
-               FETCH columns INTO _column_name, _column_default, _is_nullable, _collation_name, _column_type, _extra, _column_comment;
-               IF NOT done THEN
-                       SET set_after = 1;
-                       CASE _column_name";
-                       foreach ($fields as $row) {
-                               echo "
-                               WHEN " . q($row["COLUMN_NAME"]) . " THEN
-                                       SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
-                                       IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . q($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . q($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
-                                               SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
-                                       END IF;"; //! don't replace in comment
-                       }
-                       echo "
-                               ELSE
-                                       SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
-                                       SET set_after = 0;
-                       END CASE;
-                       IF set_after THEN
-                               SET after = _column_name;
-                       END IF;
-               END IF;
-       UNTIL done END REPEAT;
-       CLOSE columns;
-       IF @alter_table != '' OR add_columns != '' THEN
-               SET alter_command = CONCAT(alter_command, 'ALTER TABLE " . table($table) . "', SUBSTR(CONCAT(add_columns, @alter_table), 2), ';\\n');
-       END IF;
-END;;
-DELIMITER ;
-CALL adminer_alter(@adminer_alter);
-DROP PROCEDURE adminer_alter;
-
-";
-                       //! indexes
-               }
-       }
-}
-
-function dump_data($table, $style, $select = "") {
-       global $connection, $jush;
-       $max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
-       if ($style) {
-               if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
-                       echo truncate_sql($table) . ";\n";
-               }
-               $fields = fields($table);
-               $result = $connection->query(($select ? $select : "SELECT * FROM " . table($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
-               if ($result) {
-                       $insert = "";
-                       $buffer = "";
-                       while ($row = $result->fetch_assoc()) {
-                               if ($_POST["format"] != "sql") {
-                                       dump_csv($row);
-                               } else {
-                                       if (!$insert) {
-                                               $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
-                                       }
-                                       foreach ($row as $key => $val) {
-                                               $row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
-                                       }
-                                       $s = implode(",\t", $row);
-                                       if ($style == "INSERT+UPDATE") {
-                                               $set = array();
-                                               foreach ($row as $key => $val) {
-                                                       $set[] = idf_escape($key) . " = $val";
-                                               }
-                                               echo "$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n";
-                                       } else {
-                                               $s = ($max_packet ? "\n" : " ") . "($s)";
-                                               if (!$buffer) {
-                                                       $buffer = $insert . $s;
-                                               } elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length
-                                                       $buffer .= ",$s";
-                                               } else {
-                                                       $buffer .= ";\n";
-                                                       echo $buffer;
-                                                       $buffer = $insert . $s;
-                                               }
-                                       }
-                               }
-                       }
-                       if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
-                               $buffer .= ";\n";
-                               echo $buffer;
-                       }
-               }
-       }
-}
-
-function dump_headers($identifier, $multi_table = false) {
-       $filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
-       $output = $_POST["output"];
-       $ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
-       header("Content-Type: " .
-               ($output == "bz2" ? "application/x-bzip" :
-               ($output == "gz" ? "application/x-gzip" :
-               ($ext == "tar" ? "application/x-tar" :
-               ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
-       ))));
-       if ($output != "text") {
-               header("Content-Disposition: attachment; filename=$filename.$ext" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
-       }
-       session_write_close();
-       if ($_POST["output"] == "bz2") {
-               ob_start('bzcompress', 1e6);
-       }
-       if ($_POST["output"] == "gz") {
-               ob_start('gzencode', 1e6);
-       }
-       return $ext;
-}
index 887ba0f91a48e3781b59d8fce4b0e43403928a03..b4ec236cc68370ac91217f3d40273d5712c27d68 100644 (file)
@@ -43,8 +43,8 @@ if ($_POST && !$error) {
                }
        }
        if ($_POST["export"]) {
-               dump_headers($TABLE);
-               dump_table($TABLE, "");
+               $adminer->dumpHeaders($TABLE);
+               $adminer->dumpTable($TABLE, "");
                if ($_POST["format"] != "sql") { // Editor doesn't send format
                        $row = array_keys($fields);
                        if ($select) {
@@ -60,14 +60,14 @@ if ($_POST && !$error) {
                        if (is_array($_POST["check"])) {
                                $where2[] = "($where_check)";
                        }
-                       dump_data($TABLE, "INSERT", "SELECT $from" . ($where2 ? "\nWHERE " . implode(" AND ", $where2) : "") . $group_by);
+                       $adminer->dumpData($TABLE, "INSERT", "SELECT $from" . ($where2 ? "\nWHERE " . implode(" AND ", $where2) : "") . $group_by);
                } else {
                        $union = array();
                        foreach ($_POST["check"] as $val) {
                                // where is not unique so OR can't be used
                                $union[] = "(SELECT" . limit($from, "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val) . $group_by, 1) . ")";
                        }
-                       dump_data($TABLE, "INSERT", implode(" UNION ALL ", $union));
+                       $adminer->dumpData($TABLE, "INSERT", implode(" UNION ALL ", $union));
                }
                exit;
        }
index 0ebbb868ab82054f3fc97aecd1e11c5aa3df1cc0..47a86a74dc6756de2256f8a7ff689f6fb05efe29 100644 (file)
@@ -442,6 +442,29 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                return html_select("format", array('csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
        }
        
+       function dumpTable() {
+               echo "\xef\xbb\xbf"; // UTF-8 byte order mark
+       }
+       
+       function dumpData($table, $style, $select = "") {
+               global $connection;
+               $result = $connection->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT
+               if ($result) {
+                       while ($row = $result->fetch_assoc()) {
+                               dump_csv($row);
+                       }
+               }
+       }
+       
+       function dumpHeaders($identifier) {
+               $filename = ($identifier != "" ? friendly_url($identifier) : "dump");
+               $ext = "csv";
+               header("Content-Type: text/csv; charset=utf-8");
+               header("Content-Disposition: attachment; filename=$filename.$ext");
+               session_write_close();
+               return $ext;
+       }
+       
        function navigation($missing) {
                global $VERSION, $token;
                ?>
diff --git a/editor/include/export.inc.php b/editor/include/export.inc.php
deleted file mode 100644 (file)
index dd48f7b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-function dump_table($table) {
-       echo "\xef\xbb\xbf"; // UTF-8 byte order mark
-}
-
-function dump_data($table, $style, $select = "") {
-       global $connection;
-       $result = $connection->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT
-       if ($result) {
-               while ($row = $result->fetch_assoc()) {
-                       dump_csv($row);
-               }
-       }
-}
-
-function dump_headers($identifier) {
-       $filename = ($identifier != "" ? friendly_url($identifier) : "dump");
-       $ext = "csv";
-       header("Content-Type: text/csv; charset=utf-8");
-       header("Content-Disposition: attachment; filename=$filename.$ext");
-       session_write_close();
-       return $ext;
-}