From 0b66a724846f85fd10c73d5a07e0563b1f8da8c1 Mon Sep 17 00:00:00 2001
From: "CORP\\phedor" <origami11@yandex.ru>
Date: Wed, 28 Mar 2018 17:02:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Database.php  | 19 +++++++++++--------
 src/Role/User.php |  6 ++++--
 src/Tales.php     |  9 +++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

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 @@
 <?php
 ///<reference path="Database/PDOStatement.php" />
 
-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 @@
 <?php
 
-namespace ctiso;
+namespace ctiso\Role;
 use ctiso\Database,
     ctiso\Database\Statement;
 
@@ -17,7 +17,9 @@ class User
     public $db;
     public $groups;
 
-    protected function __construct($db, $groups) { 
+    function __construct($db, $groups) { 
+        $this->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'));
     }
 }