summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-11-12 16:51:28 -0500
committerStephen Beaver <sbeaver@netgate.com>2015-11-12 16:51:28 -0500
commit6a667f304d1366628517f7b0be730fba8f7d843b (patch)
tree4b24a99fb21251345a0b2b938272b975569a01bc /src/usr/local
parent60571782bafad282cf7209670b031c368556c634 (diff)
downloadpfsense-6a667f304d1366628517f7b0be730fba8f7d843b.zip
pfsense-6a667f304d1366628517f7b0be730fba8f7d843b.tar.gz
Fixed group member creation
Nixed "I/F in button labels (by popular demand)
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/interfaces_assign.php4
-rw-r--r--src/usr/local/www/interfaces_groups_edit.php13
2 files changed, 14 insertions, 3 deletions
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php
index e84f3de..f6ec51b 100644
--- a/src/usr/local/www/interfaces_assign.php
+++ b/src/usr/local/www/interfaces_assign.php
@@ -555,7 +555,7 @@ display_top_tabs($tab_array);
<?php if ($ifname != 'wan'):?>
<button type="submit" name="del[<?=$ifname?>]" class="btn btn-danger btn-sm" title="<?=gettext("Delete interface")?>">
<i class="fa fa-trash icon-embed-btn"></i>
- <?=gettext("Delete I/F")?>
+ <?=gettext("Delete")?>
</button>
<?php endif;?>
</td>
@@ -579,7 +579,7 @@ display_top_tabs($tab_array);
<td>
<button type="submit" name="add" title="<?=gettext("Add selected interface")?>" value="add interface" class="btn btn-success btn-sm" >
<i class="fa fa-plus icon-embed-btn"></i>
- <?=gettext("Add I/F")?>
+ <?=gettext("Add")?>
</button>
</td>
</tr>
diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php
index 3ae6677..9735213 100644
--- a/src/usr/local/www/interfaces_groups_edit.php
+++ b/src/usr/local/www/interfaces_groups_edit.php
@@ -126,7 +126,18 @@ if ($_POST) {
}
}
- $members = isset($_POST['members']) ? join(' ', $_POST['members']) : "";
+ if (isset($_POST['members'])) {
+ foreach ($_POST['members'] as $member ) {
+ if ($isfirst > 0)
+ $members .= " ";
+
+ $members .= $member[0];
+ $isfirst++;
+ }
+ }
+ else {
+ $members = "";
+ }
if (!$input_errors) {
$ifgroupentry = array();
OpenPOWER on IntegriCloud