diff options
| author | Colin Smith <colin@pfsense.org> | 2005-07-13 18:56:29 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-07-13 18:56:29 +0000 |
| commit | ce696feb1da4a85f13381a0c2560e3fe309eddcf (patch) | |
| tree | a9f458c02f985a005f8b3cc3e78a631b0308674f /usr/local/www/pkg.php | |
| parent | 7db8ff99c149db616220cf08e6825b5f400bdc53 (diff) | |
| download | pfsense-ce696feb1da4a85f13381a0c2560e3fe309eddcf.zip pfsense-ce696feb1da4a85f13381a0c2560e3fe309eddcf.tar.gz | |
Clean up eval()s.
Diffstat (limited to 'usr/local/www/pkg.php')
| -rwxr-xr-x | usr/local/www/pkg.php | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index deb6833..8f9d2ed 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -54,8 +54,7 @@ $section = $pkg['menu'][0]['section']; $config_path = $pkg['configpath']; $title = $section . ": " . $package_name; -$toeval = "\$evaledvar = \$config['installedpackages']['" . xml_safe_fieldname($pkg['name']) . "']['config'];"; -eval($toeval); +$evaledvar = $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']; if ($_GET['act'] == "del") { // loop through our fieldnames and automatically setup the fieldnames @@ -64,13 +63,11 @@ if ($_GET['act'] == "del") { foreach ($evaledvar as $ip) { if($pkg['adddeleteeditpagefields']['columnitem']) foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column) { - $toeval = "\$" . xml_safe_fieldname($column['fielddescr']) . " = " . "\$ip['" . xml_safe_fieldname($column['fieldname']) . "'];"; - eval($toeval); + ${xml_safe_fieldname($column['fielddescr'])} = $ip[xml_safe_fieldname($column['fieldname'])]; } } - $toeval = "\$a_pkg = &\$config['installedpackages']['" . xml_safe_fieldname($pkg['name']) . "']['config'];"; - eval($toeval); + $a_pkg = &$config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']; if ($a_pkg[$_GET['id']]) { if($pkg['custom_delete_php_command'] <> "") { @@ -86,8 +83,7 @@ if ($_GET['act'] == "del") { } } -$toeval = "\$evaledvar = \$config['installedpackages']['" . xml_safe_fieldname($pkg['name']) . "']['config'];"; -eval($toeval); +$evaledvar = $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']; if($pkg['custom_php_global_functions'] <> "") eval($pkg['custom_php_global_functions']); @@ -122,11 +118,9 @@ if ($pkg['tabs'] <> "") { if($tab['url'] <> "") $urltmp = $tab['url']; if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml']; - $toeval = "\$myurl = \"" . getenv("HTTP_HOST") . "\"; \n"; - eval($toeval); + $myurl = getenv("HTTP_HOST"); // eval url so that above $myurl item can be processed if need be. - $toeval = "\$url = \"" . $urltmp . "\"; \n"; - eval($toeval); + $url = $urltmp; if($active == "tabinact") { echo "<li class=\"{$active}\">"; @@ -173,8 +167,7 @@ if ($pkg['tabs'] <> "") { ?> <td class="listlr" ondblclick="document.location='pkg_edit.php?xml=<?=$xml?>&act=edit&id=<?=$i;?>';"> <?php - $toeval="\$fieldname = \$ip['" . xml_safe_fieldname($column['fieldname']) . "'];"; - eval($toeval); + $fieldname = $ip[xml_safe_fieldname($column['fieldname'])]; if($column['type'] == "checkbox") { if($fieldname == "") { echo "No"; |
