extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: configurable limit to exclude attachments from automatic saving as drafts, default is no limit / attachments are always saved in drafts

Browse Source
This commit is contained in:
ralf 2024-03-06 15:46:36 +02:00
parent 48fc65b4ef
commit 1533f1321d
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,9 +2667,15 @@ class mail_compose
break; break;
} }
} }
// attach files not for autosaving // attach files not for autosaving, if size-limit is configured and attachment is bigger
elseif ($_formData['filemode'] == Vfs\Sharing::ATTACH && !$_autosaving) elseif ($_formData['filemode'] == Vfs\Sharing::ATTACH)
{ {
// exclude attachments greater configured size from autosaving
if ($_autosaving && !empty(Mail::$mailConfig['autosave_attachment_limit_mb']) &&
$attachment['size'] > 1024*1024*Mail::$mailConfig['autosave_attachment_limit_mb'])
{
continue;
}
if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) == 'vfs') if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) == 'vfs')
{ {
Vfs::load_wrapper('vfs'); Vfs::load_wrapper('vfs');
@ -2761,6 +2767,9 @@ class mail_compose
*/ */
public function ajax_saveAsDraft ($content, $action='button[saveAsDraft]') public function ajax_saveAsDraft ($content, $action='button[saveAsDraft]')
{ {
// release session, as we don't need it and it blocks parallel requests
$GLOBALS['egw']->session->commit_session();
//error_log(__METHOD__.__LINE__.array2string($content)."(, action=$action)"); //error_log(__METHOD__.__LINE__.array2string($content)."(, action=$action)");
$response = Api\Json\Response::get(); $response = Api\Json\Response::get();
$success = true; $success = true;

1
mail/lang/egw_de.lang
View File

@ -227,6 +227,7 @@ event details follow mail de Details zum Termin folgen
every %1. day mail de Jeden %1. Tag every %1. day mail de Jeden %1. Tag
everyone mail de Alle Anwender everyone mail de Alle Anwender
examine namespace to retrieve folders in others and shared mail de Den Namensraum untersuchen, um Ordner in anderen und gemeinsam genutzten Ordnern abzurufen examine namespace to retrieve folders in others and shared mail de Den Namensraum untersuchen, um Ordner in anderen und gemeinsam genutzten Ordnern abzurufen
exclude attachments greater than given size from automatic saving as draft (in mb) admin de Schließe Anhänge größer als die angegebene Größe vom automatischen Speichern als Entwurf aus (in MB)
extended mail de Erweitert extended mail de Erweitert
extra sent folders mail de Anzeigeschema Gesendet-Ordner extra sent folders mail de Anzeigeschema Gesendet-Ordner
failed to delete %1 mail de Löschen von %1 fehlgeschlagen failed to delete %1 mail de Löschen von %1 fehlgeschlagen

1
mail/lang/egw_en.lang
View File

@ -227,6 +227,7 @@ event details follow mail en Event details follow
every %1. day mail en Every %1. day every %1. day mail en Every %1. day
everyone mail en Everyone everyone mail en Everyone
examine namespace to retrieve folders in others and shared mail en Examine namespace to retrieve folders in others and shared examine namespace to retrieve folders in others and shared mail en Examine namespace to retrieve folders in others and shared
exclude attachments greater than given size from automatic saving as draft (in mb) admin en Exclude attachments greater than given size from automatic saving as draft (in MB)
extended mail en Extended extended mail en Extended
extra sent folders mail en Extra Sent Folders extra sent folders mail en Extra Sent Folders
failed to delete %1 mail en Failed to delete %1 failed to delete %1 mail en Failed to delete %1

4
mail/templates/default/config.xet
View File

@ -126,6 +126,10 @@
<et2-description value="Default value for remembering S/MIME passphrase in minutes"></et2-description> <et2-description value="Default value for remembering S/MIME passphrase in minutes"></et2-description>
<et2-textbox id="newsettings[smime_pass_exp]"></et2-textbox> <et2-textbox id="newsettings[smime_pass_exp]"></et2-textbox>
</row> </row>
<row>
<et2-description value="Exclude attachments greater than given size from automatic saving as draft (in MB)"></et2-description>
<et2-number id="newsettings[autosave_attachment_limit_mb]"></et2-number>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>