Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lolo888
ISPConfig 3
Commits
9db56726
Commit
9db56726
authored
Jun 07, 2012
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented: FS#2107 - Add option to disable mailbox quota statistics
parent
3560ade3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
1 deletion
+19
-1
install/tpl/server.ini.master
install/tpl/server.ini.master
+1
-0
interface/web/admin/form/server_config.tform.php
interface/web/admin/form/server_config.tform.php
+6
-0
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
+1
-0
interface/web/admin/templates/server_config_mail_edit.htm
interface/web/admin/templates/server_config_mail_edit.htm
+6
-0
server/mods-available/monitor_core_module.inc.php
server/mods-available/monitor_core_module.inc.php
+5
-1
No files found.
install/tpl/server.ini.master
View file @
9db56726
...
...
@@ -31,6 +31,7 @@ relayhost_user=
relayhost_password=
mailbox_size_limit=0
message_size_limit=0
mailbox_quota_stats=y
realtime_blackhole_list=
[getmail]
...
...
interface/web/admin/form/server_config.tform.php
View file @
9db56726
...
...
@@ -292,6 +292,12 @@ $form["tabs"]['mail'] = array(
'width'
=>
'10'
,
'maxlength'
=>
'15'
),
'mailbox_quota_stats'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'CHECKBOX'
,
'default'
=>
'y'
,
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
'realtime_blackhole_list'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
...
...
interface/web/admin/lib/lang/en_server_config.lng
View file @
9db56726
...
...
@@ -163,4 +163,5 @@ $wb["php_settings_txt"] = 'PHP Settings';
$wb
[
"apps_vhost_settings_txt"
]
=
'Apps Vhost Settings'
;
$wb
[
"awstats_settings_txt"
]
=
'AWStats Settings'
;
$wb
[
"firewall_txt"
]
=
'Firewall'
;
$wb
[
"mailbox_quota_stats_txt"
]
=
'Mailbox quota statistic'
;
?>
\ No newline at end of file
interface/web/admin/templates/server_config_mail_edit.htm
View file @
9db56726
...
...
@@ -71,6 +71,12 @@
<label
for=
"message_size_limit"
>
{tmpl_var name='message_size_limit_txt'}
</label>
<input
name=
"message_size_limit"
id=
"message_size_limit"
value=
"{tmpl_var name='message_size_limit'}"
size=
"10"
maxlength=
"15"
type=
"text"
class=
"textInput formLengthLimit"
/>
MB
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='mailbox_quota_stats_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='mailbox_quota_stats'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"realtime_blackhole_list"
>
{tmpl_var name='realtime_blackhole_list_txt'}
</label>
<input
name=
"realtime_blackhole_list"
id=
"realtime_blackhole_list"
value=
"{tmpl_var name='realtime_blackhole_list'}"
size=
"40"
maxlength=
"255"
type=
"text"
class=
"textInput"
/>
{tmpl_var name='realtime_blackhole_list_note_txt'}
...
...
server/mods-available/monitor_core_module.inc.php
View file @
9db56726
...
...
@@ -117,7 +117,7 @@ class monitor_core_module {
}
private
function
_monitorEmailQuota
()
{
global
$app
;
global
$app
,
$conf
;
/*
* This monitoring is expensive, so do it only every 15 minutes
...
...
@@ -125,6 +125,10 @@ class monitor_core_module {
$min
=
@
date
(
'i'
);
if
(
$min
%
15
!=
0
)
return
;
$app
->
uses
(
'getconf'
);
$mail_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'mail'
);
if
(
$mail_config
[
'mailbox_quota_stats'
]
==
'n'
)
return
;
/*
* First we get the Monitoring-data from the tools
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment