summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-10-05 15:31:11 -0400
committerStephen Beaver <sbeaver@netgate.com>2015-10-05 15:31:11 -0400
commit5fec2813cf73f58297b80b6d167910e1507a2f52 (patch)
tree3b8e31ac274a25dfda37884d2f896614988995fb /src/usr/local
parent9c82e8ed2338be92ee227797cabe0e5608199472 (diff)
downloadpfsense-5fec2813cf73f58297b80b6d167910e1507a2f52.zip
pfsense-5fec2813cf73f58297b80b6d167910e1507a2f52.tar.gz
Fixed #5252
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/pkg_mgr_install.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 457f7c6..238d65e 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -31,7 +31,7 @@
*/
/*
pfSense_BUILDER_BINARIES: /bin/rm
- pfSense_MODULE: pkgs
+ pfSense_MODULE: pkgs
*/
##|+PRIV
@@ -60,6 +60,11 @@ if ($_POST) {
header("Location: pkg_mgr_installed.php");
return;
}
+
+ if (isset($_POST['pkgcancel']) || (empty($_POST['id']) && $_POST['mode'] != 'reinstallall')) {
+ header("Location: pkg_mgr_installed.php");
+ return;
+ }
} else if ($_GET) {
switch ($_GET['mode']) {
case 'reinstallall':
@@ -255,7 +260,7 @@ if ($_GET) {
if ($status) {
$static_output .= "\n" . gettext("Installation completed.") . "\n{$pkgid} " . gettext("setup instructions") . ":\n{$status}";
} else {
- $static_output .= "\n" . gettext("Installation completed. Please check to make sure that the package is configured from the respective menu then start the package.");
+ $static_output .= "\n" . gettext("Installation completed. Please check to make sure that the package is configured from the respective menu then start the package.");
}
@file_put_contents("/tmp/{$pkgid}.info", $static_output);
OpenPOWER on IntegriCloud