diff --git a/src/Database.php b/src/Database.php index cd196f8..0a8e103 100644 --- a/src/Database.php +++ b/src/Database.php @@ -1,7 +1,15 @@ -namespace ctiso; +namespace { + if(!function_exists('sqliteLower')){ + function sqliteLower($str) { + return mb_strtolower($str, 'UTF-8'); + } + } +} + +namespace ctiso { use PDO, ctiso\Database\Statement, ctiso\Database\IdGenerator; @@ -45,13 +53,7 @@ class Database extends PDO $connection->setAttribute(PDO::ATTR_TIMEOUT, 5); $mode = defined('SQLITE_JOURNAL_MODE') ? SQLITE_JOURNAL_MODE : 'WAL'; $connection->query("PRAGMA journal_mode=$mode"); - - if(!function_exists('sqliteLower')){ - function sqliteLower($str) { - return mb_strtolower($str, 'UTF-8'); - } - $connection->sqliteCreateFunction('LOWER', 'sqliteLower', 1); - } + $connection->sqliteCreateFunction('LOWER', 'sqliteLower', 1); } $connection->dsn = $dsn; return $connection; @@ -183,3 +185,4 @@ class Database extends PDO return null; } } +} \ No newline at end of file diff --git a/src/Role/User.php b/src/Role/User.php index 53dd441..d287543 100644 --- a/src/Role/User.php +++ b/src/Role/User.php @@ -1,6 +1,6 @@ db = $db; + $this->groups = $groups; } public function setDB(Database $db) { diff --git a/src/Tales.php b/src/Tales.php index 32b0533..c3f2155 100644 --- a/src/Tales.php +++ b/src/Tales.php @@ -8,9 +8,10 @@ use PHPTAL_Php_TalesInternal, ctiso\Controller\Site, ctiso\Controller\Component, ctiso\HttpRequest, + PHPTAL_Tales, PHPTAL_TalesRegistry; -class Tales_DateTime_ implements PHPTAL_Tales +class Tales_DateTime implements PHPTAL_Tales { static public function date($expression, $nothrow = false) { return "ctiso\\Tales::phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")"; @@ -68,8 +69,8 @@ class Tales { /* Регистрация нового префикса для подключения компонента */ $tales = PHPTAL_TalesRegistry::getInstance(); - $tales->registerPrefix('component', array('ctiso\\Component_Tales', 'component')); - $tales->registerPrefix('date', array('ctiso\\DateTime_Tales', 'date')); - $tales->registerPrefix('time', array('ctiso\\DateTime_Tales', 'time')); + $tales->registerPrefix('component', array('ctiso\\Tales_Component', 'component')); + $tales->registerPrefix('date', array('ctiso\\Tales_DateTime', 'date')); + $tales->registerPrefix('time', array('ctiso\\Tales_DateTime', 'time')); } }