From 10cd3a61a97a9eb4cca3b4a3b0de63853b52c3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Thu, 18 Aug 2016 22:48:37 +0200
Subject: [PATCH] check for PROXY_NAME definition before using it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 index.php         | 2 +-
 lib/HTMLUtils.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 778a4b2a..aa2a4372 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@ 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
+// Comment this line or keep PROXY_NAME empty to display PROXY_URL instead
 define('PROXY_NAME','Hidden Proxy Name');
 
 date_default_timezone_set('UTC');
diff --git a/lib/HTMLUtils.php b/lib/HTMLUtils.php
index 1ab77992..756ee098 100644
--- a/lib/HTMLUtils.php
+++ b/lib/HTMLUtils.php
@@ -31,7 +31,7 @@ CARD;
 				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 .= '<label for="' .$idArg. '">Disable proxy ('.((defined('PROXY_NAME') && PROXY_NAME)?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
 				}
 
 				$card .= HTMLUtils::getHelperButtonsFormat($formats);
@@ -109,7 +109,7 @@ CARD;
 				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 .= '<label for="' .$idArg. '">Disable proxy ('.((defined('PROXY_NAME') && PROXY_NAME)?PROXY_NAME:PROXY_URL).')</label><br />' . PHP_EOL;
 				}
 
 				$card .= HTMLUtils::getHelperButtonsFormat($formats);