public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 18:35:57 +00:00
Code Issues Releases Wiki Activity

hopefully unify handling of server HTTPS variables where needed, use scheme based on SELF_URL_PATH otherwise

Browse Source
This commit is contained in:
Andrew Dolgov
2017-07-10 16:20:40 +03:00
parent 1003cb24b9
commit 9f7bd151c6
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/functions.php
View File

@@ -1528,7 +1528,6 @@
$doc->loadHTML($charset_hack . $res);
$xpath = new DOMXPath($doc);
$ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https';
$rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
$entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src])');
@@ -1578,7 +1577,7 @@
if ($entry->hasAttribute('src')) {
$is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
if ($ttrss_uses_https && !$is_https_url) {
if (is_prefix_https() && !$is_https_url) {
if ($entry->hasAttribute('srcset')) {
$entry->removeAttribute('srcset');
@@ -1619,7 +1618,7 @@
if (!iframe_whitelisted($entry)) {
$entry->setAttribute('sandbox', 'allow-scripts');
} else {
if ($_SERVER['HTTPS'] == "on") {
if (is_prefix_https()) {
$entry->setAttribute("src",
str_replace("http://", "https://",
$entry->getAttribute("src")));
@@ -1782,6 +1781,14 @@
return $tag;
}
function is_server_https() {
return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
}
function is_prefix_https() {
return parse_url(SELF_URL_PATH, PHP_URL_SCHEME) == 'https';
}
// this returns SELF_URL_PATH sans ending slash
function get_self_url_prefix() {
if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {