summaryrefslogtreecommitdiffstats
path: root/usr/local/www/pkg_mgr_install.php
diff options
context:
space:
mode:
authorMatthew Grooms <mgrooms@pfsense.org>2008-09-10 18:41:07 +0000
committerMatthew Grooms <mgrooms@pfsense.org>2008-09-10 18:41:07 +0000
commit4c951cc9c9265fa036835dc76a386ebb59c11c50 (patch)
tree95b524c4df823a72c4dd599fc18c93af31d07522 /usr/local/www/pkg_mgr_install.php
parent228d6f9acbeaa85cfcb469d6d1d2cd5da7528926 (diff)
downloadpfsense-4c951cc9c9265fa036835dc76a386ebb59c11c50.zip
pfsense-4c951cc9c9265fa036835dc76a386ebb59c11c50.tar.gz
Whitespace and minor bug fixes for package manager pages.
Diffstat (limited to 'usr/local/www/pkg_mgr_install.php')
-rwxr-xr-xusr/local/www/pkg_mgr_install.php200
1 files changed, 99 insertions, 101 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 3572d88..6edb347 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -52,62 +52,60 @@ include("head.inc");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<form action="pkg_mgr_install.php" method="post">
-
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php
-?>
-<div id="mainareapkg">
-<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td>
-<?php
- $version = file_get_contents("/etc/version");
- $tab_array = array();
- $tab_array[] = array("Available {$version} packages", false, "pkg_mgr.php");
- $tab_array[] = array("Packages for any platform", false, "pkg_mgr.php?ver=none");
-/* $tab_array[] = array("Packages for a different platform", $requested_version == "other" ? true : false, "pkg_mgr.php?ver=other"); */
- $tab_array[] = array("Installed packages", false, "pkg_mgr_installed.php");
- $tab_array[] = array("Package Installer", true, "");
- display_top_tabs($tab_array);
-?>
- </td></tr>
- <tr>
- <td class="tabcont">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
- <td>
- <center>
- <table height='15' width='420' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
+ <form action="pkg_mgr_install.php" method="post">
+ <div id="mainareapkg">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height='15' width='5'>
- </td>
<td>
- <table id="progholder" name="progholder" height='15' width='410' border='0' colspacing='0' cellpadding='0' cellspacing='0'><td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" valign="top" align="left"><img src='./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'></td></table>
+ <?php
+ $version = file_get_contents("/etc/version");
+ $tab_array = array();
+ $tab_array[] = array("Available {$version} packages", false, "pkg_mgr.php");
+ $tab_array[] = array("Packages for any platform", false, "pkg_mgr.php?ver=none");
+// $tab_array[] = array("Packages for a different platform", $requested_version == "other" ? true : false, "pkg_mgr.php?ver=other");
+ $tab_array[] = array("Installed packages", false, "pkg_mgr_installed.php");
+ $tab_array[] = array("Package Installer", true, "");
+ display_top_tabs($tab_array);
+ ?>
</td>
- <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height='15' width='5'>
+ </tr>
+ <tr>
+ <td class="tabcont">
+ <center>
+ <table height='15' width='420' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height='15' width='5'>
+ </td>
+ <td>
+ <table id="progholder" name="progholder" height='15' width='410' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
+ <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" valign="top" align="left">
+ <img src='./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'>
+ </td>
+ </table>
+ </td>
+ <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height='15' width='5'>
+ </td>
+ </tr>
+ </table>
+ <br>
+ <!-- status box -->
+ <textarea cols="60" rows="1" name="status" id="status" wrap="hard">
+ Beginning package installation.
+ </textarea>
+ <!-- command output box -->
+ <textarea cols="60" rows="25" name="output" id="output" wrap="hard">
+ </textarea>
+ </center>
</td>
</tr>
</table>
- <br>
- <!-- status box -->
- <textarea cols="60" rows="1" name="status" id="status" wrap="hard">Beginning package installation.</textarea>
- <!-- command output box -->
- <textarea cols="60" rows="25" name="output" id="output" wrap="hard"></textarea>
- </center>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-</div>
-</form>
+ </div>
+ </form>
<?php include("fend.inc"); ?>
-
<script type="text/javascript">
NiftyCheck();
Rounded("div#mainareapkg","bl br","#FFF","#eeeeee","smooth");
</script>
-
</body>
</html>
@@ -121,70 +119,70 @@ conf_mount_rw();
switch($_GET['mode']) {
case "delete":
- $id = get_pkg_id($_GET['pkg']);
- $todel = substr(reverse_strrchr($config['installedpackages']['package'][$id]['depends_on_package'], "."), 0, -1);
- delete_package($todel, htmlspecialchars($_GET['pkg']));
- delete_package_xml(htmlspecialchars($_GET['pkg']));
- update_status("Package deleted.");
- $static_output .= "\nPackage deleted.";
- update_output_window($static_output);
- break;
+ $id = get_pkg_id($_GET['pkg']);
+ $todel = substr(reverse_strrchr($config['installedpackages']['package'][$id]['depends_on_package'], "."), 0, -1);
+ delete_package($todel, htmlspecialchars($_GET['pkg']));
+ delete_package_xml(htmlspecialchars($_GET['pkg']));
+ update_status("Package deleted.");
+ $static_output .= "\nPackage deleted.";
+ update_output_window($static_output);
+ break;
case "showlog":
- $id = htmlspecialchars($_GET['pkg']);
- if(strpos($id, "."))
- exit;
- update_output_window(file_get_contents("/tmp/pkg_mgr_{$id}.log"));
- break;
+ $id = htmlspecialchars($_GET['pkg']);
+ if(strpos($id, "."))
+ exit;
+ update_output_window(file_get_contents("/tmp/pkg_mgr_{$id}.log"));
+ break;
case "reinstallpkg":
- $id = get_pkg_id(htmlspecialchars($_GET['pkg']));
- $todel = substr(reverse_strrchr($config['installedpackages']['package'][$id]['depends_on_package'], "."), 0, -1);
- delete_package($todel, htmlspecialchars($_GET['pkg']));
- delete_package_xml(htmlspecialchars($_GET['pkg']));
- install_package(htmlspecialchars($_GET['pkg']));
- update_status("Package reinstalled.");
- $static_output .= "\n\nPackage reinstalled.";
- start_service(htmlspecialchars($_GET['pkg']));
- update_output_window($static_output);
- break;
+ $id = get_pkg_id(htmlspecialchars($_GET['pkg']));
+ $todel = substr(reverse_strrchr($config['installedpackages']['package'][$id]['depends_on_package'], "."), 0, -1);
+ delete_package($todel, htmlspecialchars($_GET['pkg']));
+ delete_package_xml(htmlspecialchars($_GET['pkg']));
+ install_package(htmlspecialchars($_GET['pkg']));
+ update_status("Package reinstalled.");
+ $static_output .= "\n\nPackage reinstalled.";
+ start_service(htmlspecialchars($_GET['pkg']));
+ update_output_window($static_output);
+ break;
case "reinstallxml":
- delete_package_xml(htmlspecialchars($_GET['pkg']));
- install_package(htmlspecialchars($_GET['pkg']));
- $static_output .= "\n\nPackage reinstalled.";
- start_service(htmlspecialchars($_GET['pkg']));
- update_output_window($static_output);
- break;
+ delete_package_xml(htmlspecialchars($_GET['pkg']));
+ install_package(htmlspecialchars($_GET['pkg']));
+ $static_output .= "\n\nPackage reinstalled.";
+ start_service(htmlspecialchars($_GET['pkg']));
+ update_output_window($static_output);
+ break;
case "reinstallall":
- if($config['installedpackages']['package'])
+ if ($config['installedpackages']['package'])
exec("rm -rf /var/db/pkg/*");
- 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);
- delete_package($pkgtodo['name'] . '-' . $pkgtodo['version'], $pkg_id);
- delete_package_xml($pkgtodo['name']);
- install_package($pkgtodo['name']);
- $pkg_id++;
- }
- }
- update_status("All packages reinstalled.");
- $static_output .= "\n\nAll packages reinstalled.";
- start_service(htmlspecialchars($_GET['pkg']));
- update_output_window($static_output);
- break;
+ if (is_array($config['installedpackages']['package']))
+ 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);
+ delete_package($pkgtodo['name'] . '-' . $pkgtodo['version'], $pkg_id);
+ delete_package_xml($pkgtodo['name']);
+ install_package($pkgtodo['name']);
+ $pkg_id++;
+ }
+ }
+ update_status("All packages reinstalled.");
+ $static_output .= "\n\nAll packages reinstalled.";
+ start_service(htmlspecialchars($_GET['pkg']));
+ update_output_window($static_output);
+ break;
default:
- $status = install_package(htmlspecialchars($_GET['id']));
- if($status == -1) {
- update_status("Installation of " . htmlspecialchars($_GET['id']) . " FAILED!");
- $static_output .= "\n\nInstallation halted.";
- } else {
+ $status = install_package(htmlspecialchars($_GET['id']));
+ if($status == -1) {
+ update_status("Installation of " . htmlspecialchars($_GET['id']) . " FAILED!");
+ $static_output .= "\n\nInstallation halted.";
+ } else {
update_status("Installation of " . htmlspecialchars($_GET['id']) . " completed.");
$static_output .= "\n\nInstallation completed. Please check to make sure that the package is configured from the respective menu then start the package.";
- }
- update_output_window($static_output);
-
+ }
+ update_output_window($static_output);
}
// Delete all temporary package tarballs and staging areas.
OpenPOWER on IntegriCloud