From 8b7e8d4b598361db8aa1af1410e63e4186c42d7e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 17 Mar 2011 16:13:28 +0000
Subject: [PATCH] disable changes from r34201

---
 felamimail/inc/class.bofelamimail.inc.php     | 2 --
 felamimail/inc/class.felamimail_hooks.inc.php | 2 +-
 felamimail/inc/class.uidisplay.inc.php        | 2 ++
 felamimail/inc/class.uiwidgets.inc.php        | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/felamimail/inc/class.bofelamimail.inc.php b/felamimail/inc/class.bofelamimail.inc.php
index fbbc1a7ed0..235dd96c33 100644
--- a/felamimail/inc/class.bofelamimail.inc.php
+++ b/felamimail/inc/class.bofelamimail.inc.php
@@ -2661,8 +2661,6 @@
 		// return the qouta of the users INBOX
 		function getQuotaRoot()
 		{
-			if (!$this->icServer->_connected) $this->openConnection();
-
 			if(!$this->icServer->hasCapability('QUOTA')) {
 				return false;
 			}
diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php
index 6b671d19f5..1688dca5d6 100644
--- a/felamimail/inc/class.felamimail_hooks.inc.php
+++ b/felamimail/inc/class.felamimail_hooks.inc.php
@@ -668,7 +668,7 @@ class felamimail_hooks
 					'divFolderTree',
 					FALSE
 				);
-				$bofelamimail->closeConnection();
+				//$bofelamimail->closeConnection();
 		        $file[] =  array(
 	        	    'text' => "<div id=\"divFolderTree\" class=\"dtree\" style=\"overflow:auto; max-width:400px; width:100%; max-height:450px; margin-bottom: 0px;padding-left: 0px; padding-right: 0px; padding-top:0px; z-index:100; \">
 					$folderTree
diff --git a/felamimail/inc/class.uidisplay.inc.php b/felamimail/inc/class.uidisplay.inc.php
index c3a8aa5a94..c56c76c84e 100644
--- a/felamimail/inc/class.uidisplay.inc.php
+++ b/felamimail/inc/class.uidisplay.inc.php
@@ -478,6 +478,7 @@
 			// --> use it to send the mail as data uri
 			if (!isset($_GET['printable']))
 			{
+/*
 				$bodyParts	= $this->bofelamimail->getMessageBody($this->uid,'',$partID);
 
 				$frameHtml = base64_encode(
@@ -486,6 +487,7 @@
 				$iframe_url = egw::link('/phpgwapi/js/egw_instant_load.html').'" onload="if (this.contentWindow && typeof this.contentWindow.egw_instant_load != \'undefined\') this.contentWindow.egw_instant_load(\''.$frameHtml.'\', true);';
 
 				$this->t->set_var('url_displayBody', $iframe_url);
+*/
 			}
 
 			// attachments
diff --git a/felamimail/inc/class.uiwidgets.inc.php b/felamimail/inc/class.uiwidgets.inc.php
index eaf74fabfb..bae769e215 100644
--- a/felamimail/inc/class.uiwidgets.inc.php
+++ b/felamimail/inc/class.uiwidgets.inc.php
@@ -726,6 +726,7 @@ class uiwidgets
 				// --> use it to send the mail as data uri
 				if (!isset($_GET['printable']))
 				{
+/*
 					$bodyParts	= $this->bofelamimail->getMessageBody($headerData['uid'],'',$partID);
 					$uidisplay = CreateObject('felamimail.uidisplay');
 
@@ -733,6 +734,7 @@ class uiwidgets
 						$uidisplay->get_email_header().
 						$uidisplay->showBody($uidisplay->getdisplayableBody($bodyParts), false));
 					$iframe_url = egw::link('/phpgwapi/js/egw_instant_load.html').'" onload="if (this.contentWindow && typeof this.contentWindow.egw_instant_load != \'undefined\') this.contentWindow.egw_instant_load(\''.$frameHtml.'\', true);';
+*/
 				}
 
 				//_debug_array($GLOBALS['egw']->link('/index.php',$linkData));