Skip to content

Commit 4a54265

Browse files
tbrehmtbrehm
committed
Implemented: FS#851 - Add client wide website quota (group quota)
1 parent 1d8123a commit 4a54265

File tree

12 files changed

+76
-1
lines changed

12 files changed

+76
-1
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ CREATE TABLE `client` (
8282
`default_webserver` int(11) unsigned NOT NULL default '1',
8383
`limit_web_ip` text,
8484
`limit_web_domain` int(11) NOT NULL default '-1',
85+
`limit_web_quota` int(11) NOT NULL default '-1',
8586
`web_php_options` varchar(255) NOT NULL default 'no,fast-cgi,cgi,mod,suphp',
8687
`limit_web_subdomain` int(11) NOT NULL default '-1',
8788
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
@@ -138,6 +139,7 @@ CREATE TABLE `client_template` (
138139
`limit_spamfilter_policy` int(11) NOT NULL default '0',
139140
`limit_web_ip` text,
140141
`limit_web_domain` int(11) NOT NULL default '-1',
142+
`limit_web_quota` int(11) NOT NULL default '-1',
141143
`limit_web_subdomain` int(11) NOT NULL default '-1',
142144
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
143145
`limit_ftp_user` int(11) NOT NULL default '-1',

‎interface/web/client/form/client.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,20 @@
529529
'rows' => '',
530530
'cols' => ''
531531
),
532+
'limit_web_quota' => array (
533+
'datatype' => 'INTEGER',
534+
'formtype' => 'TEXT',
535+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
536+
'errmsg'=> 'limit_web_quota_error_notint'),
537+
),
538+
'default' => '-1',
539+
'value' => '',
540+
'separator' => '',
541+
'width' => '10',
542+
'maxlength' => '10',
543+
'rows' => '',
544+
'cols' => ''
545+
),
532546
'web_php_options' => array (
533547
'datatype' => 'VARCHAR',
534548
'formtype' => 'CHECKBOXARRAY',

‎interface/web/client/form/client_template.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,20 @@
297297
'rows' => '',
298298
'cols' => ''
299299
),
300+
'limit_web_quota' => array (
301+
'datatype' => 'INTEGER',
302+
'formtype' => 'TEXT',
303+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
304+
'errmsg'=> 'limit_web_quota_error_notint'),
305+
),
306+
'default' => '-1',
307+
'value' => '',
308+
'separator' => '',
309+
'width' => '10',
310+
'maxlength' => '10',
311+
'rows' => '',
312+
'cols' => ''
313+
),
300314
'limit_web_aliasdomain' => array (
301315
'datatype' => 'INTEGER',
302316
'formtype' => 'TEXT',

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,20 @@
515515
'rows' => '',
516516
'cols' => ''
517517
),
518+
'limit_web_quota' => array (
519+
'datatype' => 'INTEGER',
520+
'formtype' => 'TEXT',
521+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
522+
'errmsg'=> 'limit_web_quota_error_notint'),
523+
),
524+
'default' => '-1',
525+
'value' => '',
526+
'separator' => '',
527+
'width' => '10',
528+
'maxlength' => '10',
529+
'rows' => '',
530+
'cols' => ''
531+
),
518532
'web_php_options' => array (
519533
'datatype' => 'VARCHAR',
520534
'formtype' => 'CHECKBOXARRAY',

‎interface/web/client/lib/lang/en_client.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,5 @@ $wb["template_additional_txt"] = 'Addon template';
9191
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
9292
$wb["web_php_options_txt"] = 'PHP Options';
9393
$wb["limit_client_error"] = 'The max. number of clients is reached.';
94+
$wb["limit_web_quota_txt"] = 'Web Quota';
9495
?>

‎interface/web/client/lib/lang/en_client_template.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ $wb["limit_database_error_notint"] = 'The database limit must be a number.';
5454
$wb["limit_cron_error_notint"] = 'The cron limit must be a number.';
5555
$wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.';
5656
$wb["error_template_name_empty"] = 'Please enter a Template name';
57+
$wb["limit_web_quota_txt"] = 'Web Quota';
5758
?>

‎interface/web/client/lib/lang/en_reseller.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,5 @@ $wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
9090
$wb["web_php_options_txt"] = 'PHP Options';
9191
$wb["limit_client_error"] = 'The max. number of clients is reached.';
9292
$wb["limit_client_error_positive"] = 'The number of clients must be > 0';
93+
$wb["limit_web_quota_txt"] = 'Web Quota';
9394
?>

‎interface/web/client/templates/client_edit_limits.htm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
103103
<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
104104
<input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
105105
</div>
106+
<div class="ctrlHolder">
107+
<label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
108+
<input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
109+
</div>
106110
<div class="ctrlHolder">
107111
<p class="label">{tmpl_var name='web_php_options_txt'}</p>
108112
<div class="multiField">

‎interface/web/client/templates/client_template_edit_limits.htm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
6161
<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
6262
<input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
6363
</div>
64+
<div class="ctrlHolder">
65+
<label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
66+
<input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
67+
</div>
6468
<div class="ctrlHolder">
6569
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
6670
<input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />

‎interface/web/client/templates/reseller_edit_limits.htm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
8888
<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
8989
<input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
9090
</div>
91+
<div class="ctrlHolder">
92+
<label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
93+
<input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
94+
</div>
9195
<div class="ctrlHolder">
9296
<p class="label">{tmpl_var name='web_php_options_txt'}</p>
9397
<div class="multiField">

0 commit comments

Comments
 (0)