Simplify variables

This commit is contained in:
Jakub Vrana 2011-02-18 19:26:23 +01:00
parent 35c8c9224d
commit 544b562cfe
2 changed files with 6 additions and 6 deletions

View file

@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/ */
class AdminerDumpZip { class AdminerDumpZip {
var $_filename, $_data = ""; var $filename;
function dumpOutput() { function dumpOutput() {
if (!class_exists('ZipArchive')) { if (!class_exists('ZipArchive')) {
@ -17,12 +17,13 @@ class AdminerDumpZip {
} }
function _zip($string, $state) { function _zip($string, $state) {
$this->_data .= $string; static $data = "";
$data .= $string;
if ($state & PHP_OUTPUT_HANDLER_END) { if ($state & PHP_OUTPUT_HANDLER_END) {
$zip = new ZipArchive; $zip = new ZipArchive;
$zipFile = tempnam("", "zip"); $zipFile = tempnam("", "zip");
$zip->open($zipFile, ZipArchive::OVERWRITE); // php://output is not supported $zip->open($zipFile, ZipArchive::OVERWRITE); // php://output is not supported
$zip->addFromString($this->_filename, $this->_data); $zip->addFromString($this->filename, $data);
$zip->close(); $zip->close();
$return = file_get_contents($zipFile); $return = file_get_contents($zipFile);
unlink($zipFile); unlink($zipFile);
@ -32,7 +33,7 @@ class AdminerDumpZip {
} }
function dumpHeaders($identifier, $multi_table = false) { 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") { if ($_POST["output"] == "zip") {
header("Content-Type: application/zip"); header("Content-Type: application/zip");
} }

View file

@ -8,8 +8,7 @@
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other) * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/ */
class AdminerEditCalendar { class AdminerEditCalendar {
var $prepend; var $prepend, $langPath;
var $langPath;
/** /**
* @param string text to append before first calendar usage * @param string text to append before first calendar usage