January 2007 - Wine-commits

appdb/ ./vendorview.php include/vendor.php
by WineHQ 30 Jan '07

30 Jan '07

ChangeSet ID: 30920 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/30 20:24:54 Modified files: . : vendorview.php include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use vendor::objectOutputHeader() and vendor::objectGetEntries() Patch: http://cvs.winehq.org/patch.py?id=30920 Old revision New revision Changes Path 1.25 1.26 +3 -11 appdb/vendorview.php 1.11 1.12 +28 -0 appdb/include/vendor.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.25 appdb/vendorview.php:1.26 --- appdb/vendorview.php:1.25 31 Jan 2007 2:24:54 -0000 +++ appdb/vendorview.php 31 Jan 2007 2:24:54 -0000 @@ -45,21 +45,13 @@ else apidb_header("View Vendors"); //get available vendors - $hResult = query_parameters("SELECT vendorId FROM vendor ORDER BY vendorName, vendorId;"); + $hResult = vendor::objectGetEntries(false); // show vendorlist echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - echo '<tr class="color4">',"\n"; - echo '<td>Vendor name</td>',"\n"; - echo '<td>Vendor\'s Web Page</td>',"\n"; - echo '<td align="right">linked Apps</td>',"\n"; - if ($_SESSION['current']->hasPriv("admin")) - { - echo '<td align="center">Action</td>',"\n"; - } - echo '</tr>',"\n"; - + vendor::objectOutputHeader("color4"); + $c = 1; while($oRow = mysql_fetch_object($hResult)) { Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.11 appdb/include/vendor.php:1.12 --- appdb/include/vendor.php:1.11 31 Jan 2007 2:24:54 -0000 +++ appdb/include/vendor.php 31 Jan 2007 2:24:54 -0000 @@ -140,6 +140,34 @@ class Vendor { echo "</table>\n"; } + function objectGetEntries($bQueued) + { + /* Vendor queueing is not implemented yet */ + if($bQueued) + return NULL; + + $hResult = query_parameters("SELECT * FROM vendor + ORDER BY vendorName"); + + if(!$hResult) + return FALSE; + + return $hResult; + } + + function objectOutputHeader($sClass = "") + { + $sCells = array( + "Name", + "Website", + array("Linked apps", "align=\"right\"")); + + if(vendor::canEdit()) + $sCells[sizeof($sCells)] = "Action"; + + echo html_tr($sCells, $sClass); + } + function canEdit() { if($_SESSION['current']->hasPriv("admin"))

1 0

appdb/ ./distributionView.php include/distribu ...
by WineHQ 30 Jan '07

30 Jan '07

