diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-03-13 15:06:28 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-03-13 15:06:28 -0300 |
| commit | 244467c9c1e7208874868deb4ebaa5038f565982 (patch) | |
| tree | 49767a3f44ce777ea4581100b9349bfa1863a886 /config | |
| parent | 00591e4cfe9140aef399f2d47e7417a6c3387403 (diff) | |
| parent | 75e58870aea85346fe7b439ff04c5b98b2e7dfb2 (diff) | |
| download | pfsense-packages-244467c9c1e7208874868deb4ebaa5038f565982.tar.gz pfsense-packages-244467c9c1e7208874868deb4ebaa5038f565982.tar.bz2 pfsense-packages-244467c9c1e7208874868deb4ebaa5038f565982.zip | |
Merge pull request #619 from PiBa-NL/hap_small_fixes
haproxy-devel,fix sslcheckbox from automatically turning on, allow immediate frontend sharing when duplicating
Diffstat (limited to 'config')
| -rw-r--r-- | config/haproxy-devel/haproxy_listeners_edit.php | 16 |
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..3ea72274 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'])) + $excludefrontend = $pconfig['name']; +$primaryfrontends = get_haproxy_frontends($excludefrontend); $interfaces = haproxy_get_bindable_interfaces(); ?> |