Skip to content

Commit f414abd

Browse files
tbrehmtbrehm
committed
Added Limits for OpenVZ virtual servers in VM module.
1 parent f8442b3 commit f414abd

File tree

13 files changed

+186
-7
lines changed

13 files changed

+186
-7
lines changed

‎install/sql/incremental/upd_0017.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE `client_template` ADD `limit_openvz_vm` int(11) NOT NULL DEFAULT '0' AFTER `limit_mailmailinglist` ,
2+
ADD `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0' AFTER `limit_openvz_vm`;

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,31 @@
827827
'rows' => '',
828828
'cols' => ''
829829
),
830+
'limit_openvz_vm' => array (
831+
'datatype' => 'INTEGER',
832+
'formtype' => 'TEXT',
833+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
834+
'errmsg'=> 'limit_openvz_vm_error_notint'),
835+
),
836+
'default' => '0',
837+
'value' => '',
838+
'separator' => '',
839+
'width' => '10',
840+
'maxlength' => '10',
841+
'rows' => '',
842+
'cols' => ''
843+
),
844+
'limit_openvz_vm_template_id' => array (
845+
'datatype' => 'INTEGER',
846+
'formtype' => 'SELECT',
847+
'default' => '',
848+
'datasource' => array ( 'type' => 'SQL',
849+
'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE 1 ORDER BY template_name',
850+
'keyfield'=> 'template_id',
851+
'valuefield'=> 'template_name'
852+
),
853+
'value' => array(0 => ' ')
854+
),
830855
##################################
831856
# END Datatable fields
832857
##################################

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,31 @@
515515
'rows' => '',
516516
'cols' => ''
517517
),
518+
'limit_openvz_vm' => array (
519+
'datatype' => 'INTEGER',
520+
'formtype' => 'TEXT',
521+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
522+
'errmsg'=> 'limit_openvz_vm_error_notint'),
523+
),
524+
'default' => '0',
525+
'value' => '',
526+
'separator' => '',
527+
'width' => '10',
528+
'maxlength' => '10',
529+
'rows' => '',
530+
'cols' => ''
531+
),
532+
'limit_openvz_vm_template_id' => array (
533+
'datatype' => 'INTEGER',
534+
'formtype' => 'SELECT',
535+
'default' => '',
536+
'datasource' => array ( 'type' => 'SQL',
537+
'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE 1 ORDER BY template_name',
538+
'keyfield'=> 'template_id',
539+
'valuefield'=> 'template_name'
540+
),
541+
'value' => array(0 => ' ')
542+
),
518543
##################################
519544
# END Datatable fields
520545
##################################

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,31 @@
817817
'rows' => '',
818818
'cols' => ''
819819
),
820+
'limit_openvz_vm' => array (
821+
'datatype' => 'INTEGER',
822+
'formtype' => 'TEXT',
823+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
824+
'errmsg'=> 'limit_openvz_vm_error_notint'),
825+
),
826+
'default' => '0',
827+
'value' => '',
828+
'separator' => '',
829+
'width' => '10',
830+
'maxlength' => '10',
831+
'rows' => '',
832+
'cols' => ''
833+
),
834+
'limit_openvz_vm_template_id' => array (
835+
'datatype' => 'INTEGER',
836+
'formtype' => 'SELECT',
837+
'default' => '',
838+
'datasource' => array ( 'type' => 'SQL',
839+
'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE 1 ORDER BY template_name',
840+
'keyfield'=> 'template_id',
841+
'valuefield'=> 'template_name'
842+
),
843+
'value' => array(0 => ' ')
844+
),
820845
##################################
821846
# END Datatable fields
822847
##################################

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,7 @@ $wb["customer_no_txt"] = 'Customer No.';
104104
$wb["vat_id_txt"] = 'VAT ID';
105105
$wb["required_fields_txt"] = '* Required fields';
106106
$wb['company_id_txt'] = 'Company/Entrepreneur ID';
107+
$wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers';
108+
$wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
109+
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
107110
?>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,7 @@ $wb["limit_web_quota_txt"] = 'Web Quota';
6464
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';
6565
$wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
6666
$wb["template_del_aborted_txt"] = 'Delete aborted. There is still a client which has this template selected.';
67+
$wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers';
68+
$wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
69+
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
6770
?>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,7 @@ $wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
103103
$wb["customer_no_txt"] = 'Customer No.';
104104
$wb["vat_id_txt"] = 'VAT ID';
105105
$wb["required_fields_txt"] = '* Required fields';
106+
$wb["limit_openvz_vm_txt"] = 'Max. number of virtual servers';
107+
$wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
108+
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
106109
?>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,16 @@ <h2><tmpl_var name="list_head_txt"></h2>
189189
<label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
190190
<input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
191191
</div>
192+
<div class="ctrlHolder">
193+
<label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
194+
<input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
195+
</div>
196+
<div class="ctrlHolder">
197+
<label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
198+
<select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
199+
{tmpl_var name='limit_openvz_vm_template_id'}
200+
</select>
201+
</div>
192202
</fieldset>
193203

194204
<input type="hidden" name="id" value="{tmpl_var name='id'}">

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@ <h2><tmpl_var name="list_head_txt"></h2>
123123
<label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
124124
<input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
125125
</div>
126+
<div class="ctrlHolder">
127+
<label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
128+
<input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
129+
</div>
130+
<div class="ctrlHolder">
131+
<label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
132+
<select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
133+
{tmpl_var name='limit_openvz_vm_template_id'}
134+
</select>
135+
</div>
126136
</fieldset>
127137

128138
<input type="hidden" name="id" value="{tmpl_var name='id'}">

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,16 @@ <h2><tmpl_var name="list_head_txt"></h2>
182182
<label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
183183
<input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
184184
</div>
185+
<div class="ctrlHolder">
186+
<label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
187+
<input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
188+
</div>
189+
<div class="ctrlHolder">
190+
<label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
191+
<select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
192+
{tmpl_var name='limit_openvz_vm_template_id'}
193+
</select>
194+
</div>
185195
</fieldset>
186196

187197
<input type="hidden" name="id" value="{tmpl_var name='id'}">

0 commit comments

Comments
 (0)