From 254ca19c2d693c5ad5f1842588bc963e8988fb9d Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 18 Apr 2017 17:48:16 +0200 Subject: [PATCH] * Mail: Make quota limit warning configurable - Fix dialog warning message - Add Quota limit warning in mail site configuration --- mail/inc/class.mail_ui.inc.php | 6 ++++-- mail/js/app.js | 2 +- mail/lang/egw_de.lang | 2 +- mail/lang/egw_en.lang | 2 +- mail/templates/default/config.xet | 4 ++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index daf10362f3..c35e81e035 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -4490,14 +4490,16 @@ $filter['before']= date("d-M-Y", $cutoffdate2); if($quota !== false && $quota['limit'] != 'NOT SET') { $quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']); - $quotaMin = $quotainfo['freespace']/pow(1024, 2); + $quotaMin = ceil($quotainfo['freespace']/pow(1024, 2)); + $quota_limit_warning = isset(mail::$mailConfig['quota_limit_warning']) ? mail::$mailConfig['quota_limit_warning'] : 30; $content = array ( 'quota' => $quotainfo['text'], 'quotainpercent' => (string)$quotainfo['percent'], 'quotaclass' => $quotainfo['class'], 'quotanotsupported' => "", 'profileid' => $icServerID, - 'quotawarning' => $quotaMin < 30 ? true : false + 'quotawarning' => $quotaMin < $quota_limit_warning ? true : false, + 'quotafreespace' => Mail::show_readable_size($quotainfo['freespace']) ); } else diff --git a/mail/js/app.js b/mail/js/app.js index f29d96ae9f..249e88c0c5 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -1263,7 +1263,7 @@ app.classes.mail = AppJS.extend( } return; }, - this.egw.lang("Your mail quota is %1% full, you may not be able to send/receive further emails.\n Although cleaning up emails in trash or junk folder might help you to get some free space back.\n If that didn't help, please ask administrator for more quota.", _data.data.quotainpercent), + this.egw.lang("Your remaining quota %1 is too low, you may not be able to send/receive further emails.\n Although cleaning up emails in trash or junk folder might help you to get some free space back.\n If that didn't help, please ask your administrator for more quota.", _data.data.quotafreespace), this.egw.lang("Mail cleanup"), '', buttons, et2_dialog.WARNING_MESSAGE); } diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index b3977d124b..0127838b19 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -569,4 +569,4 @@ you need to install mailvelope plugin available for chrome and firefox from %1. you need to save the message as draft first before to be able to save it into vfs mail de Sie müssen die E-Mail zuerst als Entwurf speichern, bevor Sie die Mail im EGroupware Dateimanager speichern können. you will loose current message body, unless you save it to your clipboard! mail de Sie werden Ihren aktuellen Nachrichtentext verlieren, sofern Sie ihn nicht in der Zwischenablage speichern! you've got new mail mail de Sie haben neue E-Mails -your mail quota is %1% full, you may not be able to send/receive further emails.\n although cleaning up emails in trash or junk folder might help you to get some free space back.\n if that didn't help, please ask administrator for more quota. mail de Ihre Mailbox ist zu 99% gefüllt. damit können Sie u.U. weder Mails senden noch empfangen!\n Bitte ggf. Papierkorb und Spam Ordner leeren, um Platz zu schaffen.\n Wenn das nicht ausreicht, fragen Sie bitte Ihren Administrator nach einer höheren Quota für ihr Postfach. +your remaining quota %1 is too low, you may not be able to send/receive further emails.\n although cleaning up emails in trash or junk folder might help you to get some free space back.\n if that didn't help, please ask your administrator for more quota. mail de Ihre restliche Quota %1 ist zu niedrig. damit können Sie u.U. weder Mails senden noch empfangen!\n Bitte ggf. Papierkorb und Spam Ordner leeren, um Platz zu schaffen.\n Wenn das nicht ausreicht, fragen Sie bitte Ihren Administrator nach einer höheren Quota für ihr Postfach. diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 2ec37a9939..9e3fd31453 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -568,4 +568,4 @@ you need to install mailvelope plugin available for chrome and firefox from %1. you need to save the message as draft first before to be able to save it into vfs mail en You need to save the message as draft first before to be able to save it into VFS you will loose current message body, unless you save it to your clipboard! mail en You will loose current message body, unless you save it to your clipboard! you've got new mail mail en You've got new mail -your mail quota is %1% full, you may not be able to send/receive further emails.\n although cleaning up emails in trash or junk folder might help you to get some free space back.\n if that didn't help, please ask administrator for more quota. mail en Your mail quota is %1% full, you may not be able to send/receive further emails.\n Although cleaning up emails in trash or junk folder might help you to get some free space back.\n If that didn't help, please ask administrator for more quota. +your remaining quota %1 is too low, you may not be able to send/receive further emails.\n although cleaning up emails in trash or junk folder might help you to get some free space back.\n if that didn't help, please ask your administrator for more quota. mail en Your remaining quota %1 is too low, you may not be able to send/receive further emails.\n Although cleaning up emails in trash or junk folder might help you to get some free space back.\n If that didn't help, please ask your administrator for more quota. diff --git a/mail/templates/default/config.xet b/mail/templates/default/config.xet index 6fbc5bab89..54e7906ddc 100644 --- a/mail/templates/default/config.xet +++ b/mail/templates/default/config.xet @@ -81,6 +81,10 @@ + + + +