holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport commit r48041, committed by Nathan Gray. Some more speed improvements for get_rows:

Browse Source 
- Specify & cache headers we want instead of reading all headers
This commit is contained in:
Hadi Nategh 2014-08-14 07:38:32 +00:00
parent 6b44e369f2
commit 08efcf7d20
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -1364,10 +1364,18 @@ class emailadmin_imapbase
$uidsToFetch->add($sortResult); $uidsToFetch->add($sortResult);
$fquery = new Horde_Imap_Client_Fetch_Query(); $fquery = new Horde_Imap_Client_Fetch_Query();
// as we need the prio, we are not using the Envelope (which is not providing it)
// fetching both headers and envelope takes too much time // Pre-cache the headers we want, 'fetchHeaders' is a label into the cache
$fquery->headerText(array('peek'=>true)); // needed for getHeaderText; needed for X-Priority $fquery->headers('fetchHeaders',array(
//$fquery->envelope(); 'DISPOSITION-NOTIFICATION-TO','RETURN-RECEIPT-TO','X-CONFIRM-READING-TO',
'DATE','SUBJECT','FROM','TO','CC',
'X-PRIORITY'
),array(
// Cache headers, we'll look at them below
'cache' => true,
// Set peek so messages are not flagged as read
'peek' => true
));
$fquery->size(); $fquery->size();
$fquery->structure(); $fquery->structure();
$fquery->flags(); $fquery->flags();
@ -1405,9 +1413,9 @@ class emailadmin_imapbase
$headerObject['MSG_NUM'] = $_headerObject->getSeq(); $headerObject['MSG_NUM'] = $_headerObject->getSeq();
$headerObject['SIZE'] = $_headerObject->getSize(); $headerObject['SIZE'] = $_headerObject->getSize();
$headerObject['INTERNALDATE'] = $_headerObject->getImapDate(); $headerObject['INTERNALDATE'] = $_headerObject->getImapDate();
// as we need the prio, we are not using the Envelope (which is not providing it)
// fetching both headers and envelope takes too much time // Get already cached headers, 'fetchHeaders' is a label matchimg above
$headerForPrio = array_change_key_case($_headerObject->getHeaderText(0,Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER); $headerForPrio = array_change_key_case($_headerObject->getHeaders('fetchHeaders',Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->toArray(), CASE_UPPER);
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio)); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($headerForPrio));
if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) { if ( isset($headerForPrio['DISPOSITION-NOTIFICATION-TO']) ) {
$headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO'])); $headerObject['DISPOSITION-NOTIFICATION-TO'] = self::decode_header(trim($headerForPrio['DISPOSITION-NOTIFICATION-TO']));