From d51c93b43e4b24b56e5c225154be4a60fcb418c6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 1 Jun 2009 07:21:14 +0000
Subject: - get rid of some hardcoded action names and move decission about
 output compression to the user

---
 .htaccess                         |  2 +-
 index.php                         | 14 ++------------
 program/steps/mail/get.inc        |  1 +
 program/steps/mail/viewsource.inc |  1 +
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.htaccess b/.htaccess
index 98c5fecaf..2d734690a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -10,7 +10,7 @@ php_value	upload_max_filesize	5M
 php_value	post_max_size		6M
 php_value	memory_limit		64M
 
-php_value	zlib.output_compression		0
+php_value	zlib.output_compression		1
 php_value	magic_quotes_gpc		0
 php_value	zend.ze1_compatibility_mode	0
 php_value 	suhosin.session.encrypt 	Off 
diff --git a/index.php b/index.php
index 721aefc7c..0904f2be6 100644
--- a/index.php
+++ b/index.php
@@ -39,18 +39,8 @@ $OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gu
 // init plugin API
 $RCMAIL->plugins->init();
 
-// set output buffering
-if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
-  // use gzip compression if supported
-  if (function_exists('ob_gzhandler')
-      && !ini_get('zlib.output_compression')
-      && ini_get('output_handler') != 'ob_gzhandler') {
-    ob_start('ob_gzhandler');
-  }
-  else {
-    ob_start();
-  }
-}
+// turn on output buffering
+ob_start();
 
 // check if config files had errors
 if ($err_str = $RCMAIL->config->get_error()) {
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index d2863e8bc..cf66914d7 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -33,6 +33,7 @@ if (!empty($_GET['_preload'])) {
   exit;
 }
 
+ob_end_clean();
 
 // similar code as in program/steps/mail/show.inc
 if (!empty($_GET['_uid'])) {
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 56a8ddec8..16d92c859 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -19,6 +19,7 @@
 
 */
 
+ob_end_clean();
 
 // similar code as in program/steps/mail/get.inc
 if ($uid = get_input_value('_uid', RCUBE_INPUT_GET))
-- 
cgit v1.2.3