extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 19:30:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

still some issues regarding signatures->fixed them (hopefully)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-20 10:59:39 +00:00
parent 32f75929af
commit 238391ee63
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mail/inc/class.mail_activesync.inc.php
View File

@ -811,15 +811,18 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
} // end forward } // end forward
// add signature!! ----------------------------------------------------------------- // add signature!! -----------------------------------------------------------------
$bosignatures = CreateObject('felamimail.felamimail_bosignatures');
if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile)); if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
$defaultSig = $bosignatures->getDefaultSignature(); try
if ($defaultSig === false) $defaultSig = -1; {
$presetSig = (!empty($activeMailProfile->signature) ? $activeMailProfile->signature : $defaultSig); // thats the default $acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
$disableRuler = false; //error_log(__METHOD__.__LINE__.array2string($acc));
$_signature = emailadmin_account::read_identity($acc['ident_id'],true);
$_signature = $bosignatures->getSignature($presetSig); }
$signature = $_signature->fm_signature; catch (Exception $e)
{
$_signature=array();
}
$signature = $_signature['ident_signature'];
if ((isset($preferencesArray['disableRulerForSignatureSeparation']) && if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
$preferencesArray['disableRulerForSignatureSeparation']) || $preferencesArray['disableRulerForSignatureSeparation']) ||
empty($signature) || trim(translation::convertHTMLToText($signature)) =='') empty($signature) || trim(translation::convertHTMLToText($signature)) =='')

2
mail/inc/class.mail_compose.inc.php
View File

@ -2035,7 +2035,7 @@ class mail_compose
} }
$disableRuler = false; $disableRuler = false;
#if ($realCharset != $this->displayCharset) error_log("Error: bocompose::createMessage found Charset ($realCharset) differs from DisplayCharset (".$this->displayCharset.")"); #if ($realCharset != $this->displayCharset) error_log("Error: bocompose::createMessage found Charset ($realCharset) differs from DisplayCharset (".$this->displayCharset.")");
$signature = $_signature[ident_signature]; $signature = $_signature['ident_signature'];
if ((isset($this->preferencesArray['insertSignatureAtTopOfMessage']) && $this->preferencesArray['insertSignatureAtTopOfMessage'])) if ((isset($this->preferencesArray['insertSignatureAtTopOfMessage']) && $this->preferencesArray['insertSignatureAtTopOfMessage']))
{ {