Merge branch 'master' of http://gitlab.edu.yar.ru/composer/PHP_Library

# Conflicts:
#	src/Filter/Login.php
#	src/View/Page.php

src/Controller/Component.php

@@ -23,7 +23,8 @@ class ComponentRequest {
         if ($key == 'active_page') {
             return $this->r->get($key);
         }
-        if ($arr = $this->r->get($key)) {
+        $arr = $this->r->get($key);
+        if ($arr !== NULL) {
             if (is_array($arr)) {
                 return Arr::get($arr, $this->component_id, $default);
             } else {
@@ -273,7 +274,7 @@ class Controller_Component
                 $instance->componentsConfig[] = $editor;
             } else {
                 global $componentsConfig;
-                $componentsConfig[] = $editor;                
+                $componentsConfig[] = $editor;
             }
         }
 

src/Controller/Service.php

@@ -5,11 +5,14 @@
  */
 class Controller_Service
 {
-    public $viewPath = array();
+    public $viewPath = [];
+    public $webPath = [];
     public $registry; // Registry->getInstance
     public $template;
     public $templatePath;
     public $COMPONENTS_WEB;
+    
+    public $db;
 
     public function getTemplatePath($name)
     {
@@ -58,5 +61,14 @@ class Controller_Service
         }
         return $result;
     }
+    
+    function getInfo() {
+        $filename = Path::join($this->viewPath[0], 'install.json');
+        if (file_exists($filename)) {
+            $settings = json_decode(File::getContents($filename), true);
+            return $settings;
+        }
+        return array();
+    }
 }
 

src/Database.php

@@ -13,8 +13,14 @@ class Database extends PDO
     {
         parent::__construct($dsn, $username, $password);
         $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $this->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
         $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Database_PDOStatement', array()));
     }
+    
+    function prepare($sql, $args = []) {
+        $result = parent::prepare($sql, $args);
+        return $result;
+    }
 
     public function getDSN()
     {
@@ -35,6 +41,10 @@ class Database extends PDO
             if ($dsn['phptype'] == 'pgsql') {
                 $connection->query('SET client_encoding="UTF-8"');
             }
+            
+            if (isset($dsn['schema'])) {
+                $connection->query('SET search_path TO ' . $dsn['schema']);
+            }
         }
         if ($dsn['phptype'] == 'sqlite') {
             /*.Database.*/$connection = new static("{$dsn['phptype']}:{$dsn['database']}");

src/Database/PDOStatement.php

@@ -74,7 +74,7 @@ class Database_PDOStatement extends PDOStatement implements IteratorAggregate
     }
 
     function getString($name) {
-        return $this->fields[$name];
+        return isset($this->fields[$name]) ? $this->fields[$name]: null;
     }
 
     function getBoolean($name) {
@@ -92,4 +92,10 @@ class Database_PDOStatement extends PDOStatement implements IteratorAggregate
     function getRecordCount() {
         return count($this->cache);
     }
+    
+    function execute($args = null) {
+        $result = parent::execute($args);
+        return $result;
+    }
+
 }

src/Database/Statement.php

@@ -17,33 +17,27 @@ class Database_Statement
         $this->conn = $conn;
     }
     
-    function setInt($n, $value)
+    function setInt($n, $value) {  
-    {   
         $this->binds [] = array($n, $value, PDO::PARAM_INT);
     }
 
-    function setString($n, $value)
+    function setString($n, $value) {
-    {
         $this->binds [] = array($n, $value, PDO::PARAM_STR);
     }
 
-    function setBlob($n, $value)
+    function setBlob($n, $value) {
-    {
         $this->binds [] = array($n, $value, PDO::PARAM_LOB);
     }
 
-    function setLimit($limit)
+    function setLimit($limit) {
-    {
         $this->limit = $limit;
     }
 
-    function setOffset($offset)
+    function setOffset($offset) {
-    {
         $this->offset = $offset;
     }
 
-    function executeQuery()
+    function executeQuery() {
-    {
         if ($this->limit) {
             $this->query .= " LIMIT {$this->limit} OFFSET {$this->offset}";
         }

src/Excel/Number.php

@@ -6,7 +6,7 @@ class Excel_Number
 
     function __construct($value) 
     {
-        $this->value = intval($value);
+        $this->value = (int)($value);
     }
 
     function getString()

src/Filter/Login.php

@@ -13,13 +13,18 @@ class Filter_Login extends Filter_Filter
     const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
     const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
     public $mode = 'ajax';
+    public $user;
 
     //AJAX-Реквесты для которых не требуется авторизация, потребовалось для сбора статистики
-    public $whiteRequestList = [['module' => "requiredcontent", "action" => "getcount"],
+    public $whiteRequestList = [
-                                ['module' => "requiredcontent", "action" => "teststructure"],
+        ['module' => "requiredcontent", "action" => "getcount"],
-                                ['module' => "requiredcontent", "action" => "specialdump"],
+        ['module' => "requiredcontent", "action" => "teststructure"],
-                                ['module' => "requiredcontent", "action" => "OrgMonitoringSchema"]
+        ['module' => "requiredcontent", "action" => "specialdump"],
-                            ];
+        ['module' => "requiredcontent", "action" => "OrgMonitoring"],
+        ['module' => "requiredcontent", "action" => "OrgMonitoringSchema"],
+        ['module' => "appeals", "action" => "changestatus"],
+        ['module' => "appeals", "action" => "savestatus"]
+    ];
     /**
      * Проверка авторизации
      * @return Boolean Авторизовани пользователь или нет
@@ -30,6 +35,7 @@ class Filter_Login extends Filter_Filter
         session_start();
         $db = $this->getConnection();
         Filter_UserAccess::setUp($db); // Соединение
+
         switch ($request->getAction()) {
             // Авторизация по постоянному паролю
             case 'login': 
@@ -52,10 +58,9 @@ class Filter_Login extends Filter_Filter
                     if (md5($password) == $userPassword) { // password
                         $this->enter($db, $result);
                         return true;
-                    } else {
+                    } 
-                        $request->set('error', true);
-                    }
                 }
+                $request->set('error', true);
                 break;
             case 'logout': // Выход
                 session_destroy();

src/Filter/UserAccess.php

@@ -62,7 +62,7 @@ class Filter_UserAccess
             $time = time();
             if ($time - $lasttime > self::LIFE_TIME) return null; // Вышло время сессии 
             $id = self::$id;
-            self::$db->executeQuery("UPDATE users SET lasttime = $time WHERE id_user = $id"); // Время последнего обращения входа
+            // self::$db->executeQuery("UPDATE users SET lasttime = $time WHERE id_user = $id"); // Время последнего обращения входа
         }
         return $result;
     }

src/Tools/TemplateImage.php

@@ -134,7 +134,7 @@ class Tools_TemplateImage
         }
 
         if ($value->valign[0]) { 
-            $valign = Drawing::ALIGN_TOP;
+            $valign = Tools_Drawing::ALIGN_TOP;
       } elseif ($value->valign[1]) { 
             $valign = Tools_Drawing::ALIGN_CENTER;
         } else {

src/Validator/Rule/Date.php

@@ -15,6 +15,7 @@ class Validator_Rule_Date extends Validator_Rule_Abstract
     public function isValid(Collection $container, $status = null)
     {
         $pattern = "/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})$/";
+        $matches = [];
         return (preg_match($pattern, $container->get($this->field), $matches) 
             && checkdate($matches[2], $matches[1], $matches[3]));
     }