xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop support for (obsolete, removed from recent php versions) php safe_mode setting

Browse Source 
remove ugly hacks for curl + open_basedir combination breaking support for http redirects
This commit is contained in:
Andrew Dolgov
2015-11-19 20:05:17 +03:00
parent 6497fb65b4
commit 4c46702672
8 changed files with 17 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/af_tumblr_1280/init.php
Regular → Executable
+4 -4
View File
@@ -4,7 +4,7 @@ class Af_Tumblr_1280 extends Plugin {
function about() {
return array(1.0,
"Replace Tumblr pictures with largest size if available",
"Replace Tumblr pictures with largest size if available (requires CURL)",
"fox");
}
@@ -18,7 +18,8 @@ class Af_Tumblr_1280 extends Plugin {
function hook_article_filter($article) {
$owner_uid = $article["owner_uid"];
if (!function_exists("curl_init") || ini_get("open_basedir"))
return $article;
$charset_hack = '<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -46,8 +47,7 @@ class Af_Tumblr_1280 extends Plugin {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION,
!ini_get("safe_mode") && !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
@$result = curl_exec($ch);