aboutsummaryrefslogtreecommitdiff
path: root/lib/lib_rss.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-29 17:47:05 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-29 17:47:05 +0100
commit1e644b64709b6f9bae89ef77b89203c210462a58 (patch)
tree59280b2a3f83796f3e749d04ecad9bf605537610 /lib/lib_rss.php
parent911bf6aefeeb8bb41570a404c03b81843791e224 (diff)
parent685c0ad2f8a4f6e854240d3a11415bcd62157ca4 (diff)
Merge pull request #1087 from Alkarex/HTTPS_Everywhere
Force HTTPS for selected embed providers
Diffstat (limited to 'lib/lib_rss.php')
-rw-r--r--lib/lib_rss.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index a09960de0..135115ea5 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -238,6 +238,16 @@ function customSimplePie() {
'src',
),
));
+ $https_domains = array();
+ $force = @file(DATA_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ if (is_array($force)) {
+ $https_domains = array_merge($https_domains, $force);
+ }
+ $force = @file(DATA_PATH . '/force-https.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ if (is_array($force)) {
+ $https_domains = array_merge($https_domains, $force);
+ }
+ $simplePie->set_https_domains($https_domains);
return $simplePie;
}