blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove sanity check on open_basedir, block using CURL instead while running under it

Browse source
This commit is contained in:
Andrew Dolgov 2011-07-05 12:05:51 +04:00
parent 19929bbeec
commit 3610b48ba3
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
functions.php
View file

@ -362,7 +362,7 @@
$login = urlencode($login);
$pass = urlencode($pass);
if (function_exists('curl_init')) {
if (function_exists('curl_init') && !ini_get("open_basedir")) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
@ -816,7 +816,8 @@
if ($debug_enabled) _debug("update_rss_feed: feed hub url: $feed_hub_url");
if ($feed_hub_url && function_exists('curl_init')) {
if ($feed_hub_url && function_exists('curl_init') &&
!ini_get("open_basedir")) {
$callback_url = get_self_url_prefix() .
"/backend.php?op=pubsub&id=$feed";

2
modules/pref-instances.php
View file

@ -113,7 +113,7 @@
return;
}
if (!function_exists('curl_init')) {
if (!function_exists('curl_init') && !ini_get("open_basedir")) {
print "<div style='padding : 1em'>";
print_error("This functionality requires CURL functions. Please enable CURL in your PHP configuration and reload this page.");
print "</div>";

4
sanity_check.php
View file

@ -115,9 +115,9 @@
$err_msg = "config: your ICONS_DIR (" . ICONS_DIR . ") is not writable.\n";
}
if (ini_get("open_basedir")) {
/* if (ini_get("open_basedir")) {
$err_msg = "php.ini: open_basedir is not supported.";
}
} */
if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
$err_msg = "php.ini: either allow_url_fopen or CURL needs to be enabled.";