ChangeSet ID: 30919 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/30 20:18:18 Modified files: . : distributionView.php include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use distribution::display() Patch: http://cvs.winehq.org/patch.py?id=30919 Old revision New revision Changes Path 1.24 1.25 +2 -73 appdb/distributionView.php 1.9 1.10 +77 -1 appdb/include/distribution.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.24 appdb/distributionView.php:1.25 --- appdb/distributionView.php:1.24 31 Jan 2007 2:18:18 -0000 +++ appdb/distributionView.php 31 Jan 2007 2:18:18 -0000 @@ -43,7 +43,7 @@ if(!$oDistribution->iDistributionId) { $oDistribution = distribution::ObjectGetInstanceFromRow($oRow); - $oDistribution->display(($c % 2) ? "color0" : "color1"); + $oDistribution->objectOutputTableRow(($c % 2) ? "color0" : "color1"); } echo "</table>\n\n"; echo html_frame_end(" "); @@ -57,78 +57,7 @@ else apidb_header("View Distribution"); echo html_frame_start("Distribution Information",500); - echo "Distribution Name:"; - - if($oDistribution->sUrl) - echo "<a href='".$oDistribution->sUrl."'>"; - - echo $oDistribution->sName; - - if ($oDistribution->sUrl) - { - echo " (".$oDistribution->sUrl.")"; - echo "</a> <br />\n"; - } else - { - echo "<br />\n"; - } - - if($oDistribution->aTestingIds) - { - echo '<p><span class="title">Testing Results for '.$oDistribution->sName.'</span><br />',"\n"; - echo '<table width="100%" border="1">',"\n"; - echo '<thead class="historyHeader">',"\n"; - echo '<tr>',"\n"; - echo '<td>Application Version</td>',"\n"; - echo '<td>Submitter</td>',"\n"; - echo '<td>Date Submitted</td>',"\n"; - echo '<td>Wine version</td>',"\n"; - echo '<td>Installs?</td>',"\n"; - echo '<td>Runs?</td>',"\n"; - echo '<td>Rating</td>',"\n"; - echo '</tr></thead>',"\n"; - foreach($oDistribution->aTestingIds as $iTestingId) - { - $oTest = new testData($iTestingId); - $oVersion = new Version($oTest->iVersionId); - $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?iVersionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n"; - echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n"; - echo '<td>',"\n"; - if($_SESSION['current']->isLoggedIn()) - { - echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; - echo $oSubmitter->sRealname; - echo $oSubmitter->sEmail ? "</a>":""; - } - else - echo $oSubmitter->sRealname; - echo '</td>',"\n"; - echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n"; - echo '<td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n"; - echo '<td>'.$oTest->sInstalls.'&nbsp</td>',"\n"; - echo '<td>'.$oTest->sRuns.'&nbsp</td>',"\n"; - echo '<td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; - if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) - { - echo '<td><a href="'.BASE.'admin/adminTestResults.php?sSub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; - echo 'Edit</a></td>',"\n"; - } - echo '</tr>',"\n"; - } - echo '</table>',"\n"; - } + $oDistribution->display(); echo html_frame_end(); echo html_back_link(1); Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.9 appdb/include/distribution.php:1.10 --- appdb/include/distribution.php:1.9 31 Jan 2007 2:18:18 -0000 +++ appdb/include/distribution.php 31 Jan 2007 2:18:18 -0000 @@ -464,7 +464,7 @@ class distribution { return new distribution($oRow->distributionId); } - function display($sClass = "") + function objectOutputTableRow($sClass = "") { $aCells = array( "<a href=\"".BASE."distributionView.php?iDistributionId=". @@ -496,6 +496,82 @@ class distribution { return FALSE; } + + function display() + { + echo "Distribution Name:"; + + if($this->sUrl) + echo "<a href='".$this->sUrl."'>"; + + echo $this->sName; + + if ($this->sUrl) + { + echo " (".$this->sUrl.")"; + echo "</a> <br />\n"; + } else + { + echo "<br />\n"; + } + + if($this->aTestingIds) + { + echo '<p><span class="title">Testing Results for '.$this->sName.'</span><br />',"\n"; + echo '<table width="100%" border="1">',"\n"; + echo '<thead class="historyHeader">',"\n"; + echo '<tr>',"\n"; + echo '<td>Application Version</td>',"\n"; + echo '<td>Submitter</td>',"\n"; + echo '<td>Date Submitted</td>',"\n"; + echo '<td>Wine version</td>',"\n"; + echo '<td>Installs?</td>',"\n"; + echo '<td>Runs?</td>',"\n"; + echo '<td>Rating</td>',"\n"; + echo '</tr></thead>',"\n"; + foreach($this->aTestingIds as $iTestingId) + { + $oTest = new testData($iTestingId); + $oVersion = new Version($oTest->iVersionId); + $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?iVersionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n"; + echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n"; + echo '<td>',"\n"; + if($_SESSION['current']->isLoggedIn()) + { + echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; + echo $oSubmitter->sRealname; + echo $oSubmitter->sEmail ? "</a>":""; + } + else + echo $oSubmitter->sRealname; + echo '</td>',"\n"; + echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n"; + echo '<td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n"; + echo '<td>'.$oTest->sInstalls.'&nbsp</td>',"\n"; + echo '<td>'.$oTest->sRuns.'&nbsp</td>',"\n"; + echo '<td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; + if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) + { + echo '<td><a href="'.BASE.'admin/adminTestResults.php?sSub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; + echo 'Edit</a></td>',"\n"; + } + echo '</tr>',"\n"; + } + echo '</table>',"\n"; + } + } } ?>

