From e7dba0ce7cfaf5e84687593a8b0d58d89fbff302 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 9 Aug 2014 23:29:13 +0200
Subject: Add basic system of update

- Check on update.freshrss.org for new updates
- Download script
- Apply script
- Need translations and verifications

NOTE: current script on server indicates version 0.7.3 is an update
of 0.8-dev ==> IT'S ONLY FOR MY TESTS!

Script just does a backup of ./data actually...

See https://github.com/marienfressinaud/FreshRSS/issues/411
---
 app/Controllers/updateController.php | 106 +++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 app/Controllers/updateController.php

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
new file mode 100644
index 000000000..a15cb9fd5
--- /dev/null
+++ b/app/Controllers/updateController.php
@@ -0,0 +1,106 @@
+<?php
+
+class FreshRSS_update_Controller extends Minz_ActionController {
+	public function firstAction() {
+		$current_user = Minz_Session::param('currentUser', '');
+		if (!$this->view->loginOk && Minz_Configuration::isAdmin($current_user)) {
+			Minz_Error::error(
+				403,
+				array('error' => array(_t('access_denied')))
+			);
+		}
+
+		Minz_View::prependTitle(_t('update_system') . ' · ');
+	}
+
+	public function indexAction() {
+		if (file_exists(UPDATE_FILENAME)) {
+			// There is an update file to apply!
+			$this->view->message = array(
+				'status' => 'good',
+				'title' => _t('ok'),
+				'body' => _t('update_can_apply', _url('update', 'apply'))
+			);
+
+			return;
+		}
+	}
+
+	public function checkAction() {
+		$this->view->change_view('update', 'index');
+
+		if (file_exists(UPDATE_FILENAME)) {
+			// There is already an update file to apply: we don't need to check
+			// the webserver!
+			$this->view->message = array(
+				'status' => 'good',
+				'title' => _t('ok'),
+				'body' => _t('update_can_apply', _url('update', 'apply'))
+			);
+
+			return;
+		}
+
+		$c = curl_init(FRESHRSS_UPDATE_WEBSITE);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+		$result = curl_exec($c);
+
+		if (curl_getinfo($c, CURLINFO_HTTP_CODE) == 200) {
+			$res_array = explode("\n", $result, 2);
+			$status = $res_array[0];
+
+			if (strpos($status, 'UPDATE') === 0) {
+				$script = $res_array[1];
+				if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
+					$this->view->message = array(
+						'status' => 'good',
+						'title' => _t('ok'),
+						'body' => _t('update_can_apply', _url('update', 'apply'))
+					);
+				} else {
+					$this->view->message = array(
+						'status' => 'bad',
+						'title' => _t('damn'),
+						'body' => _t('update_problem')
+					);
+				}
+			} else {
+				$this->view->message = array(
+					'status' => 'bad',
+					'title' => _t('damn'),
+					'body' => _t('no_update')
+				);
+			}
+		} else {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
+			);
+		}
+		curl_close($c);
+	}
+
+	public function applyAction() {
+		require(UPDATE_FILENAME);
+		$res = apply_update();
+
+		if ($res === true) {
+			@unlink(UPDATE_FILENAME);
+
+			Minz_Session::_param('notification', array(
+				'type' => 'good',
+				'content' => Minz_Translate::t('update_finished')
+			));
+
+			Minz_Request::forward(array(), true);
+		} else {
+			Minz_Session::_param('notification', array(
+				'type' => 'bad',
+				'content' => Minz_Translate::t('update_failed', $res)
+			));
+
+			Minz_Request::forward(array('c' => 'update'), true);
+		}
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 7ed111b1bf152613d17254808a4fcf89f5774297 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 10 Aug 2014 10:35:17 +0200
Subject: Add translations for update system

---
 app/Controllers/updateController.php |  7 +++++--
 app/i18n/en.php                      |  9 +++++++++
 app/i18n/fr.php                      | 11 ++++++++++-
 app/views/update/index.phtml         |  4 +++-
 4 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index a15cb9fd5..a94af4417 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -11,6 +11,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		}
 
 		Minz_View::prependTitle(_t('update_system') . ' · ');
