extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 13:22:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: new reply with attachments (answer to mail incl. all attachments)

Browse Source
This commit is contained in:
ralf 2024-09-02 14:11:16 +02:00
parent aa183e929b
commit a8909da9d8
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mail/inc/class.mail_ui.inc.php
View File

@ -480,7 +480,10 @@ class mail_ui
'no_columnselection' => false 'no_columnselection' => false
); );
} }
if (Api\Header\UserAgent::mobile()) $content[self::$nm_index]['header_row'] = 'mail.index.header_right'; if (Api\Header\UserAgent::mobile())
{
$content[self::$nm_index]['header_row'] = 'mail.index.header_right';
}
} }
// These must always be set, even if $content is an array // These must always be set, even if $content is an array
@ -1179,21 +1182,35 @@ class mail_ui
'default' => true, 'default' => true,
'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/mail/templates/mobile/view.xet')) 'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/mail/templates/mobile/view.xet'))
), ),
'reply' => array( 'replies' => array(
'caption' => 'Reply', 'caption' => 'Reply',
'icon' => 'mail_reply', 'icon' => 'mail_reply',
'group' => ++$group, 'group' => ++$group,
'onExecute' => 'javaScript:app.mail.mail_compose', 'onExecute' => 'javaScript:app.mail.mail_compose',
'allowOnMultiple' => false, 'allowOnMultiple' => false,
'toolbarDefault' => true 'children' => [
), 'reply' => [
'reply_all' => array( 'caption' => 'Reply',
'caption' => 'Reply All', 'icon' => 'mail_reply',
'icon' => 'mail_replyall', 'onExecute' => 'javaScript:app.mail.mail_compose',
'group' => $group, 'allowOnMultiple' => false,
'onExecute' => 'javaScript:app.mail.mail_compose', 'toolbarDefault' => true,
'allowOnMultiple' => false, ],
'shortcut' => array('ctrl' => true, 'shift' => true, 'keyCode' => 65, 'caption' => 'Ctrl + Shift + A'), 'reply_all' => [
'caption' => 'Reply All',
'icon' => 'mail_replyall',
'onExecute' => 'javaScript:app.mail.mail_compose',
'allowOnMultiple' => false,
'shortcut' => array('ctrl' => true, 'shift' => true, 'keyCode' => 65, 'caption' => 'Ctrl + Shift + A'),
'toolbarDefault' => true,
],
'reply_attachments' => [
'caption' => 'Reply With Attachments',
'icon' => 'attach',
'onExecute' => 'javaScript:app.mail.mail_compose',
'allowOnMultiple' => false,
],
],
), ),
'forward' => array( 'forward' => array(
'caption' => 'Forward', 'caption' => 'Forward',
@ -1858,19 +1875,26 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
function get_toolbar_actions() function get_toolbar_actions()
{ {
$actions = $this->get_actions(); $actions = $this->get_actions();
$arrActions = array('composeasnew', 'reply', 'reply_all', 'forward', 'flagged', 'delete', 'print', $arrActions = array('composeasnew', 'replies', 'forward', 'flagged', 'delete', 'print',
'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1', 'label2', 'label3', 'label4', 'label5','spam', 'ham'); 'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1', 'label2', 'label3', 'label4', 'label5','spam', 'ham');
$actionsenabled = [];
foreach( $arrActions as &$act) foreach( $arrActions as &$act)
{ {
//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act])); //error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));
switch ($act) switch ($act)
{ {
case 'replies':
// flatten reply-actions for toolbar
foreach($actions[$act]['children'] as $name => $child)
{
$actionsenabled[$name]=$child;
}
break;
case 'forward': case 'forward':
$actionsenabled[$act]=$actions[$act]; $actionsenabled[$act]=$actions[$act];
break; break;
case 'save': case 'save':
$actionsenabled[$act]=$actions[$act]; $actionsenabled[$act]=$actions[$act];
break; break;
case 'view': case 'view':
$actionsenabled[$act]=$actions[$act]; $actionsenabled[$act]=$actions[$act];