1 0

appdb/ ./vendorview.php include/vendor.php
by WineHQ 30 Jan '07

30 Jan '07

ChangeSet ID: 30918 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/30 20:16:54 Modified files: . : vendorview.php include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use vendor::display() Patch: http://cvs.winehq.org/patch.py?id=30918 Old revision New revision Changes Path 1.24 1.25 +1 -22 appdb/vendorview.php 1.10 1.11 +28 -1 appdb/include/vendor.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.24 appdb/vendorview.php:1.25 --- appdb/vendorview.php:1.24 31 Jan 2007 2:16:54 -0000 +++ appdb/vendorview.php 31 Jan 2007 2:16:54 -0000 @@ -33,28 +33,7 @@ if($oVendor->iVendorId) apidb_header("View Vendor"); echo html_frame_start("Vendor Information",500); - echo 'Vendor Name: '.$oVendor->sName,"\n"; - if($_SESSION['current']->hasPriv("admin")) - { - echo ' [<a href="'.apidb_fullurl("admin/editVendor.php").'?iVendorId='.$oVendor->iVendorId.'">edit</a>]',"\n"; - } - - echo '<br />',"\n"; - if ($oVendor->sWebpage) - echo 'Vendor URL: <a href="'.$oVendor->sWebpage.'">'.$oVendor->sWebpage.'</a> <br />',"\n"; - - - if($oVendor->aApplicationsIds) - { - echo '<br />Applications by '.$oVendor->sName.'<br /><ol>',"\n"; - foreach($oVendor->aApplicationsIds as $iAppId) - { - $oApp = new Application($iAppId); - echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'.$oApp->sName.'</a> </li>',"\n"; - } - echo '</ol>',"\n"; - } - + $oVendor->display(); echo html_frame_end(); echo html_back_link(1); Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.10 appdb/include/vendor.php:1.11 --- appdb/include/vendor.php:1.10 31 Jan 2007 2:16:54 -0000 +++ appdb/include/vendor.php 31 Jan 2007 2:16:54 -0000 @@ -148,11 +148,38 @@ class Vendor { return FALSE; } - function getOutputEditorValues($aClean) + function getOutputEditorValues($aClean) { $this->sName = $aClean['sVendorName']; $this->sWebpage = $aClean['sVendorWebpage']; } + + function display() + { + echo 'Vendor Name: '.$this->sName,"\n"; + if($this->canEdit()) + { + echo "[<a href=\"".BASE."admin/editVendor.php?iVendorId=$this->iVendorId\">edit</a>]"; + } + + echo '<br />',"\n"; + if ($this->sWebpage) + echo 'Vendor URL: <a href="'.$this->sWebpage.'">'. + $this->sWebpage.'</a> <br />',"\n"; + + + if($this->aApplicationsIds) + { + echo '<br />Applications by '.$this->sName.'<br /><ol>',"\n"; + foreach($this->aApplicationsIds as $iAppId) + { + $oApp = new Application($iAppId); + echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'. + $oApp->sName.'</a> </li>',"\n"; + } + echo '</ol>',"\n"; + } + } } /* Get the total number of Vendors in the database */

1 0

appdb/include distribution.php
by WineHQ 29 Jan '07

29 Jan '07

ChangeSet ID: 30917 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/29 18:46:55 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix capitalization of some methods of distribution class Patch: http://cvs.winehq.org/patch.py?id=30917 Old revision New revision Changes Path 1.8 1.9 +2 -2 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.8 appdb/include/distribution.php:1.9 --- appdb/include/distribution.php:1.8 30 Jan 2007 0:46:55 -0000 +++ appdb/include/distribution.php 30 Jan 2007 0:46:55 -0000 @@ -425,7 +425,7 @@ class distribution { echo "</select>\n"; } - function ObjectOutputHeader($sClass = "") + function objectOutputHeader($sClass = "") { $aCells = array( "Distribution name", @@ -438,7 +438,7 @@ class distribution { echo html_tr($aCells, $sClass); } - function ObjectGetEntries($bQueued) + function objectGetEntries($bQueued) { if($bQueued) {

