From 86b40f338c8ef0740b4219016223f5308d4e488d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= <phedor@corp.edu.yar.ru>
Date: Mon, 15 Jan 2018 16:44:58 +0300
Subject: [PATCH] http -> https

---
 src/Connection/HttpRequest.php | 13 +++++++++----
 src/Controller/Action.php      |  2 +-
 src/View/Top.php               |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Connection/HttpRequest.php b/src/Connection/HttpRequest.php
index 87a2561..01176c8 100644
--- a/src/Connection/HttpRequest.php
+++ b/src/Connection/HttpRequest.php
@@ -97,15 +97,20 @@ class Connection_HttpRequest
     }
 
     static function getJSON($url, $data) {
-        $c = new Connection_HttpRequest();
+        $query = http_build_query($data);
+        $q = $url . '?' . $query;
+        /*$c = new Connection_HttpRequest();
         $c->http_version = "HTTP/1.0";
 
-        $query = http_build_query($data);
-        $c->setUrl($q = $url . '?' . $query);
+
+        $c->setUrl($q);
         $page = $c->getPage();
 
         $response = new Connection_HttpResponse($page);
-        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $response->getData()), true);
+        $data = $response->getData();
+        */
+        $data = file_get_contents($q);
+        return json_decode((string) preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $data), true);
     }
 }
 
diff --git a/src/Controller/Action.php b/src/Controller/Action.php
index 9d5753f..72222c8 100644
--- a/src/Controller/Action.php
+++ b/src/Controller/Action.php
@@ -119,7 +119,7 @@ class Controller_Action
 
         /*.View_Composite.*/$tpl = new $viewClass($template);
 
-        $assets = Path::join(WWW_PATH, "assets", "css");
+        $assets = Path::join(enableHttps(WWW_PATH), "assets", "css");
         $tpl->set('icons', $this->iconPath); // Путь к файлам текущей темы
         $tpl->set('media', $this->themePath); // Путь к файлам текущей темы
         $tpl->set('assets', $assets); 
diff --git a/src/View/Top.php b/src/View/Top.php
index bd35017..480f00d 100644
--- a/src/View/Top.php
+++ b/src/View/Top.php
@@ -117,7 +117,7 @@ class View_Top extends View_Composite {
         $this->set('deps', implode(",", array_values($this->require)));
 
         $this->set('title', $this->getTitle());
-        $this->set('jspath', WWW_PATH);
+        $this->set('jspath', enableHttps(WWW_PATH));
         // 
         return $this->execute(); // execute+phptal ??
     }