From 98b3b2b2f66abc514dcad867bfc757cb060be5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 11:57:03 +0100
Subject: [PATCH] Fix EmailField type and add "if helpers.exists ..." to
 squid.conf

---
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml     | 6 +++---
 src/opnsense/service/templates/OPNsense/Proxy/squid.conf | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 78c23b2ae..d7a6c735b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -69,12 +69,12 @@
                 <default>0</default>
                 <Required>N</Required>
             </suppressVersion>
-            <VisibleEmail type="TextField">
-                <default>localhost</default>
+            <VisibleEmail type="EmailField">
+                <default>admin@localhost</default>
                 <Required>N</Required>
             </VisibleEmail>
             <VisibleHostname type="TextField">
-                <default>admin@localhost</default>
+                <default>localhost</default>
                 <Required>N</Required>
             </VisibleHostname>
             <cache>
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
index 66ebbc23c..43d752b50 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
+++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
@@ -523,7 +523,11 @@ delay_parameters 1 {{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|i
 {% endif %}
 # Disable squid logfile rotate to use system defaults
 logfile_rotate 0
+{% if helpers.exists('OPNsense.proxy.general.VisibleHostname') %}
 # Define visible hostname
 visible_hostname {{OPNsense.proxy.general.VisibleHostname}}
+{% endif %}
+{% if helpers.exists('OPNsense.proxy.general.VisibleEmail') %}
 # Define visible email
 cache_mgr {{OPNsense.proxy.general.VisibleEmail}}
+{% endif %}