From b1b186ba4e48c392902f7b34b10a9eda6c6d3cff Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 9 Feb 2016 09:47:32 +0000 Subject: [PATCH] Ensure that socks5 proxy is used for rss --- src/freedombone | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/freedombone b/src/freedombone index de751dfd..9ddaad89 100755 --- a/src/freedombone +++ b/src/freedombone @@ -8307,6 +8307,13 @@ function install_rss_reader { cd $RSS_READER_PATH git_pull $RSS_READER_REPO $RSS_READER_COMMIT sed -i "s/RSS reader commit.*/RSS reader commit:$RSS_READER_COMMIT/g" $COMPLETION_FILE + # ensure that socks5 proxy is used + if ! grep -q "CURLOPT_PROXYTYPE" $RSS_READER_PATH/plugins/af_unburn/init.php; then + sed -i '/curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);/a \\t\t\t\t\tcurl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);' $RSS_READER_PATH/plugins/af_unburn/init.php + fi + if ! grep -q "CURLOPT_PROXYTYPE" $RSS_READER_PATH/include/functions.php; then + sed -i '/curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);/a \\t\t\t\tcurl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);' $RSS_READER_PATH/include/functions.php + fi chown -R www-data:www-data $RSS_READER_PATH fi else @@ -8460,6 +8467,14 @@ function install_rss_reader { echo " define('CONFIG_VERSION', 26);" >> $RSS_READER_PATH/config.php fi + # ensure that socks5 proxy is used + if ! grep -q "CURLOPT_PROXYTYPE" $RSS_READER_PATH/plugins/af_unburn/init.php; then + sed -i '/curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);/a \\t\t\t\t\tcurl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);' $RSS_READER_PATH/plugins/af_unburn/init.php + fi + if ! grep -q "CURLOPT_PROXYTYPE" $RSS_READER_PATH/include/functions.php; then + sed -i '/curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);/a \\t\t\t\tcurl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);' $RSS_READER_PATH/include/functions.php + fi + chown -R www-data:www-data $RSS_READER_PATH chmod a+x $RSS_READER_PATH