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

remove config option for how2displayIdentities; defaults to show all available now; Remove possible Organization header as it might hold UTF-8 chars and is not sufficiently handled (encoded) by horde

Browse Source
This commit is contained in:
Klaus Leithoff 2015-03-20 12:26:32 +00:00
parent 7493c69ece
commit 661ff9ecf1
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -772,10 +772,11 @@ class emailadmin_imapbase
static function generateIdentityString($identity, $fullString=true) static function generateIdentityString($identity, $fullString=true)
{ {
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($identity)); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($identity));
if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail'); //if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
// not set? -> use default, means full display of all available data // not set? -> use default, means full display of all available data
if (!isset(self::$mailConfig['how2displayIdentities'])) self::$mailConfig['how2displayIdentities']=''; //if (!isset(self::$mailConfig['how2displayIdentities'])) self::$mailConfig['how2displayIdentities']='';
switch (self::$mailConfig['how2displayIdentities']) $how2displayIdentities = '';
switch ($how2displayIdentities)
{ {
case 'email'; case 'email';
//$retData = str_replace('@',' ',$identity->emailAddress).($fullString===true?' <'.$identity->emailAddress.'>':''); //$retData = str_replace('@',' ',$identity->emailAddress).($fullString===true?' <'.$identity->emailAddress.'>':'');

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

@ -2205,9 +2205,10 @@ class mail_compose
if($_formData['disposition']=='on') { if($_formData['disposition']=='on') {
$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']); $_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
} }
if(!empty($_identity->organization) && (mail_bo::$mailConfig['how2displayIdentities'] == '' || mail_bo::$mailConfig['how2displayIdentities'] == 'orgNemail')) { //error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
$_mailObject->addHeader('Organization', $_identity['ident_org']); //if(!empty($_identity['ident_org'])) {
} // $_mailObject->addHeader('Organization', $_identity['ident_org']);
//}
// Expand any mailing lists // Expand any mailing lists
foreach(array('to', 'cc', 'bcc', 'replyto') as $field) foreach(array('to', 'cc', 'bcc', 'replyto') as $field)

17
mail/templates/default/config.tpl
View File

@ -10,23 +10,6 @@
</tr> </tr>
<!-- END header --> <!-- END header -->
<!-- BEGIN body --> <!-- BEGIN body -->
<tr class="th">
<td colspan="2"><b>{lang_General}</b></td>
</tr>
<tr class="row_on">
<td>
<b>{lang_display_of_identities}</b><br/>
{lang_how_should_the_available_information_on_identities_be_displayed}
</td>
<td>
<select name="newsettings[how2displayIdentities]">
<option value=""{selected_how2displayIdentities_full}>{lang_all_available_info}</option>
<option value="email"{selected_how2displayIdentities_email}>{lang_emailaddress}</option>
<option value="nameNemail"{selected_how2displayIdentities_nameNemail}>{lang_name} &amp; {lang_emailaddress}</option>
<option value="orgNemail"{selected_how2displayIdentities_orgNemail}>{lang_organisation} &amp; {lang_emailaddress}</option>
</select>
</td>
</tr>
<tr class="th"> <tr class="th">
<td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td> <td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td>
</tr> </tr>