From 457f7cc34ba39b3f91e0a2313683038c270fdc52 Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Tue, 11 Jul 2006 17:02:35 +0000
Subject: [PATCH] Move distribution related functions into distribution class
 and combine getNumberOfDistributions() and getNumberOfQueuedDistributions()
 by passing in a $bQueued flag

---
 include/distributions.php | 64 ++++++++++++++++++---------------------
 include/sidebar.php       |  2 +-
 include/testResults.php   |  2 +-
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/include/distributions.php b/include/distributions.php
index eaf944c..dcabfd1 100644
--- a/include/distributions.php
+++ b/include/distributions.php
@@ -387,48 +387,42 @@ class distribution{
         $this->sName = $aValues['sName'];
         $this->sUrl = $aValues['sUrl'];
     }
-}
 
-/* Make a dropdown list of distributions */
-function make_distribution_list($varname, $cvalue)
-{
-    $sQuery = "SELECT name, distributionId FROM distributions ORDER BY name";
-    $hResult = query_parameters($sQuery);
-    if(!$hResult) return;
-
-    echo "<select name='$varname'>\n";
-    echo "<option value=\"\">Choose ...</option>\n";
-    while(list($name, $value) = mysql_fetch_row($hResult))
+    /* Get the total number of Distributions in the database */
+    function getNumberOfDistributions($bQueued)
     {
-        if($value == $cvalue)
-            echo "<option value=$value selected>$name\n";
+        if($bQueued)
+            $hResult = query_parameters("SELECT count(*) as num_dists FROM
+                                        distributions WHERE queued='true';");
         else
-            echo "<option value=$value>$name\n";
+            $hResult = query_parameters("SELECT count(*) as num_dists FROM
+                                        distributions");
+        if($hResult)
+        {
+            $oRow = mysql_fetch_object($hResult);
+            return $oRow->num_dists;
+        }
+        return 0;
     }
-    echo "</select>\n";
-}
-/* Get the total number of Distributions in the database */
-function getNumberOfDistributions()
-{
-    $hResult = query_parameters("SELECT count(*) as num_dists FROM distributions");
-    if($hResult)
-    {
-      $oRow = mysql_fetch_object($hResult);
-      return $oRow->num_dists;
-    }
-    return 0;
-}
 
-/* Get the number of Queued Distributions in the database */
-function getNumberOfQueuedDistributions()
-{
-    $hResult = query_parameters("SELECT count(*) as num_dists FROM distributions WHERE queued='true';");
-    if($hResult)
+    /* Make a dropdown list of distributions */
+    function make_distribution_list($varname, $cvalue)
     {
-      $oRow = mysql_fetch_object($hResult);
-      return $oRow->num_dists;
+        $sQuery = "SELECT name, distributionId FROM distributions ORDER BY name";
+        $hResult = query_parameters($sQuery);
+        if(!$hResult) return;
+
+        echo "<select name='$varname'>\n";
+        echo "<option value=\"\">Choose ...</option>\n";
+        while(list($name, $value) = mysql_fetch_row($hResult))
+        {
+            if($value == $cvalue)
+                echo "<option value=$value selected>$name\n";
+            else
+                echo "<option value=$value>$name\n";
+        }
+        echo "</select>\n";
     }
-    return 0;
 }
 
 ?>
diff --git a/include/sidebar.php b/include/sidebar.php
index 9f65c77..4c0655f 100644
--- a/include/sidebar.php
+++ b/include/sidebar.php
@@ -27,7 +27,7 @@ function global_sidebar_menu() {
     $g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application");
     $g->add("Help &amp; Documentation", BASE."help/");
     $g->add("AppDB Stats", BASE."appdbStats.php");
-    $g->add("View Distributions (".getNumberOfDistributions().")", BASE."distributionView.php");
+    $g->add("View Distributions (".distribution::getNumberOfDistributions(false).")", BASE."distributionView.php");
     $g->add("View Vendors (".getNumberOfvendors().")", BASE."vendorview.php");
 
     $g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org");
diff --git a/include/testResults.php b/include/testResults.php
index abd36f7..ad9d09c 100644
--- a/include/testResults.php
+++ b/include/testResults.php
@@ -514,7 +514,7 @@ class testData{
             echo '<tr><td class=color0><b></b></td>',"\n";
         }
         echo '<td class=color0>',"\n";
-        make_distribution_list("iDistributionId", $this->iDistributionId);
+        distribution::make_distribution_list("iDistributionId", $this->iDistributionId);
         echo '</td></tr>',"\n";
         // Version List
         echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n";