wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Jaime Rave : wineconsole: Update Spanish translation.
by Alexandre Julliard 16 Jun '08

16 Jun '08

Module: wine Branch: master Commit: 39289d4bd4079f2cce51891851246c9e14fd1f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39289d4bd4079f2cce5189185… Author: Jaime Rave <jaime@rave> Date: Sun Jun 15 16:53:11 2008 -0500 wineconsole: Update Spanish translation. --- programs/wineconsole/wineconsole_Es.rc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/wineconsole_Es.rc b/programs/wineconsole/wineconsole_Es.rc index d923c2f..d26dc9f 100644 --- a/programs/wineconsole/wineconsole_Es.rc +++ b/programs/wineconsole/wineconsole_Es.rc @@ -2,6 +2,7 @@ * wineconsole (Spanish resources) * * Copyright 2004 Jos� Manuel Ferrer Ortiz + * Copyright 2008 Jaime Rave Torres * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,19 @@ IDS_DLG_TIT_DEFAULT, "Configuraci IDS_DLG_TIT_CURRENT, "Configuraci�n - Valores actuales" IDS_DLG_TIT_ERROR, "Error de configuraci�n" IDS_DLG_ERR_SBWINSIZE, "El tama�o del buffer de la pantalla debe ser mayor o igual que el de la ventana" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: No se pudo procesar el id del evento\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Final invalido\n" +IDS_CMD_INVALID_OPTION "wineconsole: Linea de comando no reconocida\n" +IDS_CMD_ABOUT "Inicia un programa en una consola de Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: El arranque del programa %s fall�.\n"\ + "El comando es inv�lido.\n" + +IDS_USAGE_HEADER "\nUso:\n wineconsole [opciones] <comando>\n\nOpciones:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Seleccionando user generar� una nueva ventana, curses\n"\ + " intentara configurar el terminal actual como una consola de Wine\n" +IDS_USAGE_COMMAND " <comando> EL programa de Wine que se iniciar� en la consola\n" +IDS_USAGE_FOOTER "\nEjemplo:\n wineconsole cmd\nInicia el simbolo del sistema de Wine en una consola Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105

1 0

Matthias Kupfer : wordpad: Small typo fix for German translation.
by Alexandre Julliard 16 Jun '08

16 Jun '08

Module: wine Branch: master Commit: 0e074d6dd6432e96f7037657bbe1921be38415fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e074d6dd6432e96f7037657b… Author: Matthias Kupfer <matthias.kupfer(a)informatik.tu-chemnitz.de> Date: Fri Jun 13 18:22:42 2008 +0200 wordpad: Small typo fix for German translation. --- programs/wordpad/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index bf5b1e1..0c875a5 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -78,7 +78,7 @@ BEGIN MENUITEM "Sch&riftart...", ID_FONTSETTINGS MENUITEM "Auf&z�hlungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT - MENUITEM "&Tabsstopps..." ID_TABSTOPS + MENUITEM "&Tabstopps..." ID_TABSTOPS POPUP "&Hintergrund" BEGIN MENUITEM "&System\tStrg+1", ID_BACK_1

1 0

Austin English : winetest: Detect 2008 separately from Vista.
by Alexandre Julliard 16 Jun '08

16 Jun '08

