aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2014-03-06 00:50:03 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2014-03-06 00:50:03 +0100
commit9cabf2d6c98b88a7cc704a04c2eaf9992e903819 (patch)
treefd90bff50e52c82e499e9e8ad50d98169077d552
parent51b49f5f1a214a565194ea2db3bb0231689309c7 (diff)
downloadpfsense-packages-9cabf2d6c98b88a7cc704a04c2eaf9992e903819.tar.gz
pfsense-packages-9cabf2d6c98b88a7cc704a04c2eaf9992e903819.tar.bz2
pfsense-packages-9cabf2d6c98b88a7cc704a04c2eaf9992e903819.zip
haproxy-devel,
-fix sslcheckbox that was automatically turning on when editing -allow 2nd clones to be linked to the original primary frontend when making them shared
-rw-r--r--config/haproxy-devel/haproxy_listeners_edit.php16
1 files changed, 9 insertions, 7 deletions
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index bd0f93d5..47fb3b03 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -80,6 +80,12 @@ if (isset($_GET['dup']))
$id = get_frontend_id($id);
+if (!is_numeric($id))
+{
+ //default value for new items.
+ $pconfig['ssloffloadacl'] = "yes";
+}
+
$servercerts = get_certificates_server();
$fields_sslCertificates=array();
@@ -227,17 +233,13 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
if(strstr($pfSversion, "1.2"))
$one_two = true;
-if (!$id)
-{
- //default value for new items.
- $pconfig['ssloffloadacl'] = "yes";
-}
-
$closehead = false;
$pgtitle = "HAProxy: Frontend: Edit";
include("head.inc");
-$primaryfrontends = get_haproxy_frontends($pconfig['name']);
+if (!isset($_GET['dup']))
+ $excludefrontent = $pconfig['name'];
+$primaryfrontends = get_haproxy_frontends($excludefrontent);
$interfaces = haproxy_get_bindable_interfaces();
?>