extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with visible broken css stuff in outlook when answering to html-mails (with style-definitions) to outlook

Browse Source
This commit is contained in:
leithoff 2016-07-07 12:04:47 +02:00
parent 36005d8189
commit 5f7e13adaa
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mail/inc/class.mail_zpush.inc.php
View File

@ -173,16 +173,32 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
'admin' => False, 'admin' => False,
); );
/* /*
$sigOptions = array(
'send'=>'yes, always add EGroupware signatures to outgoing mails',
'nosend'=>'no, never add EGroupware signatures to outgoing mails',
);
if (!isset($hook_data['setup']) && in_array($hook_data['type'], array('user', 'group'))&&$hook_data['account_id'])
{
$pID=self::$profileID;
if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']=='G')
{
$pID=Mail\Account::get_default_acc_id();
}
$acc = Mail\Account::read($pID);
error_log(__METHOD__.__LINE__.':'.$pID.'->'.array2string($acc));
$Identities = Mail\Account::identities($pID);
foreach($Identities as &$identity)
{
$Identity = self::identity_name($identity);
}
error_log(__METHOD__.__LINE__.array2string($Identities));
}
$settings['mail-useSignature'] = array( $settings['mail-useSignature'] = array(
'type' => 'select', 'type' => 'select',
'label' => 'control if and which available signature is added to outgoing mails', 'label' => 'control if and which available signature is added to outgoing mails',
'name' => 'mail-useSignature', 'name' => 'mail-useSignature',
'help' => 'control the use of signatures', 'help' => 'control the use of signatures',
'values' => array( 'values' => $sigOptions,
'sendifnocalnotif'=>'only send if there is no notification in calendar',
'send'=>'yes, always add EGroupware signatures to outgoing mails',
'nosend'=>'no, never add EGroupware signatures to outgoing mails',
),
'xmlrpc' => True, 'xmlrpc' => True,
'default' => 'nosend', 'default' => 'nosend',
'admin' => False, 'admin' => False,
@ -979,6 +995,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
'<body>'; '<body>';
if ($output->nativebodytype==2) if ($output->nativebodytype==2)
{ {
if ($css) Api\Mail\Html::replaceTagsCompletley($body,'style');
// as we fetch html, and body is HTML, we may not need to handle this // as we fetch html, and body is HTML, we may not need to handle this
$htmlbody .= $body; $htmlbody .= $body;
} }