Simplify variables
This commit is contained in:
parent
35c8c9224d
commit
544b562cfe
|
@ -7,7 +7,7 @@
|
|||
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
|
||||
*/
|
||||
class AdminerDumpZip {
|
||||
var $_filename, $_data = "";
|
||||
var $filename;
|
||||
|
||||
function dumpOutput() {
|
||||
if (!class_exists('ZipArchive')) {
|
||||
|
@ -17,12 +17,13 @@ class AdminerDumpZip {
|
|||
}
|
||||
|
||||
function _zip($string, $state) {
|
||||
$this->_data .= $string;
|
||||
static $data = "";
|
||||
$data .= $string;
|
||||
if ($state & PHP_OUTPUT_HANDLER_END) {
|
||||
$zip = new ZipArchive;
|
||||
$zipFile = tempnam("", "zip");
|
||||
$zip->open($zipFile, ZipArchive::OVERWRITE); // php://output is not supported
|
||||
$zip->addFromString($this->_filename, $this->_data);
|
||||
$zip->addFromString($this->filename, $data);
|
||||
$zip->close();
|
||||
$return = file_get_contents($zipFile);
|
||||
unlink($zipFile);
|
||||
|
@ -32,7 +33,7 @@ class AdminerDumpZip {
|
|||
}
|
||||
|
||||
function dumpHeaders($identifier, $multi_table = false) {
|
||||
$this->_filename = "$identifier." . ($multi_table && ereg("[ct]sv", $_POST["format"]) ? "tar" : $_POST["format"]);
|
||||
$this->filename = "$identifier." . ($multi_table && ereg("[ct]sv", $_POST["format"]) ? "tar" : $_POST["format"]);
|
||||
if ($_POST["output"] == "zip") {
|
||||
header("Content-Type: application/zip");
|
||||
}
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
|
||||
*/
|
||||
class AdminerEditCalendar {
|
||||
var $prepend;
|
||||
var $langPath;
|
||||
var $prepend, $langPath;
|
||||
|
||||
/**
|
||||
* @param string text to append before first calendar usage
|
||||
|
|
Loading…
Reference in a new issue