extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues 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:10:53 +00:00
parent f7f5662e10
commit b72aef8cc2
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -10,23 +10,6 @@
</tr>
<!-- END header -->
<!-- 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">
<td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td>
</tr>