diff options
Diffstat (limited to 'app/Models/EntryDAO.php')
| -rw-r--r-- | app/Models/EntryDAO.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 6eefd684c..c9fae7923 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -906,6 +906,14 @@ SQL; $sub_search .= 'AND ' . $alias . 'date <= ? '; $values[] = $filter->getMaxPubdate(); } + if ($filter->getMinUserdate() !== null) { + $sub_search .= 'AND ' . $alias . '`lastUserModified` >= ? '; + $values[] = $filter->getMinUserdate(); + } + if ($filter->getMaxUserdate() !== null) { + $sub_search .= 'AND ' . $alias . '`lastUserModified` <= ? '; + $values[] = $filter->getMaxUserdate(); + } //Negation of date intervals must be combined by OR if ($filter->getNotMinDate() !== null || $filter->getNotMaxDate() !== null) { @@ -938,6 +946,21 @@ SQL; } $sub_search .= ') '; } + if ($filter->getNotMinUserdate() !== null || $filter->getNotMaxUserdate() !== null) { + $sub_search .= 'AND ('; + if ($filter->getNotMinUserdate() !== null) { + $sub_search .= $alias . '`lastUserModified` < ?'; + $values[] = $filter->getNotMinUserdate(); + if ($filter->getNotMaxUserdate()) { + $sub_search .= ' OR '; + } + } + if ($filter->getNotMaxUserdate() !== null) { + $sub_search .= $alias . '`lastUserModified` > ?'; + $values[] = $filter->getNotMaxUserdate(); + } + $sub_search .= ') '; + } if ($filter->getFeedIds() !== null) { $sub_search .= 'AND ' . $alias . 'id_feed IN ('; |