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

src/Connection/HttpRequest.php

@@ -81,7 +81,7 @@ class Connection_HttpRequest
         $port = ($this->proxy_port) ? $this->proxy_port : $this->port;
         $errno = 0;
         $errstr = '';
-        $socket = fsockopen($host, $port, $errno, $errstr, 30);
+        $socket = @fsockopen($host, $port, $errno, $errstr, 30);
         if (is_resource($socket)) {
             $header = $this->getHeader();
             fwrite($socket, $header);

src/Controller/Component.php

@@ -318,11 +318,7 @@ class Controller_Component
     }
 
     function addRequireJsPath($name, $path, $shim = null) {
-        global $requireJsConfig;
+        Controller_Site::addRequireJsPath($name, $path, $shim);
-        $requireJsConfig['paths'][$name] = $path;
-        if ($shim) {
-            $requireJsConfig['shim'][$name] = $shim;
-        }
     }
 
     function actionIndex(/*.ComponentRequest.*/ $request) {

src/Filter/Authorization.php

@@ -10,8 +10,8 @@ class Filter_Authorization {
         }
         $hash = self::getBrowserSign();
         // Если $hash не совпадает $_SESSION['hash'] то удаляем сессию
+//        print_r($_SESSION);
         if (isset($_SESSION['access']) && isset($_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME])) {
-
             if ($hash == $_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME]) {
 //                UserAccess::getUserById($_SESSION ['access']); // Поиск по идентификатору
                 return true;
@@ -25,8 +25,8 @@ class Filter_Authorization {
     static function enter($id) 
     {
         // $db->executeQuery("UPDATE visitor SET sid = '' WHERE id_visitor = " . $result->getInt('id_user'));
-        session_register("access");
+//        session_register("access");
-        session_register("time");
+//        session_register("time");
 
 //        $_SESSION ["group"]  = $result->getInt('access'); 
         $_SESSION ["access"] = $id; // id_user

src/Validator/Validator.php

@@ -61,7 +61,7 @@ class Validator_Validator
                         $ruleObj->$p_name = $p_value;
                     }
                     $this->addRule($ruleObj);
-                } else {
+                } else if (!empty($rule)) {
                     throw new Exception('Unknown validation rule "' . $rule . "'");
                 }
             }