extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: Make quota limit warning configurable

Browse Source 
- Fix dialog warning message
- Add Quota limit warning in mail site configuration
This commit is contained in:
Hadi Nategh 2017-04-18 17:48:16 +02:00
parent 6b294db3fc
commit 254ca19c2d
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
mail/js/app.js
View File

@ -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);
}

2
mail/lang/egw_de.lang
View File

@ -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.

2
mail/lang/egw_en.lang
View File

@ -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.

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

@ -81,6 +81,10 @@
<option value="True">Yes</option>
</select>
</row>
<row>
<description value="Quota limit warning in MegaByte (recommended value is 30 MB)."/>
<textbox id="newsettings[quota_limit_warning]"/>
</row>
</rows>
</grid>
</template>