diff options
| -rw-r--r-- | classes/feeds.php | 4 | ||||
| -rw-r--r-- | include/functions.php | 8 | ||||
| -rw-r--r-- | js/functions.js | 2 | ||||
| -rw-r--r-- | plugins/af_unburn/init.php | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 5ee125f5f..e26318e7e 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -978,6 +978,10 @@ class Feeds extends Handler_Protected { print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"addfeed\">"; + print "<div id='fadd_multiple_notify' style='display : none'>"; + print_notice("Provided URL is a HTML page referencing multiple feeds, please select required feed from the dropdown menu below."); + print "<p></div>"; + print "<div class=\"dlgSec\">".__("Feed or site URL")."</div>"; print "<div class=\"dlgSecCont\">"; diff --git a/include/functions.php b/include/functions.php index 7e08d2296..e9b1270fb 100644 --- a/include/functions.php +++ b/include/functions.php @@ -379,6 +379,10 @@ curl_setopt($ch, CURLOPT_ENCODING, ""); curl_setopt($ch, CURLOPT_REFERER, $url); + if (defined('_CURL_HTTP_PROXY')) { + curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY); + } + if ($post_query) { curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query); @@ -4216,6 +4220,10 @@ curl_setopt($curl, CURLOPT_TIMEOUT, 60); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + if (defined('_CURL_HTTP_PROXY')) { + curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY); + } + if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) { curl_setopt($curl, CURLOPT_SSLVERSION, 3); } diff --git a/js/functions.js b/js/functions.js index c75fb95cb..fdd791598 100644 --- a/js/functions.js +++ b/js/functions.js @@ -854,6 +854,8 @@ function quickAddFeed() { case 4: feeds = rc['feeds']; + Element.show("fadd_multiple_notify"); + var select = dijit.byId("feedDlg_feedContainerSelect"); while (select.getOptions().length > 0) diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php index a97502b12..5873ccdf7 100644 --- a/plugins/af_unburn/init.php +++ b/plugins/af_unburn/init.php @@ -38,6 +38,10 @@ class Af_Unburn extends Plugin { curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir")); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); + if (defined('_CURL_HTTP_PROXY')) { + curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY); + } + $contents = @curl_exec($ch); $real_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); |