summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/pkg_mgr_install.php
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-06-08 14:10:50 -0400
committerRenato Botelho <renato@netgate.com>2016-06-08 19:02:26 -0400
commitddbe2c0cd9d283d8f6ecc65ffbdc5417f66d63b7 (patch)
tree9e403dadfdceee4a703bee0494395daa18c19abc /src/usr/local/www/pkg_mgr_install.php
parentd85e29b74bda133a0704bd7ee9fb493dc7095268 (diff)
downloadpfsense-ddbe2c0cd9d283d8f6ecc65ffbdc5417f66d63b7.zip
pfsense-ddbe2c0cd9d283d8f6ecc65ffbdc5417f66d63b7.tar.gz
Simplify mode parameter validation
Diffstat (limited to 'src/usr/local/www/pkg_mgr_install.php')
-rw-r--r--src/usr/local/www/pkg_mgr_install.php29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index b5ce5b0..771fe6c 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -221,23 +221,20 @@ function waitfor_string_in_file($filename, $string, $timeout) {
}
$pkgmode = '';
-if (!empty($_POST['mode'])) {
- $pkgmode = $_POST['mode'];
-} elseif (!empty($_GET['mode'])) {
- $pkgmode = $_GET['mode'];
-}
+if (!empty($_REQUEST['mode'])) {
+ $valid_modes = array(
+ 'reinstallall',
+ 'reinstallpkg',
+ 'delete',
+ 'installed'
+ );
+
+ if (!in_array($_REQUEST['mode'], $valid_modes)) {
+ header("Location: pkg_mgr_installed.php");
+ return;
+ }
-$valid_modes = array(
- '',
- 'reinstallall',
- 'reinstallpkg',
- 'delete',
- 'installed'
-);
-
-if (!in_array($pkgmode, $valid_modes)) {
- header("Location: pkg_mgr_installed.php");
- return;
+ $pkgmode = $_REQUEST['mode'];
}
if ($_POST) {
OpenPOWER on IntegriCloud