diff options
| author | Seth Mos <seth.mos@dds.nl> | 2010-12-20 21:06:33 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2010-12-20 21:06:33 +0100 |
| commit | 81afb50916235853a9b3046796199a443d27c224 (patch) | |
| tree | f25e1acd56748f178699a1edc33c123bd2182f20 /usr/local/www/interfaces_gif_edit.php | |
| parent | 172007f50c215acf458340773a32052c28556aaa (diff) | |
| parent | 49659e1cc6f78af1287590fca7b64791fd6da6f1 (diff) | |
| download | pfsense-81afb50916235853a9b3046796199a443d27c224.zip pfsense-81afb50916235853a9b3046796199a443d27c224.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/vslb.inc
usr/local/www/interfaces.php
Diffstat (limited to 'usr/local/www/interfaces_gif_edit.php')
| -rw-r--r-- | usr/local/www/interfaces_gif_edit.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php index fc21620..ee9157a 100644 --- a/usr/local/www/interfaces_gif_edit.php +++ b/usr/local/www/interfaces_gif_edit.php @@ -136,6 +136,9 @@ include("head.inc"); <select name="if" class="formselect"> <?php $portlist = get_configured_interface_with_descr(); + $carplist = get_configured_carp_interface_list(); + foreach ($carplist as $cif => $carpip) + $portlist[$cif] = $carpip." (".get_vip_descr($carpip).")"; foreach ($portlist as $ifn => $ifinfo) { echo "<option value=\"{$ifn}\""; if ($ifn == $pconfig['if']) |
