summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--web/html/packages.php6
-rw-r--r--web/lib/pkgfuncs.inc11
2 files changed, 10 insertions, 7 deletions
diff --git a/web/html/packages.php b/web/html/packages.php
index 4e52fa0c..5b2d5ef4 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -62,12 +62,12 @@ if ($output):
<?php
endif;
-if (isset($_GET["ID"])) {
+if (isset($_GET['ID'])) {
include('pkg_search_form.php');
- if (!intval($_GET["ID"])) {
+ if (!$_GET['ID'] = intval($_GET['ID'])) {
print __("Error trying to retrieve package details.")."<br />\n";
} else {
- package_details($_GET["ID"], $_COOKIE["AURSID"]);
+ package_details($_GET['ID'], $_COOKIE["AURSID"]);
}
} else {
pkg_search_page($_COOKIE["AURSID"]);
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 5ce659ef..b95f910d 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -180,7 +180,11 @@ function package_comments($pkgid=0) {
$q.= " AND DelUsersID = 0"; # only display non-deleted comments
$q.= " ORDER BY CommentTS DESC";
$result = db_query($q, $dbh);
- if (!$result) {print 'poop';return array();}
+
+ if (!$result) {
+ return;
+ }
+
while ($row = mysql_fetch_assoc($result)) {
$comments[] = $row;
}
@@ -268,7 +272,6 @@ function pkgname_from_id($id="") {
# display package details
#
function package_details($id=0, $SID="") {
- global $_REQUEST;
global $pkgsearch_vars;
$atype = account_from_sid($SID);
$uid = uid_from_sid($SID);
@@ -277,7 +280,7 @@ function package_details($id=0, $SID="") {
$q.= "FROM Packages,PackageLocations,PackageCategories ";
$q.= "WHERE Packages.LocationID = PackageLocations.ID ";
$q.= "AND Packages.CategoryID = PackageCategories.ID ";
- $q.= "AND Packages.ID = " . intval($_REQUEST['ID']);
+ $q.= "AND Packages.ID = " . intval($id);
$dbh = db_connect();
$results = db_query($q, $dbh);
@@ -300,7 +303,7 @@ function package_details($id=0, $SID="") {
}
# Print Comments
- $comments = package_comments($_REQUEST['ID']);
+ $comments = package_comments($id);
if (!empty($comments)) {
include('pkg_comments.php');
}