switch($type) {
case self::$FILTER_HASH:
return $this->filterSmallHash($request);
- break;
+ case self::$FILTER_TAG | self::$FILTER_TEXT:
+ if (!empty($request)) {
+ $filtered = $this->links;
+ if (isset($request[0])) {
+ $filtered = $this->filterTags($request[0], $casesensitive, $privateonly);
+ }
+ if (isset($request[1])) {
+ $lf = new LinkFilter($filtered);
+ $filtered = $lf->filterFulltext($request[1], $privateonly);
+ }
+ return $filtered;
+ }
+ return $this->noFilter($privateonly);
case self::$FILTER_TEXT:
return $this->filterFulltext($request, $privateonly);
- break;
case self::$FILTER_TAG:
return $this->filterTags($request, $casesensitive, $privateonly);
- break;
case self::$FILTER_DAY:
return $this->filterDay($request);
- break;
default:
return $this->noFilter($privateonly);
}
*/
private function filterFulltext($searchterms, $privateonly = false)
{
+ if (empty($searchterms)) {
+ return $this->links;
+ }
+
+ $filtered = array();
$search = mb_convert_case(html_entity_decode($searchterms), MB_CASE_LOWER, 'UTF-8');
$exactRegex = '/"([^"]+)"/';
// Retrieve exact search terms.
continue;
}
- // Iterate over searchable link fields.
+ // Concatenate link fields to search across fields.
+ // Adds a '\' separator for exact search terms.
+ $content = '';
foreach ($keys as $key) {
- // Be optimistic
- $found = true;
-
- $haystack = mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8');
-
- // First, we look for exact term search
- for ($i = 0; $i < count($exactSearch) && $found; $i++) {
- $found = strpos($haystack, $exactSearch[$i]) !== false;
- }
+ $content .= mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8') . '\\';
+ }
- // Iterate over keywords, if keyword is not found,
- // no need to check for the others. We want all or nothing.
- for ($i = 0; $i < count($andSearch) && $found; $i++) {
- $found = strpos($haystack, $andSearch[$i]) !== false;
- }
+ // Be optimistic
+ $found = true;
- // Exclude terms.
- for ($i = 0; $i < count($excludeSearch) && $found; $i++) {
- $found = strpos($haystack, $excludeSearch[$i]) === false;
- }
-
- // One of the fields of the link matches, no need to check the other.
- if ($found) {
- break;
- }
+ // First, we look for exact term search
+ for ($i = 0; $i < count($exactSearch) && $found; $i++) {
+ $found = strpos($content, $exactSearch[$i]) !== false;
+ }
+
+ // Iterate over keywords, if keyword is not found,
+ // no need to check for the others. We want all or nothing.
+ for ($i = 0; $i < count($andSearch) && $found; $i++) {
+ $found = strpos($content, $andSearch[$i]) !== false;
+ }
+
+ // Exclude terms.
+ for ($i = 0; $i < count($excludeSearch) && $found; $i++) {
+ $found = strpos($content, $excludeSearch[$i]) === false;
}
-
+
if ($found) {
$filtered[$link['linkdate']] = $link;
}
*/
public function filterTags($tags, $casesensitive = false, $privateonly = false)
{
+ // Implode if array for clean up.
+ $tags = is_array($tags) ? trim(implode(' ', $tags)) : $tags;
+ if (empty($tags)) {
+ return $this->links;
+ }
+
$searchtags = self::tagsStrToArray($tags, $casesensitive);
$filtered = array();
if (empty($searchtags)) {