Skip to content
GitLab
Menu
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
6ae1c77d
Commit
6ae1c77d
authored
Aug 19, 2009
by
tbrehm
Browse files
Fixed: FS#847 - Database management issues.
parent
af756a1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/sites/database_edit.php
View file @
6ae1c77d
...
...
@@ -255,6 +255,9 @@ class page_action extends tform_actions {
}
}
unset
(
$old_record
);
if
(
strlen
(
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
])
>
64
)
$app
->
tform
->
errorMessage
.
=
str_replace
(
'{db}'
,
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
],
$app
->
tform
->
wordbook
[
"database_name_error_len"
])
.
'<br />'
;
if
(
strlen
(
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
])
>
16
)
$app
->
tform
->
errorMessage
.
=
str_replace
(
'{user}'
,
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
],
$app
->
tform
->
wordbook
[
"database_user_error_len"
])
.
'<br />'
;
if
(
$app
->
tform
->
errorMessage
==
''
){
/* restrict the names if there is no error */
...
...
@@ -278,11 +281,17 @@ class page_action extends tform_actions {
$global_config
=
$app
->
getconf
->
get_global_config
(
'sites'
);
$dbname_prefix
=
replacePrefix
(
$global_config
[
'dbname_prefix'
],
$this
->
dataRecord
);
$dbuser_prefix
=
replacePrefix
(
$global_config
[
'dbuser_prefix'
],
$this
->
dataRecord
);
if
(
strlen
(
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
])
>
64
)
$app
->
tform
->
errorMessage
.
=
str_replace
(
'{db}'
,
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
],
$app
->
tform
->
wordbook
[
"database_name_error_len"
])
.
'<br />'
;
if
(
strlen
(
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
])
>
16
)
$app
->
tform
->
errorMessage
.
=
str_replace
(
'{user}'
,
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
],
$app
->
tform
->
wordbook
[
"database_user_error_len"
])
.
'<br />'
;
/* restrict the names */
/* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */
$this
->
dataRecord
[
'database_name'
]
=
substr
(
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
],
0
,
64
);
$this
->
dataRecord
[
'database_user'
]
=
substr
(
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
],
0
,
16
);
if
(
$app
->
tform
->
errorMessage
==
''
){
$this
->
dataRecord
[
'database_name'
]
=
substr
(
$dbname_prefix
.
$this
->
dataRecord
[
'database_name'
],
0
,
64
);
$this
->
dataRecord
[
'database_user'
]
=
substr
(
$dbuser_prefix
.
$this
->
dataRecord
[
'database_user'
],
0
,
16
);
}
parent
::
onBeforeInsert
();
}
...
...
interface/web/sites/lib/lang/en_database.lng
View file @
6ae1c77d
...
...
@@ -20,4 +20,6 @@ $wb["database_user_error_regex"] = 'Invalid database user name. The username may
$wb
[
"limit_database_txt"
]
=
'The max. number of databases is reached.'
;
$wb
[
"database_name_change_txt"
]
=
'The database name can not be changed'
;
$wb
[
"database_charset_change_txt"
]
=
'The database charset can not be changed'
;
$wb
[
"database_name_error_len"
]
=
'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.'
;
$wb
[
"database_user_error_len"
]
=
'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.'
;
?>
Write
Preview
Supports
Markdown
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