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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
nathan 2021-12-10 11:15:42 -07:00
commit a82c080ca5
4 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ class mail_compose
), ),
'disposition' => array( 'disposition' => array(
'caption' => 'Notification', 'caption' => 'Notification',
'icon' => 'notification_message', 'icon' => 'notification',
'group' => ++$group, 'group' => ++$group,
'checkbox' => true, 'checkbox' => true,
'hint' => 'check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)', 'hint' => 'check to receive a notification when the message is read (note: not all clients support this and/or the receiver may not authorize the notification)',
@ -2463,7 +2463,7 @@ class mail_compose
$email_From = $_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email']; $email_From = $_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'];
// Try to fix identity email with no domain part set // Try to fix identity email with no domain part set
$_mailObject->setFrom(Mail::fixInvalidAliasAddress(Api\Accounts::id2name($_identity['account_id'], 'account_email'), $email_From), $_mailObject->setFrom(Mail::fixInvalidAliasAddress(Api\Accounts::id2name($_identity['account_id'], 'account_email'), $email_From),
Mail::generateIdentityString($_identity,false)); mail_tree::getIdentityName($_identity));
$_mailObject->addHeader('X-Priority', $_formData['priority']); $_mailObject->addHeader('X-Priority', $_formData['priority']);
$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail'); $_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');

3
mail/inc/class.mail_hooks.inc.php
View File

@ -469,7 +469,8 @@ class mail_hooks
1 => lang('Real name'), 1 => lang('Real name'),
2 => lang('Email'), 2 => lang('Email'),
4 => lang('Organization'), 4 => lang('Organization'),
8 => lang('Ident name') 8 => lang('Ident name'),
16 => lang('Organization | Real name Email')
), ),
'default' => 7 'default' => 7
), ),

10
mail/inc/class.mail_tree.inc.php
View File

@ -46,6 +46,11 @@ class mail_tree
*/ */
const IDENT_NAME_IDENTITY= 8; const IDENT_NAME_IDENTITY= 8;
/**
* bit flag: org | name email
*/
const ORG_NAME_EMAIL = 16;
/** /**
* Icons used for nodes different states * Icons used for nodes different states
* *
@ -560,6 +565,11 @@ class mail_tree
$name[] = $_account['ident_org']; $name[] = $_account['ident_org'];
} }
if ($identLabel & self::ORG_NAME_EMAIL)
{
$name[] = $_account['ident_org']." | ".$_account['ident_realname'].' '.' <'.$_account['ident_email'].'>';
}
if ($identLabel & self::IDENT_EMAIL || empty($name)) if ($identLabel & self::IDENT_EMAIL || empty($name))
{ {
if (strpos($_account['ident_email'], '@') !== false || trim($_account['ident_email']) !='') if (strpos($_account['ident_email'], '@') !== false || trim($_account['ident_email']) !='')

29
mail/templates/pixelegg/images/notification.svg Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g id="XMLID_3_">
<g>
</g>
<g>
</g>
</g>
<path fill="#006699" d="M11.544,28.35c0.358,2.05,1.646,3.165,3.557,3.67l1.331,0.008c1.904-0.469,3.164-1.585,3.574-3.558
C17.36,28.265,14.336,28.421,11.544,28.35z"/>
<path fill="#006699" d="M29.61,26.509c0.028-0.001,0.057-0.001,0.085-0.001c0-0.876-0.003-1.768-0.002-2.658
c-0.639-0.211-1.177-0.523-1.646-0.906c-0.548-0.479-1.016-1.061-1.424-1.711c-0.633-1.072-1.082-2.344-1.498-3.683
c-0.696-2.254-1.076-4.693-1.249-7.132c-0.111-1.464-0.076-2.719-0.248-3.902c-0.205-1.404-0.716-2.588-1.455-3.567
c0.002-0.001,0.004-0.002,0.007-0.003c-0.03-0.039-0.069-0.069-0.1-0.107c-0.237-0.302-0.497-0.583-0.78-0.842
c-0.051-0.048-0.105-0.092-0.158-0.138c-0.261-0.226-0.536-0.435-0.829-0.627c-0.117-0.078-0.235-0.153-0.357-0.226
c-0.217-0.126-0.444-0.241-0.677-0.351c-0.195-0.094-0.389-0.189-0.593-0.269c-0.221-0.086-0.456-0.153-0.688-0.225
c-0.166-0.05-0.32-0.12-0.491-0.161l0.001-0.025l-0.085,0.002h-0.02c-0.004-0.001-0.007-0.002-0.01-0.003L16-0.025l-1.394-0.001
c-0.003,0.001-0.006,0.002-0.009,0.003h-0.02l-0.085-0.002L14.493,0c-0.17,0.041-0.325,0.11-0.49,0.16
c-0.233,0.072-0.469,0.139-0.69,0.225c-0.204,0.08-0.396,0.174-0.591,0.268c-0.233,0.11-0.461,0.225-0.679,0.352
c-0.121,0.072-0.238,0.147-0.354,0.225c-0.294,0.192-0.571,0.403-0.832,0.629C10.804,1.904,10.75,1.948,10.7,1.995
c-0.284,0.261-0.544,0.542-0.783,0.845c-0.03,0.038-0.068,0.067-0.098,0.105c0.002,0.001,0.004,0.002,0.007,0.003
c-0.739,0.979-1.25,2.163-1.455,3.567c-0.172,1.184-0.137,2.438-0.249,3.902C7.95,12.856,7.57,15.296,6.874,17.55
c-0.416,1.338-0.865,2.608-1.496,3.68c-0.409,0.651-0.878,1.235-1.426,1.715c-0.469,0.383-1.006,0.694-1.645,0.905
c0.001,0.891-0.002,1.782-0.002,2.658c0.028,0,0.057,0,0.084,0.001c0.007,0.034,0.007,0.075,0.016,0.108
c4.501-0.063,9.057-0.059,13.595-0.055c4.538-0.004,9.094-0.009,13.595,0.055C29.604,26.584,29.604,26.543,29.61,26.509z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB