class.mail_compose.inc.php

leithoff 2016-03-10 11:15:46 UTC #1

Author: leithoff
New Revision: 55345

URL: http://svn.stylite.de/viewvc/egroupware?rev=55345&view=rev
Log:
fix for (sometimes) not attached attachment when composing as new, when triggered from message with attachments present

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

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=55345&r1=55344&r2=55345&view=diff

— trunk/mail/inc/class.mail_compose.inc.php (original)
+++ trunk/mail/inc/class.mail_compose.inc.php Thu Mar 10 12:15:45 2016
@@ -1656,8 +1656,11 @@

	if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
		foreach($attachments as $attachment) {

  		//error_log(__METHOD__.__LINE__.array2string($attachment));
  		$cid = $attachment['cid'];

  		preg_match("/[cid:{$cid}]/", $bodyParts['0']['body'], $match);

```
  		$match=null;
```

  		preg_match("/cid:{$cid}/", $bodyParts['0']['body'], $match);

  		//error_log(__METHOD__.__LINE__.'searching for cid:'."/cid:{$cid}/".'#'.$r.'#'.array2string($match));
  		if (!$match || !$attachment['cid'])
  		{
  			$this->addMessageAttachment($_uid, $attachment['partID'],

@@ -2565,8 +2568,14 @@
$success = false;
error_log(METHOD.LINE.$msg);
}

```
  				} else {
```

  					error_log(__METHOD__.__LINE__.': original message ('.$pMuid.') has attachments and lastDrafted ID ('.$duid.') equals the former');
  				}

```
  			}
```

```
  			} else {
```

  				error_log(__METHOD__.__LINE__." No current draftID (".$draft_id."), or no lastDrafted Info (".$content['lastDrafted'].") or the former being equal:".array2string($content)."(, action=$action)");

```
  			}
```
```
  		} else {
```

  			error_log(__METHOD__.__LINE__.' No headerdata found for messageUID='.$messageUid.' in Folder:'.$folder.':'.array2string($content)."(, action=$action)");
  		}
  	}
  	else

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=278785111&iu=/4140

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