boyska/rss-bridge
1
0
Fork 0
forked from blallo/rss-bridge
Code Releases Activity

proxy settings must be the service provider decision

Browse source 
therefore, the provider decides if the service use a
proxy or not, and if users can have the possibility to
disable it on a bridge basis.

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
This commit is contained in:
Pierre Mazière 2016-07-03 23:49:43 +02:00
parent 09d4e21bdc
commit d71674d2ba
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
index.php
View file

@ -11,6 +11,8 @@ TODO :
*/ */
//define('PROXY_URL', 'tcp://192.168.0.0:28'); //define('PROXY_URL', 'tcp://192.168.0.0:28');
// Set to true if you allow users to disable proxy usage for specific bridges
define('PROXY_BYBRIDGE',false);
// keep PROXY_NAME empty to display PROXY_URL instead // keep PROXY_NAME empty to display PROXY_URL instead
define('PROXY_NAME','Hidden Proxy Name'); define('PROXY_NAME','Hidden Proxy Name');
@ -113,8 +115,10 @@ try{
} else { } else {
$bridge->setCache($cache); // just add disable cache to your query to disable caching $bridge->setCache($cache); // just add disable cache to your query to disable caching
} }
if(isset($_REQUEST['_p'])){ if(defined('PROXY_URL') && PROXY_BYBRIDGE &&
$bridge->useProxy=true; isset($_REQUEST['_noproxy'])
){
$bridge->useProxy=false;
} }
$bridge->setDatas($_REQUEST); $bridge->setDatas($_REQUEST);
$bridge->loadMetadatas(); $bridge->loadMetadatas();

2
lib/Bridge.php
View file

@ -21,7 +21,7 @@ abstract class BridgeAbstract implements BridgeInterface{
public $uri = ""; public $uri = "";
public $description = 'No description provided'; public $description = 'No description provided';
public $maintainer = 'No maintainer'; public $maintainer = 'No maintainer';
public $useProxy = false; public $useProxy = true;
public $parameters = array(); public $parameters = array();
/** /**

16
lib/HTMLUtils.php
View file

@ -28,10 +28,10 @@ CARD;
$card .= HTMLUtils::getFormHeader($bridgeName); $card .= HTMLUtils::getFormHeader($bridgeName);
if ($isActive){ if ($isActive){
if(defined('PROXY_URL')){ if(defined('PROXY_URL') && PROXY_BYBRIDGE){
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxy') . '-' . urlencode('_p'); $idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
$card .= '<input id="' . $idArg . '" type="checkbox" name="_p" />' . PHP_EOL; $card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
$card .= '<label for="' .$idArg. '">Enable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL; $card .= '<label for="' .$idArg. '">Disable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
} }
$card .= HTMLUtils::getHelperButtonsFormat($formats); $card .= HTMLUtils::getHelperButtonsFormat($formats);
@ -106,10 +106,10 @@ CARD;
} }
if ($isActive){ if ($isActive){
if(defined('PROXY_URL')){ if(defined('PROXY_URL') && PROXY_BYBRIDGE){
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxy') . '-' . urlencode('_p'); $idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
$card .= '<input id="' . $idArg . '" type="checkbox" name="_p" />' . PHP_EOL; $card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
$card .= '<label for="' .$idArg. '">Enable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL; $card .= '<label for="' .$idArg. '">Disable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
} }
$card .= HTMLUtils::getHelperButtonsFormat($formats); $card .= HTMLUtils::getHelperButtonsFormat($formats);