extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:04:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix signature-selector shows placeholders instead their content

Browse Source
This commit is contained in:
Ralf Becker 2014-11-11 13:40:24 +00:00
parent 0217d8ad0d
commit 242d4740df
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emailadmin/inc/class.emailadmin_account.inc.php
View File

@ -451,7 +451,7 @@ class emailadmin_account implements ArrayAccess
if (is_null($account)) $account = $this;
$acc_id = is_scalar($account) ? $account : $account['acc_id'];
$cols = array('ident_id', 'ident_name', 'ident_realname', 'ident_org', 'ident_email', 'acc_id', 'acc_imap_username', 'acc_imap_logintype', 'acc_domain');
$cols = array('ident_id', 'ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature', 'acc_id', 'acc_imap_username', 'acc_imap_logintype', 'acc_domain');
if (!in_array($field, array_merge($cols, array('name', 'params'))))
{
$cols[] = $field;

23
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -684,24 +684,17 @@ class emailadmin_imapbase
}
/**
* getAccountIdentities - function to gather the identities connected to the current mailaccount
* @param int $acc_id to pass all conected identities back
* Get all identities of given mailaccount
*
* @param int|emailadmin_account $account account-object or acc_id
* @return array - array(email=>realname)
*/
function getAccountIdentities($acc_id) {
$userEMailAdresses = array();
$acc = emailadmin_account::read($acc_id);
$userEMailAdresses[$acc['ident_id']] = array('acc_id'=>$acc_id,'ident_id'=>$acc['ident_id'],'ident_email'=>$acc['ident_email'],'ident_org'=>$acc['ident_org'],'ident_realname'=>$acc['ident_realname'],'ident_signature'=>$acc['ident_signature'],'ident_name'=>$acc['ident_name']);
$identities = $acc->identities();
foreach($identities as $ik => $ident) {
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident));
$identity = emailadmin_account::read_identity($ik);
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity));
if (!isset($userEMailAdresses[$identity['ident_id']])) $userEMailAdresses[$identity['ident_id']] = array('ident_id'=>$identity['ident_id'],'ident_email'=>$identity['ident_email'],'ident_org'=>$identity['ident_org'],'ident_realname'=>$identity['ident_realname'],'ident_signature'=>$identity['ident_signature'],'ident_name'=>$identity['ident_name']);
function getAccountIdentities($account) {
if (!$account instanceof emailadmin_account)
{
$account = emailadmin_account::read($account);
}
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($userEMailAdresses));
return $userEMailAdresses;
return $account->identities(null, true, 'params');
}
/**