Merge branch 'dev' of github.com:marienfressinaud/freshrss into dev

9 files changed, 20 insertions, 23 deletions

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index f016e1fbf..ed8cfdb15 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -187,6 +187,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$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->_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/Configuration.php b/app/Models/Configuration.php
index f2084b833..7596c54cd 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -20,6 +20,7 @@ class FreshRSS_Configuration {
 		'onread_jump_next' => true,
 		'lazyload' => true,
 		'sticky_post' => true,
+		'reading_confirm' => false,
 		'sort_order' => 'DESC',
 		'anon_access' => false,
 		'mark_when' => array(
@@ -149,6 +150,9 @@ class FreshRSS_Configuration {
 	public function _sticky_post($value) {
 		$this->data['sticky_post'] = ((bool)$value) && $value !== 'no';
 	}
+	public function _reading_confirm($value) {
+		$this->data['reading_confirm'] = ((bool)$value) && $value !== 'no';
+	}
 	public function _sort_order ($value) {
 		$this->data['sort_order'] = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
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;
 	}
 
diff --git a/app/i18n/en.php b/app/i18n/en.php
index b9aff9d73..8634f99b5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -264,6 +264,7 @@ return array (
 	'bottom_line'			=> 'Bottom line',
 	'img_with_lazyload'		=> 'Use "lazy load" mode to load pictures',
 	'sticky_post'			=> 'Stick the article to the top when opened',
+	'reading_confirm'		=> 'Display a confirmation dialog on “mark all as read” actions',
 	'auto_read_when'		=> 'Mark article as read…',
 	'article_viewed'		=> 'when article is viewed',
 	'article_open_on_website'	=> 'when article is opened on its original website',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index c43e2611b..e04078dba 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -264,6 +264,7 @@ return array (
 	'bottom_line'			=> 'Ligne du bas',
 	'img_with_lazyload'		=> 'Utiliser le mode “chargement différé” pour les images',
 	'sticky_post'			=> 'Aligner l’article en haut quand il est ouvert',
+	'reading_confirm'		=> 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'auto_read_when'		=> 'Marquer un article comme lu…',
 	'article_viewed'		=> 'lorsque l’article est affiché',
 	'article_open_on_website'	=> 'lorsque l’article est ouvert sur le site d’origine',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index c7a189cce..29ea9032c 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -181,7 +181,7 @@
 	?>
 
 	<div class="stick" id="nav_menu_read_all">
-		<a class="read_all btn" href="<?php echo $markReadUrl; ?>"><?php echo Minz_Translate::t ('mark_read'); ?></a>
+		<a class="read_all btn<?php if ($this->conf->reading_confirm) {echo ' confirm';} ?>" href="<?php echo $markReadUrl; ?>"><?php echo Minz_Translate::t ('mark_read'); ?></a>
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
 
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 0388e0bee..4d439e83d 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -83,6 +83,16 @@
 		</div>
 
 		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="reading_confirm">
+					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
+					<?php echo Minz_Translate::t ('reading_confirm'); ?>
+					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group">
 			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index d4983a32e..f38913c06 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -12,7 +12,7 @@
 	<?php $params['next'] = $this->nextId; ?>
 	<a id="load_more" href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t ('load_more'); ?></a>
 	<?php } elseif ($markReadUrl) { ?>
-	<a id="bigMarkAsRead" href="<?php echo $markReadUrl; ?>">
+	<a id="bigMarkAsRead" href="<?php echo $markReadUrl; ?>"<?php if ($this->conf->reading_confirm) { echo ' class="confirm"';} ?>>
 		<?php echo Minz_Translate::t ('nothing_to_load'); ?><br />
 		<span class="bigTick">✔</span><br />
 		<?php echo Minz_Translate::t ('mark_all_read'); ?>