holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setting ident_realname/email for mail accounts&identities where mail-server is managed by EGroupware

Browse Source
This commit is contained in:
Ralf Becker 2014-01-18 14:00:19 +00:00
parent c93e4fdc0e
commit 6b926d5267
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class mail_compose
var $composeID; var $composeID;
var $sessionData; var $sessionData;
function mail_compose() function __construct()
{ {
if (!isset($GLOBALS['egw_info']['flags']['js_link_registry'])) if (!isset($GLOBALS['egw_info']['flags']['js_link_registry']))
{ {
@ -984,6 +984,7 @@ class mail_compose
$sel_options['mailaccount'][$singleIdentity['acc_id']] = $id_prepend.$iS; $sel_options['mailaccount'][$singleIdentity['acc_id']] = $id_prepend.$iS;
} }
} }
$sel_options['mailaccount'] = iterator_to_array(emailadmin_account::search());
//error_log(__METHOD__.__LINE__.' Identities regarded/marked as default:'.array2string($defaultIds). ' MailProfileActive:'.$this->mail_bo->profileID); //error_log(__METHOD__.__LINE__.' Identities regarded/marked as default:'.array2string($defaultIds). ' MailProfileActive:'.$this->mail_bo->profileID);
// if there are 2 defaultIDs, its most likely, that the user choose to set // if there are 2 defaultIDs, its most likely, that the user choose to set
// the one not being the activeServerProfile to be his default Identity // the one not being the activeServerProfile to be his default Identity
@ -2733,7 +2734,7 @@ class mail_compose
$response = egw_json_response::get(); $response = egw_json_response::get();
$document_merge = new addressbook_merge(); $document_merge = new addressbook_merge();
$this->mail_bo->openConnection(); $this->mail_bo->openConnection();
if($error = $document_merge->check_document($_REQUEST['document'],'')) if($error = $document_merge->check_document($_REQUEST['document'],''))
{ {
$response->error($error); $response->error($error);