June 2008 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : browse apps: Add support for only showing downloadable apps
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: a1410d38c6ee74e02d28699e7b8ced0a5846071f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a1410d38c6ee74e02d28699e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 00:53:34 2008 +0200 browse apps: Add support for only showing downloadable apps --- include/application.php | 29 ++++++++++-- include/db_filter.php | 19 +++++--- include/db_filter_ui.php | 116 ++++++++++++++++++++++++++++++++++++++------- include/objectManager.php | 11 +++-- 4 files changed, 143 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=a1410d38c6ee74e02d28…

1 0

Alexander Nicolaysen Sørnes : browse apps: Remove greater/less than filter for app rating
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: 449d1721df301ed4f674f48a040798bde55375a8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=449d1721df301ed4f674f48a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 12:07:02 2008 +0200 browse apps: Remove greater/less than filter for app rating --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 4b13adf..0b2a13d 100644 --- a/include/application.php +++ b/include/application.php @@ -1032,7 +1032,7 @@ class Application { $aLicenses = version::getLicenses(); - $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS, FILTER_LESS_THAN, FILTER_GREATER_THAN), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); + $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); $oFilter->AddFilterInfo('appFamily.catId', 'Category', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('onlyDownloadable', 'Only show downloadable apps', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true'));

1 0

Alexander Nicolaysen Sørnes : Rename ' Vendors' menu link to 'Browse by Developer'
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: fc379cb4a1674456194ca4a4047c65ba9876aaf6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fc379cb4a1674456194ca4a4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 15:24:49 2008 +0200 Rename 'Vendors' menu link to 'Browse by Developer' --- include/sidebar.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index 11cede2..49236ff 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -23,13 +23,13 @@ function global_sidebar_menu() $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Browse Apps", BASE."objectManager.php?sClass=application&". 'sTitle=Browse%20Applications&sOrderBy=appName&bAscending=true'); + $g->add('Browse by Developer', BASE.'objectManager.php?sClass=vendor&sTitle=Browse%20by%20Developer'); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&". "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); $g->add("Statistics", BASE."appdbStats.php"); $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); - $g->add('Vendors ('.vendor::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done();

1 0

Alexander Nicolaysen Sørnes : vendor: Respect state in objectGetEntries[Count]
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: f78a7c931b91e4d7ca7709e3460f50a4599832dd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f78a7c931b91e4d7ca7709e3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 12:30:45 2008 +0200 vendor: Respect state in objectGetEntries[Count] --- include/vendor.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index e3a16dd..4537f93 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -258,9 +258,9 @@ class Vendor { if(!$iRows) $iRows = Vendor::objectGetEntriesCount($sState); - $hResult = query_parameters("SELECT * FROM vendor - ORDER BY $sOrderBy $sOrder LIMIT ?,?", - $iStart, $iRows); + $hResult = query_parameters("SELECT * FROM vendor WHERE state = '?' + ORDER BY $sOrderBy $sOrder LIMIT ?,?", + $sState, $iStart, $iRows); if(!$hResult) return FALSE; @@ -407,7 +407,8 @@ class Vendor { if($sState == 'rejected') return FALSE; - $hResult = query_parameters("SELECT COUNT(vendorId) as count FROM vendor"); + $hResult = query_parameters("SELECT COUNT(vendorId) as count FROM vendor WHERE state = '?'", + $sState); if(!$hResult) return FALSE;

1 0

Alexander Nicolaysen Sørnes : browse apps: Sort by app name by default
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: 35df7b4f3017cf49fd4b3313d6cde4ba14b93d14 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=35df7b4f3017cf49fd4b3313… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 11:59:33 2008 +0200 browse apps: Sort by app name by default --- include/sidebar.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index da0ab3a..11cede2 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -22,7 +22,7 @@ function global_sidebar_menu() $g->add('Home', BASE.'index.php'); $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Browse Apps", BASE."objectManager.php?sClass=application&". - 'sTitle=Browse%20Applications&sOrderBy=appId&bAscending=false'); + 'sTitle=Browse%20Applications&sOrderBy=appName&bAscending=true'); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&". "sTitle=Submit+Application&sAction=add");

1 0

Alexander Nicolaysen Sørnes : Delete browse_by_rating.php
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: 8651f97b9ffd6611da2401e7f563a211d0a65b0a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8651f97b9ffd6611da2401e7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 01:04:29 2008 +0200 Delete browse_by_rating.php --- browse_by_rating.php | 248 -------------------------------------------------- 1 files changed, 0 insertions(+), 248 deletions(-) diff --git a/browse_by_rating.php b/browse_by_rating.php deleted file mode 100644 index ee15ada..0000000 --- a/browse_by_rating.php +++ /dev/null @@ -1,248 +0,0 @@ -<?php -/** - * Browse Applications by their respective ratings - * - */ - -// application environment -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/application.php"); - -apidb_header("Browse Applications by Rating"); - -echo "<div class='default_container'>\n"; - -$sPathtrail = "<a href=\"browse_by_rating.php\">Main</a>"; - -echo html_frame_start("", '98%', '', 2); - -if (empty($aClean['sRating'])) -{ - echo "<b>Rating: $sPathtrail</b>"; - echo html_frame_end(); - echo html_frame_start("", '98%', '', 2); - - // create the table - $oTable = new Table(); - $oTable->SetCellSpacing(1); - $oTable->SetCellPadding(3); - $oTable->SetBorder(0); - $oTable->SetWidth("100%"); - - // create the header row - $aHeaderCells = array(); - $oTableCell = new TableCell("Rating"); - $oTableCell->SetBold(true); - $aHeaderCells[] = $oTableCell; - - $oTableCell = new TableCell("Description"); - $oTableCell->SetBold(true); - $aHeaderCells[] = $oTableCell; - - $oTableCell = new TableCell("No. Apps"); - $oTableCell->SetBold(true); - $aHeaderCells[] = $oTableCell; - - $oTableRowHeader = new TableRow(); - $oTableRowHeader->AddCells($aHeaderCells); - $oTableRowHeader->SetClass("color4"); - - $oTable->SetHeader($oTableRowHeader); - - // setup arrays for processing in the below loop - $aColorName = array("Platinum", "Gold", "Silver", "Bronze", "Garbage"); - $aRating = array(PLATINUM_RATING, GOLD_RATING, SILVER_RATING, - BRONZE_RATING, GARBAGE_RATING); - $aRatingText = array("Applications that install and run out of the box", - "Applications that work flawlessly with some DLL overrides, other settings or third party software.", - "Applications that work excellently for 'normal use'", - "Applications that work but have some issues, even for 'normal use'", - "Applications that don't work as intended, there should be at least one bug report if an app gets this rating"); - - $iIndex = 0; - foreach($aColorName as $sColor) - { - $oTableRow = new TableRow(); - $oTableRow->SetClass($aRating[$iIndex]); - - $sUrl = "browse_by_rating.php?sRating=".$aRating[$iIndex]; - - $oTableCell = new TableCell($aColorName[$iIndex]); - $oTableCell->SetCellLink($sUrl); - $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell($aRatingText[$iIndex]); - $oTableRow->AddTextCell(Application::countWithRating($aRating[$iIndex])); - - // click entry for the row - $oInactiveColor = new color(); - $oInactiveColor->SetColorByName($aColorName[$iIndex]); - $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor); - $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); - $oTableRowClick = new TableRowClick($sUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); - - // set the clickable row - $oTableRow->SetRowClick($oTableRowClick); - - $oTable->AddRow($oTableRow); - - $iIndex++; - } - - echo $oTable->GetString(); - - echo html_frame_end(); -} else -{ - /* display a range of 10 pages */ - $iPageRange = 10; - $iItemsPerPage = 50; - $iCurrentPage = 1; - - if($aClean['iItemsPerPage']) - $iItemsPerPage = $aClean['iItemsPerPage']; - if($aClean['iPage']) - $iCurrentPage = $aClean['iPage']; - - $iItemsPerPage = min($iItemsPerPage,500); - - switch($aClean['sRating']) - { - case PLATINUM_RATING: - $sPathtrail.=" > <a href=\"browse_by_rating.php?sRating=".PLATINUM_RATING."\">Platinum</a>"; - $iTotalPages = ceil(Application::countWithRating(PLATINUM_RATING)/$iItemsPerPage); - $sRating = PLATINUM_RATING; - break; - - case GOLD_RATING: - $sPathtrail.=" > <a href=\"browse_by_rating.php?sRating=".GOLD_RATING."\">Gold</a>"; - $iTotalPages = ceil(Application::countWithRating(GOLD_RATING)/$iItemsPerPage); - $sRating = GOLD_RATING; - break; - - case SILVER_RATING: - $sPathtrail.=" > <a href=\"browse_by_rating.php?sRating=".SILVER_RATING."\">Silver</a>"; - $iTotalPages = ceil(Application::countWithRating(SILVER_RATING)/$iItemsPerPage); - $sRating = SILVER_RATING; - break; - case BRONZE_RATING: - $sPathtrail.=" > <a href=\"browse_by_rating.php?sRating=".BRONZE_RATING."\">Bronze</a>"; - $iTotalPages = ceil(Application::countWithRating(BRONZE_RATING)/$iItemsPerPage); - $sRating = BRONZE_RATING; - break; - case GARBAGE_RATING: - $sPathtrail.=" > <a href=\"browse_by_rating.php?sRating=".GARBAGE_RATING."\">Garbage</a>"; - $iTotalPages = ceil(Application::countWithRating(GARBAGE_RATING)/$iItemsPerPage); - $sRating=GARBAGE_RATING; - break; - - } - - $iCurrentPage = min($iCurrentPage,$iTotalPages); - $iOffset = (($iCurrentPage-1) * $iItemsPerPage); - $apps=Application::getWithRating($sRating, $iOffset, $iItemsPerPage); - - echo "<b>Rating: $sPathtrail</b><p>"; - echo html_frame_end(); - - - - - /* display page selection links */ - echo "<center>"; - echo "<b>Page $iCurrentPage of $iTotalPages</b><br>"; - display_page_range($iCurrentPage, $iPageRange, $iTotalPages, - $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&iItemsPerPage=".$iItemsPerPage); - echo "<br>"; - echo "<br>"; - - /* display the option to choose how many applications per-page to display */ - echo '<form method="get" name="message" action="'.$_SERVER['PHP_SELF'].'">'; - echo '<b>Number of Applications per page:</b>'; - echo " <select name='iItemsPerPage'>"; - - $iItemsPerPageArray = array(50, 100, 150, 200, 250, 300, 350, 400, 450, 500); - foreach($iItemsPerPageArray as $i => $value) - { - if($iItemsPerPageArray[$i] == $iItemsPerPage) - echo "<option value='$iItemsPerPageArray[$i]' SELECTED>$iItemsPerPageArray[$i]"; - else - echo "<option value='$iItemsPerPageArray[$i]'>$iItemsPerPageArray[$i]"; - } - echo "</select>"; - - echo "<input type=hidden name=iPage value=$iCurrentPage>"; - echo "<input type=hidden name=sRating value=".$aClean['sRating'].">"; - echo " <input type=submit value='Refresh'>"; - echo "</form>"; - echo "</center>"; - - echo html_frame_start("","98%","",0); - - $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetBorder(0); - $oTable->SetCellPadding(3); - $oTable->SetCellSpacing(1); - - $oTableRow = new TableRow(); - $oTableRow->SetClass("color4"); - - $oTableCell = new TableCell("Application Name"); - $oTableCell->SetBold(true); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell("Description"); - $oTableCell->SetBold(true); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell("No. Versions"); - $oTableCell->SetBold(true); - $oTableRow->AddCell($oTableCell); - - $oTable->AddRow($oTableRow); - - while(list($iIndex, $iAppId) = each($apps)) - { - $oApp = new Application($iAppId); - - $oTableRowHighlight = GetStandardRowHighlight($iIndex); - - $sUrl = $oApp->objectMakeUrl(); - - $sColor = ($iIndex % 2) ? "color0" : "color1"; - - $oTableRowClick = new TableRowClick($sUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); - - //format desc - $sDesc = util_trim_description($oApp->sDescription); - - //display row - $oTableRow = new TableRow(); - $oTableRow->SetRowClick($oTableRowClick); - $oTableRow->SetClass($sColor); - - $oTableRow->AddTextCell($oApp->objectMakeLink()); - $oTableRow->AddTextCell("$sDesc  "); - $oTableRow->AddTextCell(sizeof($oApp->aVersionsIds)); - - $oTable->AddRow($oTableRow); - } - - // output the table - echo $oTable->GetString(); - - echo html_frame_end(); - echo "<center>"; - display_page_range($iCurrentPage, $iPageRange, $iTotalPages, - $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&iItemsPerPage=".$iItemsPerPage); - echo "</center>"; -} - -echo "</div>\n"; - -apidb_footer(); - -?>

1 0

Alexander Nicolaysen Sørnes : Remove ' browse downloadable apps'
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: a8bdb129e7d554173f7878563cb728ba83ab8e8b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a8bdb129e7d554173f787856… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 01:04:01 2008 +0200 Remove 'browse downloadable apps' --- browse_downloadable.php | 163 ----------------------------------------------- include/sidebar.php | 1 - 2 files changed, 0 insertions(+), 164 deletions(-) diff --git a/browse_downloadable.php b/browse_downloadable.php deleted file mode 100644 index 199bdeb..0000000 --- a/browse_downloadable.php +++ /dev/null @@ -1,163 +0,0 @@ -<?php - -/** -* Browse downloadable applications -*/ - -require("path.php"); -require(BASE."include/incl.php"); - -apidb_header("Browse Downloadable Applications"); - -echo "<div class='default_container'>\n"; - -/* Match specific license? */ -$sLicenseString = isset($aClean['sLicense']) ? $aClean['sLicense'] : ''; -$sLicense = version::checkLicense( $sLicenseString ); - -/* Set default values */ -if(!isset($aClean['iNumVersions']) || $aClean['iNumVersions'] > 200 || $aClean['iNumVersions'] < 0) - $aClean['iNumVersions'] = 25; - -if( !isset($aClean['iPage']) ) - $aClean['iPage'] = 1; - -/* Count the possible matches */ -$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 AND appVersion.state = 'accepted'"; - -if(!$sLicense) - $hResult = query_parameters($sQuery, "downloadurl"); -else -{ - $sQuery .= " AND license = '?'"; - $hResult = query_parameters($sQuery, "downloadurl", $sLicense); -} - -if($hResult && query_num_rows($hResult)) - $num = query_num_rows($hResult); - -$iNumPages = isset($num) ? ceil($num/$aClean['iNumVersions']) : 0; - -/* Check page logic */ -$aClean['iPage'] = min($aClean['iPage'], $iNumPages); - -/* Calculate values for the LIMIT clause */ -$iLimitLower = ($aClean['iPage'] - 1) * $aClean['iNumVersions']; - -/* Page selection */ -echo "<div align=\"center\">\n"; -echo "<b>Page ".$aClean['iPage']." of $iNumPages</b><br>\n"; -// $iPageRange is non-existent here? creating it -$iPageRange = 10; -display_page_range($aClean['iPage'], $iPageRange, $iNumPages, - $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']."&sLicense=". - $sLicenseString); - -/* Selector for how many versions to display */ -echo "<form method=\"get\" action=\"".$_SERVER['PHP_SELF']."\">\n"; -echo "<b>How many versions to display:</b>\n"; -echo "<select name=\"iNumVersions\">\n"; - -$numVersionsArray = array(1, 25, 50, 100, 200); - -foreach($numVersionsArray as $i) -{ - if($i == $aClean['iNumVersions']) - echo "<option selected=\"selected\">$i</option>\n"; - else - echo "<option>$i</option>\n"; -} - -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"; - -if(!isset($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 - AND appVersion.state = 'accepted' "; - -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 && query_num_rows($hResult)) -{ - echo html_frame_start("", "90%"); - - $oTable = new Table(); - $oTable->SetWidth("100%"); - $oTable->SetAlign("center"); - - $oTableRow = new TableRow(); - $oTableCell = new TableCell("Name"); - $oTableCell->SetBold(true); - $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("Description"); - $oTableCell->SetBold(true); - $oTableRow->AddCell($oTableCell); - - $oTableRow->SetClass("color4"); - $oTable->AddRow($oTableRow); - - for($iIndex = 1; $oRow = query_fetch_object($hResult); $iIndex++) - { - $oVersion = new version($oRow->versionId); - - $oTableRow = new TableRow(); - if($iIndex % 2) - $sColor = "color1"; - else - $sColor = "color0"; - - $oTableRow->SetClass($sColor); - - $oTableRowHighlight = GetStandardRowHighlight($iIndex); - - $oTableRowClick = new TableRowClick($oVersion->objectMakeUrl()); - $oTableRowClick->SetHighlight($oTableRowHighlight); - - $oTableRow->SetRowClick($oTableRowClick); - - $oTableRow->AddCell(new TableCell(version::fullNameLink($oVersion->iVersionId))); - $oTableRow->AddCell(new TableCell($oRow->description)); - $oTable->AddRow($oTableRow); - } - - echo $oTable->GetString(); - - echo html_frame_end(" "); -} - -echo "</div>\n"; - -apidb_footer(); - -?> diff --git a/include/sidebar.php b/include/sidebar.php index 69c4517..da0ab3a 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -23,7 +23,6 @@ function global_sidebar_menu() $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Browse Apps", BASE."objectManager.php?sClass=application&". 'sTitle=Browse%20Applications&sOrderBy=appId&bAscending=false'); - $g->add("Downloadable Apps", BASE."browse_downloadable.php"); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&". "sTitle=Submit+Application&sAction=add");

1 0

Jeff Zaroyko : fix a typo which prevents versions from being moderated
by Chris Morgan June 15, 2008

June 15, 2008

Module: appdb Branch: master Commit: f593c926e383bfd142783acb7c2eaec57485a3db URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f593c926e383bfd142783acb… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sun Jun 15 13:37:47 2008 +1000 fix a typo which prevents versions from being moderated --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index be905e2..e04955b 100644 --- a/include/version.php +++ b/include/version.php @@ -1383,7 +1383,7 @@ class version { $sReturn = "<select name=\"sLicense\">\n"; $sReturn .= "<option value=\"\">Choose . . .</option>\n"; - $aLicense = version::getLicences(); + $aLicense = version::getLicenses(); $iMax = count($aLicense); for($i = 0; $i < $iMax; $i++)

1 0

Jeff Zaroyko : Applying make information about version field simpler and more direct - brevity is a virtue
by Chris Morgan June 14, 2008

June 14, 2008

Module: appdb Branch: master Commit: 1a50f7d05be181e76b155685cc55733f9d54d17d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1a50f7d05be181e76b155685… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sat Jun 14 10:19:18 2008 +1000 Applying make information about version field simpler and more direct - brevity is a virtue --- include/testData.php | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index 757ffa0..845a432 100644 --- a/include/testData.php +++ b/include/testData.php @@ -906,14 +906,7 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<ul>\n"; - echo "<li>If you are testing with a newer release than listed please"; - echo " check back tomorrow, sometimes it takes us a day to update the list.</li>\n"; - echo "<li>If you are testing with an older release than listed please"; - echo " upgrade and test with a newer release.</li>\n"; - echo "<li>If you haven't tested with one of the"; - echo " listed versions please retest with a recent release and resubmit.</li>\n"; - echo "</ul>\n"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"http://winehq.org/download\">upgrade!</a></span>"; echo '</td></tr>',"\n"; // Installs

1 0

Alexander Nicolaysen Sørnes : filter_ui: Improve display of filters with only one operator
by Chris Morgan June 14, 2008

June 14, 2008

Module: appdb Branch: master Commit: 7a138bd2c2ad80cb75f7b2cb2bb0d8514e08fbb5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7a138bd2c2ad80cb75f7b2cb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 13 23:18:07 2008 +0200 filter_ui: Improve display of filters with only one operator --- include/db_filter_ui.php | 49 +++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 18 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index d928b84..ed2f270 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -165,32 +165,45 @@ class FilterInterface $oColumn = $this->aFilterInfo[$oFilter->getColumn()]; $sId = ($iId == -1) ? '' : $iId; - $shEditor = $oColumn->getDisplayName(); + $shEditor = $oColumn->getDisplayName().' '; - $shEditor .= " <select name='i{$sColumn}Op$sId'>"; + $aTypes = $oColumn->getTypes(); - if($iId == -1) + /* It doesn't make sense to show a dropdown menu of choices if there is only one + If the filter is already active then there are more than one; one to remove */ + if($iId == -1 && sizeof($aTypes) == 1) { - $sText = 'select'; - $sSel = " selected='selected'"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + + /* Printing 'equal to' sounds weird if it is the only choice */ + if($aTypes[0] != FILTER_EQUALS) + $shEditor .= $oColumn->getOpName($aTypes[0]); } else { - $sSel = ''; - $sText = 'remove'; - } - - $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; + $shEditor .= "<select name='i{$sColumn}Op$sId'>"; - foreach($oColumn->getTypes() as $iType) - { - if($oFilter->getOperatorId() == $iType) + if($iId == -1) + { + $sText = 'select'; $sSel = " selected='selected'"; - else + } else + { $sSel = ''; - $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />'; - } + $sText = 'remove'; + } + + $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; - $shEditor .= '</select> '; + foreach($aTypes as $iType) + { + if($oFilter->getOperatorId() == $iType) + $sSel = " selected='selected'"; + else + $sSel = ''; + $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />'; + } + $shEditor .= '</select> '; + } switch($oColumn->getValueType()) { @@ -344,7 +357,7 @@ class FilterInterface $sData = $aClean["s{$sColumn}Data"]; $iOp = $aClean["i{$sColumn}Op"]; - if($iOp) + if($iOp && $sData) { $oFilter = new Filter($oOption->getColumn(), $iOp, $sData); $aReturn[] = $oFilter;

1 0