aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers')
-rwxr-xr-xapp/Controllers/configureController.php84
-rwxr-xr-xapp/Controllers/feedController.php100
-rw-r--r--app/Controllers/importExportController.php3
-rwxr-xr-xapp/Controllers/indexController.php3
4 files changed, 79 insertions, 111 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 38ccd2b2d..248a3edcc 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -112,6 +112,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
FreshRSS_Context::$user_conf->sticky_post = Minz_Request::param('sticky_post', false);
FreshRSS_Context::$user_conf->reading_confirm = Minz_Request::param('reading_confirm', false);
FreshRSS_Context::$user_conf->auto_remove_article = Minz_Request::param('auto_remove_article', false);
+ FreshRSS_Context::$user_conf->mark_updated_article_unread = Minz_Request::param('mark_updated_article_unread', false);
FreshRSS_Context::$user_conf->sort_order = Minz_Request::param('sort_order', 'DESC');
FreshRSS_Context::$user_conf->mark_when = array(
'article' => Minz_Request::param('mark_open_article', false),
@@ -241,13 +242,16 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
* checking if categories and feeds are still in use.
*/
public function queriesAction() {
+ $category_dao = new FreshRSS_CategoryDAO();
+ $feed_dao = FreshRSS_Factory::createFeedDao();
if (Minz_Request::isPost()) {
- $queries = Minz_Request::param('queries', array());
+ $params = Minz_Request::param('queries', array());
- foreach ($queries as $key => $query) {
+ foreach ($params as $key => $query) {
if (!$query['name']) {
$query['name'] = _t('conf.query.number', $key + 1);
}
+ $queries[] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
}
FreshRSS_Context::$user_conf->queries = $queries;
FreshRSS_Context::$user_conf->save();
@@ -255,62 +259,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
Minz_Request::good(_t('feedback.conf.updated'),
array('c' => 'configure', 'a' => 'queries'));
} else {
- $this->view->query_get = array();
- $cat_dao = new FreshRSS_CategoryDAO();
- $feed_dao = FreshRSS_Factory::createFeedDao();
+ $this->view->queries = array();
foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
- if (!isset($query['get'])) {
- continue;
- }
-
- switch ($query['get'][0]) {
- case 'c':
- $category = $cat_dao->searchById(substr($query['get'], 2));
-
- $deprecated = true;
- $cat_name = '';
- if ($category) {
- $cat_name = $category->name();
- $deprecated = false;
- }
-
- $this->view->query_get[$key] = array(
- 'type' => 'category',
- 'name' => $cat_name,
- 'deprecated' => $deprecated,
- );
- break;
- case 'f':
- $feed = $feed_dao->searchById(substr($query['get'], 2));
-
- $deprecated = true;
- $feed_name = '';
- if ($feed) {
- $feed_name = $feed->name();
- $deprecated = false;
- }
-
- $this->view->query_get[$key] = array(
- 'type' => 'feed',
- 'name' => $feed_name,
- 'deprecated' => $deprecated,
- );
- break;
- case 's':
- $this->view->query_get[$key] = array(
- 'type' => 'favorite',
- 'name' => 'favorite',
- 'deprecated' => false,
- );
- break;
- case 'a':
- $this->view->query_get[$key] = array(
- 'type' => 'all',
- 'name' => 'all',
- 'deprecated' => false,
- );
- break;
- }
+ $this->view->queries[$key] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
}
}
@@ -325,16 +276,17 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
* lean data.
*/
public function addQueryAction() {
- $whitelist = array('get', 'order', 'name', 'search', 'state');
- $queries = FreshRSS_Context::$user_conf->queries;
- $query = Minz_Request::params();
- $query['name'] = _t('conf.query.number', count($queries) + 1);
- foreach ($query as $key => $value) {
- if (!in_array($key, $whitelist)) {
- unset($query[$key]);
- }
+ $category_dao = new FreshRSS_CategoryDAO();
+ $feed_dao = FreshRSS_Factory::createFeedDao();
+ $queries = array();
+ foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
+ $queries[$key] = new FreshRSS_UserQuery($query, $feed_dao, $category_dao);
}
- $queries[] = $query;
+ $params = Minz_Request::params();
+ $params['url'] = Minz_Url::display(array('params' => $params));
+ $params['name'] = _t('conf.query.number', count($queries) + 1);
+ $queries[] = new FreshRSS_UserQuery($params, $feed_dao, $category_dao);
+
FreshRSS_Context::$user_conf->queries = $queries;
FreshRSS_Context::$user_conf->save();
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 6f544d834..8db273aca 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -145,8 +145,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// Call the extension hook
$name = $feed->name();
$feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed);
- if (is_null($feed)) {
- Minz_Request::bad(_t('feed_not_added', $name), $url_redirect);
+ if ($feed === null) {
+ Minz_Request::bad(_t('feedback.sub.feed.not_added', $name), $url_redirect);
}
$values = array(
@@ -181,7 +181,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// Use a shared statement and a transaction to improve a LOT the
// performances.
- $prepared_statement = $entryDAO->addEntryPrepare();
$feedDAO->beginTransaction();
foreach ($entries as $entry) {
// Entries are added without any verification.
@@ -190,13 +189,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$entry->_isRead($is_read);
$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
- if (is_null($entry)) {
+ if ($entry === null) {
// An extension has returned a null value, there is nothing to insert.
continue;
}
$values = $entry->toArray();
- $entryDAO->addEntry($values, $prepared_statement);
+ $entryDAO->addEntry($values);
}
$feedDAO->updateLastUpdate($feed->id());
$feedDAO->commit();
@@ -302,17 +301,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue;
}
+ $url = $feed->url(); //For detection of HTTP 301
try {
// Load entries
$feed->load(false);
} catch (FreshRSS_Feed_Exception $e) {
Minz_Log::notice($e->getMessage());
- $feedDAO->updateLastUpdate($feed->id(), 1);
+ $feedDAO->updateLastUpdate($feed->id(), true);
$feed->unlock();
continue;
}
- $url = $feed->url();
$feed_history = $feed->keepHistory();
if ($feed_history == -2) {
// TODO: -2 must be a constant!
@@ -323,49 +322,66 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// We want chronological order and SimplePie uses reverse order.
$entries = array_reverse($feed->entries());
if (count($entries) > 0) {
- // For this feed, check last n entry GUIDs already in database.
- $existing_guids = array_fill_keys($entryDAO->listLastGuidsByFeed(
- $feed->id(), count($entries) + 10
- ), 1);
- $use_declared_date = empty($existing_guids);
+ $newGuids = array();
+ foreach ($entries as $entry) {
+ $newGuids[] = $entry->guid();
+ }
+ // For this feed, check existing GUIDs already in database.
+ $existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
+ unset($newGuids);
+ $oldGuids = array();
// Add entries in database if possible.
- $prepared_statement = $entryDAO->addEntryPrepare();
- $feedDAO->beginTransaction();
foreach ($entries as $entry) {
$entry_date = $entry->date(true);
- if (isset($existing_guids[$entry->guid()]) ||
- ($feed_history == 0 && $entry_date < $date_min)) {
- // This entry already exists in DB or should not be added
- // considering configuration and date.
- continue;
- }
-
- $id = uTimeString();
- if ($use_declared_date || $entry_date < $date_min) {
- // Use declared date at first import.
- $id = min(time(), $entry_date) . uSecString();
+ if (isset($existingHashForGuids[$entry->guid()])) {
+ $existingHash = $existingHashForGuids[$entry->guid()];
+ if (strcasecmp($existingHash, $entry->hash()) === 0 || $existingHash === '00000000000000000000000000000000') {
+ //This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
+ $oldGuids[] = $entry->guid();
+ } else { //This entry already exists but has been updated
+ Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
+ ', old hash ' . $existingHash . ', new hash ' . $entry->hash());
+ //TODO: Make an updated/is_read policy by feed, in addition to the global one.
+ $entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null); //Change is_read according to policy.
+ if (!$entryDAO->hasTransaction()) {
+ $entryDAO->beginTransaction();
+ }
+ $entryDAO->updateEntry($entry->toArray());
+ }
+ } elseif ($feed_history == 0 && $entry_date < $date_min) {
+ // This entry should not be added considering configuration and date.
+ $oldGuids[] = $entry->guid();
+ } else {
+ if ($entry_date < $date_min) {
+ $id = min(time(), $entry_date) . uSecString();
+ $entry->_isRead(true); //Old article that was not in database. Probably an error, so mark as read
+ } else {
+ $id = uTimeString();
+ $entry->_isRead($is_read);
+ }
+ $entry->_id($id);
+
+ $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
+ if ($entry === null) {
+ // An extension has returned a null value, there is nothing to insert.
+ continue;
+ }
+
+ if (!$entryDAO->hasTransaction()) {
+ $entryDAO->beginTransaction();
+ }
+ $entryDAO->addEntry($entry->toArray());
}
-
- $entry->_id($id);
- $entry->_isRead($is_read);
-
- $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
- if (is_null($entry)) {
- // An extension has returned a null value, there is nothing to insert.
- continue;
- }
-
- $values = $entry->toArray();
- $entryDAO->addEntry($values, $prepared_statement);
}
+ $entryDAO->updateLastSeen($feed->id(), $oldGuids);
}
if ($feed_history >= 0 && rand(0, 30) === 1) {
// TODO: move this function in web cron when available (see entry::purge)
// Remove old entries once in 30.
- if (!$feedDAO->hasTransaction()) {
- $feedDAO->beginTransaction();
+ if (!$entryDAO->hasTransaction()) {
+ $entryDAO->beginTransaction();
}
$nb = $feedDAO->cleanOldEntries($feed->id(),
@@ -377,9 +393,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
}
- $feedDAO->updateLastUpdate($feed->id(), 0, $feedDAO->hasTransaction());
- if ($feedDAO->hasTransaction()) {
- $feedDAO->commit();
+ $feedDAO->updateLastUpdate($feed->id(), 0, $entryDAO->hasTransaction());
+ if ($entryDAO->hasTransaction()) {
+ $entryDAO->commit();
}
if ($feed->url() !== $url) {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 589777b2a..26b163e43 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -361,7 +361,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
// Then, articles are imported.
- $prepared_statement = $this->entryDAO->addEntryPrepare();
$this->entryDAO->beginTransaction();
foreach ($article_object['items'] as $item) {
if (!isset($article_to_feed[$item['id']])) {
@@ -396,7 +395,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
$values = $entry->toArray();
- $id = $this->entryDAO->addEntry($values, $prepared_statement);
+ $id = $this->entryDAO->addEntry($values);
if (!$error && ($id === false)) {
$error = true;
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index c53d3223e..baaf99065 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -137,6 +137,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
}
// No layout for RSS output.
+ $this->view->url = empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING'];
$this->view->rss_title = FreshRSS_Context::$name . ' | ' . Minz_View::title();
$this->view->_useLayout(false);
header('Content-Type: application/rss+xml; charset=utf-8');
@@ -173,7 +174,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
FreshRSS_Context::$state |= FreshRSS_Entry::STATE_READ;
}
- FreshRSS_Context::$search = Minz_Request::param('search', '');
+ FreshRSS_Context::$search = new FreshRSS_Search(Minz_Request::param('search', ''));
FreshRSS_Context::$order = Minz_Request::param(
'order', FreshRSS_Context::$user_conf->sort_order
);
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 22:48:36 +0000