Merge branch 'develop' into main
commit
8c404d8427
|
@ -7,6 +7,7 @@ use Cake\Utility\Text;
|
||||||
use Cake\ORM\TableRegistry;
|
use Cake\ORM\TableRegistry;
|
||||||
use \Cake\Database\Expression\QueryExpression;
|
use \Cake\Database\Expression\QueryExpression;
|
||||||
use Cake\Http\Exception\UnauthorizedException;
|
use Cake\Http\Exception\UnauthorizedException;
|
||||||
|
use Cake\Http\Exception\MethodNotAllowedException;
|
||||||
use Cake\Core\Configure;
|
use Cake\Core\Configure;
|
||||||
|
|
||||||
class UsersController extends AppController
|
class UsersController extends AppController
|
||||||
|
@ -100,11 +101,10 @@ class UsersController extends AppController
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
$id = $currentUser['id'];
|
$id = $currentUser['id'];
|
||||||
} else {
|
} else {
|
||||||
|
$id = intval($id);
|
||||||
if ((empty($currentUser['role']['perm_org_admin']) && empty($currentUser['role']['perm_admin']))) {
|
if ((empty($currentUser['role']['perm_org_admin']) && empty($currentUser['role']['perm_admin']))) {
|
||||||
if ($id !== $currentUser['id']) {
|
if ($id !== $currentUser['id']) {
|
||||||
throw new MethodNotAllowedException(__('You are not authorised to edit that user.'));
|
throw new MethodNotAllowedException(__('You are not authorised to edit that user.'));
|
||||||
} else {
|
|
||||||
$id = $currentUser['id'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue