search: add support for label:XXX search keyword

Labels: enforce case-insensitive lookups when creating/looking for labels

2 files changed, 25 insertions, 4 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index 77add790e..bd2334747 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -2267,6 +2267,24 @@ class Feeds extends Handler_Protected {
 						if (!$not) array_push($search_words, $k);
 					}
 					break;
+				case "label":
+					if ($commandpair[1]) {
+						$label_id = Labels::find_id($commandpair[1], $_SESSION["uid"]);
+
+						if ($label_id) {
+							array_push($query_keywords, "($not 
+								(ttrss_entries.id IN (
+									SELECT article_id FROM ttrss_user_labels2 WHERE 
+										label_id = ".$pdo->quote($label_id).")))");
+						} else {
+							array_push($query_keywords, "(false)");
+						}
+					} else {
+						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
+						if (!$not) array_push($search_words, $k);
+					}
+					break;
 				case "unread":
 					if ($commandpair[1]) {
 						if ($commandpair[1] == "true")
@@ -2323,7 +2341,10 @@ class Feeds extends Handler_Protected {
 
 		}
 
-		$search_query_part = implode("AND", $query_keywords);
+		if (count($query_keywords) > 0)
+			$search_query_part = implode("AND", $query_keywords);
+		else
+			$search_query_part = "false";
 
 		return array($search_query_part, $search_words);
 	}
diff --git a/classes/labels.php b/classes/labels.php
index 19d060617..7a69a5191 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -12,7 +12,7 @@ class Labels
 	static function find_id($label, $owner_uid) {
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2 WHERE caption = ?
+		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2 WHERE LOWER(caption) = LOWER(?)
 				AND owner_uid = ? LIMIT 1");
 		$sth->execute([$label, $owner_uid]);
 
@@ -186,7 +186,7 @@ class Labels
 		}
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2
-			WHERE caption = ? AND owner_uid = ?");
+			WHERE LOWER(caption) = LOWER(?) AND owner_uid = ?");
 		$sth->execute([$caption, $owner_uid]);
 
 		if (!$sth->fetch()) {
@@ -202,4 +202,4 @@ class Labels
 
 		return $result;
 	}
-}
\ No newline at end of file
+}