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

Изменен механизм расширения ссылок. Избавление от глобальных переменных

Browse source
This commit is contained in:
CORP\phedor 2018-04-18 18:20:56 +03:00
parent 524b27936a
commit 40fad0e75b
11 changed files with 77 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Tales.php
View file

@ -14,11 +14,11 @@ use PHPTAL_Php_TalesInternal,
class Tales_DateTime implements PHPTAL_Tales
{
static public function date($expression, $nothrow = false) {
return "ctiso\\Tales::phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")";
return "ctiso\\Tales::phptal_date(".PHPTAL_Php_TalesInternal::path($expression).")";
}
static public function time($expression, $nothrow = false) {
return "ctiso\\Tales::phptal_time(".PHPTAL_Php_TalesInternal::path ($expression).")";
return "ctiso\\Tales::phptal_time(".PHPTAL_Php_TalesInternal::path($expression).")";
}
}
@ -32,8 +32,7 @@ class Tales_Component implements PHPTAL_Tales
}
class Tales {
static $db;
static $registry;
static $site;
static function phptal_date ($e) {
return date("d.m.Y", $e);
@ -50,11 +49,7 @@ class Tales {
$begin = floatval(microtime(true));
/*.Component.*/$component = null;
if (class_exists("ctiso\\Controller\\Site")) { //Если мы в CMS2
$component = Site::loadComponent($expression);
} else {
$component = Component::loadComponent($expression, self::$db, self::$registry);
}
$component = self::$site->loadComponent($expression);
$req = new HttpRequest();
$result = $component->execute($req);
@ -63,9 +58,8 @@ class Tales {
}
static function register($db, $registry) {
self::$db = $db;
self::$registry = $registry;
static function register($site) {
self::$site = $site;
/* Регистрация нового префикса для подключения компонента */
$tales = PHPTAL_TalesRegistry::getInstance();