extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

ignore empty signatures and email, identity_name needs mail-account data to

Browse Source
This commit is contained in:
Ralf Becker 2016-11-18 14:48:17 +01:00
parent f7b7bc8155
commit df58b405af
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/emclient-signatures.php
View File

@ -42,15 +42,29 @@ $xml->setIndent(true);
$xml->startDocument('1.0', 'UTF-8'); $xml->startDocument('1.0', 'UTF-8');
$xml->startElement('signatures'); $xml->startElement('signatures');
foreach(Api\Mail\Account::identities(array(), true, 'params') as $identity) foreach(Api\Mail\Account::search(true, false) as $acc_id => $account)
{ {
$xml->startElement('signature'); foreach($account->identities($account, true, 'params') as $ident_id => $identity)
$xml->writeAttribute('name', Api\Mail\Account::identity_name($row, true)); {
$xml->writeAttribute('allow-edit', 'true'); // dont write empty signatures
$xml->writeAttribute('overwrite', 'true'); if (strlen(trim(strip_tags($identity['ident_signature']))) < 10) continue;
$xml->writeAttribute('targetMail', $identity['ident_email'].' <mailto:'.$identity['ident_email'].'>');
$xml->writeCdata($identity['ident_signature']); // check if we have an non-empty email address
$xml->endElement(); foreach(array($identity['ident_email'], $account->ident_email, $account->acc_imap_username,
$GLOBALS['egw_info']['user']['account_email']) as $email)
{
if (strpos($email, '@')) break;
}
if (!strpos($email, '@')) continue;
$xml->startElement('signature');
$xml->writeAttribute('name', Api\Mail\Account::identity_name($identity+$account->params, true));
$xml->writeAttribute('allow-edit', 'true');
$xml->writeAttribute('overwrite', 'true');
$xml->writeAttribute('targetMail', $email.' <mailto:'.$email.'>');
$xml->writeCdata($identity['ident_signature']);
$xml->endElement();
}
} }
$xml->endElement(); $xml->endElement();
$xml->endDocument(); $xml->endDocument();