From 21d8c03ac969d93b9a0d29ee5cb8cd2f5630bdb8 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Mon, 7 Jul 2014 19:21:57 -0400 Subject: Add a configuration parameter Add a parameter to choose wether or not the user want to display a confirmation dialog when clicking on "mark all as read" actions. --- app/Controllers/configureController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/Controllers/configureController.php') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index f016e1fbf..9c143508e 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -185,8 +185,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false)); $this->view->conf->_display_posts(Minz_Request::param('display_posts', false)); $this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false)); - $this->view->conf->_lazyload(Minz_Request::param('lazyload', false)); - $this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false)); + $this->view->conf->_lazyload (Minz_Request::param('lazyload', false)); + $this->view->conf->_sticky_post (Minz_Request::param('sticky_post', false)); + $this->view->conf->_reading_confirm (Minz_Request::param('reading_confirm', false)); $this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC')); $this->view->conf->_mark_when(array( 'article' => Minz_Request::param('mark_open_article', false), -- cgit v1.2.3 From 0f842c1aea74792d9b6f7e41e374c5aa0ec745fb Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 8 Jul 2014 14:14:02 +0200 Subject: SQL: removed superfluous transactions to avoid some dead locks --- app/Controllers/configureController.php | 6 +++--- app/Models/EntryDAO.php | 12 ------------ app/Models/EntryDAOSQLite.php | 10 +--------- 3 files changed, 4 insertions(+), 24 deletions(-) (limited to 'app/Controllers/configureController.php') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 9c143508e..ed8cfdb15 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -185,9 +185,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false)); $this->view->conf->_display_posts(Minz_Request::param('display_posts', false)); $this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false)); - $this->view->conf->_lazyload (Minz_Request::param('lazyload', false)); - $this->view->conf->_sticky_post (Minz_Request::param('sticky_post', false)); - $this->view->conf->_reading_confirm (Minz_Request::param('reading_confirm', false)); + $this->view->conf->_lazyload(Minz_Request::param('lazyload', false)); + $this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false)); + $this->view->conf->_reading_confirm(Minz_Request::param('reading_confirm', false)); $this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC')); $this->view->conf->_mark_when(array( 'article' => Minz_Request::param('mark_open_article', false), diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 6f3f472f6..f184ab1fa 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -137,7 +137,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { return $affected; } - $this->bd->beginTransaction(); $sql = 'UPDATE `' . $this->prefix . 'entry` ' . 'SET is_read=? ' . 'WHERE id IN (' . str_repeat('?,', count($ids) - 1). '?)'; @@ -147,15 +146,12 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { if (!($stm && $stm->execute($values))) { $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); Minz_Log::record('SQL error markRead: ' . $info[2], Minz_Log::ERROR); - $this->bd->rollBack(); return false; } $affected = $stm->rowCount(); if (($affected > 0) && (!$this->updateCacheUnreads(false, false))) { - $this->bd->rollBack(); return false; } - $this->bd->commit(); return $affected; } else { $sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id ' @@ -179,7 +175,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $idMax = time() . '000000'; Minz_Log::record($nb . 'Calling markReadEntries(0) is deprecated!', Minz_Log::DEBUG); } - $this->bd->beginTransaction(); $sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id ' . 'SET e.is_read=1 ' @@ -194,15 +189,12 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { if (!($stm && $stm->execute($values))) { $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); Minz_Log::record('SQL error markReadEntries: ' . $info[2], Minz_Log::ERROR); - $this->bd->rollBack(); return false; } $affected = $stm->rowCount(); if (($affected > 0) && (!$this->updateCacheUnreads(false, false))) { - $this->bd->rollBack(); return false; } - $this->bd->commit(); return $affected; } @@ -211,7 +203,6 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $idMax = time() . '000000'; Minz_Log::record($nb . 'Calling markReadCat(0) is deprecated!', Minz_Log::DEBUG); } - $this->bd->beginTransaction(); $sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed=f.id ' . 'SET e.is_read=1 ' @@ -221,15 +212,12 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { if (!($stm && $stm->execute($values))) { $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); Minz_Log::record('SQL error markReadCat: ' . $info[2], Minz_Log::ERROR); - $this->bd->rollBack(); return false; } $affected = $stm->rowCount(); if (($affected > 0) && (!$this->updateCacheUnreads($id, false))) { - $this->bd->rollBack(); return false; } - $this->bd->commit(); return $affected; } diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php index efcbed521..3dabce4b2 100644 --- a/app/Models/EntryDAOSQLite.php +++ b/app/Models/EntryDAOSQLite.php @@ -75,7 +75,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { Minz_Log::record($nb . 'Calling markReadEntries(0) is deprecated!', Minz_Log::DEBUG); } - $this->bd->beginTransaction(); $sql = 'UPDATE `' . $this->prefix . 'entry` SET is_read=1 WHERE is_read=0 AND id <= ?'; if ($onlyFavorites) { $sql .= ' AND is_favorite=1'; @@ -86,16 +85,13 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { $stm = $this->bd->prepare($sql); if (!($stm && $stm->execute($values))) { $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); - Minz_Log::record('SQL error markReadEntries 1: ' . $info[2], Minz_Log::ERROR); - $this->bd->rollBack(); + Minz_Log::record('SQL error markReadEntries: ' . $info[2], Minz_Log::ERROR); return false; } $affected = $stm->rowCount(); if (($affected > 0) && (!$this->updateCacheUnreads(false, false))) { - $this->bd->rollBack(); return false; } - $this->bd->commit(); return $affected; } @@ -104,7 +100,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { $idMax = time() . '000000'; Minz_Log::record($nb . 'Calling markReadCat(0) is deprecated!', Minz_Log::DEBUG); } - $this->bd->beginTransaction(); $sql = 'UPDATE `' . $this->prefix . 'entry` ' . 'SET is_read=1 ' @@ -115,15 +110,12 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { if (!($stm && $stm->execute($values))) { $info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo(); Minz_Log::record('SQL error markReadCat: ' . $info[2], Minz_Log::ERROR); - $this->bd->rollBack(); return false; } $affected = $stm->rowCount(); if (($affected > 0) && (!$this->updateCacheUnreads($id, false))) { - $this->bd->rollBack(); return false; } - $this->bd->commit(); return $affected; } -- cgit v1.2.3