+		$this->view->last_update_time = 'unknown';  // TODO
 	}
 
 	public function indexAction() {
@@ -61,7 +62,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 					$this->view->message = array(
 						'status' => 'bad',
 						'title' => _t('damn'),
-						'body' => _t('update_problem')
+						'body' => _t('update_problem', 'Cannot save the update script')
 					);
 				}
 			} else {
@@ -88,6 +89,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		if ($res === true) {
 			@unlink(UPDATE_FILENAME);
 
+			// TODO: record last update
+
 			Minz_Session::_param('notification', array(
 				'type' => 'good',
 				'content' => Minz_Translate::t('update_finished')
@@ -97,7 +100,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		} else {
 			Minz_Session::_param('notification', array(
 				'type' => 'bad',
-				'content' => Minz_Translate::t('update_failed', $res)
+				'content' => Minz_Translate::t('update_problem', $res)
 			));
 
 			Minz_Request::forward(array('c' => 'update'), true);
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 6110ccb11..6a0b4a139 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -192,6 +192,7 @@ return array (
 
 	'informations'			=> 'Information',
 	'damn'				=> 'Damn!',
+	'ok'				=> 'Ok!',
 	'feed_in_error'			=> 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
 	'feed_empty'			=> 'This feed is empty. Please verify that it is still maintained.',
 	'feed_description'		=> 'Description',
@@ -409,5 +410,13 @@ return array (
 	'stats_top_feed'		=> 'Top ten feeds',
 	'stats_entry_count'		=> 'Entry count',
 
+	'update'			=> 'Update',
+	'update_system'			=> 'Update system',
+	'update_check'			=> 'Check for new updates',
+	'update_last'			=> 'Last update: %s',
 	'update_can_apply'		=> 'There is an available update. <a class="btn" href="%s">Apply</a>',
+	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
+	'no_update'			=> 'No update to apply',
+	'update_problem'		=> 'Update has encountered an error: %s',
+	'update_finished'		=> 'Update is now  finished!',
 );
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 5f88aa069..d0637b9f7 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -192,6 +192,7 @@ return array (
 
 	'informations'			=> 'Informations',
 	'damn'				=> 'Arf !',
+	'ok'				=> 'Ok !',
 	'feed_in_error'			=> 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
 	'feed_empty'			=> 'Ce flux est vide. Veuillez vérifier qu’il est toujours maintenu.',
 	'feed_description'		=> 'Description',
@@ -409,5 +410,13 @@ return array (
 	'stats_top_feed'		=> 'Les dix plus gros flux',
 	'stats_entry_count'		=> 'Nombre d’articles',
 
-	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer. <a class="btn" href="%s">Appliquer</a>',
+	'update'			=> 'Mise à jour',
+	'update_system'			=> 'Système de mise à jour',
+	'update_check'			=> 'Vérifier les mises à jour',
+	'update_last'			=> 'Dernière mise à jour : %s',
+	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer. <a class="btn" href="%s">Appliquer la mise à jour</a>',
+	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
+	'no_update'			=> 'Aucune mise à jour à appliquer',
+	'update_problem'		=> 'La mise à jour a rencontré un problème : %s',
+	'update_finished'		=> 'La mise à jour est terminée !',
 );
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index a1a872845..8f6ee6269 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -12,8 +12,10 @@
 
 	<?php if (empty($this->message) || $this->message['status'] !== 'good') { ?>
 	<p>
-		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
 		<?php echo _i('help'); ?> <?php echo _t('update_last', $this->last_update_time); ?>
 	</p>
+	<p>
+		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
+	</p>
 	<?php } ?>
 </div>
-- 
cgit v1.2.3


From 9a5d6245fbeb413766362fd6b2c4f5f5b6a22a22 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 10 Aug 2014 10:55:51 +0200
Subject: Improve update API

Update script must implement 4 functions:
- apply_update() to perform the update (most important). Return true if
  all is ok, else false.
- need_info_update() returns true if we need more info for update, else
  false. If this function always returns false, you don't need to
  implement following functions (but it's better to not forget)
- ask_info_update() should be a HTML form to ask infos. Method must be
  post and action must point to _url('update', 'apply') (or leave it
  blank)
- save_info_update() is called for POST requests (to save form from
  ask_info_update())
---
 app/Controllers/updateController.php | 37 +++++++++++++++++++++---------------
 app/views/update/apply.phtml         |  9 +++++++++
 app/views/update/index.phtml         |  2 ++
 3 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 app/views/update/apply.phtml

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index a94af4417..1095f9da7 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -84,26 +84,33 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 	public function applyAction() {
 		require(UPDATE_FILENAME);
-		$res = apply_update();
 
-		if ($res === true) {
-			@unlink(UPDATE_FILENAME);
+		if (Minz_Request::isPost()) {
+			save_info_update();
+		}
 
-			// TODO: record last update
+		if (!need_info_update()) {
+			$res = apply_update();
 
-			Minz_Session::_param('notification', array(
-				'type' => 'good',
-				'content' => Minz_Translate::t('update_finished')
-			));
+			if ($res === true) {
+				@unlink(UPDATE_FILENAME);
 
-			Minz_Request::forward(array(), true);
-		} else {
-			Minz_Session::_param('notification', array(
-				'type' => 'bad',
-				'content' => Minz_Translate::t('update_problem', $res)
-			));
+				// TODO: record last update
+
+				Minz_Session::_param('notification', array(
+					'type' => 'good',
+					'content' => Minz_Translate::t('update_finished')
+				));
 
-			Minz_Request::forward(array('c' => 'update'), true);
+				Minz_Request::forward(array(), true);
+			} else {
+				Minz_Session::_param('notification', array(
+					'type' => 'bad',
+					'content' => Minz_Translate::t('update_problem', $res)
+				));
+
+				Minz_Request::forward(array('c' => 'update'), true);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml
new file mode 100644
index 000000000..d7ea466c5
--- /dev/null
+++ b/app/views/update/apply.phtml
@@ -0,0 +1,9 @@
+<?php $this->partial('aside_configure'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<h1><?php echo _t('update_system'); ?></h1>
+
+	<?php ask_info_update(); ?>
+</div>
\ No newline at end of file
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 8f6ee6269..1824c02b8 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -1,6 +1,8 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
 	<h1><?php echo _t('update_system'); ?></h1>
 
 	<?php if (!empty($this->message)) { ?>
-- 
cgit v1.2.3


From 3ca8c7ec4c55b4fa751fbcdc8e28f28351c4a967 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 10 Aug 2014 11:52:18 +0200
Subject: Litlle improvements (update system)

- Check UPDATE_FILENAME exists before applying update
- Add empty line at the end of files
---
 app/Controllers/updateController.php | 7 ++++++-
 app/views/update/apply.phtml         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 1095f9da7..fa62f4a70 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -79,10 +79,15 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
 			);
 		}
+
 		curl_close($c);
 	}
 
 	public function applyAction() {
+		if (!file_exists(UPDATE_FILENAME)) {
+			Minz_Request::forward(array('c' => 'update'), true);
+		}
+
 		require(UPDATE_FILENAME);
 
 		if (Minz_Request::isPost()) {
@@ -113,4 +118,4 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml
index d7ea466c5..30566c7ab 100644
--- a/app/views/update/apply.phtml
+++ b/app/views/update/apply.phtml
@@ -6,4 +6,4 @@
 	<h1><?php echo _t('update_system'); ?></h1>
 
 	<?php ask_info_update(); ?>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 909d8747ba09f9c9a6ac895f1f4f0763bdb27a55 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 12 Aug 2014 20:15:46 +0200
Subject: Update system now uses HTTPS connection

- Add some curl checks
- Refactor code
---
 app/Controllers/updateController.php | 60 +++++++++++++++++++-----------------
 constants.php                        |  2 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index fa62f4a70..857d975b2 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -44,43 +44,47 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		$c = curl_init(FRESHRSS_UPDATE_WEBSITE);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($c, CURLOPT_SSL_VERIFYPEER, true);
+		curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2);
 		$result = curl_exec($c);
+		$c_status = curl_getinfo($c, CURLINFO_HTTP_CODE);
+		curl_close($c);
 
-		if (curl_getinfo($c, CURLINFO_HTTP_CODE) == 200) {
-			$res_array = explode("\n", $result, 2);
-			$status = $res_array[0];
-
-			if (strpos($status, 'UPDATE') === 0) {
-				$script = $res_array[1];
-				if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
-					$this->view->message = array(
-						'status' => 'good',
-						'title' => _t('ok'),
-						'body' => _t('update_can_apply', _url('update', 'apply'))
-					);
-				} else {
-					$this->view->message = array(
-						'status' => 'bad',
-						'title' => _t('damn'),
-						'body' => _t('update_problem', 'Cannot save the update script')
-					);
-				}
-			} else {
-				$this->view->message = array(
-					'status' => 'bad',
-					'title' => _t('damn'),
-					'body' => _t('no_update')
-				);
-			}
-		} else {
+		if ($c_status !== 200) {
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('damn'),
 				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
 			);
+			return;
 		}
 
-		curl_close($c);
+		$res_array = explode("\n", $result, 2);
+		$status = $res_array[0];
+		if (strpos($status, 'UPDATE') !== 0) {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('no_update')
+			);
+
+			return;
+		}
+
+		$script = $res_array[1];
+		if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
+			$this->view->message = array(
+				'status' => 'good',
+				'title' => _t('ok'),
+				'body' => _t('update_can_apply', _url('update', 'apply'))
+			);
+		} else {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('update_problem', 'Cannot save the update script')
+			);
+		}
 	}
 
 	public function applyAction() {
diff --git a/constants.php b/constants.php
index a968b82f4..ba9c508dc 100644
--- a/constants.php
+++ b/constants.php
@@ -1,7 +1,7 @@
 <?php
 define('FRESHRSS_VERSION', '0.8-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
-define('FRESHRSS_UPDATE_WEBSITE', 'http://update.freshrss.org?v=' . FRESHRSS_VERSION);
+define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
 define('PHP_COMPRESSION', false);
-- 
cgit v1.2.3


From 48f91da2e5d7da4d8a4f11987116bfc8cbf049ca Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Sep 2014 19:52:21 +0200
Subject: Check FRESHRSS_PATH is writable.

FRESHRSS_PATH needs to be writable before performing update.
---
 app/Controllers/updateController.php | 41 ++++++++++++------------------------
 app/i18n/en.php                      |  2 ++
 app/i18n/fr.php                      |  2 ++
 3 files changed, 18 insertions(+), 27 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 857d975b2..5d5ec3586 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -15,15 +15,19 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	}
 
 	public function indexAction() {
-		if (file_exists(UPDATE_FILENAME)) {
+		if (file_exists(UPDATE_FILENAME) && !is_writable(FRESHRSS_PATH)) {
+			$this->view->message = array(
+				'status' => 'bad',
+				'title' => _t('damn'),
+				'body' => _t('file_is_nok', FRESHRSS_PATH)
+			);
+		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
 			$this->view->message = array(
 				'status' => 'good',
 				'title' => _t('ok'),
 				'body' => _t('update_can_apply', _url('update', 'apply'))
 			);
-
-			return;
 		}
 	}
 
@@ -33,11 +37,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		if (file_exists(UPDATE_FILENAME)) {
 			// There is already an update file to apply: we don't need to check
 			// the webserver!
-			$this->view->message = array(
-				'status' => 'good',
-				'title' => _t('ok'),
-				'body' => _t('update_can_apply', _url('update', 'apply'))
-			);
+			Minz_Request::forward(array('c' => 'update'));
 
 			return;
 		}
@@ -73,11 +73,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		$script = $res_array[1];
 		if (file_put_contents(UPDATE_FILENAME, $script) !== false) {
-			$this->view->message = array(
-				'status' => 'good',
-				'title' => _t('ok'),
-				'body' => _t('update_can_apply', _url('update', 'apply'))
-			);
+			Minz_Request::forward(array('c' => 'update'));
 		} else {
 			$this->view->message = array(
 				'status' => 'bad',
@@ -88,7 +84,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	}
 
 	public function applyAction() {
-		if (!file_exists(UPDATE_FILENAME)) {
+		if (!file_exists(UPDATE_FILENAME) || !is_writable(FRESHRSS_PATH)) {
 			Minz_Request::forward(array('c' => 'update'), true);
 		}
 
@@ -104,21 +100,12 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			if ($res === true) {
 				@unlink(UPDATE_FILENAME);
 
-				// TODO: record last update
+				// TODO: record last update_finished
 
-				Minz_Session::_param('notification', array(
-					'type' => 'good',
-					'content' => Minz_Translate::t('update_finished')
-				));
-
-				Minz_Request::forward(array(), true);
+				Minz_Request::good(_t('update_finished'));
 			} else {
-				Minz_Session::_param('notification', array(
-					'type' => 'bad',
-					'content' => Minz_Translate::t('update_problem', $res)
-				));
-
-				Minz_Request::forward(array('c' => 'update'), true);
+				Minz_Request::bad(_t('update_problem', $res),
+				                  array('c' => 'update', 'a' => 'index'));
 			}
 		}
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 95356af2c..c5911cde7 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -152,6 +152,8 @@ return array (
 	'public'			=> 'Public',
 	'invalid_login'			=> 'Login is invalid',
 
+	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into.',
+
 	// VIEWS
 	'save'				=> 'Save',
 	'delete'			=> 'Delete',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 8437e872e..789a0bb98 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -152,6 +152,8 @@ return array (
 	'public'			=> 'Public',
 	'invalid_login'			=> 'L’identifiant est invalide !',
 
+	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
+
 	// VIEWS
 	'save'				=> 'Enregistrer',
 	'delete'			=> 'Supprimer',
-- 
cgit v1.2.3


From d59eebf5423afb94ff68550aa9218674889ab4ad Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Sep 2014 20:07:09 +0200
Subject: Add data/last_update.txt

Remember last update timestamp.
---
 app/Controllers/updateController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 5d5ec3586..5424792f4 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -11,7 +11,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		}
 
 		Minz_View::prependTitle(_t('update_system') . ' · ');
-		$this->view->last_update_time = 'unknown';  // TODO
+		$this->view->last_update_time = 'unknown';
+		$timestamp = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
+		if (is_numeric($timestamp) && $timestamp > 0) {
+			$this->view->last_update_time = timestamptodate($timestamp);
+		}
 	}
 
 	public function indexAction() {
@@ -99,8 +103,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 			if ($res === true) {
 				@unlink(UPDATE_FILENAME);
-
-				// TODO: record last update_finished
+				@file_put_contents(DATA_PATH . '/last_update.txt', time());
 
 				Minz_Request::good(_t('update_finished'));
 			} else {
-- 
cgit v1.2.3


From 213bc2b9ddef88fd9e3cb50ac0893742f5fdd101 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Sep 2014 21:07:53 +0200
Subject: Check if update has been done during last minute

Cancel check action if update has been done during last hour.
---
 app/Controllers/updateController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 5424792f4..ec6778d51 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -38,7 +38,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function checkAction() {
 		$this->view->change_view('update', 'index');
 
-		if (file_exists(UPDATE_FILENAME)) {
+		// Get the last update. If already check during the last hour, do nothing.
+		$last_update = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
+		$check_last_hour = (time() - 3600) <= $last_update;
+
+		if (file_exists(UPDATE_FILENAME) || $check_last_hour) {
 			// There is already an update file to apply: we don't need to check
 			// the webserver!
 			Minz_Request::forward(array('c' => 'update'));
-- 
cgit v1.2.3


From 098f5e6d747cf442b72f75a22a9ce43d36605d65 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 12 Sep 2014 21:10:45 +0200
Subject: Log error if update.freshrss.org is unreachable

---
 app/Controllers/updateController.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index ec6778d51..4c1dd002c 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -56,9 +56,14 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2);
 		$result = curl_exec($c);
 		$c_status = curl_getinfo($c, CURLINFO_HTTP_CODE);
+		$c_error = curl_error($c);
 		curl_close($c);
 
 		if ($c_status !== 200) {
+			Minz_Log::error(
+				'Error during update (HTTP code ' . $c_status . '): ' . $c_error
+			);
+
 			$this->view->message = array(
 				'status' => 'bad',
 				'title' => _t('damn'),
-- 
cgit v1.2.3


From a4e43e9c53ac404d16af5d913a56eeb444b1ce10 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 16 Sep 2014 18:30:24 +0200
Subject: Message if last update checking is close

last_update.txt is updated even if there is no update
If last_update.txt has been modified during last hour, show a message

See https://github.com/marienfressinaud/FreshRSS/issues/480#issuecomment-55765373
---
 app/Controllers/updateController.php | 11 ++++++-----
 app/i18n/en.php                      |  2 +-
 app/i18n/fr.php                      |  2 +-
 app/views/update/index.phtml         | 17 +++++++++++++----
 4 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4c1dd002c..72244e9c7 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -12,9 +12,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(_t('update_system') . ' · ');
 		$this->view->last_update_time = 'unknown';
+		$this->view->check_last_hour = false;
 		$timestamp = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
 		if (is_numeric($timestamp) && $timestamp > 0) {
 			$this->view->last_update_time = timestamptodate($timestamp);
+			$this->view->check_last_hour = (time() - 3600) <= $timestamp;
 		}
 	}
 
@@ -38,13 +40,10 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 	public function checkAction() {
 		$this->view->change_view('update', 'index');
 
-		// Get the last update. If already check during the last hour, do nothing.
-		$last_update = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
-		$check_last_hour = (time() - 3600) <= $last_update;
-
-		if (file_exists(UPDATE_FILENAME) || $check_last_hour) {
+		if (file_exists(UPDATE_FILENAME) || $this->view->check_last_hour) {
 			// There is already an update file to apply: we don't need to check
 			// the webserver!
+			// Or if already check during the last hour, do nothing.
 			Minz_Request::forward(array('c' => 'update'));
 
 			return;
@@ -81,6 +80,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				'body' => _t('no_update')
 			);
 
+			@file_put_contents(DATA_PATH . '/last_update.txt', time());
+
 			return;
 		}
 
diff --git a/app/i18n/en.php b/app/i18n/en.php
index c5911cde7..8f39115ad 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -424,7 +424,7 @@ return array (
 	'update'			=> 'Update',
 	'update_system'			=> 'Update system',
 	'update_check'			=> 'Check for new updates',
-	'update_last'			=> 'Last update: %s',
+	'update_last'			=> 'Last verification: %s',
 	'update_can_apply'		=> 'There is an available update. <a class="btn" href="%s">Apply</a>',
 	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
 	'no_update'			=> 'No update to apply',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 789a0bb98..48b4c1732 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -424,7 +424,7 @@ return array (
 	'update'			=> 'Mise à jour',
 	'update_system'			=> 'Système de mise à jour',
 	'update_check'			=> 'Vérifier les mises à jour',
-	'update_last'			=> 'Dernière mise à jour : %s',
+	'update_last'			=> 'Dernière vérification : %s',
 	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer. <a class="btn" href="%s">Appliquer la mise à jour</a>',
 	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
 	'no_update'			=> 'Aucune mise à jour à appliquer',
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 1824c02b8..5be8b1e8b 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -5,17 +5,26 @@
 
 	<h1><?php echo _t('update_system'); ?></h1>
 
+	<p>
+		<?php echo _i('help'); ?> <?php echo _t('update_last', $this->last_update_time); ?>
+	</p>
+
 	<?php if (!empty($this->message)) { ?>
 	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
 		<span class="alert-head"><?php echo $this->message['title']; ?></span>
 		<?php echo $this->message['body']; ?>
 	</p>
+	<?php } elseif ($this->check_last_hour) { ?>
+	<p class="alert alert-warn">
+		<span class="alert-head"><?php echo _t('damn'); ?></span>
+		<?php echo _t('no_update'); ?>
+	</p>
 	<?php } ?>
 
-	<?php if (empty($this->message) || $this->message['status'] !== 'good') { ?>
-	<p>
-		<?php echo _i('help'); ?> <?php echo _t('update_last', $this->last_update_time); ?>
-	</p>
+	<?php
+		if (!$this->check_last_hour &&
+				(empty($this->message) || $this->message['status'] !== 'good')) {
+	?>
 	<p>
 		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
 	</p>
-- 
cgit v1.2.3


From a3b5e72729be08f79585c782d497f49edd11c064 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Sep 2014 13:26:32 +0200
Subject: Move button to apply update outside the message

---
 app/Controllers/updateController.php | 4 +++-
 app/i18n/en.php                      | 3 ++-
 app/i18n/fr.php                      | 3 ++-
 app/views/update/index.phtml         | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 72244e9c7..78d636163 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -11,6 +11,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		}
 
 		Minz_View::prependTitle(_t('update_system') . ' · ');
+		$this->view->update_to_apply = false;
 		$this->view->last_update_time = 'unknown';
 		$this->view->check_last_hour = false;
 		$timestamp = (int)@file_get_contents(DATA_PATH . '/last_update.txt');
@@ -29,10 +30,11 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			);
 		} elseif (file_exists(UPDATE_FILENAME)) {
 			// There is an update file to apply!
+			$this->view->update_to_apply = true;
 			$this->view->message = array(
 				'status' => 'good',
 				'title' => _t('ok'),
-				'body' => _t('update_can_apply', _url('update', 'apply'))
+				'body' => _t('update_can_apply')
 			);
 		}
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 562697585..f84593cb5 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -428,7 +428,8 @@ return array (
 	'update_system'			=> 'Update system',
 	'update_check'			=> 'Check for new updates',
 	'update_last'			=> 'Last verification: %s',
-	'update_can_apply'		=> 'There is an available update. <a class="btn" href="%s">Apply</a>',
+	'update_can_apply'		=> 'There is an available update.',
+	'update_apply'			=> 'Apply',
 	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
 	'no_update'			=> 'No update to apply',
 	'update_problem'		=> 'Update has encountered an error: %s',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 9516f66cb..da5819529 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -428,7 +428,8 @@ return array (
 	'update_system'			=> 'Système de mise à jour',
 	'update_check'			=> 'Vérifier les mises à jour',
 	'update_last'			=> 'Dernière vérification : %s',
-	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer. <a class="btn" href="%s">Appliquer la mise à jour</a>',
+	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer.',
+	'update_apply'			=> 'Appliquer la mise à jour',
 	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
 	'no_update'			=> 'Aucune mise à jour à appliquer',
 	'update_problem'		=> 'La mise à jour a rencontré un problème : %s',
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 5be8b1e8b..401f6acd6 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -29,4 +29,8 @@
 		<a href="<?php echo _url('update', 'check'); ?>" class="btn"><?php echo _t('update_check'); ?></a>
 	</p>
 	<?php } ?>
+
+	<?php if ($this->update_to_apply) { ?>
+	<a class="btn btn-important" href="<?php echo _url('update', 'apply'); ?>"><?php echo _t('update_apply'); ?></a>
+	<?php } ?>
 </div>
-- 
cgit v1.2.3


From 3b8c381689334a15e7c034425f8615860dc3fa13 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Sep 2014 13:37:39 +0200
Subject: No cache for update system

See https://github.com/marienfressinaud/FreshRSS/issues/616
---
 app/Controllers/updateController.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/Controllers/updateController.php')

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 78d636163..da5bddc65 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -10,6 +10,8 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			);
 		}
 
+		invalidateHttpCache();
+
 		Minz_View::prependTitle(_t('update_system') . ' · ');
 		$this->view->update_to_apply = false;
 		$this->view->last_update_time = 'unknown';
-- 
cgit v1.2.3