summaryrefslogtreecommitdiffstats
path: root/usr/local/www/pkg_mgr.php
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2004-12-12 20:25:24 +0000
committerScott Ullrich <sullrich@pfsense.org>2004-12-12 20:25:24 +0000
commit859329c867ad0deacb58b5c577d1c54f4767a436 (patch)
treef1769fdc0be8f278de4dd940a4798b5aeddeef2d /usr/local/www/pkg_mgr.php
parenta7f908dbec43e9764b084ddd8c066f0de8ecc28a (diff)
downloadpfsense-859329c867ad0deacb58b5c577d1c54f4767a436.zip
pfsense-859329c867ad0deacb58b5c577d1c54f4767a436.tar.gz
* converted return_menu to return_ext_menu in fbegin.inc.
* fixed interfaces left menu from not displaying additional interfaces by saving and restoring config value. * equipped edit.php with the pfSense theme so it looks uniform
Diffstat (limited to 'usr/local/www/pkg_mgr.php')
-rwxr-xr-xusr/local/www/pkg_mgr.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 2610346..31ee1a2 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -63,7 +63,12 @@ if ($_POST) {
</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
+<?php
+$config_tmp = $config;
+$config = $pfSense_config;
+include("fbegin.inc");
+$config = $config_tmp;
+?>
<p class="pgtitle">System: Package Manager</p>
<form action="firewall_nat_out_load_balancing.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
@@ -73,8 +78,14 @@ if ($_POST) {
<?php endif; ?>
<?php
$configa = $config;
+
+// Allow package location to be overriden
+$config_location = "http://www.pfsense.com/packages/pkg_config.xml";
+if($configa['package_location'])
+ $config_location = $configa['package_location'];
+
if(!file_exists("/tmp/pkg_config.xml")) {
- mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"http://www.pfsense.com/packages/pkg_config.xml\" >/dev/null 2>&1 ");
+ mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"" . $config_location . "\" >/dev/null 2>&1 ");
if(!file_exists("{$g['tmp_path']}/pkg_config.xml")) {
print_info_box_np("Could not download pkg_config.xml from pfSense.com. Check your DNS settings.");
die;
OpenPOWER on IntegriCloud