From 9cabf2d6c98b88a7cc704a04c2eaf9992e903819 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 6 Mar 2014 00:50:03 +0100 Subject: 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 --- config/haproxy-devel/haproxy_listeners_edit.php | 16 +++++++++------- 1 file 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(); ?> -- cgit v1.2.3 From 75e58870aea85346fe7b439ff04c5b98b2e7dfb2 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 13 Mar 2014 18:51:57 +0100 Subject: haproxy-devel, type in var: excludefrontent > excludefrontend --- config/haproxy-devel/haproxy_listeners_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php index 47fb3b03..3ea72274 100644 --- a/config/haproxy-devel/haproxy_listeners_edit.php +++ b/config/haproxy-devel/haproxy_listeners_edit.php @@ -238,8 +238,8 @@ $pgtitle = "HAProxy: Frontend: Edit"; include("head.inc"); if (!isset($_GET['dup'])) - $excludefrontent = $pconfig['name']; -$primaryfrontends = get_haproxy_frontends($excludefrontent); + $excludefrontend = $pconfig['name']; +$primaryfrontends = get_haproxy_frontends($excludefrontend); $interfaces = haproxy_get_bindable_interfaces(); ?> -- cgit v1.2.3