From d9c0d25b85ef3df7ea2cdc261e274efcdd5cfce0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 1 Apr 2017 22:31:12 +0200
Subject: Improve search: intitle, author, inurl

Allow multiple values of intitle: , author:, inurl:

Note: Tests for UserQueryTest are broken due to
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.0.0#backwards-compatibility-issues
---
 app/Models/EntryDAO.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'app/Models/EntryDAO.php')

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 61ec48d08..510755a2f 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -631,16 +631,22 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		}
 		if ($filter) {
 			if ($filter->getIntitle()) {
-				$search .= 'AND ' . $alias . 'title LIKE ? ';
-				$values[] = "%{$filter->getIntitle()}%";
+				foreach ($filter->getIntitle() as $title) {
+					$search .= 'AND ' . $alias . 'title LIKE ? ';
+					$values[] = "%{$title}%";
+				}
 			}
 			if ($filter->getInurl()) {
-				$search .= 'AND CONCAT(' . $alias . 'link, ' . $alias . 'guid) LIKE ? ';
-				$values[] = "%{$filter->getInurl()}%";
+				foreach ($filter->getInurl() as $url) {
+					$search .= 'AND CONCAT(' . $alias . 'link, ' . $alias . 'guid) LIKE ? ';
+					$values[] = "%{$url}%";
+				}
 			}
 			if ($filter->getAuthor()) {
-				$search .= 'AND ' . $alias . 'author LIKE ? ';
-				$values[] = "%{$filter->getAuthor()}%";
+				foreach ($filter->getAuthor() as $author) {
+					$search .= 'AND ' . $alias . 'author LIKE ? ';
+					$values[] = "%{$author}%";
+				}
 			}
 			if ($filter->getMinDate()) {
 				$search .= 'AND ' . $alias . 'id >= ? ';
@@ -659,8 +665,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				$values[] = $filter->getMaxPubdate();
 			}
 			if ($filter->getTags()) {
-				$tags = $filter->getTags();
-				foreach ($tags as $tag) {
+				foreach ($filter->getTags() as $tag) {
 					$search .= 'AND ' . $alias . 'tags LIKE ? ';
 					$values[] = "%{$tag}%";
 				}
-- 
cgit v1.2.3