forked from phpmyadmin/phpmyadmin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added PMA_OutputBuffering class, dropped ob.lib.php
- Loading branch information
Showing
10 changed files
with
207 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,5 @@ | |
| $response->addHTML( | ||
| PMA_getRelationsParamDiagnostic(PMA_getRelationsParam()) | ||
| ); | ||
| $response->response(); | ||
|
|
||
| ?> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| <?php | ||
| /* vim: set expandtab sw=4 ts=4 sts=4: */ | ||
| /** | ||
| * | ||
| * | ||
| * @package PhpMyAdmin | ||
| */ | ||
| if (! defined('PHPMYADMIN')) { | ||
| exit; | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * | ||
| * @package PhpMyAdmin | ||
| */ | ||
| class PMA_OutputBuffering | ||
| { | ||
| private static $_instance; | ||
| private $_mode; | ||
| private $_content; | ||
| private $_on; | ||
|
|
||
| private function __construct() | ||
| { | ||
| $this->_mode = $this->_getMode(); | ||
| $this->_on = false; | ||
| } | ||
|
|
||
| /** | ||
| * This function could be used eventually to support more modes. | ||
| * | ||
| * @return integer the output buffer mode | ||
| */ | ||
| private function _getMode() | ||
| { | ||
| $mode = 0; | ||
| if ($GLOBALS['cfg']['OBGzip'] && function_exists('ob_start')) { | ||
| if (ini_get('output_handler') == 'ob_gzhandler') { | ||
| // If a user sets the output_handler in php.ini to ob_gzhandler, then | ||
| // any right frame file in phpMyAdmin will not be handled properly by | ||
| // the browser. My fix was to check the ini file within the | ||
| // PMA_outBufferModeGet() function. | ||
| $mode = 0; | ||
| } elseif (function_exists('ob_get_level') && ob_get_level() > 0) { | ||
| // If output buffering is enabled in php.ini it's not possible to | ||
| // add the ob_gzhandler without a warning message from php 4.3.0. | ||
| // Being better safe than sorry, check for any existing output handler | ||
| // instead of just checking the 'output_buffering' setting. | ||
| $mode = 0; | ||
| } else { | ||
| $mode = 1; | ||
| } | ||
| } | ||
| // Zero (0) is no mode or in other words output buffering is OFF. | ||
| // Follow 2^0, 2^1, 2^2, 2^3 type values for the modes. | ||
| // Usefull if we ever decide to combine modes. Then a bitmask field of | ||
| // the sum of all modes will be the natural choice. | ||
| return $mode; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the singleton PMA_Response object | ||
| * | ||
| * @return PMA_Response object | ||
| */ | ||
| public static function getInstance() | ||
| { | ||
| if (empty(self::$_instance)) { | ||
| self::$_instance = new PMA_OutputBuffering(); | ||
| } | ||
| return self::$_instance; | ||
| } | ||
|
|
||
| /** | ||
| * This function will need to run at the top of all pages if output | ||
| * output buffering is turned on. It also needs to be passed $mode from | ||
| * the PMA_outBufferModeGet() function or it will be useless. | ||
| * | ||
| */ | ||
| public function start() | ||
| { | ||
| if (! $this->_on) { | ||
| if ($this->_mode) { | ||
| ob_start('ob_gzhandler'); | ||
| } | ||
| ob_start(); | ||
| header('X-ob_mode: ' . $this->_mode); | ||
| register_shutdown_function('PMA_OutputBuffering::stop'); | ||
| $this->_on = true; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This function will need to run at the bottom of all pages if output | ||
| * buffering is turned on. It also needs to be passed $mode from the | ||
| * PMA_outBufferModeGet() function or it will be useless. | ||
| * | ||
| */ | ||
| public static function stop() | ||
| { | ||
| $buffer = PMA_OutputBuffering::getInstance(); | ||
| if ($buffer->_on) { | ||
| $buffer->_on = false; | ||
| $buffer->_content = ob_get_contents(); | ||
| ob_end_clean(); | ||
| } | ||
| PMA_Response::response(); | ||
| } | ||
|
|
||
| public function getContents() | ||
| { | ||
| return $this->_content; | ||
| } | ||
|
|
||
| public function flush() | ||
| { | ||
| if (ob_get_status() && $this->_mode) { | ||
| ob_flush(); | ||
| } | ||
| /** | ||
| * previously we had here an "else flush()" but some PHP versions | ||
| * (at least PHP 5.2.11) have a bug (49816) that produces garbled | ||
| * data | ||
| */ | ||
| } | ||
| } | ||
|
|
||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.