diff options
Diffstat (limited to 'lib/MasterWebInterface/Database')
| -rwxr-xr-x | lib/MasterWebInterface/Database/Games.pm | 8 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Database/Servers.pm | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/MasterWebInterface/Database/Games.pm b/lib/MasterWebInterface/Database/Games.pm index 02b6ad9..c9dab95 100755 --- a/lib/MasterWebInterface/Database/Games.pm +++ b/lib/MasterWebInterface/Database/Games.pm @@ -18,6 +18,12 @@ sub dbGameListGet # search criteria my %where = ( $o{search} ? ('lower(label) LIKE lower(?)' => "%$o{search}%") : (), + $o{search} ? ('lower(label) LIKE lower(?) OR lower(gamename) LIKE lower(?)' => ["%$o{search}%","%$o{search}%"]) : (), + + + #$o{search} ? ('LOWER(hostname) LIKE LOWER(?) OR LOWER(maptitle) LIKE LOWER(?) OR LOWER(mapname) LIKE LOWER(?)' => ["%$o{search}%", "%$o{search}%", "%$o{search}%"]) : (), + + !$o{all} ? ( 'num_total > ?' => 0) : (), ); @@ -55,7 +61,7 @@ sub dbGameListGet sub dbGetGameDesc { my ($self, $gn) = @_; - return $self->dbAll("SELECT label FROM gameinfo WHERE gamename = ?", $gn)->[0]{label}; + return $self->dbAll("SELECT label FROM gameinfo WHERE gamename = ? LIMIT 1", $gn)->[0]{label}; } 1; diff --git a/lib/MasterWebInterface/Database/Servers.pm b/lib/MasterWebInterface/Database/Servers.pm index 99b4f1e..f8a4b66 100755 --- a/lib/MasterWebInterface/Database/Servers.pm +++ b/lib/MasterWebInterface/Database/Servers.pm @@ -16,8 +16,9 @@ sub dbServerListGet { my %where = ( # gamename and char are "all" or value + $o{gamename} !~ /all/ ? ('serverlist.gamename = ?' => $o{gamename}) : (), $o{updated} ? ('dt_updated > ?' => (time-$o{updated})) : (), - $o{gamename} ? ('serverlist.gamename = ?' => $o{gamename}) : (), + #$o{gamename} ? ('serverlist.gamename = ?' => $o{gamename}) : (), $o{nolist} ? ('serverlist.gamename <> ?' => $o{nolist}) : (), $o{search} ? ('LOWER(hostname) LIKE LOWER(?)' => "%$o{search}%") : (), $o{popserv} ? ('numplayers > ?' => 0) : (), @@ -25,7 +26,7 @@ sub dbServerListGet { #advanced search $o{hostname} ? ('LOWER(hostname) LIKE LOWER(?)' => "%$o{hostname}%") : (), - $o{gametype} ? ('LOWER(gametype) LIKE LOWER(?)' => $o{gametype}) : (), + $o{gametype} ? ('LOWER(gametype) LIKE LOWER(?)' => "%$o{gametype}%") : (), $o{mapname} ? ('(LOWER(mapname) LIKE LOWER(?) OR LOWER(maptitle) LIKE LOWER(?))' => ["%$o{mapname}%", "%$o{mapname}%"]) : (), $o{country} ? ('country LIKE UPPER(?)' => $o{country}) : (), |