Skip to content

Commit 856a3fd

Browse files
author
Marius Burkard
committed
Merge branch 'master' into 'stable-3.1'
 Master Closes #2586 See merge request !285
2 parents 4fa79cf + 2527d26 commit 856a3fd

File tree

81 files changed

+243
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+243
-0
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,7 @@ ALTER TABLE `sys_user`
222222
ADD COLUMN `lost_password_reqtime` DATETIME NULL default NULL;
223223

224224
ALTER TABLE `web_database` ADD COLUMN `quota_exceeded` enum('n','y') NOT NULL DEFAULT 'n' AFTER `database_quota`;
225+
226+
ALTER TABLE `client` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
227+
ALTER TABLE `client_template` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
228+

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ CREATE TABLE `client` (
230230
`default_dbserver` int(11) NOT NULL DEFAULT '1',
231231
`dns_servers` blob,
232232
`limit_database` int(11) NOT NULL DEFAULT '-1',
233+
`limit_database_user` int(11) NOT NULL DEFAULT '-1',
233234
`limit_database_quota` int(11) NOT NULL default '-1',
234235
`limit_cron` int(11) NOT NULL DEFAULT '0',
235236
`limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url',
@@ -351,6 +352,7 @@ CREATE TABLE `client_template` (
351352
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
352353
`limit_dns_record` int(11) NOT NULL default '-1',
353354
`limit_database` int(11) NOT NULL default '-1',
355+
`limit_database_user` int(11) NOT NULL DEFAULT '-1',
354356
`limit_database_quota` int(11) NOT NULL default '-1',
355357
`limit_cron` int(11) NOT NULL default '0',
356358
`limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,20 @@
12621262
'rows' => '',
12631263
'cols' => ''
12641264
),
1265+
'limit_database_user' => array (
1266+
'datatype' => 'INTEGER',
1267+
'formtype' => 'TEXT',
1268+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
1269+
'errmsg'=> 'limit_database_user_notint'),
1270+
),
1271+
'default' => '-1',
1272+
'value' => '',
1273+
'separator' => '',
1274+
'width' => '10',
1275+
'maxlength' => '10',
1276+
'rows' => '',
1277+
'cols' => ''
1278+
),
12651279
'limit_database_quota' => array (
12661280
'datatype' => 'INTEGER',
12671281
'formtype' => 'TEXT',

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,20 @@
729729
'rows' => '',
730730
'cols' => ''
731731
),
732+
'limit_database_user' => array (
733+
'datatype' => 'INTEGER',
734+
'formtype' => 'TEXT',
735+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
736+
'errmsg'=> 'limit_database_user_error_notint'),
737+
),
738+
'default' => '0',
739+
'value' => '',
740+
'separator' => '',
741+
'width' => '10',
742+
'maxlength' => '10',
743+
'rows' => '',
744+
'cols' => ''
745+
),
732746
'limit_database_quota' => array (
733747
'datatype' => 'INTEGER',
734748
'formtype' => 'TEXT',

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,20 @@
12611261
'rows' => '',
12621262
'cols' => ''
12631263
),
1264+
'limit_database_user' => array (
1265+
'datatype' => 'INTEGER',
1266+
'formtype' => 'TEXT',
1267+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
1268+
'errmsg'=> 'limit_database_user_error_notint'),
1269+
),
1270+
'default' => '-1',
1271+
'value' => '',
1272+
'separator' => '',
1273+
'width' => '10',
1274+
'maxlength' => '10',
1275+
'rows' => '',
1276+
'cols' => ''
1277+
),
12641278
'limit_cron' => array (
12651279
'datatype' => 'INTEGER',
12661280
'formtype' => 'TEXT',

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
194194
$wb['btn_save_txt'] = 'Save';
195195
$wb['btn_cancel_txt'] = 'Cancel';
196196
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
197+
$wb['limit_database_user_txt'] = 'Max. Database users';
198+
$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.';
197199
?>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
196196
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
197197
$wb['limit_xmpp_status_txt'] = 'Status host available';
198198
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
199+
$wb['limit_database_user_txt'] = 'Max. Database users';
200+
$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.';
201+
$wb['limit_database_quota_txt'] = 'Database quota';
202+
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
199203
?>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
194194
$wb['btn_save_txt'] = 'Save';
195195
$wb['btn_cancel_txt'] = 'Cancel';
196196
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
197+
$wb['limit_database_user_txt'] = 'Max. Database users';
198+
$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.';
197199
?>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
196196
$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
197197
$wb['limit_xmpp_status_txt'] = 'Status host available';
198198
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
199+
$wb['limit_database_user_txt'] = 'Max. Database users';
200+
$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.';
201+
$wb['limit_database_quota_txt'] = 'Database quota';
202+
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
199203
?>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
194194
$wb['btn_save_txt'] = 'Save';
195195
$wb['btn_cancel_txt'] = 'Cancel';
196196
$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
197+
$wb['limit_database_user_txt'] = 'Max. Database users';
198+
$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.';
197199
?>

0 commit comments

Comments
 (0)