EGroupware Enterprise Collaboration

Author: leithoff
Date: Mon May 26 13:17:42 2008
New Revision: 25512

URL: http://www.egroupware.org/viewvc?rev=3D25512&view=3Drev
Log:
preserve the signature of a draft or template

Modified:
    trunk/felamimail/inc/class.bocompose.inc.php

Modified: trunk/felamimail/inc/class.bocompose.inc.php
URL: http://www.egroupware.org/viewvc/trunk/felamimail/inc/class.bocompose.=
inc.php?rev=3D25512&r1=3D25511&r2=3D25512&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/felamimail/inc/class.bocompose.inc.php (original)
+++ trunk/felamimail/inc/class.bocompose.inc.php Mon May 26 13:17:42 2008
@@ -311,6 +311,9 @@
 				foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
 					$this->sessionData['folder'][] =3D $val;
 				}
+			}
+			if (!empty($addHeadInfo['X-SIGNATURE'])) {
+				$this->sessionData['signatureID'] =3D $addHeadInfo['X-SIGNATURE'];
 			}
 			$this->sessionData['uid'] =3D $_uid;
 			$this->sessionData['messageFolder'] =3D $_folder;
@@ -892,6 +895,7 @@
 			// preserve the bcc and if possible the save to folder information
 			$this->sessionData['folder']    =3D $_formData['folder'];
 			$this->sessionData['bcc']   =3D $_formData['bcc'];
+			$this->sessionData['signatureID'] =3D $_formData['signatureID'];
 			foreach((array)$this->sessionData['bcc'] as $address) {
 				$address_array  =3D imap_rfc822_parse_adrlist($address,'');
 				foreach((array)$address_array as $addressObject) {
@@ -906,6 +910,7 @@
 				$folders =3D implode('|',array_unique($this->sessionData['folder']));
 				$mail->AddCustomHeader("X-Mailfolder: $folders");
 			}
+			$mail->AddCustomHeader('X-Signature: '.$this->sessionData['signatureID'=
]);
 			// decide where to save the message (default to draft folder, if we fin=
d nothing else)
 			// if the current folder is in draft or template folder save it there
 			// if it is called from printview then save it with the draft folder