diff options
| author | Jeremy Porter <jporter@pfsense.org> | 2015-12-23 15:19:21 -0600 |
|---|---|---|
| committer | Jeremy Porter <jporter@pfsense.org> | 2015-12-23 15:19:21 -0600 |
| commit | e6d22cd63fae76f9d9cc4607c03157bf9c603117 (patch) | |
| tree | 0e4bce3d8bf06a68c0966bc9f227eb399b825e6f /src/usr | |
| parent | e8da0bcd6b62cc3691775337e96440ae41993780 (diff) | |
| parent | 962ec941ec74c50cc6c619de4bf80d05c88cbcf9 (diff) | |
| download | pfsense-e6d22cd63fae76f9d9cc4607c03157bf9c603117.zip pfsense-e6d22cd63fae76f9d9cc4607c03157bf9c603117.tar.gz | |
Merge branch 'master' of git.pfmechanics.com:pfsense/pfsense
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/pkg_edit.php | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 8fd1a6a..341998e 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -731,28 +731,26 @@ foreach ($pkg['fields']['field'] as $pkga) { $value = base64_decode($value); } - if ($grouping) { - $group->add(new Form_Input( + $grp = new Form_Input( $pkga['fieldname'], $pkga['fielddescr'], 'text', $value - ))->setHelp($pkga['description']); + ); + + $grp->setHelp($pkga['description']); + + if ($pkga['width']) { + $grp->setWidth($pkga['width']); + } + + if ($grouping) { + $group->add($grp); } else { if (isset($pkga['advancedfield']) && isset($advfield_count)) { - $advanced->addInput(new Form_Input( - $pkga['fieldname'], - $pkga['fielddescr'], - 'text', - $value - ))->setHelp($pkga['description']); + $advanced->addInput($grp); } else { - $section->addInput(new Form_Input( - $pkga['fieldname'], - $pkga['fielddescr'], - 'text', - $value - ))->setHelp($pkga['description']); + $section->addInput($grp); } } @@ -1096,28 +1094,26 @@ foreach ($pkg['fields']['field'] as $pkga) { } } - if (grouping) { - $group->add(new Form_Input( + $grp = new Form_Input( $pkga['fieldname'], $pkga['fielddescr'], 'text', $value - ))->setHelp($pkga['description']); + ); + + $grp->setHelp($pkga['description']); + + if ($pkga['width']) { + $grp->setWidth($pkga['width']); + } + + if (grouping) { + $group->add($grp); } else { if (isset($pkga['advancedfield']) && isset($advfield_count)) { - $advanced->addInput(new Form_Input( - $pkga['fieldname'], - $pkga['fielddescr'], - 'text', - $value - ))->setHelp($pkga['description']); + $advanced->addInput($grp); } else { - $section->addInput(new Form_Input( - $pkga['fieldname'], - $pkga['fielddescr'], - 'text', - $value - ))->setHelp($pkga['description']); + $section->addInput($grp); } } |
