libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http -> https

Browse source
This commit is contained in:
Фёдор Подлеснов 2018-01-15 16:44:58 +03:00
parent 5c421805bf
commit 86b40f338c
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Connection/HttpRequest.php
View file

@ -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);
}
}

2
src/Controller/Action.php
View file

@ -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);

2
src/View/Top.php
View file

@ -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 ??
}