github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed false positives

pull/841/head
TimZ99 2020-02-04 16:13:32 +01:00
parent 43ab8cb158
commit 99ef952a00
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/psm/Module/User/Controller/UserController.php
View File

@ -295,9 +295,11 @@ class UserController extends AbstractController
if ($user_id > 0) { if ($user_id > 0) {
// edit user // edit user
unset($clean['password']); // password update is executed separately unset($clean['password']); // password update is executed separately
$admins = $this->db->select(PSM_DB_PREFIX . 'users', array('level' => PSM_USER_ADMIN));
if ( if (
count($this->db->select(PSM_DB_PREFIX . 'users', array('level' => PSM_USER_ADMIN))) == 1 && (int) count($admins) === (int) 1 &&
$this->getUser()->getUserLevel() == PSM_USER_ADMIN (int) $admins[0]['user_id'] === (int) $user_id &&
(int) $clean['level'] === (int) PSM_USER_USER
) { ) {
$this->addMessage(psm_get_lang('users', 'error_user_admin_cant_be_deleted'), 'warning'); $this->addMessage(psm_get_lang('users', 'error_user_admin_cant_be_deleted'), 'warning');
$clean['level'] = PSM_USER_ADMIN; $clean['level'] = PSM_USER_ADMIN;
@ -352,7 +354,11 @@ class UserController extends AbstractController
try { try {
$this->container->get('util.user.validator')->userId($id); $this->container->get('util.user.validator')->userId($id);
if (count($this->db->select(PSM_DB_PREFIX . 'users', array('level' => PSM_USER_ADMIN))) == 1) { $admins = $this->db->select(PSM_DB_PREFIX . 'users', array('level' => PSM_USER_ADMIN));
if (
(int) count($admins) === (int) 1 &&
(int) $admins[0]['user_id'] === (int) $id
) {
$this->addMessage(psm_get_lang('users', 'error_user_admin_cant_be_deleted'), 'error'); $this->addMessage(psm_get_lang('users', 'error_user_admin_cant_be_deleted'), 'error');
} else { } else {
$this->db->delete(PSM_DB_PREFIX . 'users', array('user_id' => $id,)); $this->db->delete(PSM_DB_PREFIX . 'users', array('user_id' => $id,));