diff options
author | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-10 18:41:07 +0000 |
---|---|---|
committer | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-10 18:41:07 +0000 |
commit | 4c951cc9c9265fa036835dc76a386ebb59c11c50 (patch) | |
tree | 95b524c4df823a72c4dd599fc18c93af31d07522 /usr/local | |
parent | 228d6f9acbeaa85cfcb469d6d1d2cd5da7528926 (diff) | |
download | pfsense-4c951cc9c9265fa036835dc76a386ebb59c11c50.zip pfsense-4c951cc9c9265fa036835dc76a386ebb59c11c50.tar.gz |
Whitespace and minor bug fixes for package manager pages.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/pkg_mgr_install.php | 200 | ||||
-rwxr-xr-x | usr/local/www/pkg_mgr_installed.php | 197 |
2 files changed, 209 insertions, 188 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. diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 9459653..51f9686 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -51,93 +51,116 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc"); ?> -<?php if ($savemsg) print_info_box($savemsg); ?> -<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", true, "pkg_mgr_installed.php"); - display_top_tabs($tab_array); -?> - </td></tr> - <tr> - <td> - <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="15%" class="listhdrr">Package Name</td> - <td width="20%" class="listhdrr">Category</td> - <td width="10%" class="listhdrr">Package Version</td> - <td width="45%" class="listhdr">Description</td> - </tr> - <?php - if($config['installedpackages']['package'] != "") { - $instpkgs = array(); - foreach($config['installedpackages']['package'] as $instpkg) $instpkgs[] = $instpkg['name']; - asort($instpkgs); - foreach ($instpkgs as $index => $pkgname){ - $pkg = $config['installedpackages']['package'][$index]; - if($pkg['name'] <> "") { - ?> - <tr valign="top"> - <td class="listlr"> - <?= $pkg['name'] ?> - </td> - <td class="listlr"> - <?= $pkg['category'] ?> - </td> - <?php - $latest_package = $currentvers[$pkg['name']]['version']; - if($latest_package == false) { - // We can't determine this package's version status. - ?><td class="listlr"><?php - echo "Current: Unknown.<br>Installed: " . $pkg['version']; - ?></td><?php - } elseif(strcmp($pkg['version'], $latest_package) > 0) { - /* we're running a newer version of the package */ - ?><td class="listbggrey"><font color="#FFFFFF"><?php - echo "Current: {$latest_package}"; - echo "<br>Installed: {$pkg['version']}"; - ?></td><?php - } elseif(strcmp($pkg['version'], $latest_package) < 0) { - /* our package is out of date */ - ?><td class="listbg"><font color="#FFFFFF"><?php - echo "Current: {$latest_package}"; - echo "<br>Installed: {$pkg['version']}"; - ?></td><?php - } else { - ?><td class="listlr"><?php - echo $pkg['version']; - ?></td><?php - } - ?> - <td class="listbg"> - <font color="#ffffff"> - <?= $pkg['descr'] ?> - </td> - <td valign="middle" class="list" nowrap> - <a onclick="return confirm('Do you really want to remove this package?')" href="pkg_mgr_install.php?mode=delete&pkg=<?= $pkg['name']; ?>"><img title="Remove this package." src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a> - <br> - <a href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?= $pkg['name']; ?>"><img title="Reinstall this package." src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0"</a> - <a href="pkg_mgr_install.php?mode=reinstallxml&pkg=<?= $pkg['name']; ?>"><img title="Reinstall this package's GUI components." src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0"</a> - </td> - </tr> - <?php - } - } - } else { - echo "<tr><td colspan=\"5\"><center>There are no packages currently installed.</td></tr>"; - } - ?> - </table> - </div> - </td> - </tr> -</table> + <?php include("fbegin.inc"); ?> + <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", true, "pkg_mgr_installed.php"); + display_top_tabs($tab_array); + ?> + </td> + </tr> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="15%" class="listhdrr">Package Name</td> + <td width="20%" class="listhdrr">Category</td> + <td width="10%" class="listhdrr">Package Version</td> + <td width="45%" class="listhdr">Description</td> + </tr> + <?php + if(is_array($config['installedpackages']['package'])): + + $instpkgs = array(); + foreach($config['installedpackages']['package'] as $instpkg) + if($instpkg['name']) + $instpkgs[] = $instpkg['name']; + asort($instpkgs); + + foreach ($instpkgs as $index => $pkgname): + + $pkg = $config['installedpackages']['package'][$index]; + if(!$pkg['name']) + continue; + + $latest_package = $currentvers[$pkg['name']]['version']; + if ($latest_package) { + // we're running a newer version of the package + if(strcmp($pkg['version'], $latest_package) > 0) { + $tdclass = "listbggrey"; + $pkgver = "Available: {$latest_package}<br/>"; + $pkgver .= "Installed: {$pkg['version']}"; + } + // we're running an older version of the package + if(strcmp($pkg['version'], $latest_package) < 0) { + $tdclass = "listbg"; + $pkgver = "Available: {$latest_package}<br/>"; + $pkgver .= "Installed: {$pkg['version']}"; + } + // we're running the current version + if(!strcmp($pkg['version'], $latest_package)) { + $tdclass = "listr"; + $pkgver = $pkg['version']; + } + } else { + // unknown available package version + if(!strcmp($pkg['version'], $latest_package)) { + $tdclass = "listr"; + $pkgver = $pkg['version']; + } + } + ?> + <tr valign="top"> + <td class="listlr"> + <?=$pkg['name'];?> + </td> + <td class="listr"> + <?=$pkg['category'];?> + </td> + <td class="<?=$tdclass;?>"> + <?=$pkgver;?> + </td> + <td class="listbg"> + <font color="#ffffff"> + <?=$pkg['descr'];?> + </font> + </td> + <td valign="middle" class="list" nowrap> + <a onclick="return confirm('Do you really want to remove this package?')" href="pkg_mgr_install.php?mode=delete&pkg=<?= $pkg['name']; ?>"> + <img title="Remove this package." src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"> + </a> + <br> + <a href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?= $pkg['name']; ?>"> + <img title="Reinstall this package." src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0"> + </a> + <a href="pkg_mgr_install.php?mode=reinstallxml&pkg=<?= $pkg['name']; ?>"> + <img title="Reinstall this package's GUI components." src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0"> + </a> + </td> + </tr> + <?php + endforeach; + else: + ?> + <tr> + <td colspan="5" align="center"> + There are no packages currently installed. + </td> + </tr> + <?php endif; ?> + </table> + </div> + </td> + </tr> + </table> <?php include("fend.inc"); ?> </body> </html> |