forked from blallo/rss-bridge
proxy settings must be the service provider decision
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:
parent
09d4e21bdc
commit
d71674d2ba
3 changed files with 15 additions and 11 deletions
|
@ -11,6 +11,8 @@ TODO :
|
|||
*/
|
||||
|
||||
//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
|
||||
define('PROXY_NAME','Hidden Proxy Name');
|
||||
|
||||
|
@ -113,8 +115,10 @@ try{
|
|||
} else {
|
||||
$bridge->setCache($cache); // just add disable cache to your query to disable caching
|
||||
}
|
||||
if(isset($_REQUEST['_p'])){
|
||||
$bridge->useProxy=true;
|
||||
if(defined('PROXY_URL') && PROXY_BYBRIDGE &&
|
||||
isset($_REQUEST['_noproxy'])
|
||||
){
|
||||
$bridge->useProxy=false;
|
||||
}
|
||||
$bridge->setDatas($_REQUEST);
|
||||
$bridge->loadMetadatas();
|
||||
|
|
|
@ -21,7 +21,7 @@ abstract class BridgeAbstract implements BridgeInterface{
|
|||
public $uri = "";
|
||||
public $description = 'No description provided';
|
||||
public $maintainer = 'No maintainer';
|
||||
public $useProxy = false;
|
||||
public $useProxy = true;
|
||||
public $parameters = array();
|
||||
|
||||
/**
|
||||
|
|
|
@ -28,10 +28,10 @@ CARD;
|
|||
$card .= HTMLUtils::getFormHeader($bridgeName);
|
||||
|
||||
if ($isActive){
|
||||
if(defined('PROXY_URL')){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxy') . '-' . urlencode('_p');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_p" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Enable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
if(defined('PROXY_URL') && PROXY_BYBRIDGE){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Disable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
}
|
||||
|
||||
$card .= HTMLUtils::getHelperButtonsFormat($formats);
|
||||
|
@ -106,10 +106,10 @@ CARD;
|
|||
}
|
||||
|
||||
if ($isActive){
|
||||
if(defined('PROXY_URL')){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxy') . '-' . urlencode('_p');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_p" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Enable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
if(defined('PROXY_URL') && PROXY_BYBRIDGE){
|
||||
$idArg = 'arg-' . urlencode($bridgeName) . '-' . urlencode('proxyoff') . '-' . urlencode('_noproxy');
|
||||
$card .= '<input id="' . $idArg . '" type="checkbox" name="_noproxy" />' . PHP_EOL;
|
||||
$card .= '<label for="' .$idArg. '">Disable proxy ('.(PROXY_NAME?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
|
||||
}
|
||||
|
||||
$card .= HTMLUtils::getHelperButtonsFormat($formats);
|
||||
|
|
Loading…
Reference in a new issue