Message info
 
To:aur-dev@archlinux.org From:Lukas Fleischer Subject:[aur-dev] [PATCH] web/html/packages.php: Remove duplicate code Date:Sun, 6 May 2012 12:50:10 +0200
 

Retrieve the package ID early and merge the if-branches calling
package_details().

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
web/html/packages.php | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/web/html/packages.php b/web/html/packages.php
index 8f3b143..aa1d04c 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -89,28 +89,24 @@ html_header($title);

<?php
if (isset($_GET['ID'])) {
- include('pkg_search_form.php');
- if (!$_GET['ID'] = intval($_GET['ID'])) {
- print __("Error trying to retrieve package details.")."<br />\n";
- } else {
- if (isset($_COOKIE["AURSID"])) {
- package_details($_GET['ID'], $_COOKIE["AURSID"]);
- }
- else {
- package_details($_GET['ID'], null);
- }
- }
+ $pkgid = intval($_GET['ID']);
} else if (isset($_GET['N'])) {
+ $pkgid = pkgid_from_name($_GET['N']);
+} else {
+ unset($pkgid);
+}
+
+if (isset($pkgid)) {
include('pkg_search_form.php');
- if (!$pkgid = pkgid_from_name($_GET['N'])) {
- print __("Error trying to retrieve package details.")."<br />\n";
- } else {
+ if ($pkgid) {
if (isset($_COOKIE["AURSID"])) {
package_details($pkgid, $_COOKIE["AURSID"]);
}
else {
package_details($pkgid, null);
}
+ } else {
+ print __("Error trying to retrieve package details.")."<br />\n";
}
} else {
if (!isset($_GET['K']) && !isset($_GET['SB'])) {
--
1.7.10.1