From 785da9007ae76fa88b46c333cfbd3da78a7a26cc Mon Sep 17 00:00:00 2001 From: origami11 Date: Mon, 5 Jun 2017 15:50:19 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9=20=D0=BA=20=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controller/Component.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Controller/Component.php b/src/Controller/Component.php index 5d56d24..7115b22 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -318,11 +318,7 @@ class Controller_Component } function addRequireJsPath($name, $path, $shim = null) { - global $requireJsConfig; - $requireJsConfig['paths'][$name] = $path; - if ($shim) { - $requireJsConfig['shim'][$name] = $shim; - } + Controller_Site::addRequireJsPath($name, $path, $shim); } function actionIndex(/*.ComponentRequest.*/ $request) { From 4507f7f9d53b26bcecce945645f25987708f0336 Mon Sep 17 00:00:00 2001 From: origami11 Date: Tue, 6 Jun 2017 10:16:44 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Connection/HttpRequest.php | 2 +- src/Validator/Validator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Connection/HttpRequest.php b/src/Connection/HttpRequest.php index 28d0515..87a2561 100644 --- a/src/Connection/HttpRequest.php +++ b/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); diff --git a/src/Validator/Validator.php b/src/Validator/Validator.php index fe3ea2e..d838d65 100644 --- a/src/Validator/Validator.php +++ b/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 . "'"); } } From ebeb72771720a218999cb3cfe97c21573b4fdffd Mon Sep 17 00:00:00 2001 From: origami11 Date: Wed, 7 Jun 2017 13:54:45 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Database.php | 2 +- src/Filter/Authorization.php | 8 ++++---- src/{security.php => Security.php} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename src/{security.php => Security.php} (100%) diff --git a/src/Database.php b/src/Database.php index 0d8813e..2ddc1f4 100644 --- a/src/Database.php +++ b/src/Database.php @@ -29,7 +29,7 @@ class Database extends PDO { if ($dsn['phptype'] == 'pgsql' || $dsn['phptype'] == 'mysql') { - $port = (isset($dsn['port'])) ? "port={$dsn['port']};" : ""; + $port = (isset($dsn['port'])) ? "port={$dsn['port']};" : ""; /*.Database.*/$connection = new static("{$dsn['phptype']}:host={$dsn['hostspec']}; $port dbname={$dsn['database']}", $dsn['username'], $dsn['password']); if ($dsn['phptype'] == 'pgsql') { $connection->query('SET client_encoding="UTF-8"'); diff --git a/src/Filter/Authorization.php b/src/Filter/Authorization.php index 17db6a6..2666465 100644 --- a/src/Filter/Authorization.php +++ b/src/Filter/Authorization.php @@ -10,8 +10,8 @@ class Filter_Authorization { } $hash = self::getBrowserSign(); // Если $hash не совпадает $_SESSION['hash'] то удаляем сессию - if (isset($_SESSION ['access']) && isset($_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME])) { - +// 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("time"); +// session_register("access"); +// session_register("time"); // $_SESSION ["group"] = $result->getInt('access'); $_SESSION ["access"] = $id; // id_user diff --git a/src/security.php b/src/Security.php similarity index 100% rename from src/security.php rename to src/Security.php