diff options
author | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-03 21:03:51 +0000 |
---|---|---|
committer | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-03 21:03:51 +0000 |
commit | d591e2e19e061da8d7b1a9bfd29ac07cf7ae1b42 (patch) | |
tree | 7f549434ba4046f01fc4d1847fc9aa24ba1e25ee /usr | |
parent | f5054d5798399b458e9ab624e480bf5025af46f1 (diff) | |
download | pfsense-d591e2e19e061da8d7b1a9bfd29ac07cf7ae1b42.zip pfsense-d591e2e19e061da8d7b1a9bfd29ac07cf7ae1b42.tar.gz |
Major whitespace cleanup. Fix some html table column class mismatches that
made for ugly output
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/pkg_mgr.php | 256 |
1 files changed, 127 insertions, 129 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 7ad1d85..9a526aa 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -43,22 +43,20 @@ if($pkg_info) { $fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w"); fwrite($fout, serialize($pkg_info)); fclose($fout); - //$pkg_sizes = get_pkg_sizes(); + //$pkg_sizes = get_pkg_sizes(); } else { $using_cache = true; if(file_exists("{$g['tmp_path']}/pkg_info.cache")) { - $savemsg = "Unable to retrieve package info from {$g['xmlrpcbaseurl']}. Cached data will be used."; + $savemsg = "Unable to retrieve package info from {$g['xmlrpcbaseurl']}. Cached data will be used."; $pkg_info = unserialize(@file_get_contents("{$g['tmp_path']}/pkg_info.cache")); } else { $savemsg = "Unable to communicate to {$g['product_website']}. Please check DNS, default gateway, etc."; } } -if (! empty($_GET)) { - if (isset($_GET['ver'])) { - $requested_version = htmlspecialchars($_GET['ver']); - } -} +if (! empty($_GET)) + if (isset($_GET['ver'])) + $requested_version = htmlspecialchars($_GET['ver']); $pgtitle = array("System","Package Manager"); include("head.inc"); @@ -67,134 +65,134 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php -include("fbegin.inc"); -?> -<?php if ($savemsg) print_info_box($savemsg); ?> -<?php - -?> - -<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> -<?php - $version = file_get_contents("/etc/version"); - $dot = strpos($version, "."); - $hyphen = strpos($version, "-"); - $major = substr($version, 0, $dot); - $minor = substr($version, $dot + 1, $hyphen - $dot - 1); - $testing_version = substr($version, $hyphen + 1, strlen($version) - $hyphen); - - $tab_array = array(); - $tab_array[] = array("Available {$version} packages", $requested_version <> "" ? false : true, "pkg_mgr.php"); - $tab_array[] = array("Packages for any platform", $requested_version == "none" ? true : false, "pkg_mgr.php?ver=none"); -/* $tab_array[] = array("Packages with a different version", $requested_version == "other" ? true : false, "pkg_mgr.php?ver=other"); */ - $tab_array[] = array("Installed Packages", false, "pkg_mgr_installed.php"); - display_top_tabs($tab_array); + include("fbegin.inc"); + if ($savemsg) + print_info_box($savemsg); ?> - </td></tr> - <tr> - <td> - <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="10%" class="listhdrr">Package Name</td> - <td width="25%" class="listhdrr">Category</td> -<!-- - <td width="10%" class="listhdrr">Size</td> ---> - <td width="5%" class="listhdrr">Status</td> - <td width="5%" class="listhdrr">Maintainer</td> - <td width="50%" class="listhdr">Description</td> - </tr> - +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td> <?php - if(!$pkg_info) { - echo "<tr><td colspan=\"5\"><center>There are currently no packages available for installation.</td></tr>"; - } else { - $pkgs = array(); - $instpkgs = array(); - if($config['installedpackages']['package'] != "") - foreach($config['installedpackages']['package'] as $instpkg) $instpkgs[] = $instpkg['name']; - $pkg_names = array_keys($pkg_info); - $pkg_keys = array(); - foreach($pkg_names as $name) { - if(!in_array($name, $instpkgs)) $pkg_keys[] = $name; - } - sort($pkg_keys); - if(count($pkg_keys) != 0) { - foreach($pkg_keys as $key) { - $index = &$pkg_info[$key]; - if(in_array($index['name'], $instpkgs)) continue; - $dot = strpos($index['required_version'], "."); - $index['major_version'] = substr($index['required_version'], 0, $dot); - - if ($version <> "HEAD" && - $index['required_version'] == "HEAD" && - $requested_version <> "other") { continue; } - if (empty($index['required_version']) && - $requested_version <> "none") { continue; } - if($index['major_version'] > $major && - $requested_version <> "other") { continue; } - if(isset($index['major_version']) && - $requested_version == "none") { continue; } - if($index['major_version'] == $major && - $requested_version == "other") { continue; } - - ?> - <tr valign="top"> - <td class="listlr"> - <A target="_blank" href="<?= $index['website'] ?>"><?= $index['name'] ?></a> - </td> - <td class="listlr"> - <?= $index['category'] ?> - </td> - <?php - /* - if(!$using_cache) { - $size = get_package_install_size($index['name'], $pkg_sizes); - $size = squash_from_bytes($size[$index['name']], 1); - } - if(!$size) $size = "Unknown."; - */ - ?> - <!-- - <td class="listlr"> - <?= $size ?> - </td> - --> - <td class="listlr"> - <?= $index['status'] ?> - <br> - <?= $index['version'] ?> - <br /> - platform: <?= $index['required_version'] ?> - </td> - <td class="listlr"> + $version = file_get_contents("/etc/version"); + $dot = strpos($version, "."); + $hyphen = strpos($version, "-"); + $major = substr($version, 0, $dot); + $minor = substr($version, $dot + 1, $hyphen - $dot - 1); + $testing_version = substr($version, $hyphen + 1, strlen($version) - $hyphen); + + $tab_array = array(); + $tab_array[] = array("Available {$version} packages", $requested_version <> "" ? false : true, "pkg_mgr.php"); + $tab_array[] = array("Packages for any platform", $requested_version == "none" ? true : false, "pkg_mgr.php?ver=none"); +// $tab_array[] = array("Packages with a different version", $requested_version == "other" ? true : false, "pkg_mgr.php?ver=other"); + $tab_array[] = array("Installed Packages", false, "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="10%" class="listhdrr">Package Name</td> + <td width="25%" class="listhdrr">Category</td> +<!-- <td width="10%" class="listhdrr">Size</td> --> + <td width="5%" class="listhdrr">Status</td> + <td width="5%" class="listhdrr">Maintainer</td> + <td width="50%" class="listhdr">Description</td> + </tr> <?php - if($index['maintainer'] != "") { - echo "<a href='mailto:{$index['maintainer']}'>{$index['maintainer']}</a>"; + if(!$pkg_info) { + echo "<tr><td colspan=\"5\"><center>There are currently no packages available for installation.</td></tr>"; } else { - echo "Nobody. <a href='mailto:{$g['product_email']}'>Apply</a> for it!"; + $pkgs = array(); + $instpkgs = array(); + if($config['installedpackages']['package'] != "") + foreach($config['installedpackages']['package'] as $instpkg) $instpkgs[] = $instpkg['name']; + $pkg_names = array_keys($pkg_info); + $pkg_keys = array(); + foreach($pkg_names as $name) + if(!in_array($name, $instpkgs)) $pkg_keys[] = $name; + sort($pkg_keys); + if(count($pkg_keys) != 0) { + foreach($pkg_keys as $key) { + $index = &$pkg_info[$key]; + if(in_array($index['name'], $instpkgs)) continue; + $dot = strpos($index['required_version'], "."); + $index['major_version'] = substr($index['required_version'], 0, $dot); + + if ($version <> "HEAD" && + $index['required_version'] == "HEAD" && + $requested_version <> "other") + continue; + if (empty($index['required_version']) && + $requested_version <> "none") + continue; + if($index['major_version'] > $major && + $requested_version <> "other") + continue; + if(isset($index['major_version']) && + $requested_version == "none") + continue; + if($index['major_version'] == $major && + $requested_version == "other") + continue; + ?> + <tr valign="top"> + <td class="listlr"> + <A target="_blank" href="<?= $index['website'] ?>"><?= $index['name'] ?></a> + </td> + <td class="listr"> + <?= $index['category'] ?> + </td> + <?php + /* + if(!$using_cache) { + $size = get_package_install_size($index['name'], $pkg_sizes); + $size = squash_from_bytes($size[$index['name']], 1); + } + if(!$size) + $size = "Unknown."; + */ + ?> +<!-- + <td class="listr"> + <?= $size ?> + </td> +--> + <td class="listr"> + <?= $index['status'] ?> + <br/> + <?= $index['version'] ?> + <br/> + platform: <?= $index['required_version'] ?> + </td> + <td class="listr"> + <?php + if($index['maintainer'] != "") + echo "<a href='mailto:{$index['maintainer']}'>{$index['maintainer']}</a>"; + else + echo "Nobody. <a href='mailto:{$g['product_email']}'>Apply</a> for it!"; + ?> + </td> + <td class="listbg" class="listbg" style="color: #FFFFFF; overflow: hidden;"> + <?= $index['descr'] ?> + </td> + <td valign="middle" class="list" nowrap> + <a onclick="return confirm('Do you really want to install this package?')" href="pkg_mgr_install.php?id=<?=$index['name'];?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a> + </td> + </tr> + <?php + } + } else { + echo '<tr><td colspan="5"><center>There are currently no packages available for installation.</center></td></tr>'; + } } ?> - </td> - <td class="listbg" class="listbg" style="color: #FFFFFF; overflow: hidden;"> - <?= $index['descr'] ?> - </td> - <td valign="middle" class="list" nowrap> - <a onclick="return confirm('Do you really want to install this package?')" href="pkg_mgr_install.php?id=<?=$index['name'];?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a> - </td> - </tr> - <?php - } - } else { - echo '<tr><td colspan="5"><center>There are currently no packages available for installation.</center></td></tr>'; - } - } - ?> - </table> - </div> - </td> - </tr> + </table> + </div> + </td> + </tr> </table> <?php include("fend.inc"); ?> </body> |