Обьединение с namespace
This commit is contained in:
commit
8b38b2a3cc
90 changed files with 601 additions and 222 deletions
|
|
@ -3,7 +3,11 @@
|
|||
/**
|
||||
* Фильтр действий
|
||||
*/
|
||||
class Filter_ActionAccess
|
||||
namespace ctiso\Filter;
|
||||
use ctiso\Filter\UserAccess,
|
||||
ctiso\HttpRequest;
|
||||
|
||||
class ActionAccess
|
||||
{
|
||||
public $access = array();
|
||||
public $processor;
|
||||
|
|
@ -19,7 +23,7 @@ class Filter_ActionAccess
|
|||
*/
|
||||
function checkAction($action) {
|
||||
// Импликация !! http://ru.wikipedia.org/wiki/Импликация
|
||||
return (!isset($this->access[$action]) || in_array(Filter_UserAccess::$access, $this->access[$action]));
|
||||
return (!isset($this->access[$action]) || in_array(UserAccess::$access, $this->access[$action]));
|
||||
}
|
||||
|
||||
function execute(HttpRequest $request) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
<?php
|
||||
|
||||
class Filter_ActionLogger
|
||||
namespace ctiso\Filter;
|
||||
use ctiso\Shortcut,
|
||||
ctiso\HttpRequest,
|
||||
ctiso\Filter\UserAccess;
|
||||
|
||||
class ActionLogger
|
||||
{
|
||||
public $before = array();
|
||||
public $file;
|
||||
|
|
@ -15,7 +20,7 @@ class Filter_ActionLogger
|
|||
function execute(HttpRequest $request) {
|
||||
$action = $request->getAction();
|
||||
if(in_array($action, $this->before)) {
|
||||
fwrite($this->file, "time: " . date("r", time()) . " query: ". json_encode(array_merge($_POST, $_GET)) . " by: " . Filter_UserAccess::$name . "\n");
|
||||
fwrite($this->file, "time: " . date("r", time()) . " query: ". json_encode(array_merge($_POST, $_GET)) . " by: " . UserAccess::$name . "\n");
|
||||
}
|
||||
return $this->processor->execute($request);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?php
|
||||
|
||||
class Filter_Authorization {
|
||||
namespace ctiso\Filter;
|
||||
|
||||
class Authorization {
|
||||
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
|
||||
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@
|
|||
/**
|
||||
* Попытка реализовать фильтр для запросов
|
||||
*/
|
||||
class Filter_Filter
|
||||
namespace ctiso\Filter;
|
||||
use ctiso\HttpRequest;
|
||||
|
||||
class Filter
|
||||
{
|
||||
public $processor;
|
||||
public function __construct(/*.Controller_Action.*/$processor)
|
||||
|
|
|
|||
|
|
@ -8,11 +8,19 @@
|
|||
*/
|
||||
// В класс авторизации передавать обьект для управления пользователем
|
||||
// Вынести в отдельный файл
|
||||
class Filter_Login extends Filter_Filter
|
||||
namespace ctiso\Filter;
|
||||
use ctiso\Filter\Filter,
|
||||
ctiso\HttpRequest,
|
||||
ctiso\Settings,
|
||||
ctiso\Database,
|
||||
ctiso\Collection;
|
||||
|
||||
class Login extends Filter
|
||||
{
|
||||
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
|
||||
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
|
||||
public $mode = 'ajax';
|
||||
public $user;
|
||||
|
||||
function __construct($processor, $role, $whitelist = []) {
|
||||
parent::__construct($processor);
|
||||
|
|
@ -33,6 +41,7 @@ class Filter_Login extends Filter_Filter
|
|||
$login = $request->get('login');
|
||||
$password = $request->get('password');
|
||||
|
||||
|
||||
$result = $this->role->getUserByLogin($login); // Поиск по логину
|
||||
if ($result) {
|
||||
$userPassword = $this->role->getUserPassword($result);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue