summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorbcyrill <cyrill@bannwart.info>2013-01-17 19:36:17 +0100
committerbcyrill <cyrill@bannwart.info>2013-01-17 19:36:17 +0100
commit633d51b75cf81e653c62ce94624dc68c80de11d6 (patch)
tree7c166674600ec4f881e9224862487784e4f94305 /usr/local
parent5f921566499a3a11ac3ffd5ab74bb43c53c9ef7b (diff)
downloadpfsense-633d51b75cf81e653c62ce94624dc68c80de11d6.zip
pfsense-633d51b75cf81e653c62ce94624dc68c80de11d6.tar.gz
Add version check to package install
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/pkg_mgr_install.php85
1 files changed, 42 insertions, 43 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 4f93408..ad3175c 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -1,32 +1,32 @@
<?php
/* $Id$ */
/*
- pkg_mgr_install.php
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com>
+ pkg_mgr_install.php
+ part of pfSense (http://www.pfSense.com)
+ Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2005 Colin Smith
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
*/
/*
pfSense_BUILDER_BINARIES: /bin/rm
@@ -52,8 +52,6 @@ $static_output = "";
$static_status = "";
$sendto = "output";
-$todo = array();
-
$pgtitle = array(gettext("System"),gettext("Package Manager"),gettext("Install Package"));
include("head.inc");
@@ -175,23 +173,24 @@ switch($_GET['mode']) {
update_output_window(sprintf(gettext("Could not find %s."), htmlspecialchars($_GET['pkg'])));
break;
case "reinstallall":
- if (is_array($config['installedpackages']['package']))
+ if (is_array($config['installedpackages']['package'])) {
+ $todo = array();
foreach($config['installedpackages']['package'] as $package)
$todo[] = array('name' => $package['name'], 'version' => $package['version']);
- $pkg_id = 0;
- foreach($todo as $pkgtodo) {
- $static_output = "";
- if($pkgtodo['name']) {
- update_output_window($static_output);
- uninstall_package($pkgtodo['name']);
- install_package($pkgtodo['name']);
- $pkg_id++;
+ foreach($todo as $pkgtodo) {
+ $static_output = "";
+ if($pkgtodo['name']) {
+ update_output_window($static_output);
+ uninstall_package($pkgtodo['name']);
+ install_package($pkgtodo['name']);
+ }
}
- }
- update_status(gettext("All packages reinstalled."));
- $static_output .= "\n" . gettext("All packages reinstalled.");
- update_output_window($static_output);
- filter_configure();
+ update_status(gettext("All packages reinstalled."));
+ $static_output .= "\n" . gettext("All packages reinstalled.");
+ update_output_window($static_output);
+ filter_configure();
+ } else
+ update_output_window(gettext("No packages are installed."));
break;
default:
$pkgid = htmlspecialchars($_GET['id']);
@@ -221,10 +220,10 @@ rmdir_recursive("/var/tmp/instmp*");
// close log
if($fd_log)
- fclose($fd_log);
+ fclose($fd_log);
if($fs_mounted_rw) {
/* Restore to read only fs */
conf_mount_ro();
}
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud