extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eSync: fix signature problem, when using emailadmin defined profile

Browse Source
This commit is contained in:
Klaus Leithoff 2011-07-29 12:41:08 +00:00
parent f911749268
commit 1909213bcb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
felamimail/inc/class.bopreferences.inc.php
View File

@ -363,7 +363,7 @@
if (!isset($userPrefs['sendOptions']) || empty($userPrefs['sendOptions'])) $userPrefs['sendOptions'] = 'move_to_sent';
}
$userPrefs['signature'] = $userPrefs['email_sig'];
if (!empty($userPrefs['email_sig'])) $userPrefs['signature'] = $userPrefs['email_sig'];
unset($userPrefs['email_sig']);
return $userPrefs;

6
felamimail/inc/class.felamimail_activesync.inc.php
View File

@ -617,11 +617,13 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
} // end forward
// add signature!! -----------------------------------------------------------------
$bosignatures = CreateObject('felamimail.felamimail_bosignatures');
if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
$presetSig = (!empty($activeMailProfile->signature) ? $activeMailProfile->signature : -1); // thats the default
$defaultSig = $bosignatures->getDefaultSignature();
if ($defaultSig === false) $defaultSig = -1;
$presetSig = (!empty($activeMailProfile->signature) ? $activeMailProfile->signature : $defaultSig); // thats the default
$disableRuler = false;
$bosignatures = CreateObject('felamimail.felamimail_bosignatures');
$_signature = $bosignatures->getSignature($presetSig);
$signature = $_signature->fm_signature;
if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&