|
|
@@ -260,7 +260,7 @@ class SecurityComponent extends Component
|
|
|
$request = $controller->request;
|
|
|
if (is_array($this->_config['requireAuth']) &&
|
|
|
!empty($this->_config['requireAuth']) &&
|
|
|
- $request->data()
|
|
|
+ $request->getData()
|
|
|
) {
|
|
|
$requireAuth = $this->_config['requireAuth'];
|
|
|
|
|
|
@@ -273,23 +273,23 @@ class SecurityComponent extends Component
|
|
|
$tData = $this->session->read('_Token');
|
|
|
|
|
|
if (!empty($tData['allowedControllers']) &&
|
|
|
- !in_array($request->param('controller'), $tData['allowedControllers'])) {
|
|
|
+ !in_array($request->getParam('controller'), $tData['allowedControllers'])) {
|
|
|
throw new AuthSecurityException(
|
|
|
sprintf(
|
|
|
'Controller \'%s\' was not found in allowed controllers: \'%s\'.',
|
|
|
- $request->param('controller'),
|
|
|
+ $request->getParam('controller'),
|
|
|
implode(', ', (array)$tData['allowedControllers'])
|
|
|
)
|
|
|
);
|
|
|
}
|
|
|
if (!empty($tData['allowedActions']) &&
|
|
|
- !in_array($request->param('action'), $tData['allowedActions'])
|
|
|
+ !in_array($request->getParam('action'), $tData['allowedActions'])
|
|
|
) {
|
|
|
throw new AuthSecurityException(
|
|
|
sprintf(
|
|
|
'Action \'%s::%s\' was not found in allowed actions: \'%s\'.',
|
|
|
- $request->param('controller'),
|
|
|
- $request->param('action'),
|
|
|
+ $request->getParam('controller'),
|
|
|
+ $request->getParam('action'),
|
|
|
implode(', ', (array)$tData['allowedActions'])
|
|
|
)
|
|
|
);
|
|
|
@@ -312,7 +312,7 @@ class SecurityComponent extends Component
|
|
|
*/
|
|
|
protected function _validatePost(Controller $controller)
|
|
|
{
|
|
|
- if (!$controller->request->data()) {
|
|
|
+ if (!$controller->request->getData()) {
|
|
|
return true;
|
|
|
}
|
|
|
$token = $this->_validToken($controller);
|
|
|
@@ -375,8 +375,8 @@ class SecurityComponent extends Component
|
|
|
*/
|
|
|
protected function _hashParts(Controller $controller)
|
|
|
{
|
|
|
- $fieldList = $this->_fieldsList($controller->request->data());
|
|
|
- $unlocked = $this->_sortedUnlocked($controller->request->data());
|
|
|
+ $fieldList = $this->_fieldsList($controller->request->getData());
|
|
|
+ $unlocked = $this->_sortedUnlocked($controller->request->getData());
|
|
|
|
|
|
return [
|
|
|
$controller->request->here(),
|