From 8f658975925c98ae9ced49a6fa15dc8e917d38c2 Mon Sep 17 00:00:00 2001
From: WineHQ <wineowner@winehq.org>
Date: Sat, 14 Jan 2006 03:30:35 +0000
Subject: [PATCH] Chris Morgan Only display testing results for applications
 that are not currently queued if the user isn't an admin.

---
 distributionView.php      |  8 ++++++++
 include/distributions.php | 22 +++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/distributionView.php b/distributionView.php
index 87ec568..5a6e879 100644
--- a/distributionView.php
+++ b/distributionView.php
@@ -119,6 +119,14 @@ else
             $oApp  = new application($oVersion->iAppId);
             $oSubmitter = new User($oTest->iSubmitterId);
             $bgcolor = $oTest->sTestedRating;
+
+            /* make sure the user can view the versions we list in the table */
+            /* otherwise skip over displaying the entries in this table */
+            if(!$_SESSION[current]->canViewApplication($oApp))
+                continue;
+            if(!$_SESSION[current]->canViewVersion($oVersion))
+                continue;
+
             echo '<tr class='.$bgcolor.'>',"\n";
             echo '<td><a href="'.BASE.'appview.php?versionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n";
             echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n";
diff --git a/include/distributions.php b/include/distributions.php
index f749844..05ce49f 100644
--- a/include/distributions.php
+++ b/include/distributions.php
@@ -44,9 +44,25 @@ class distribution{
             /*
              * We fetch Test Result Ids. 
              */
-            $sQuery = "SELECT testingId
-                       FROM testResults
-                       WHERE distributionId = ".$iDistributionId;
+
+            if($_SESSION['current']->hasPriv("admin"))
+            {
+                $sQuery = "SELECT testingId
+                             FROM testResults
+                             WHERE distributionId = ".$iDistributionId;
+            } else /* only let users view test results that aren't queued and for apps that */
+                   /* aren't queued or versions that aren't queued */
+            {
+                $sQuery = "SELECT testingId
+                             FROM testResults, appFamily, appVersion
+                             WHERE testResults.queued = 'false' AND
+                                    testResults.versionId = appVersion.versionId AND
+                                    appFamily.appId = appVersion.appId AND
+                                    appFamily.queued = 'false' AND
+                                    appVersion.queued = 'false' AND
+                                    distributionId = ".$iDistributionId;
+            }
+
             if($hResult = query_appdb($sQuery))
             {
                 while($oRow = mysql_fetch_object($hResult))