Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
7e2a3fa2
Commit
7e2a3fa2
authored
Feb 21, 2016
by
Florian Schaal
Browse files
Add DB-User limit (Issue #2586)
parent
c74c6544
Changes
81
Hide whitespace changes
Inline
Side-by-side
install/sql/incremental/upd_dev_collection.sql
View file @
7e2a3fa2
...
...
@@ -222,3 +222,7 @@ ALTER TABLE `sys_user`
ADD
COLUMN
`lost_password_reqtime`
DATETIME
NULL
default
NULL
;
ALTER
TABLE
`web_database`
ADD
COLUMN
`quota_exceeded`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`database_quota`
;
ALTER
TABLE
`client`
ADD
COLUMN
`limit_database_users`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
after
limit_database
;
ALTER
TABLE
`client_template`
ADD
COLUMN
`limit_database_users`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
after
limit_database
;
install/sql/ispconfig3.sql
View file @
7e2a3fa2
...
...
@@ -230,6 +230,7 @@ CREATE TABLE `client` (
`default_dbserver`
int
(
11
)
NOT
NULL
DEFAULT
'1'
,
`dns_servers`
blob
,
`limit_database`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`limit_database_users`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`limit_database_quota`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_cron`
int
(
11
)
NOT
NULL
DEFAULT
'0'
,
`limit_cron_type`
enum
(
'url'
,
'chrooted'
,
'full'
)
NOT
NULL
DEFAULT
'url'
,
...
...
@@ -351,6 +352,7 @@ CREATE TABLE `client_template` (
`limit_dns_slave_zone`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_dns_record`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_database`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_database_users`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`limit_database_quota`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_cron`
int
(
11
)
NOT
NULL
default
'0'
,
`limit_cron_type`
enum
(
'url'
,
'chrooted'
,
'full'
)
NOT
NULL
default
'url'
,
...
...
interface/web/client/form/client.tform.php
View file @
7e2a3fa2
...
...
@@ -1262,6 +1262,20 @@ $form["tabs"]['limits'] = array (
'rows'
=>
''
,
'cols'
=>
''
),
'limit_database_user'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISINT'
,
'errmsg'
=>
'limit_database_user_notint'
),
),
'default'
=>
'-1'
,
'value'
=>
''
,
'separator'
=>
''
,
'width'
=>
'10'
,
'maxlength'
=>
'10'
,
'rows'
=>
''
,
'cols'
=>
''
),
'limit_database_quota'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
...
...
interface/web/client/form/client_template.tform.php
View file @
7e2a3fa2
...
...
@@ -729,6 +729,20 @@ $form["tabs"]['limits'] = array (
'rows'
=>
''
,
'cols'
=>
''
),
'limit_database_user'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISINT'
,
'errmsg'
=>
'limit_database_user_error_notint'
),
),
'default'
=>
'0'
,
'value'
=>
''
,
'separator'
=>
''
,
'width'
=>
'10'
,
'maxlength'
=>
'10'
,
'rows'
=>
''
,
'cols'
=>
''
),
'limit_database_quota'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
...
...
interface/web/client/form/reseller.tform.php
View file @
7e2a3fa2
...
...
@@ -1261,6 +1261,20 @@ $form["tabs"]['limits'] = array (
'rows'
=>
''
,
'cols'
=>
''
),
'limit_database_user'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISINT'
,
'errmsg'
=>
'limit_database_user_error_notint'
),
),
'default'
=>
'-1'
,
'value'
=>
''
,
'separator'
=>
''
,
'width'
=>
'10'
,
'maxlength'
=>
'10'
,
'rows'
=>
''
,
'cols'
=>
''
),
'limit_cron'
=>
array
(
'datatype'
=>
'INTEGER'
,
'formtype'
=>
'TEXT'
,
...
...
interface/web/client/lib/lang/ar_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/ar_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/bg_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/bg_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/br_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/br_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/ca_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['btn_save_txt'] = 'Save';
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'email_error_empty'
]
=
'Email is empty'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/ca_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'email_error_empty'
]
=
'Email is empty'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/cz_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/cz_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/de_client.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,6 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'limit_directive_snippets_txt'
]
=
'Webserver-Konfigurationsauswahl sichtbar'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/de_reseller.lng
View file @
7e2a3fa2
...
...
@@ -198,4 +198,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'limit_directive_snippets_txt'
]
=
'Webserver-Konfigurationsauswahl sichtbar'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/el_client.lng
View file @
7e2a3fa2
...
...
@@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller';
$wb
[
'btn_save_txt'
]
=
'Save'
;
$wb
[
'btn_cancel_txt'
]
=
'Cancel'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
?>
interface/web/client/lib/lang/el_reseller.lng
View file @
7e2a3fa2
...
...
@@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
$wb
[
'limit_xmpp_proxy_txt'
]
=
'Bytestream proxy available'
;
$wb
[
'limit_xmpp_status_txt'
]
=
'Status host available'
;
$wb
[
'invalid_vat_id'
]
=
'The VAT ID is invalid.'
;
$wb
[
'limit_database_user_txt'
]
=
'Max. Database users'
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
?>
interface/web/client/lib/lang/en_client.lng
View file @
7e2a3fa2
...
...
@@ -196,6 +196,9 @@ $wb['parent_client_id_txt'] = 'Client of reseller';
$wb
[
'none_txt'
]
=
'none'
;
$wb
[
'limit_database_quota_txt'
]
=
'Database quota'
;
$wb
[
'limit_database_quota_error_notint'
]
=
'The database quota limit must be a number.'
;
$wb
[
'limit_database_user_txt'
]
=
"Max. Database users"
;
$wb
[
'limit_database_user_error_notint'
]
=
'The database user limit must be a number.'
;
$wb
[
'reseller_txt'
]
=
'Reseller'
;
$wb
[
'btn_save_txt'
]
=
"Save"
;
$wb
[
'btn_cancel_txt'
]
=
"Cancel"
;
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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