Skip to content
Browse files

be more strict about allowed comparisons

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@20 7f39781d-f577-437e-ae19-be835c7a54ca
  • Loading branch information...
1 parent 8d44a83 commit ab42847cf8b2103e8944ea0e98b8ca6bf1dd653e shish committed Apr 27, 2007
Showing with 3 additions and 3 deletions.
  1. +3 −3 core/database.class.php
View
6 core/database.class.php
@@ -93,17 +93,17 @@ private function build_search_querylet($terms) {
$term = $this->resolve_alias($term);
$matches = array();
- if(preg_match("/size([><=]+)(\d+)x(\d+)/", $term, $matches)) {
+ if(preg_match("/size(<|>|<=|>=|=)(\d+)x(\d+)/", $term, $matches)) {
$cmp = $matches[1];
$args = array(int_escape($matches[2]), int_escape($matches[3]));
$img_search->append(new Querylet("AND (width $cmp ? AND height $cmp ?)", $args));
}
- else if(preg_match("/ratio([><=]+)(\d+):(\d+)/", $term, $matches)) {
+ else if(preg_match("/ratio(<|>|<=|>=|=)(\d+):(\d+)/", $term, $matches)) {
$cmp = $matches[1];
$args = array(int_escape($matches[2]), int_escape($matches[3]));
$img_search->append(new Querylet("AND (width / height $cmp ? / ?)", $args));
}
- else if(preg_match("/(filesize|id)([><=]+)([\dKMGB]+)/i", $term, $matches)) {
+ else if(preg_match("/(filesize|id)(<|>|<=|>=|=)([\dKMGB]+)/i", $term, $matches)) {
$col = $matches[1];
$cmp = $matches[2];
$val = parse_shorthand_int($matches[3]);

0 comments on commit ab42847

Please sign in to comment.
Something went wrong with that request. Please try again.