Правки namespace

This commit is contained in:
CORP\phedor 2018-04-13 17:59:57 +03:00
parent ee06f1febb
commit 524b27936a
39 changed files with 141 additions and 120 deletions

View file

@ -12,7 +12,7 @@ class ActionAccess
public $access = array();
public $processor;
function __construct(/*.Filter_Filter.*/$processor) {
function __construct(/*.Filter.*/$processor) {
$this->processor = $processor;
}
@ -23,7 +23,7 @@ class ActionAccess
*/
function checkAction($action) {
// Импликация !! http://ru.wikipedia.org/wiki/Импликация
return (!isset($this->access[$action]) || in_array(UserAccess::$access, $this->access[$action]));
return (!isset($this->access[$action]) || in_array($this->user->access, $this->access[$action]));
}
function execute(HttpRequest $request) {

View file

@ -11,7 +11,7 @@ class ActionLogger
public $action;
public $processor;
function __construct(/*.Filter_Filter.*/$processor, $logPath, $user) {
function __construct(/*.Filter.*/$processor, $logPath, $user) {
$this->processor = $processor;
$this->user = $user;
$this->file = fopen($logPath, "a");

View file

@ -4,12 +4,14 @@
* Попытка реализовать фильтр для запросов
*/
namespace ctiso\Filter;
use ctiso\HttpRequest;
use ctiso\Controller\Action,
ctiso\HttpRequest;
class Filter
{
public $processor;
public function __construct(/*.Controller_Action.*/$processor)
public function __construct(/*.Action.*/$processor)
{
$this->processor = $processor;
}

View file

@ -19,8 +19,11 @@ class Login extends Filter
{
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
public $mode = 'ajax';
public $user;
public $role;
public $whitelist;
function __construct($processor, $role, $whitelist = []) {
parent::__construct($processor);
@ -63,7 +66,7 @@ class Login extends Filter
if ($result) {
$temp = md5($result->getString('password') . $result->getString('login') . $result->getString('sid'));
if ($password == $temp) {
$this->enter($db, $result);
$this->enter($result);
return true;
}
}