libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Поправил namespace

Browse source
This commit is contained in:
CORP\phedor 2018-04-03 14:35:20 +03:00
parent bef7165777
commit ee06f1febb
4 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Controller/Action.php
View file

@ -4,6 +4,7 @@ namespace ctiso\Controller;
use ctiso\Shortcut,
Exception,
ctiso\Path,
ctiso\Url,
ctiso\View\View,
ctiso\Model\Factory,
ctiso\HttpRequest,
@ -11,14 +12,6 @@ use ctiso\Shortcut,
ctiso\Settings,
ctiso\Controller\State;
function forceUrl($name)
{
if (is_callable($name)) {
return call_user_func($name);
}
return $name;
}
/**
* Контроллер страниц
*/
@ -158,7 +151,7 @@ class Action
public function getModel($name)
{
if (!$this->factory) {
$this->factory = new Factory($this->db, $this->_registry);
$this->factory = new Factory($this->db, $this->settings['registry']);
}
return $this->factory->getModel($name);
}
@ -170,7 +163,7 @@ class Action
* 2. Использовать наследование чтобы добавить к старому обработчику новое поведение
* @param $request Обьект запроса
*/
public function preprocess(HttpRequest $request)
public function preProcess(HttpRequest $request)
{
$action = self::ACTION_PREFIX . ucfirst($request->getAction());
if (!method_exists($this, $action)) {
@ -186,7 +179,7 @@ class Action
public function execute(HttpRequest $request)
{
$result = $this->preprocess($request);
$result = $this->preProcess($request);
if (!empty($result)) {
$this->view = $result;
}
@ -206,15 +199,6 @@ class Action
return "";
}
public function postUrl($name, $param)
{
$uri = array_merge(array('module' =>
strtr($this->modulePrefix . strtolower(get_class($this)), array('module_' => '')), "action" => $name),
$this->param, $param);
return "?" . http_build_query($uri);
}
/**
* Генерация ссылки c учетом прав пользователя на ссылки
* @param string $name Действие
@ -227,24 +211,14 @@ class Action
/*.Filter_ActionAccess.*/$access = $this->access;
if ($access == null || $access->checkAction($name)) {
return Functions::lcurry(array($this, 'postUrl'), $name, $param);
}
return null;
}
$param = array_merge(array(
'module' => strtr($this->modulePrefix . strtolower(get_class($this)), array('module_' => '')),
"action" => $name
), $param);
public function fUrl($name, array $param = array())
{
return forceUrl($this->nUrl($name, $param));
}
/**
* Добавляет параметр для всех ссылок создаваемых функцией nUrl, aUrl
*/
public function addParameter($name, $value)
{
if ($value) {
$this->param [$name] = $value;
return new Url($param);
}
return new Url();
}
/**
@ -259,7 +233,7 @@ class Action
*/
public function aUrl($name, array $param = array())
{
return $this->nUrl($name, array_merge(array('mode' => 'ajax'), $param)); // FIXME
return $this->nUrl($name, array_merge(array('mode' => 'ajax'), $param));
}
/**