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
Webslice
ISPConfig 3
Commits
132df214
Commit
132df214
authored
Jan 23, 2014
by
Till Brehm
Browse files
Prevent that the type of a sys_user that belongs to a client or reseller can be changed to admin.
parent
08462d0f
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/admin/lib/lang/en_users.lng
View file @
132df214
...
...
@@ -30,4 +30,5 @@ $wb['repeat_password_txt'] = 'Repeat Password';
$wb
[
'password_mismatch_txt'
]
=
'The passwords do not match.'
;
$wb
[
'password_match_txt'
]
=
'The passwords do match.'
;
$wb
[
'username_error_collision'
]
=
'The username may not be web or web plus a number."'
;
$wb
[
'client_not_admin_err'
]
=
'A user that belongs to a client can not be set to type: admin'
;
?>
interface/web/admin/users_edit.php
View file @
132df214
...
...
@@ -66,7 +66,14 @@ class page_action extends tform_actions {
if
(
@
is_array
(
$this
->
dataRecord
[
'modules'
])
&&
!
in_array
(
$this
->
dataRecord
[
'startmodule'
],
$this
->
dataRecord
[
'modules'
]))
{
$app
->
tform
->
errorMessage
.
=
$app
->
tform
->
wordbook
[
'startmodule_err'
];
}
$this
->
oldDataRecord
=
$app
->
tform
->
getDataRecord
(
$this
->
id
);
//* A user that belongs to a client record (client or reseller) may not have typ admin
if
(
isset
(
$this
->
dataRecord
[
'typ'
])
&&
$this
->
dataRecord
[
'typ'
][
0
]
==
'admin'
&&
$this
->
oldDataRecord
[
'client_id'
]
>
0
)
{
$app
->
tform
->
errorMessage
.
=
$app
->
tform
->
wordbook
[
'client_not_admin_err'
];
}
}
/*
...
...
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