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

Merge branch 'dev' of http://gitlab.edu.yar.ru/composer/PHP_library

Browse source
This commit is contained in:
Anatoly 2017-11-30 10:59:54 +03:00
commit b45c7e9a58
4 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Controller/Component.php
View file

@ -260,10 +260,16 @@ class Controller_Component
$component->parameter = $params; $component->parameter = $params;
$component->template = $params->get('template', false); $component->template = $params->get('template', false);
global $componentsConfig;
$editor = $component->getEditUrl(); $editor = $component->getEditUrl();
if ($editor) { if ($editor) {
$componentsConfig[] = $editor; if(class_exists("Controller_Site")){ //Если мы в CMS2
$instance = Controller_Site::getInstance();
$instance->componentsConfig[] = $editor;
}else{
global $componentsConfig;
$componentsConfig[] = $editor;
}
} }
return $component; return $component;
@ -308,6 +314,10 @@ class Controller_Component
return '?' . http_build_query($arr); return '?' . http_build_query($arr);
} }
/**
* @deprecated В CMS2 перенесено в контроллер сайта!
*/
function addRequireJsPath($name, $path, $shim = null) { function addRequireJsPath($name, $path, $shim = null) {
Controller_Site::addRequireJsPath($name, $path, $shim); Controller_Site::addRequireJsPath($name, $path, $shim);
} }

3
src/Filter/ActionAccess.php
View file

@ -26,7 +26,8 @@ class Filter_ActionAccess
$action = $request->getAction(); $action = $request->getAction();
if(! $this->checkAction($action)) { if(! $this->checkAction($action)) {
$request->set('action', 'index'); $request->set('action', 'index');
} $request->setAction('index');
}
return $this->processor->execute($request); return $this->processor->execute($request);
} }
} }

12
src/View/Page.php
View file

@ -49,10 +49,14 @@ class View_Page extends View_View
{ {
//$result = phptal_component($match, $offset); //$result = phptal_component($match, $offset);
//*
global $db, $registry; // Нужно как-то передавать параметры if(class_exists("Controller_Site")){ //Если мы в CMS2
$component = Controller_Site::loadComponent($match);
$component = Controller_Component::loadComponent($match, $db, $registry); }else{
global $db, $registry; //
$component = Controller_Component::loadComponent($match, $db, $registry);
}
$req = new HttpRequest(); $req = new HttpRequest();
unset($req['active_page']); unset($req['active_page']);

10
src/tales.php
View file

@ -45,10 +45,14 @@ function phptal_time ($e)
* Функция подключения компонента * Функция подключения компонента
*/ */
function phptal_component ($expression) { function phptal_component ($expression) {
global $db, $registry; // Нужно как-то передавать параметры
$begin = microtime(true); $begin = microtime(true);
$component = Controller_Component::loadComponent($expression, $db, $registry);
if(class_exists("Controller_Site")){ //Если мы в CMS2
$component = Controller_Site::loadComponent($expression);
}else{
global $db, $registry; // Иначе обращаемся к глобальным переменным
$component = Controller_Component::loadComponent($expression, $db, $registry);
}
$req = new HttpRequest(); $req = new HttpRequest();
$result = $component->execute($req); $result = $component->execute($req);