appdb/include distributions.php sidebar.php te ...
WineHQ
wineowner at wine.codeweavers.com
Tue Jul 11 12:02:35 CDT 2006
ChangeSet ID: 26457
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2006/07/11 12:02:35
Modified files:
include : distributions.php sidebar.php testResults.php
Log message:
Chris Morgan <cmorgan at alum.wpi.edu>
Move distribution related functions into distribution class and combine getNumberOfDistributions() and
getNumberOfQueuedDistributions() by passing in a $bQueued flag
Patch: http://cvs.winehq.org/patch.py?id=26457
Old revision New revision Changes Path
1.12 1.13 +29 -35 appdb/include/distributions.php
1.20 1.21 +1 -1 appdb/include/sidebar.php
1.33 1.34 +1 -1 appdb/include/testResults.php
Index: appdb/include/distributions.php
diff -u -p appdb/include/distributions.php:1.12 appdb/include/distributions.php:1.13
--- appdb/include/distributions.php:1.12 11 Jul 2006 17: 2:35 -0000
+++ appdb/include/distributions.php 11 Jul 2006 17: 2:35 -0000
@@ -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;
}
?>
Index: appdb/include/sidebar.php
diff -u -p appdb/include/sidebar.php:1.20 appdb/include/sidebar.php:1.21
--- appdb/include/sidebar.php:1.20 11 Jul 2006 17: 2:35 -0000
+++ appdb/include/sidebar.php 11 Jul 2006 17: 2:35 -0000
@@ -27,7 +27,7 @@ function global_sidebar_menu() {
$g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application");
$g->add("Help & 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 at winehq.org");
Index: appdb/include/testResults.php
diff -u -p appdb/include/testResults.php:1.33 appdb/include/testResults.php:1.34
--- appdb/include/testResults.php:1.33 11 Jul 2006 17: 2:35 -0000
+++ appdb/include/testResults.php 11 Jul 2006 17: 2:35 -0000
@@ -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";
More information about the wine-cvs
mailing list