1 0

appdb/include distribution.php
by WineHQ 29 Jan '07

29 Jan '07

ChangeSet ID: 30916 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/29 18:46:05 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only display delete link for distributions without any associated test data Patch: http://cvs.winehq.org/patch.py?id=30916 Old revision New revision Changes Path 1.7 1.8 +6 -4 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.7 appdb/include/distribution.php:1.8 --- appdb/include/distribution.php:1.7 30 Jan 2007 0:46: 5 -0000 +++ appdb/include/distribution.php 30 Jan 2007 0:46: 5 -0000 @@ -474,12 +474,14 @@ class distribution { if($this->canEdit()) { + if(!sizeof($this->aTestingIds)) + { + $sDelete = "   [<a href='".$_SERVER['PHP_SELF']."?sSub=delete&". + "iDistributionId=$this->iDistributionId'>delete</a>]"; + } $aCells[3] = array( "[<a href='".BASE."admin/editDistribution.php?iDistributionId=". - $this->iDistributionId."'>edit</a>]". - (!sizeof($this->aTestingIds)) ? - "   [<a href='".$_SERVER['PHP_SELF']."?sSub=delete&". - "iDistributionId=$this->iDistributionId'>delete</a>]" : "", + $this->iDistributionId."'>edit</a>]$sDelete", "align=\"center\""); }

1 0

appdb/include distribution.php
by WineHQ 29 Jan '07

29 Jan '07

ChangeSet ID: 30915 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/29 18:43:33 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Return true on sucess in distribution::delete() Patch: http://cvs.winehq.org/patch.py?id=30915 Old revision New revision Changes Path 1.6 1.7 +2 -0 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.6 appdb/include/distribution.php:1.7 --- appdb/include/distribution.php:1.6 30 Jan 2007 0:43:33 -0000 +++ appdb/include/distribution.php 30 Jan 2007 0:43:33 -0000 @@ -162,6 +162,8 @@ class distribution { $this->SendNotificationMail("delete"); $this->mailSubmitter("delete"); + + return true; }

1 0

appdb/ ./appsubmit.php admin/adminAppQueue.php ...
by WineHQ 28 Jan '07

28 Jan '07

ChangeSet ID: 30914 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/28 17:28:15 Modified files: . : appsubmit.php admin : adminAppQueue.php editVendor.php include : application.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't use arguments for vendor::create() and vendor::update() Patch: http://cvs.winehq.org/patch.py?id=30914 Old revision New revision Changes Path 1.63 1.64 +11 -8 appdb/appsubmit.php 1.72 1.73 +4 -2 appdb/admin/adminAppQueue.php 1.17 1.18 +2 -1 appdb/admin/editVendor.php 1.89 1.90 +2 -2 appdb/include/application.php 1.9 1.10 +33 -16 appdb/include/vendor.php

1 0

appdb/. browse_downloadable.php
by WineHQ 27 Jan '07

27 Jan '07

