class.mail_compose.inc.php

leithoff 2016-03-22 08:41:58 UTC #1

Author: leithoff
New Revision: 55479

URL: http://svn.stylite.de/viewvc/egroupware?rev=55479&view=rev
Log:
when fetching headerdata/envelope gather size as well

Modified:
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
trunk/mail/inc/class.mail_compose.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=55479&r1=55478&r2=55479&view=diff

— trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Tue Mar 22 09:41:58 2016
@@ -4908,6 +4908,7 @@
$fquery = new Horde_Imap_Client_Fetch_Query();
$envFields = new Horde_Mime_Headers();
$fquery->envelope();

  	$fquery->size();
  	$headersNew = $this->icServer->fetch($_folder, $fquery, array(
  		'ids' => $uidsToFetch,
  	));

@@ -4951,6 +4952,7 @@
$envelope[$v]=$env->$v;
}
}

  			$envelope['size']=$_headerObject->getSize();
  		}
  	}
  	$envelope = array_change_key_case($envelope,CASE_UPPER);

@@ -4981,6 +4983,7 @@
if (isset($headers[‘THREAD-TOPIC’])) $newData[‘THREAD-TOPIC’] = $headers[‘THREAD-TOPIC’];
if (isset($headers[‘THREAD-INDEX’])) $newData[‘THREAD-INDEX’] = $headers[‘THREAD-INDEX’];
if (isset($headers[‘LIST-ID’])) $newData[‘LIST-ID’] = $headers[‘LIST-ID’];

  	if (isset($headers['SIZE'])) $newData['SIZE'] = $headers['SIZE'];
  	//_debug_array($newData);
  	$recepientList = array('FROM', 'TO', 'CC', 'BCC', 'SENDER', 'REPLY-TO');
  	foreach($recepientList as $recepientType) {

@@ -5043,6 +5046,8 @@
{
$fquery->headerText(array(‘peek’=>$preserveUnSeen));
}

```
  $fquery->size();
```

  $headersNew = $this->icServer->fetch($_folder, $fquery, array(
  	'ids' => $uidsToFetch,
  ));

@@ -5063,6 +5068,8 @@
}
}
}

```
  		$size = $_fetchObject->getSize();
```

  		//error_log(__METHOD__.__LINE__.'#'.$size);
  	}
  	if ($decode === 'object')
  	{

@@ -5070,6 +5077,7 @@
return $headers;
}
$retValue = is_object($headers) ? $headers->toArray():array();

  	if ($size) $retValue['size'] = $size;
  }
  $retValue = array_change_key_case($retValue,CASE_UPPER);
  //error_log(__METHOD__.' ('.__LINE__.') '.array2string($retValue));

Modified: trunk/mail/inc/class.mail_compose.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_compose.inc.php?rev=55479&r1=55478&r2=55479&view=diff

— trunk/mail/inc/class.mail_compose.inc.php (original)
+++ trunk/mail/inc/class.mail_compose.inc.php Tue Mar 22 09:41:58 2016
@@ -1703,7 +1703,7 @@
$mail_bo->reopen($_folder);

	// get message headers for specified message

  $headers	= $mail_bo->getMessageEnvelope($_uid, $_partID);

  $headers	= $mail_bo->getMessageEnvelope($_uid, $_partID,false,$_folder);
  //error_log(__METHOD__.__LINE__.array2string($headers));
  //_debug_array($headers); exit;
  // check for Re: in subject header

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs