diff options
| author | Jim P <jim@pingle.org> | 2013-03-16 13:30:29 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-03-16 13:30:29 -0700 |
| commit | 8faeea76e036374316b74f8c951ad17937fa73bf (patch) | |
| tree | 90014d0593d2af9c0ed487d9bf4e1a443682ba1b /config/haproxy-devel/haproxy_pools.php | |
| parent | 35a877e46fdcc438958debe8844351040d21ee86 (diff) | |
| parent | 826b152e5d25978f8b9306f90450197ce4f4827b (diff) | |
| download | pfsense-packages-8faeea76e036374316b74f8c951ad17937fa73bf.tar.gz pfsense-packages-8faeea76e036374316b74f8c951ad17937fa73bf.tar.bz2 pfsense-packages-8faeea76e036374316b74f8c951ad17937fa73bf.zip | |
Merge pull request #410 from PiBa-NL/haproxy-devel-2.1
haproxy-devel, removed cert filtering, server options, fixed saving global advanced setting.
Diffstat (limited to 'config/haproxy-devel/haproxy_pools.php')
| -rw-r--r-- | config/haproxy-devel/haproxy_pools.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config/haproxy-devel/haproxy_pools.php b/config/haproxy-devel/haproxy_pools.php index 07e7d106..57b056b3 100644 --- a/config/haproxy-devel/haproxy_pools.php +++ b/config/haproxy-devel/haproxy_pools.php @@ -53,13 +53,10 @@ if ($_POST) { $retval = haproxy_configure(); config_unlock(); - $result = haproxy_check_writtenconfig_error(); + $result = haproxy_check_writtenconfig_error($messages); + $savemsg = $messages; if ($result) - $savemsg = gettext($result); - else { - $savemsg = get_std_save_message($retval); unlink_if_exists($d_haproxyconfdirty_path); - } } } @@ -90,7 +87,7 @@ include("head.inc"); <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_haproxyconfdirty_path)): ?><p> -<?php print_info_box_np("The virtual pool configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> +<?php print_info_box_np("The haproxy configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br> <?php endif; ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> |