ChangeSet ID: 30913 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/27 17:44:00 Modified files: . : browse_downloadable.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Hide queued version in the downloadable apps list Patch: http://cvs.winehq.org/patch.py?id=30913 Old revision New revision Changes Path 1.2 1.3 +3 -2 appdb/browse_downloadable.php Index: appdb/browse_downloadable.php diff -u -p appdb/browse_downloadable.php:1.2 appdb/browse_downloadable.php:1.3 --- appdb/browse_downloadable.php:1.2 27 Jan 2007 23:44: 0 -0000 +++ appdb/browse_downloadable.php 27 Jan 2007 23:44: 0 -0000 @@ -24,7 +24,7 @@ $sQuery = "SELECT DISTINCT appFamily.app appVersion.versionName, appVersion.versionId, appFamily.description FROM appFamily, appVersion, appData WHERE appData.type = '?' AND appData.versionId = appVersion.versionId - AND appFamily.appId = appVersion.appId"; + AND appFamily.appId = appVersion.appId AND appVersion.queued = 'false'"; if(!$sLicense) $hResult = query_parameters($sQuery, "downloadurl"); @@ -86,7 +86,8 @@ $sQuery = "SELECT DISTINCT appFamily.app appVersion.versionName, appVersion.versionId, appFamily.description FROM appFamily, appVersion, appData WHERE appData.type = '?' AND appData.versionId = appVersion.versionId - AND appFamily.appId = appVersion.appId "; + AND appFamily.appId = appVersion.appId + AND appVersion.queued = 'false' "; if(!$sLicense) {

1 0

appdb/unit_test test_application.php test_main ...
by WineHQ 27 Jan '07

27 Jan '07

ChangeSet ID: 30912 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/27 16:58:58 Modified files: unit_test : test_application.php test_maintainer.php test_url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Cleanup after unit tests Patch: http://cvs.winehq.org/patch.py?id=30912 Old revision New revision Changes Path 1.4 1.5 +2 -0 appdb/unit_test/test_application.php 1.5 1.6 +2 -0 appdb/unit_test/test_maintainer.php 1.1 1.2 +2 -2 appdb/unit_test/test_url.php Index: appdb/unit_test/test_application.php diff -u -p appdb/unit_test/test_application.php:1.4 appdb/unit_test/test_application.php:1.5 --- appdb/unit_test/test_application.php:1.4 27 Jan 2007 22:58:58 -0000 +++ appdb/unit_test/test_application.php 27 Jan 2007 22:58:58 -0000 @@ -197,6 +197,8 @@ function test_application_getWithRating( return false; } + delete_app_and_user($oApp, $oUser); + return true; } Index: appdb/unit_test/test_maintainer.php diff -u -p appdb/unit_test/test_maintainer.php:1.5 appdb/unit_test/test_maintainer.php:1.6 --- appdb/unit_test/test_maintainer.php:1.5 27 Jan 2007 22:58:58 -0000 +++ appdb/unit_test/test_maintainer.php 27 Jan 2007 22:58:58 -0000 @@ -302,6 +302,8 @@ function test_superMaintainerOnAppSubmit Maintainer::deleteMaintainer($oUser, $iAppId); + $oApp->delete(); + return true; } Index: appdb/unit_test/test_url.php diff -u -p appdb/unit_test/test_url.php:1.1 appdb/unit_test/test_url.php:1.2 --- appdb/unit_test/test_url.php:1.1 27 Jan 2007 22:58:58 -0000 +++ appdb/unit_test/test_url.php 27 Jan 2007 22:58:58 -0000 @@ -14,8 +14,7 @@ function test_url_update() $bSuccess = true; // default to success until we detect failure /* Log in */ - $oUser = new User(); - if($retval = $oUser->login($test_email, $test_password) != SUCCESS) + if(!$oUser = create_and_login_user()) { echo "Received '$retval' instead of SUCCESS('".SUCCESS."')."; return FALSE; @@ -61,6 +60,7 @@ function test_url_update() } $oUrl->delete(TRUE); + $oUser->delete(); return $bSuccess; }

1 0

appdb/ ./browse_downloadable.php include/versi ...
by WineHQ 27 Jan '07

27 Jan '07