Module: tools Branch: master Commit: 6de6422966ed7e832bcbbab2699fcf6a0d25db5b URL: http://source.winehq.org/git/tools.git/?a=commit;h=6de6422966ed7e832bcbbab2… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 13 15:55:15 2008 -0500 winetest: Detect 2008 separately from Vista. --- winetest/build-index | 5 +++-- winetest/dissect | 12 +++++++++--- winetest/gather | 5 +++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 66b10a2..77fb157 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -26,15 +26,16 @@ my %w2k = (name => "2000"); my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); +my %w2k8 = (name => "2008"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/dissect b/winetest/dissect index 66a3bd4..e3a702a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -124,7 +124,7 @@ while (($_ = <IN>) =~ s/^ //) } $box->{data} .= "</div>"; -my ($wine, $version, $major, $minor, $plid); +my ($wine, $version, $major, $minor, $plid, $product); /^Operating system version:\r?$/ or mydie "no OS header: $_"; $box = create_box( "version", "version", "Operating system version" ); $box->{data} .= "<table class=\"output\">\n"; @@ -138,6 +138,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $minor = $2; } elsif ($1 eq "PlatformId") { $plid = $2; + } elsif ($1 eq "wProductType") { + $product = $2; } } $box->{data} .= "</table>"; @@ -165,8 +167,12 @@ if ($plid==1 && $major==4) { $version = "2003"; } } elsif ($major==6) { - $version = "vista"; - } + if ($product==1) { + $version = "Vista"; + } elsif ($product==3) { + $version = "2008"; + } + } } elsif ($plid==3) { $version = "ce$major$minor"; } diff --git a/winetest/gather b/winetest/gather index 12deb4e..295fe9f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -93,15 +93,16 @@ my %w2k = (name => "2000"); my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); +my %w2k8 = (name => "2008"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;

1 0

Alexandre Julliard : winetest: Make sure the winetest. exe build link points to a valid URL.
by Alexandre Julliard 16 Jun '08

16 Jun '08

Module: tools Branch: master Commit: b9dee8e3f4e5b74bcb92521f7b6c7859a55c41bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=b9dee8e3f4e5b74bcb92521f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 16 15:25:16 2008 +0200 winetest: Make sure the winetest.exe build link points to a valid URL. --- winetest/gather | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 6c06b39..12deb4e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -27,6 +27,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; +use CGI qw(:standard); +charset("utf-8"); + use vars qw/$datadir $gitweb/; require "winetest.conf"; @@ -108,7 +111,7 @@ exit 2 unless defined $outdated; # Read in the data my %alltests; # union of test names -my $url; # archive url of winetest.exe +my $url = ""; # archive url of winetest.exe foreach my $file (glob "$datadir/$build/*/summary.txt") { (my $dir = $file) =~ s|^\Q$datadir/$build\E/(.*?)/summary.txt$|$1|; (my $id, my @tag) = split /_/, $dir; @@ -144,11 +147,14 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { close TEST; next; } - if (($url = <TEST>) !~ s/^Archive: (.*)\n$/$1/) { - print STDERR "$name0:error: wrong archive url in '$file': $url"; + my $archive = <TEST>; + if ($archive !~ s/^Archive: (.*)\n$/$1/) { + print STDERR "$name0:error: wrong archive url in '$file': $archive"; close TEST; next; } + $url = "href=\"" . escapeHTML($archive) . "\"" if (!$url && $archive =~ /^http:\/\//); + while (<TEST>) { my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, $source, $rev) = split; @@ -423,7 +429,7 @@ print OUT <<"EOF"; <p class="legend">This <span class="result pass also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work.</p> </div> <div class="main"> -<h1>Main summary for build <a href="$url" title="$build">$short_build</a></h1> +<h1>Main summary for build <a $url title="$build">$short_build</a></h1> <table class="report"> $header_footer <tbody onDblClick="clone();">

1 0

