* @param string $type Type of filter (eg. tags, permalink, etc.).
* @param mixed $request Filter content.
* @param bool $casesensitive Optional: Perform case sensitive filter if true.
- * @param bool $privateonly Optional: Only returns private links if true.
+ * @param string $visibility Optional: return only all/private/public links
+ * @param string $untaggedonly Optional: return only untagged links. Applies only if $type includes FILTER_TAG
*
* @return array filtered link list.
*/
- public function filter($type, $request, $casesensitive = false, $privateonly = false)
+ public function filter($type, $request, $casesensitive = false, $visibility = 'all', $untaggedonly = false)
{
+ if (! in_array($visibility, ['all', 'public', 'private'])) {
+ $visibility = 'all';
+ }
+
switch($type) {
case self::$FILTER_HASH:
return $this->filterSmallHash($request);
- case self::$FILTER_TAG | self::$FILTER_TEXT:
- if (!empty($request)) {
- $filtered = $this->links;
- if (isset($request[0])) {
- $filtered = $this->filterTags($request[0], $casesensitive, $privateonly);
+ case self::$FILTER_TAG | self::$FILTER_TEXT: // == "vuotext"
+ $noRequest = empty($request) || (empty($request[0]) && empty($request[1]));
+ if ($noRequest) {
+ if ($untaggedonly) {
+ return $this->filterUntagged($visibility);
}
- if (isset($request[1])) {
- $lf = new LinkFilter($filtered);
- $filtered = $lf->filterFulltext($request[1], $privateonly);
- }
- return $filtered;
+ return $this->noFilter($visibility);
}
- return $this->noFilter($privateonly);
+ if ($untaggedonly) {
+ $filtered = $this->filterUntagged($visibility);
+ } else {
+ $filtered = $this->links;
+ }
+ if (!empty($request[0])) {
+ $filtered = (new LinkFilter($filtered))->filterTags($request[0], $casesensitive, $visibility);
+ }
+ if (!empty($request[1])) {
+ $filtered = (new LinkFilter($filtered))->filterFulltext($request[1], $visibility);
+ }
+ return $filtered;
case self::$FILTER_TEXT:
- return $this->filterFulltext($request, $privateonly);
+ return $this->filterFulltext($request, $visibility);
case self::$FILTER_TAG:
- return $this->filterTags($request, $casesensitive, $privateonly);
+ if ($untaggedonly) {
+ return $this->filterUntagged($visibility);
+ } else {
+ return $this->filterTags($request, $casesensitive, $visibility);
+ }
case self::$FILTER_DAY:
return $this->filterDay($request);
default:
- return $this->noFilter($privateonly);
+ return $this->noFilter($visibility);
}
}
/**
* Unknown filter, but handle private only.
*
- * @param bool $privateonly returns private link only if true.
+ * @param string $visibility Optional: return only all/private/public links
*
* @return array filtered links.
*/
- private function noFilter($privateonly = false)
+ private function noFilter($visibility = 'all')
{
- if (! $privateonly) {
+ if ($visibility === 'all') {
return $this->links;
}
$out = array();
foreach ($this->links as $key => $value) {
- if ($value['private']) {
+ if ($value['private'] && $visibility === 'private') {
+ $out[$key] = $value;
+ } else if (! $value['private'] && $visibility === 'public') {
$out[$key] = $value;
}
}
* - see https://github.com/shaarli/Shaarli/issues/75 for examples
*
* @param string $searchterms search query.
- * @param bool $privateonly return only private links if true.
+ * @param string $visibility Optional: return only all/private/public links.
*
* @return array search results.
*/
- private function filterFulltext($searchterms, $privateonly = false)
+ private function filterFulltext($searchterms, $visibility = 'all')
{
if (empty($searchterms)) {
- return $this->links;
+ return $this->noFilter($visibility);
}
$filtered = array();
foreach ($this->links as $id => $link) {
// ignore non private links when 'privatonly' is on.
- if (! $link['private'] && $privateonly === true) {
- continue;
+ if ($visibility !== 'all') {
+ if (! $link['private'] && $visibility === 'private') {
+ continue;
+ } else if ($link['private'] && $visibility === 'public') {
+ continue;
+ }
}
// Concatenate link fields to search across fields.
*
* @param string $tags list of tags separated by commas or blank spaces.
* @param bool $casesensitive ignore case if false.
- * @param bool $privateonly returns private links only.
+ * @param string $visibility Optional: return only all/private/public links.
*
* @return array filtered links.
*/
- public function filterTags($tags, $casesensitive = false, $privateonly = false)
+ public function filterTags($tags, $casesensitive = false, $visibility = 'all')
{
// Implode if array for clean up.
$tags = is_array($tags) ? trim(implode(' ', $tags)) : $tags;
if (empty($tags)) {
- return $this->links;
+ return $this->noFilter($visibility);
}
$searchtags = self::tagsStrToArray($tags, $casesensitive);
foreach ($this->links as $key => $link) {
// ignore non private links when 'privatonly' is on.
- if (! $link['private'] && $privateonly === true) {
- continue;
+ if ($visibility !== 'all') {
+ if (! $link['private'] && $visibility === 'private') {
+ continue;
+ } else if ($link['private'] && $visibility === 'public') {
+ continue;
+ }
}
$linktags = self::tagsStrToArray($link['tags'], $casesensitive);
return $filtered;
}
+ /**
+ * Return only links without any tag.
+ *
+ * @param string $visibility return only all/private/public links.
+ *
+ * @return array filtered links.
+ */
+ public function filterUntagged($visibility)
+ {
+ $filtered = [];
+ foreach ($this->links as $key => $link) {
+ if ($visibility !== 'all') {
+ if (! $link['private'] && $visibility === 'private') {
+ continue;
+ } else if ($link['private'] && $visibility === 'public') {
+ continue;
+ }
+ }
+
+ if (empty(trim($link['tags']))) {
+ $filtered[$key] = $link;
+ }
+ }
+
+ return $filtered;
+ }
+
/**
* Returns the list of articles for a given day, chronologically sorted
*
* @param bool $casesensitive will convert everything to lowercase if false.
*
* @return array filtered tags string.
- */
+ */
public static function tagsStrToArray($tags, $casesensitive)
{
// We use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek)
projects / github / shaarli / Shaarli.git / blobdiff