ChangeSet ID: 30911 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/27 16:58:12 Modified files: . : browse_downloadable.php include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow filtering by license when browsing downloadable apps Patch: http://cvs.winehq.org/patch.py?id=30911 Old revision New revision Changes Path 1.1 1.2 +42 -10 appdb/browse_downloadable.php 1.102 1.103 +14 -0 appdb/include/version.php Index: appdb/browse_downloadable.php diff -u -p appdb/browse_downloadable.php:1.1 appdb/browse_downloadable.php:1.2 --- appdb/browse_downloadable.php:1.1 27 Jan 2007 22:58:12 -0000 +++ appdb/browse_downloadable.php 27 Jan 2007 22:58:12 -0000 @@ -9,6 +9,9 @@ require(BASE."include/incl.php"); apidb_header("Browse Downloadable Applications"); +/* Match specific license? */ +$sLicense = version::checkLicense($aClean['sLicense']); + /* Set default values */ if(!$aClean['iNumVersions'] || $aClean['iNumVersions'] > 200 || $aClean['iNumVersions'] < 0) $aClean['iNumVersions'] = 25; @@ -17,12 +20,19 @@ if(!$aClean['iPage']) $aClean['iPage'] = 1; /* Count the possible matches */ -$hResult = query_parameters("SELECT DISTINCT appFamily.appName, +$sQuery = "SELECT DISTINCT appFamily.appName, appVersion.versionName, appVersion.versionId, appFamily.description FROM appFamily, appVersion, appData WHERE appData.type = '?' AND appData.versionId = appVersion.versionId - AND appFamily.appId = appVersion.appId", - "downloadurl"); + AND appFamily.appId = appVersion.appId"; + +if(!$sLicense) + $hResult = query_parameters($sQuery, "downloadurl"); +else +{ + $sQuery .= " AND license = '?'"; + $hResult = query_parameters($sQuery, "downloadurl", $sLicense); +} if($hResult && mysql_num_rows($hResult)) $num = mysql_num_rows($hResult); @@ -58,16 +68,38 @@ foreach($numVersionsArray as $i) echo "</select>\n"; +echo "<b>Filter by license</b>\n"; +$oVersion = new Version(); +echo $oVersion->makeLicenseList($sLicense); + echo " <input type=\"submit\" value=\"Refresh\" />\n"; echo "</form></div>\n<br />\n"; -$hResult = query_parameters("SELECT DISTINCT appFamily.appName, - appVersion.versionName, appVersion.versionId, appFamily.description - FROM appFamily, appVersion, appData - WHERE appData.type = '?' AND appData.versionId = appVersion.versionId - AND appFamily.appId = appVersion.appId - ORDER BY appFamily.appName LIMIT ?, ?", - "downloadurl", $iLimitLower, $aClean['iNumVersions']); +if(!$num) +{ + echo "<div align=\"center\"><font color=\"red\">No matches found</font></div>\n"; + echo html_frame_end(" "); + exit; +} + +$sQuery = "SELECT DISTINCT appFamily.appName, + appVersion.versionName, appVersion.versionId, appFamily.description + FROM appFamily, appVersion, appData + WHERE appData.type = '?' AND appData.versionId = appVersion.versionId + AND appFamily.appId = appVersion.appId "; + +if(!$sLicense) +{ + $sQuery .= "ORDER BY appFamily.appName LIMIT ?, ?"; + $hResult = query_parameters($sQuery, "downloadurl", $iLimitLower, + $aClean['iNumVersions']); +} else +{ + $sQuery .= "AND license = '?' ORDER BY appFamily.appName LIMIT ?, ?"; + $hResult = query_parameters($sQuery, + "downloadurl", $sLicense, $iLimitLower, + $aClean['iNumVersions']); +} if($hResult && mysql_num_rows($hResult)) { Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.102 appdb/include/version.php:1.103 --- appdb/include/version.php:1.102 27 Jan 2007 22:58:12 -0000 +++ appdb/include/version.php 27 Jan 2007 22:58:12 -0000 @@ -1121,6 +1121,20 @@ class Version { return $sReturn; } + /* In order to prevent MySQL injections. Returns matched license */ + function checkLicense($sLicense) + { + $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREEWARE, + LICENSE_DEMO, LICENSE_SHAREWARE); + + foreach($aLicense as $sElement) + { + if($sLicense == $sElement) + return $sElement; + } + + return FALSE; + } } ?>

1 0