diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/BridgeCard.php | 15 | ||||
| -rw-r--r-- | lib/http.php | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lib/BridgeCard.php b/lib/BridgeCard.php index 27285558..f270c1a3 100644 --- a/lib/BridgeCard.php +++ b/lib/BridgeCard.php @@ -2,7 +2,7 @@ final class BridgeCard { - public static function render(string $bridgeClassName, Request $request): string + public static function render(string $bridgeClassName, ?string $token): string { $bridgeFactory = new BridgeFactory(); @@ -14,10 +14,15 @@ final class BridgeCard $description = $bridge->getDescription(); $contexts = $bridge->getParameters(); - if (Configuration::getConfig('proxy', 'url') && Configuration::getConfig('proxy', 'by_bridge')) { + // Checkbox for disabling of proxy (if enabled) + if ( + Configuration::getConfig('proxy', 'url') + && Configuration::getConfig('proxy', 'by_bridge') + ) { + $proxyName = Configuration::getConfig('proxy', 'name') ?: Configuration::getConfig('proxy', 'url'); $contexts['global']['_noproxy'] = [ - 'name' => 'Disable proxy (' . (Configuration::getConfig('proxy', 'name') ?: Configuration::getConfig('proxy', 'url')) . ')', - 'type' => 'checkbox' + 'name' => sprintf('Disable proxy (%s)', $proxyName), + 'type' => 'checkbox', ]; } @@ -47,8 +52,6 @@ final class BridgeCard CARD; - $token = $request->attribute('token'); - if (count($contexts) === 0) { // The bridge has zero parameters $card .= self::renderForm($bridgeClassName, '', [], $token); diff --git a/lib/http.php b/lib/http.php index 0d21b958..d1043b33 100644 --- a/lib/http.php +++ b/lib/http.php @@ -113,6 +113,7 @@ final class CurlHttpClient implements HttpClient if ($config['proxy']) { curl_setopt($ch, CURLOPT_PROXY, $config['proxy']); } + if (curl_setopt_array($ch, $config['curl_options']) === false) { throw new \Exception('Tried to set an illegal curl option'); } |