diff options
author | jim-p <jimp@pfsense.org> | 2016-05-06 09:40:24 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2016-05-06 09:40:24 -0400 |
commit | e079998e9d063d826d341b2b3dd8a53458a67757 (patch) | |
tree | 750954bc82ae77abb559b92ed5eb4f0b2ced57c2 /usr | |
parent | 2c88163fd2ae0629aacf5838a100335d515ff5b5 (diff) | |
download | pfsense-RELENG_2_2.zip pfsense-RELENG_2_2.tar.gz |
Change the default output of pkg.php lists to be encoded before display. Preserve the old behavior as an option in case a package needs itRELENG_2_2
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/pkg.php | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index c60806d..fff0516 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -425,29 +425,35 @@ if ($pkg['tabs'] <> "") { ?> <td class="<?=$class;?>" ondblclick="document.location='pkg_edit.php?xml=<?=$xml?>&act=edit&id=<?=$i;?>';"> <?php - $fieldname = $ip[xml_safe_fieldname($column['fieldname'])]; - #Check if columnitem has a type field declared - if($column['type'] == "checkbox") { - if($fieldname == "") { - echo gettext("No"); - } else { - echo gettext("Yes"); - } - } else if ($column['type'] == "interface") { - echo $column['prefix'] . $iflist[$fieldname] . $column['suffix']; - } else { - #Check if columnitem has an encoding field declared - if ($column['encoding'] == "base64") - echo $column['prefix'] . base64_decode($fieldname) . $column['suffix']; - #Check if there is a custom info to show when $fieldname is not empty - else if($column['listmodeon'] && $fieldname != "") - echo $column['prefix'] . gettext($column['listmodeon']). $column['suffix']; - #Check if there is a custom info to show when $fieldname is empty - else if($column['listmodeoff'] && $fieldname == "") - echo $column['prefix'] .gettext($column['listmodeoff']). $column['suffix']; - else - echo $column['prefix'] . $fieldname ." ". $column['suffix']; - } + $fieldname = $ip[xml_safe_fieldname($column['fieldname'])]; + #Check if columnitem has a type field declared + if($column['type'] == "checkbox") { + if($fieldname == "") { + echo gettext("No"); + } else { + echo gettext("Yes"); + } + } else if ($column['type'] == "interface") { + echo $column['prefix'] . $iflist[$fieldname] . $column['suffix']; + } else { + $display_text = ""; + #Check if columnitem has an encoding field declared + if ($column['encoding'] == "base64") { + $display_text = $column['prefix'] . base64_decode($fieldname) . $column['suffix']; + #Check if there is a custom info to show when $fieldname is not empty + } else if ($column['listmodeon'] && $fieldname != "") { + $display_text = $column['prefix'] . gettext($column['listmodeon']). $column['suffix']; + #Check if there is a custom info to show when $fieldname is empty + } else if ($column['listmodeoff'] && $fieldname == "") { + $display_text = $column['prefix'] .gettext($column['listmodeoff']). $column['suffix']; + } else { + $display_text = $column['prefix'] . $fieldname ." ". $column['suffix']; + } + if (!isset($column['allow_html'])) { + $display_text = htmlspecialchars($display_text); + } + echo $display_text; + } ?> </td> <?php |