Jeff Zaroyko : change the registration process to email a random password due to recent abuse
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: 7b26438a583b5d9559bd67e22511ff67812feadb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7b26438a583b5d9559bd67e2… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Mon Jun 16 12:57:55 2008 +1000 change the registration process to email a random password due to recent abuse --- account.php | 20 ++++---------------- include/form_new.php | 8 -------- include/user.php | 1 + 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/account.php b/account.php index 3538b75..1ecff46 100644 --- a/account.php +++ b/account.php @@ -96,16 +96,6 @@ function cmd_do_new() retry("new", "Invalid email address"); return; } - if(strlen($aClean['sUserPassword']) < 5) - { - retry("new", "Password must be at least 5 characters"); - return; - } - if($aClean['sUserPassword'] != $aClean['sUserPassword2']) - { - retry("new", "Passwords don't match"); - return; - } if(empty($aClean['sUserRealname'])) { retry("new", "You don't have a Real name?"); @@ -113,16 +103,14 @@ function cmd_do_new() } $oUser = new User(); - - $iResult = $oUser->create($aClean['sUserEmail'], $aClean['sUserPassword'], + $sPassword = substr(base_convert(rand(0, PHP_INT_MAX),10, 36), 0, 9); + $iResult = $oUser->create($aClean['sUserEmail'], $sPassword, $aClean['sUserRealname'], $aClean['sWineRelease'] ); if($iResult == SUCCESS) { - /* if we can log the user in, log them in automatically */ - $oUser->login($aClean['sUserEmail'], $aClean['sUserPassword']); - - addmsg("Account created! (".$aClean['sUserEmail'].")", "green"); + mail_appdb($oUser->sEmail, "New account", "Your password is ".$sPassword); + addmsg("Account created! Check your email for your password. (".$aClean['sUserEmail'].")", "green"); util_redirect_and_exit(apidb_fullurl()); } else if($iResult == USER_CREATE_EXISTS) diff --git a/include/form_new.php b/include/form_new.php index 62c3e8d..560b4bd 100644 --- a/include/form_new.php +++ b/include/form_new.php @@ -17,14 +17,6 @@ echo html_frame_start("Create New Application DB Account","400","",0) <td class=color0> <input type="text" name="sUserEmail" value='<?php if(!empty($aClean['sUserEmail'])) echo $aClean['sUserEmail']?>'> </td> </tr> <tr> - <td class=color1> Password </td> - <td class=color0> <input type="password" name="sUserPassword"> </td> - </tr> - <tr> - <td class=color1> Password (again) </td> - <td class=color0> <input type="password" name="sUserPassword2"> </td> - </tr> - <tr> <td class=color1> Real Name </td> <td class=color0> <input type="text" name="sUserRealname" value='<?php if(!empty($aClean['sUserRealname'])) echo $aClean['sUserRealname']?>'> </td> </tr> diff --git a/include/user.php b/include/user.php index af15196..20c6b1b 100644 --- a/include/user.php +++ b/include/user.php @@ -173,6 +173,7 @@ class User { $retval = $this->login($sEmail, $sPassword); if($retval == SUCCESS) $this->setPref("comments:mode", "threaded"); /* set the users default comments:mode to threaded */ + $this->logout(); return $retval; }

1 0

Alexander Nicolaysen Sørnes : distribution: Change column order and names
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: 7619dc2122e642d2154248f73f302fb0196e43b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7619dc2122e642d2154248f7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 21:12:22 2008 +0200 distribution: Change column order and names --- include/distribution.php | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index d25b012..1833177 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -541,12 +541,11 @@ class distribution { $oTableRow->AddSortableTextCell("Distribution name", "name"); - $oTableRow->AddTextCell("Distribution url"); - - $oTableCell = new TableCell("Linked Tests"); - $oTableCell->SetAlign("right"); + $oTableCell = new TableCell("Test reports"); $oTableRow->AddCell($oTableCell); + $oTableRow->AddTextCell("Distribution url"); + return $oTableRow; } @@ -590,13 +589,13 @@ class distribution { $oTableRow->AddTextCell($this->objectMakeLink()); + $oTableCell = new TableCell(sizeof($this->aTestingIds)); + $oTableRow->AddCell($oTableCell); + $oTableCell = new TableCell("$this->sUrl"); $oTableCell->SetCellLink($this->sUrl); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell(sizeof($this->aTestingIds)); - $oTableCell->SetAlign("right"); - $oTableRow->AddCell($oTableCell); // enable the 'delete' action if this distribution has no testing results $bDeleteLink = sizeof($this->aTestingIds) ? FALSE : TRUE;

1 0

Alexander Nicolaysen Sørnes : browse by developer: Change column order
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: c293db6d518d049fde5c328c268a03c693f5dbd2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c293db6d518d049fde5c328c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 21:07:28 2008 +0200 browse by developer: Change column order --- include/vendor.php | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 4537f93..4e8d759 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -271,15 +271,14 @@ class Vendor { function objectGetHeader() { $oTableRow = new TableRowSortable(); - - $oTableRow->AddSortableTextCell('Name', 'vendorName'); - $oTableRow->AddTextCell("Website"); + $oTableRow->AddSortableTextCell('Name', 'vendorName'); - $oTableCell = new TableCell("Linked apps"); - $oTableCell->SetAlign("right"); + $oTableCell = new TableCell('Applications'); $oTableRow->AddCell($oTableCell); + $oTableRow->AddTextCell("Website"); + return $oTableRow; } @@ -292,12 +291,11 @@ class Vendor { $oTableRow = new TableRow(); $oTableRow->AddTextCell($this->objectMakeLink()); - $oTableCell = new TableCell($this->sWebpage); - $oTableCell->SetCellLink($this->sWebpage); + $oTableCell = new TableCell(sizeof($this->aApplicationsIds)); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell(sizeof($this->aApplicationsIds)); - $oTableCell->SetAlign("right"); + $oTableCell = new TableCell($this->sWebpage); + $oTableCell->SetCellLink($this->sWebpage); $oTableRow->AddCell($oTableCell); // create the object manager specific row

1 0

Alexander Nicolaysen Sørnes : objectManager:=?UTF-8?Q?=20Add=20a=20space=20between=20?= æitems per pageæ and selector
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: b26be595335fe476bc72358fa9bf9ff753555b74 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b26be595335fe476bc72358f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 21:01:18 2008 +0200 objectManager: Add a space between æitems per pageæ and selector --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 0ae6113..8a6660f 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1389,7 +1389,7 @@ class ObjectManager /* Fill in form data for the objectManager URL */ $sControls .= $this->makeUrlFormData(); $sControls .= "<p><b> Items per page</b>"; - $sControls .= "<select name=\"iItemsPerPage\">"; + $sControls .= " <select name=\"iItemsPerPage\">"; foreach($aItemsPerPage as $iNum) {

1 0

Alexander Nicolaysen Sørnes : Update voting help
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: d2e06b800a5bd113f1bc586cad242c84ca5a1c90 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d2e06b800a5bd113f1bc586c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 20:56:52 2008 +0200 Update voting help --- help/voting.help | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/help/voting.help b/help/voting.help index 78775e6..ae48bf2 100644 --- a/help/voting.help +++ b/help/voting.help @@ -10,13 +10,15 @@ you would MOST like to see running in Wine. <p><b>Step by Step Help on Voting</b></p> <ol> -<li>Log into the Application Database.</li> +<li><p>Log in to the Application Database.</p></li> -<li><p>Browse to the application version you wish to add to your vote list.</li> +<li><p>Browse to the application version you wish to add to your vote list.</p></li> -<li><p>In the sidebar, click one of the 3 available slots, and click Vote.</li> +<li><p>In the table showing name, license, rating etc., click on ‘Vote’.</p></li> -<li><p>Done!</li> +<li><p>Select the slots you wish to use, and press ‘Submit’</p></li> + +<li><p>Done!</p></li> </ol> @@ -29,9 +31,8 @@ you would MOST like to see running in Wine. community. Don't vote for applications that are known to be working well. We know Solitaire works. Voting for it would not make much sense.</li> - <li>You can clear your vote at any time. Simply browse to any application - version in the database, select the slot you want to clear, and click the Clear - button.</li> + <li>You can clear your vote at any time. Browse to any application + version, select ‘Vote’ from the table showing name, license, rating etc., then choose the slots you wish to clear and press ‘Delete’.</p></li> </ul>

1 0

Alexander Nicolaysen Sørnes : browse apps: Add support for filtering by name
by Chris Morgan 16 Jun '08

16 Jun '08

Module: appdb Branch: master Commit: 628bc7c7673d57e4f15f91c53a71400641705b48 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=628bc7c7673d57e4f15f91c5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 15 20:38:27 2008 +0200 browse apps: Add support for filtering by name --- include/application.php | 1 + include/db_filter.php | 36 +++++++++++++++++++++++++++++------- include/db_filter_ui.php | 16 +++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/include/application.php b/include/application.php index 0b2a13d..44bc97b 100644 --- a/include/application.php +++ b/include/application.php @@ -1035,6 +1035,7 @@ class Application { $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('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('onlyDownloadable', 'Only show downloadable apps', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; } diff --git a/include/db_filter.php b/include/db_filter.php index 09fa909..fa5a0b7 100644 --- a/include/db_filter.php +++ b/include/db_filter.php @@ -9,12 +9,15 @@ */ define('FILTER_LIKE', 1); -define('FILTER_EQUALS', 2); -define('FILTER_GREATER_THAN', 3); -define('FILTER_LESS_THAN', 4); -define('FILTER_NOT_EQUALS', 5); -define('FILTER_NOT_LIKE', 6); -define('FILTER_OPTION_BOOL', 7); +define('FILTER_CONTAINS', 2); // Same as LIKE, but value is wrapped by wildcards +define('FILTER_STARTS_WITH', 3); // Same as LIKE, but with a prepended wildcard +define('FILTER_ENDS_WITH', 4); // Same as LIKE, but with an appended wildcard +define('FILTER_EQUALS', 5); +define('FILTER_GREATER_THAN', 6); +define('FILTER_LESS_THAN', 7); +define('FILTER_NOT_EQUALS', 8); +define('FILTER_NOT_LIKE', 9); +define('FILTER_OPTION_BOOL', 10); /* A filter as part of an SQL query, such as something = 'somevalue' */ class Filter @@ -55,6 +58,9 @@ class Filter switch($this->iType) { case FILTER_LIKE: + case FILTER_CONTAINS: + case FILTER_STARTS_WITH: + case FILTER_ENDS_WITH: return 'LIKE'; case FILTER_EQUALS: return '='; @@ -79,9 +85,25 @@ class Filter if($this->iType == FILTER_OPTION_BOOL) return ''; + $sData = $this->sData; + + /* Add wildcards if required */ + switch($this->iType) + { + case FILTER_CONTAINS: + $sData = "%$sData%"; + break; + case FILTER_STARTS_WITH: + $sData = "$sData%"; + break; + case FILTER_ENDS_WITH: + $sData = "%$sData"; + break; + } + $sOp = $this->getOperator(); - return "{$this->sColumn} $sOp '{$this->sData}'"; + return "{$this->sColumn} $sOp '$sData'"; } } diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index a301d5b..271ccba 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -10,10 +10,10 @@ require_once('db_filter.php'); -define(FILTER_VALUES_NORMAL, 1); -define(FILTER_VALUES_ENUM, 2); -define(FILTER_VALUES_BOOL, 3); -define(FILTER_VALUES_OPTION, 4); +define('FILTER_VALUES_NORMAL', 1); +define('FILTER_VALUES_ENUM', 2); +define('FILTER_VALUES_BOOL', 3); +define('FILTER_VALUES_OPTION', 4); /* Info describing an available filter: what column it applies to, and what comparison options are available */ @@ -78,6 +78,12 @@ class FilterInfo return 'equal to'; case FILTER_LIKE: return 'like'; + case FILTER_CONTAINS: + return 'contains'; + case FILTER_STARTS_WITH: + return 'starts with'; + case FILTER_ENDS_WITH: + return 'ends with'; case FILTER_NOT_LIKE: return 'not like'; case FILTER_NOT_EQUALS: @@ -216,7 +222,7 @@ class FilterInterface if($iId == -1) { - $sText = 'select'; + $sText = 'criteria'; $sSel = " selected='selected'"; } else {

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2008