From 256c8613a4046931dcd28ab22b6aebe8752a98c2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 03:21:36 +0200
Subject: First draft of PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Requires setting base_url in config.php.
Currently using the filesystem (no change to the database)
---
 app/Controllers/feedController.php | 55 ++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 20 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0443b4159..9117da639 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -168,6 +168,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Ok, feed has been added in database. Now we have to refresh entries.
 			$feed->_id($id);
 			$feed->faviconPrepare();
+			$feed->pubSubHubbubPrepare();
 
 			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
@@ -261,12 +262,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	 * This action actualizes entries from one or several feeds.
 	 *
 	 * Parameters are:
-	 *   - id (default: false)
+	 *   - id (default: false): Feed ID
+	 *   - url (default: false): Feed URL
 	 *   - force (default: false)
-	 * If id is not specified, all the feeds are actualized. But if force is
+	 * If id and url are not specified, all the feeds are actualized. But if force is
 	 * false, process stops at 10 feeds to avoid time execution problem.
 	 */
-	public function actualizeAction() {
+	public function actualizeAction($simplePie = null) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -274,14 +276,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		Minz_Session::_param('actualize_feeds', false);
 		$id = Minz_Request::param('id');
+		$url = Minz_Request::param('url');
 		$force = Minz_Request::param('force');
 
 		// Create a list of feeds to actualize.
 		// If id is set and valid, corresponding feed is added to the list but
 		// alone in order to automatize further process.
 		$feeds = array();
-		if ($id) {
-			$feed = $feedDAO->searchById($id);
+		if ($id || $url) {
+			$feed = $id ? $feedDAO->searchById($id) : $feedDAO->searchByUrl($url);
 			if ($feed) {
 				$feeds[] = $feed;
 			}
@@ -302,8 +305,11 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			try {
-				// Load entries
-				$feed->load(false);
+				if ($simplePie) {
+					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
+				} else {
+					$feed->load(false);
+				}
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::notice($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), true);
@@ -404,7 +410,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
-			$feed->faviconPrepare();
+			if ($simplePie === null) {
+				$feed->faviconPrepare();
+				if ($feed->url() === 'http://push-pub.appspot.com/feed') {
+					$secret = $feed->pubSubHubbubPrepare();
+					if ($secret != '') {
+						Minz_Log::debug('PubSubHubbub subscribe ' . $feed->url());
+						$feed->pubSubHubbubSubscribe(true, $secret);
+					}
+				}
+			}
 			$feed->unlock();
 			$updated_feeds++;
 			unset($feed);
@@ -427,20 +442,20 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 			// No layout in ajax request.
 			$this->view->_useLayout(false);
-			return;
-		}
-
-		// Redirect to the main page with correct notification.
-		if ($updated_feeds === 1) {
-			$feed = reset($feeds);
-			Minz_Request::good(_t('feedback.sub.feed.actualized', $feed->name()), array(
-				'params' => array('get' => 'f_' . $feed->id())
-			));
-		} elseif ($updated_feeds > 1) {
-			Minz_Request::good(_t('feedback.sub.feed.n_actualized', $updated_feeds), array());
 		} else {
-			Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
+			// Redirect to the main page with correct notification.
+			if ($updated_feeds === 1) {
+				$feed = reset($feeds);
+				Minz_Request::good(_t('feedback.sub.feed.actualized', $feed->name()), array(
+					'params' => array('get' => 'f_' . $feed->id())
+				));
+			} elseif ($updated_feeds > 1) {
+				Minz_Request::good(_t('feedback.sub.feed.n_actualized', $updated_feeds), array());
+			} else {
+				Minz_Request::good(_t('feedback.sub.feed.no_refresh'), array());
+			}
 		}
+		return $updated_feeds;
 	}
 
 	/**
-- 
cgit v1.2.3


From c472569b3861541c322c850c4ff8ca3471572f40 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 15:34:51 +0200
Subject: First alpha of PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Using a white list limited to http://push-pub.appspot.com/feed for alpha
testing.
---
 app/Controllers/feedController.php   | 31 ++++++++++++++------
 app/Models/Feed.php                  | 53 +++++++++++++++++++++++++---------
 data/PubSubHubbub/feeds/README.md    | 11 ++------
 data/PubSubHubbub/keys/.gitignore    |  1 +
 data/PubSubHubbub/keys/README.md     |  4 +++
 data/PubSubHubbub/secrets/.gitignore |  1 -
 data/PubSubHubbub/secrets/README.md  |  4 ---
 p/api/pshb.php                       | 55 ++++++++++++++++++++----------------
 8 files changed, 102 insertions(+), 58 deletions(-)
 create mode 100644 data/PubSubHubbub/keys/.gitignore
 create mode 100644 data/PubSubHubbub/keys/README.md
 delete mode 100644 data/PubSubHubbub/secrets/.gitignore
 delete mode 100644 data/PubSubHubbub/secrets/README.md

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 9117da639..0fb4bdf03 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -304,6 +304,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
+			$url = $feed->url();	//For detection of HTTP 301
 			try {
 				if ($simplePie) {
 					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
@@ -317,7 +318,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
-			$url = $feed->url();
 			$feed_history = $feed->keepHistory();
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
@@ -404,19 +404,34 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$entryDAO->commit();
 			}
 
-			if ($feed->url() !== $url) {
-				// HTTP 301 Moved Permanently
+			if ($feed->hubUrl() && $feed->selfUrl()) {	//selfUrl has priority for PubSubHubbub
+				if ($feed->selfUrl() !== $url) {	//https://code.google.com/p/pubsubhubbub/wiki/MovingFeedsOrChangingHubs
+					$selfUrl = checkUrl($feed->selfUrl());
+					if ($selfUrl) {
+						Minz_Log::debug('PubSubHubbub unsubscribe ' . $feed->url());
+						if (!$feed->pubSubHubbubSubscribe(false)) {	//Unsubscribe
+							Minz_Log::warning('Error while PubSubHubbub unsubscribing from ' . $feed->url());
+						}
+						$feed->_url($selfUrl, false);
+						Minz_Log::notice('Feed ' . $url . ' canonical address moved to ' . $feed->url());
+						$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
+					}
+				}
+			}
+			elseif ($feed->url() !== $url) {	// HTTP 301 Moved Permanently
 				Minz_Log::notice('Feed ' . $url . ' moved permanently to ' . $feed->url());
 				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
 			if ($simplePie === null) {
 				$feed->faviconPrepare();
-				if ($feed->url() === 'http://push-pub.appspot.com/feed') {
-					$secret = $feed->pubSubHubbubPrepare();
-					if ($secret != '') {
-						Minz_Log::debug('PubSubHubbub subscribe ' . $feed->url());
-						$feed->pubSubHubbubSubscribe(true, $secret);
+				if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
+					Minz_Log::debug('PubSubHubbub match ' . $feed->url());
+					if ($feed->pubSubHubbubPrepare()) {
+						Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+						if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+							Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
+						}
 					}
 				}
 			}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index dcf083ea8..a17cf415d 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -51,6 +51,12 @@ class FreshRSS_Feed extends Minz_Model {
 	public function url() {
 		return $this->url;
 	}
+	public function selfUrl() {
+		return $this->selfUrl;
+	}
+	public function hubUrl() {
+		return $this->hubUrl;
+	}
 	public function category() {
 		return $this->category;
 	}
@@ -344,38 +350,59 @@ class FreshRSS_Feed extends Minz_Model {
 	//<PubSubHubbub>
 
 	function pubSubHubbubPrepare() {
-		$secret = '';
+		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
-			if (!file_exists($path . '/hub.txt')) {
+			if ($hubFile = @file_get_contents($path . '/!hub.json')) {
+				$hubJson = json_decode($hubFile, true);
+				if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
+					Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+					return false;
+				}
+				if (empty($hubJson['lease_end']) || $hubJson['lease_end'] <= time()) {
+					Minz_Log::warning('PubSubHubbub lease expired: ' . $this->url);
+					$key = $hubJson['key'];	//To renew our lease
+				}
+			} else {
 				@mkdir($path, 0777, true);
-				file_put_contents($path . '/hub.txt', $this->hubUrl);
-				$secret = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
-				file_put_contents($path . '/secret.txt', $secret);
-				@mkdir(PSHB_PATH . '/secrets/');
-				file_put_contents(PSHB_PATH . '/secrets/' . $secret . '.txt', base64url_encode($this->selfUrl));
+				$key = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
+				$hubJson = array(
+					'hub' => $this->hubUrl,
+					'key' => $key,
+				);
+				file_put_contents($path . '/!hub.json', json_encode($hubJson));
+				@mkdir(PSHB_PATH . '/keys/');
+				file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl));
 				Minz_Log::notice('PubSubHubbub prepared for ' . $this->url);
 				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
 					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
 			}
-			$path .= '/' . base64url_encode($this->url);
 			$currentUser = Minz_Session::param('currentUser');
 			if (ctype_alnum($currentUser) && !file_exists($path . '/' . $currentUser . '.txt')) {
-				@mkdir($path, 0777, true);
 				touch($path . '/' . $currentUser . '.txt');
 			}
 		}
-		return $secret;
+		return $key;
 	}
 
 	//Parameter true to subscribe, false to unsubscribe.
-	function pubSubHubbubSubscribe($state, $secret = '') {
+	function pubSubHubbubSubscribe($state) {
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
-			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?s=' . $secret);
+			$hubFile = @file_get_contents(PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json');
+			if ($hubFile === false) {
+				Minz_Log::warning('JSON not found for PubSubHubbub: ' . $this->url);
+				return false;
+			}
+			$hubJson = json_decode($hubFile, true);
+			if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
+				Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+				return false;
+			}
+			$callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?k=' . $hubJson['key']);
 			if ($callbackUrl == '') {
+				Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url);
 				return false;
 			}
-
 			$ch = curl_init();
 			curl_setopt_array($ch, array(
 				CURLOPT_URL => $this->hubUrl,
diff --git a/data/PubSubHubbub/feeds/README.md b/data/PubSubHubbub/feeds/README.md
index 15fa8e521..a01a3197f 100644
--- a/data/PubSubHubbub/feeds/README.md
+++ b/data/PubSubHubbub/feeds/README.md
@@ -1,12 +1,7 @@
 List of canonical URLS of the various feeds users have subscribed to.
-Several feeds can share the same canonical URL (rel="self").
 Several users can have subscribed to the same feed.
 
 * ./base64url(canonicalUrl)/
-	* ./secret.txt
-	* ./base64url(feedUrl1)/
-		* ./user1.txt
-		* ./user2.txt
-	* ./base64url(feedUrl2)/
-		* ./user3.txt
-		* ./user4.txt
+	* ./!hub.json
+	* ./user1.txt
+	* ./user2.txt
diff --git a/data/PubSubHubbub/keys/.gitignore b/data/PubSubHubbub/keys/.gitignore
new file mode 100644
index 000000000..2211df63d
--- /dev/null
+++ b/data/PubSubHubbub/keys/.gitignore
@@ -0,0 +1 @@
+*.txt
diff --git a/data/PubSubHubbub/keys/README.md b/data/PubSubHubbub/keys/README.md
new file mode 100644
index 000000000..bb1e57cd4
--- /dev/null
+++ b/data/PubSubHubbub/keys/README.md
@@ -0,0 +1,4 @@
+List of keys given to PubSubHubbub hubs
+
+* ./sha1(random + salt).txt
+	* base64url(canonicalUrl)
diff --git a/data/PubSubHubbub/secrets/.gitignore b/data/PubSubHubbub/secrets/.gitignore
deleted file mode 100644
index 2211df63d..000000000
--- a/data/PubSubHubbub/secrets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
diff --git a/data/PubSubHubbub/secrets/README.md b/data/PubSubHubbub/secrets/README.md
deleted file mode 100644
index ad8158839..000000000
--- a/data/PubSubHubbub/secrets/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-List of secrets given to PubSubHubbub hubs
-
-* ./sha1(random + salt).txt
-	* base64url(canonicalUrl)
diff --git a/p/api/pshb.php b/p/api/pshb.php
index bcb8341b1..90d4c52bb 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -12,40 +12,41 @@ function logMe($text) {
 
 $ORIGINAL_INPUT = file_get_contents('php://input', false, null, -1, MAX_PAYLOAD);
 
-logMe(print_r(array('_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
+logMe(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true));
 
-$secret = isset($_GET['s']) ? substr($_GET['s'], 0, 128) : '';
-if (!ctype_xdigit($secret)) {
+$key = isset($_GET['k']) ? substr($_GET['k'], 0, 128) : '';
+if (!ctype_xdigit($key)) {
 	header('HTTP/1.1 422 Unprocessable Entity');
-	die('Invalid feed secret format!');
+	die('Invalid feed key format!');
 }
 chdir(PSHB_PATH);
-$canonical64 = @file_get_contents('secrets/' . $secret . '.txt');
+$canonical64 = @file_get_contents('keys/' . $key . '.txt');
 if ($canonical64 === false) {
 	header('HTTP/1.1 404 Not Found');
-	logMe('Feed secret not found!: ' . $secret);
-	die('Feed secret not found!');
+	logMe('Feed key not found!: ' . $key);
+	die('Feed key not found!');
 }
 $canonical64 = trim($canonical64);
 if (!preg_match('/^[A-Za-z0-9_-]+$/D', $canonical64)) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid secret reference!: ' . $canonical64);
-	die('Invalid secret reference!');
+	logMe('Invalid key reference!: ' . $canonical64);
+	die('Invalid key reference!');
 }
-$secret2 = @file_get_contents('feeds/' . $canonical64 . '/secret.txt');
-if ($secret2 === false) {
+$hubFile = @file_get_contents('feeds/' . $canonical64 . '/!hub.json');
+if ($hubFile === false) {
 	header('HTTP/1.1 404 Not Found');
-	//@unlink('secrets/' . $secret . '.txt');
-	logMe('Feed reverse secret not found!: ' . $canonical64);
-	die('Feed reverse secret not found!');
+	//@unlink('keys/' . $key . '.txt');
+	logMe('Feed info not found!: ' . $canonical64);
+	die('Feed info not found!');
 }
-if ($secret !== $secret2) {
+$hubJson = json_decode($hubFile, true);
+if (!$hubJson || empty($hubJson['key']) || $hubJson['key'] !== $key) {
 	header('HTTP/1.1 500 Internal Server Error');
-	logMe('Invalid secret cross-check!: ' . $secret);
-	die('Invalid secret cross-check!');
+	logMe('Invalid key cross-check!: ' . $key);
+	die('Invalid key cross-check!');
 }
 chdir('feeds/' . $canonical64);
-$users = glob('*/*.txt', GLOB_NOSORT);
+$users = glob('*.txt', GLOB_NOSORT);
 if (empty($users)) {
 	header('HTTP/1.1 410 Gone');
 	logMe('Nobody is subscribed to this feed anymore!: ' . $canonical64);
@@ -53,10 +54,19 @@ if (empty($users)) {
 }
 
 if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
-	//TODO: hub_lease_seconds
+	$leaseSeconds = empty($_REQUEST['hub_lease_seconds']) ? 0 : intval($_REQUEST['hub_lease_seconds']);
+	if ($leaseSeconds > 60) {
+		$hubJson['lease_end'] = time() + $leaseSeconds;
+		file_put_contents('./!hub.json', json_encode($hubJson));
+	}
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
+if ($ORIGINAL_INPUT == '') {
+	header('HTTP/1.1 422 Unprocessable Entity');
+	die('Missing XML payload!');
+}
+
 Minz_Configuration::register('system', DATA_PATH . '/config.php', DATA_PATH . '/config.default.php');
 $system_conf = Minz_Configuration::get('system');
 $system_conf->auth_type = 'none';	// avoid necessity to be logged in (not saved!)
@@ -80,11 +90,8 @@ if ($self !== base64url_decode($canonical64)) {
 Minz_Request::_param('url', $self);
 
 $nb = 0;
-foreach ($users as $userLine) {
-	$userLine = strtr($userLine, '\\', '/');
-	$userInfos = explode('/', $userLine);
-	$feedUrl = isset($userInfos[0]) ? base64url_decode($userInfos[0]) : '';
-	$username = isset($userInfos[1]) ? basename($userInfos[1], '.txt') : '';
+foreach ($users as $userFilename) {
+	$username = basename($userFilename, '.txt');
 	if (!file_exists(USERS_PATH . '/' . $username . '/config.php')) {
 		break;
 	}
-- 
cgit v1.2.3


From 18831a89efadf8a05fcc3285fa6af0051e41df2b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 May 2015 15:46:51 +0200
Subject: PubSubHubbub active only when refreshing, not adding a feed

https://github.com/FreshRSS/FreshRSS/issues/312
---
 app/Controllers/feedController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0fb4bdf03..ab73879d0 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -168,7 +168,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// Ok, feed has been added in database. Now we have to refresh entries.
 			$feed->_id($id);
 			$feed->faviconPrepare();
-			$feed->pubSubHubbubPrepare();
+			//$feed->pubSubHubbubPrepare();	//TODO: prepare PubSubHubbub already when adding the feed
 
 			$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 
-- 
cgit v1.2.3


From 3adab4b70fab858048bd68ed72e71676c4d5badf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 13:05:43 +0200
Subject: More PubSubHubbub

https://github.com/FreshRSS/FreshRSS/issues/312
Show whether PubSubHubbub is enabled in the Web interface of feed
configuration.
When PubSubHubbub is used, do not pull refresh so often (hard-coded to
max once per 24h for now).
Improved logic for lease renewal, and some detection of lease problems.
Updated read-me and changelog.
---
 CHANGELOG                           |  9 ++++++
 README.fr.md                        | 22 +++++++-------
 README.md                           | 34 ++++++++++-----------
 app/Controllers/feedController.php  | 36 ++++++++++++++--------
 app/Models/Feed.php                 | 59 +++++++++++++++++++++++++++++++------
 app/i18n/cz/conf.php                |  1 +
 app/i18n/cz/sub.php                 |  1 +
 app/i18n/de/sub.php                 |  1 +
 app/i18n/en/sub.php                 |  1 +
 app/i18n/fr/sub.php                 |  1 +
 app/views/helpers/feed/update.phtml |  8 +++++
 data/users/_/config.default.php     |  2 +-
 p/api/pshb.php                      |  8 +++--
 13 files changed, 128 insertions(+), 55 deletions(-)

(limited to 'app/Controllers')

diff --git a/CHANGELOG b/CHANGELOG
index d1b49d339..f3559ccc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,15 @@
 
 ## 2015-xx-xx FreshRSS 1.1.1 (beta)
 
+* Features
+	* Support for PubSubHubbub for instant notifications from compatible Web sites.
+	* New option to detect and mark updated articles as unread.
+	* Support for internationalized domain name (IDN).
+* Misc.
+	* Improved logic for automatic deletion of old articles.
+	* Attempt to better handle encoded titles.
+
+
 ## 2015-01-31 FreshRSS 1.0.0 / 1.1.0 (beta)
 
 * UI
diff --git a/README.fr.md b/README.fr.md
index 6c77ccf51..1110eb8e5 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -6,6 +6,7 @@ FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de [Leed]
 Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.
 
 Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme.
+Il supporte [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) pour des notifications instantanées depuis les sites compatibles.
 
 * Site officiel : http://freshrss.org
 * Démo : http://demo.freshrss.org/
@@ -14,28 +15,25 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note sur les branches
-**Ce logiciel est encore en développement !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
+**Ce logiciel est en développement permanent !** Veuillez vous assurer d'utiliser la branche qui vous correspond :
 
 * Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité.
 * [La branche beta](https://github.com/FreshRSS/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois.
-* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
+* Pour les développeurs et ceux qui veulent aider à tester les toutes dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
 
 # Disclaimer
-Cette application a été développée pour s’adapter à des besoins personnels et non professionnels.
-Je ne garantis en aucun cas la sécurité de celle-ci, ni son bon fonctionnement.
-Je m’engage néanmoins à répondre dans la mesure du possible aux demandes d’évolution si celles-ci me semblent justifiées.
-Privilégiez pour cela des demandes sur GitHub
-(https://github.com/FreshRSS/FreshRSS/issues).
+Cette application a été développée pour s’adapter principalement à des besoins personnels, et aucune garantie n'est fournie.
+Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
-# Pré-requis
+# Prérequis
 * Serveur modeste, par exemple sous Linux ou Windows
 	* Fonctionne même sur un Raspberry Pi avec des temps de réponse < 1s (testé sur 150 flux, 22k articles, soit 32Mo de données partiellement compressées)
 * Serveur Web Apache2 (recommandé), ou nginx, lighttpd (non testé sur les autres)
 * PHP 5.2.1+ (PHP 5.3.7+ recommandé)
-	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur platformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
+	* Requis : [PDO_MySQL](http://php.net/pdo-mysql) ou [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](http://php.net/intl.idn) (pour les noms de domaines internationalisés)
 	* Recommandés : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
 * MySQL 5.0.3+ (recommandé) ou SQLite 3.7.4+
-* Un navigateur Web récent tel Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+* Un navigateur Web récent tel Firefox, Chrome, Opera, Safari. [Internet Explorer ne fonctionne plus, mais ce sera corrigé](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Fonctionne aussi sur mobile
 
 ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -63,7 +61,7 @@ C’est une bonne idée d’utiliser le même utilisateur que votre serveur Web
 Par exemple, pour exécuter le script toutes les heures :
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /votre-chemin/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Conseils
@@ -75,7 +73,7 @@ Par exemple, pour exécuter le script toutes les heures :
 # Sauvegarde
 * Il faut conserver vos fichiers `./data/config.php` ainsi que `./data/*_user.php` et éventuellement `./data/persona/`
 * Vous pouvez exporter votre liste de flux depuis FreshRSS au format OPML
-* Pour sauvegarder les articles eux-même, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
+* Pour sauvegarder les articles eux-mêmes, vous pouvez utiliser [phpMyAdmin](http://www.phpmyadmin.net) ou les outils de MySQL :
 
 ```bash
 mysqldump -u utilisateur -p --databases freshrss > freshrss.sql
diff --git a/README.md b/README.md
index 089bbd780..4430560fe 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 * [Version française](README.fr.md)
 
 # FreshRSS
-FreshRSS is a self-hosted RSS feed agregator like [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
+FreshRSS is a self-hosted RSS feed aggregator such as [Leed](http://projet.idleman.fr/leed/) or [Kriss Feed](http://tontof.net/kriss/feed/).
 
-It is at the same time light-weight, easy to work with, powerful and customizable.
+It is at the same time lightweight, easy to work with, powerful and customizable.
 
 It is a multi-user application with an anonymous reading mode.
+It supports [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) for instant notifications from compatible Web sites.
 
 * Official website: http://freshrss.org
 * Demo: http://demo.freshrss.org/
@@ -14,28 +15,25 @@ It is a multi-user application with an anonymous reading mode.
 ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
 
 # Note on branches
-**This application is still in development!** Please use the branch that suits your needs:
+**This application is under continuous development!** Please use the branch that suits your needs:
 
 * Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version.
 * [The beta branch](https://github.com/FreshRSS/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis.
-* For developers and tech savvy persons, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
+* For developers and tech savvy persons willing to help testing the latest features, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you!
 
 # Disclaimer
-This application was developed to fulfill personal needs not professional needs.
-There is no guarantee neither on its security nor its proper functioning.
-If there is feature requests which I think are good for the project, I'll do my best to include them.
-The best way is to open issues on GitHub
-(https://github.com/FreshRSS/FreshRSS/issues).
+This application was developed to fulfil personal needs primarily, and comes with absolutely no warranty.
+Feature requests, bug reports, and other contributions are welcome. The best way is to [open issues on GitHub](https://github.com/FreshRSS/FreshRSS/issues).
 
 # Requirements
 * Light server running Linux or Windows
 	* It even works on Raspberry Pi with response time under a second (tested with 150 feeds, 22k articles, or 32Mo of compressed data)
-* A web server: Apache2 (recommanded), nginx, lighttpd (not tested on others)
-* PHP 5.2.1+ (PHP 5.3.7+ recommanded)
+* A web server: Apache2 (recommended), nginx, lighttpd (not tested on others)
+* PHP 5.2.1+ (PHP 5.3.7+ recommended)
 	* Required extensions: [PDO_MySQL](http://php.net/pdo-mysql) or [PDO_SQLite](http://php.net/pdo-sqlite), [cURL](http://php.net/curl), [GMP](http://php.net/gmp) (for API access on platforms < 64 bits), [IDN](http://php.net/intl.idn) (for Internationalized Domain Names)
-	* Recommanded extensions : [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
-* MySQL 5.0.3+ (recommanded) or SQLite 3.7.4+
-* A recent browser like Firefox 4+, Chrome, Opera, Safari, Internet Explorer 9+
+	* Recommended extensions: [JSON](http://php.net/json), [mbstring](http://php.net/mbstring), [zlib](http://php.net/zlib), [Zip](http://php.net/zip)
+* MySQL 5.0.3+ (recommended) or SQLite 3.7.4+
+* A recent browser like Firefox, Chrome, Opera, Safari. [Internet Explorer currently not supported, but support will come back](https://github.com/FreshRSS/FreshRSS/issues/772).
 	* Works on mobile
 
 ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png)
@@ -45,7 +43,7 @@ The best way is to open issues on GitHub
 2. Dump the application on your server (expose only the `./p/` folder)
 3. Add write access on `./data/` folder to the webserver user
 4. Access FreshRSS with your browser and follow the installation process
-5. Every thing should be working :) If you encounter any problem, feel free to contact me.
+5. Everything should be working :) If you encounter any problem, feel free to contact me.
 6. Advanced configuration settings can be seen in [config.php](./data/config.default.php).
 
 # Access control
@@ -59,18 +57,18 @@ It is needed for the multi-user mode to limit access to FreshRSS. You can:
 # Automatic feed update
 * You can add a Cron job to launch the update script.
 Check the Cron documentation related to your distribution ([Debian/Ubuntu](https://help.ubuntu.com/community/CronHowto), [Red Hat/Fedora](https://fedoraproject.org/wiki/Administration_Guide_Draft/Cron), [Slackware](http://docs.slackware.com/fr:slackbook:process_control?#cron), [Gentoo](https://wiki.gentoo.org/wiki/Cron), [Arch Linux](https://wiki.archlinux.org/index.php/Cron)…).
-It’s a good idea to use the web server user .
+It’s a good idea to use the Web server user.
 For example, if you want to run the script every hour:
 
 ```
-7 * * * * php /chemin/vers/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7 * * * * php /your-path/FreshRSS/app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 # Advices
 * For a better security, expose only the `./p/` folder on the web.
 	* Be aware that the `./data/` folder contains all personal data, so it is a bad idea to expose it.
 * The `./constants.php` file defines access to application folder. If you want to customize your installation, every thing happens here.
-* If you encounter any problem, logs are accessibles from the interface or manually in `./data/log/*.log` files.
+* If you encounter any problem, logs are accessible from the interface or manually in `./data/log/*.log` files.
 
 # Backup
 * You need to keep `./data/config.php`, `./data/*_user.php` and `./data/persona/` files
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ab73879d0..dfdf0dc16 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -268,7 +268,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 	 * If id and url are not specified, all the feeds are actualized. But if force is
 	 * false, process stops at 10 feeds to avoid time execution problem.
 	 */
-	public function actualizeAction($simplePie = null) {
+	public function actualizeAction($simplePiePush = null) {
 		@set_time_limit(300);
 
 		$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -295,10 +295,16 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Calculate date of oldest entries we accept in DB.
 		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
+		$pshbMinAge = time() - (3600 * 24);	//TODO: Make a configuration.
 
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
+			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
+			if ((!$simplePiePush) && (!$id) && (!$force) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+				continue;	//When PubSubHubbub is used, do not pull refresh so often
+			}
+
 			if (!$feed->lock()) {
 				Minz_Log::notice('Feed already being actualized: ' . $feed->url());
 				continue;
@@ -306,8 +312,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			$url = $feed->url();	//For detection of HTTP 301
 			try {
-				if ($simplePie) {
-					$feed->loadEntries($simplePie);	//Used by PubSubHubbub
+				if ($simplePiePush) {
+					$feed->loadEntries($simplePiePush);	//Used by PubSubHubbub
 				} else {
 					$feed->load(false);
 				}
@@ -374,6 +380,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							continue;
 						}
 
+						if ($pubSubHubbubEnabled && !$simplePiePush) {	//We use push, but have discovered an article by pull!
+							$text = 'An article was discovered by pull although we use PubSubHubbub!: Feed ' . $url . ' GUID ' . $entry->guid();
+							file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
+							Minz_Log::warning($text);
+							$pubSubHubbubEnabled = false;
+							$feed->pubSubHubbubEnabled(false);	//To force the renewal of our lease
+						}
+
 						if (!$entryDAO->hasTransaction()) {
 							$entryDAO->beginTransaction();
 						}
@@ -423,15 +437,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
 			}
 
-			if ($simplePie === null) {
-				$feed->faviconPrepare();
-				if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
-					Minz_Log::debug('PubSubHubbub match ' . $feed->url());
-					if ($feed->pubSubHubbubPrepare()) {
-						Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
-						if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
-							Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-						}
+			$feed->faviconPrepare();
+			if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
+				Minz_Log::debug('PubSubHubbub match ' . $feed->url());
+				if ($feed->pubSubHubbubPrepare()) {
+					Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+					if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+						Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
 					}
 				}
 			}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index d2b552265..7bc60dfc9 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -104,6 +104,16 @@ class FreshRSS_Feed extends Minz_Model {
 	public function ttl() {
 		return $this->ttl;
 	}
+	// public function ttlExpire() {
+		// $ttl = $this->ttl;
+		// if ($ttl == -2) {	//Default
+			// $ttl = FreshRSS_Context::$user_conf->ttl_default;
+		// }
+		// if ($ttl == -1) {	//Never
+			// $ttl = 64000000;	//~2 years. Good enough for PubSubHubbub logic
+		// }
+		// return $this->lastUpdate + $ttl;
+	// }
 	public function nbEntries() {
 		if ($this->nbEntries < 0) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -349,18 +359,42 @@ class FreshRSS_Feed extends Minz_Model {
 
 	//<PubSubHubbub>
 
+	function pubSubHubbubEnabled($keep = true) {
+		$url = $this->selfUrl ? $this->selfUrl : $this->url;
+		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
+		if ($hubFile = @file_get_contents($hubFilename)) {
+			$hubJson = json_decode($hubFile, true);
+			if (!$keep) {
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
+					. 'Force expire lease for ' . $url . "\n", FILE_APPEND);
+			} elseif ($hubJson && (empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	function pubSubHubbubPrepare() {
 		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
-			if ($hubFile = @file_get_contents($path . '/!hub.json')) {
+			$hubFilename = $path . '/!hub.json';
+			if ($hubFile = @file_get_contents($hubFilename)) {
 				$hubJson = json_decode($hubFile, true);
 				if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) {
-					Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url);
+					$text = 'Invalid JSON for PubSubHubbub: ' . $this->url;
+					Minz_Log::warning($text);
+					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					return false;
 				}
-				if (empty($hubJson['lease_end']) || $hubJson['lease_end'] <= time()) {
-					Minz_Log::warning('PubSubHubbub lease expired: ' . $this->url);
+				if (empty($hubJson['lease_end']) || ($hubJson['lease_end'] <= (time() + (3600 * 24)))) {	//TODO: Make a better policy
+					$text = 'PubSubHubbub lease ends at '
+						. date('c', empty($hubJson['lease_end']) ? time() : $hubJson['lease_end'])
+						. ' and needs renewal: ' . $this->url;
+					Minz_Log::warning($text);
+					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					$key = $hubJson['key'];	//To renew our lease
 				}
 			} else {
@@ -370,12 +404,12 @@ class FreshRSS_Feed extends Minz_Model {
 					'hub' => $this->hubUrl,
 					'key' => $key,
 				);
-				file_put_contents($path . '/!hub.json', json_encode($hubJson));
+				file_put_contents($hubFilename, json_encode($hubJson));
 				@mkdir(PSHB_PATH . '/keys/');
 				file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl));
-				Minz_Log::debug('PubSubHubbub prepared for ' . $this->url);
-				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
-					'PubSubHubbub prepared for ' . $this->url . "\n", FILE_APPEND);
+				$text = 'PubSubHubbub prepared for ' . $this->url;
+				Minz_Log::debug($text);
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 			}
 			$currentUser = Minz_Session::param('currentUser');
 			if (ctype_alnum($currentUser) && !file_exists($path . '/' . $currentUser . '.txt')) {
@@ -388,7 +422,8 @@ class FreshRSS_Feed extends Minz_Model {
 	//Parameter true to subscribe, false to unsubscribe.
 	function pubSubHubbubSubscribe($state) {
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
-			$hubFile = @file_get_contents(PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json');
+			$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl) . '/!hub.json';
+			$hubFile = @file_get_contents($hubFilename);
 			if ($hubFile === false) {
 				Minz_Log::warning('JSON not found for PubSubHubbub: ' . $this->url);
 				return false;
@@ -421,6 +456,12 @@ class FreshRSS_Feed extends Minz_Model {
 			file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" .
 				'PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $this->selfUrl .
 				' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response . "\n", FILE_APPEND);
+
+			if (!$state) {	//unsubscribe
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+			}
+
 			return substr($info['http_code'], 0, 1) == '2';
 		}
 		return false;
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 29fb1e4d4..9518df66d 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -84,6 +84,7 @@ return array(
 		'articles_per_page' => 'Počet článků na stranu',
 		'auto_load_more' => 'Načítat další články dole na stránce',
 		'auto_remove_article' => 'Po přečtení články schovat',
+		'mark_updated_article_unread' => 'Označte aktualizované položky jako nepřečtené',
 		'confirm_enabled' => 'Vyžadovat potvrzení pro akci “označit vše jako přečtené”',
 		'display_articles_unfolded' => 'Ve výchozím stavu zobrazovat články otevřené',
 		'display_categories_unfolded' => 'Ve výchozím stavu zobrazovat kategorie zavřené',
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index 78712506c..cea0541e3 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'URL kanálu',
 		'validator' => 'Zkontrolovat platnost kanálu',
 		'website' => 'URL webové stránky',
+		'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Export',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 0479b8f46..7433bd61c 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'Feed-URL',
 		'validator' => 'Überprüfen Sie die Gültigkeit des Feeds',
 		'website' => 'Webseiten-URL',
+		'pubsubhubbub' => 'Sofortige Benachrichtigung mit PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Exportieren',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 2b62e4775..d8b5ced04 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'Feed URL',
 		'validator' => 'Check the validity of the feed',
 		'website' => 'Website URL',
+		'pubsubhubbub' => 'Instant notification with PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Export',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index a3f7c4d6d..0a1a03e41 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -37,6 +37,7 @@ return array(
 		'url' => 'URL du flux',
 		'validator' => 'Vérifier la valididé du flux',
 		'website' => 'URL du site',
+		'pubsubhubbub' => 'Notification instantanée par PubSubHubbub',
 	),
 	'import_export' => array(
 		'export' => 'Exporter',
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 0b08d036c..b2cf9f93c 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -126,6 +126,14 @@
 				?></select>
 			</div>
 		</div>
+		<div class="form-group">
+			<label class="group-name" for="pubsubhubbub"><?php echo _t('sub.feed.pubsubhubbub'); ?></label>
+			<div class="group-controls">
+				<label class="checkbox" for="pubsubhubbub">
+					<input type="checkbox" name="pubsubhubbub" id="pubsubhubbub" disabled="disabled" value="1"<?php echo $this->feed->pubSubHubbubEnabled() ? ' checked="checked"' : ''; ?> />
+				</label>
+			</div>
+		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index bf74ca1de..8f8ff528c 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -25,7 +25,7 @@ return array (
 
 	# In the case an article has changed (e.g. updated content):
 	#	Set to `true` to mark it unread, or `false` to leave it as-is.
-	'mark_updated_article_unread' => false,
+	'mark_updated_article_unread' => false, //TODO: -1 => ignore, 0 => update, 1 => update and mark as unread
 
 	'sort_order' => 'DESC',
 	'anon_access' => false,
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 6280c04ac..2f7f48cd8 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -57,8 +57,10 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	$leaseSeconds = empty($_REQUEST['hub_lease_seconds']) ? 0 : intval($_REQUEST['hub_lease_seconds']);
 	if ($leaseSeconds > 60) {
 		$hubJson['lease_end'] = time() + $leaseSeconds;
-		file_put_contents('./!hub.json', json_encode($hubJson));
+	} else {
+		unset($hubJson['lease_end']);
 	}
+	file_put_contents('./!hub.json', json_encode($hubJson));
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
@@ -84,7 +86,7 @@ $self = isset($links[0]) ? $links[0] : null;
 
 if ($self !== base64url_decode($canonical64)) {
 	//header('HTTP/1.1 422 Unprocessable Entity');
-	logMe('Warning: Self URL ' . $self . ' does not match registered canonical URL!: ' . base64url_decode($canonical64));
+	logMe('Warning: Self URL [' . $self . '] does not match registered canonical URL!: ' . base64url_decode($canonical64));
 	//die('Self URL does not match registered canonical URL!');
 	$self = base64url_decode($canonical64);
 }
@@ -120,5 +122,5 @@ if ($nb === 0) {
 	die('Nobody is subscribed to this feed anymore after all!');
 }
 
-logMe($self . ' done: ' . $nb);
+logMe('PubSubHubbub ' . $self . ' done: ' . $nb);
 exit('Done: ' . $nb . "\n");
-- 
cgit v1.2.3


From 84ea636d2d8c55e04d0c2d07688b66d7730b6c7c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 16 May 2015 23:44:36 +0200
Subject: PubSubHubbub bug skip pull

Do not pull refresh feeds that are PubSubHubbub too often during cron
refresh.
And more debugging info during the test phase.
https://github.com/FreshRSS/FreshRSS/pull/831
---
 app/Controllers/feedController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index dfdf0dc16..5e845027f 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -300,8 +300,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
+			$url = $feed->url();	//For detection of HTTP 301
+
 			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
-			if ((!$simplePiePush) && (!$id) && (!$force) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
+				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
+				Minz_Log::debug($text);
+				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
 
@@ -310,7 +315,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 			}
 
-			$url = $feed->url();	//For detection of HTTP 301
 			try {
 				if ($simplePiePush) {
 					$feed->loadEntries($simplePiePush);	//Used by PubSubHubbub
-- 
cgit v1.2.3


From 001c713f030d51b74a860e20014153c6b4d9661f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 17 May 2015 22:06:11 +0200
Subject: PubSubHubbub better gestion of errors

Do not assume that PubSubHubbub works until the first successul push
https://github.com/FreshRSS/FreshRSS/issues/312#issuecomment-102706500
---
 app/Controllers/feedController.php |  4 ++--
 app/Models/Feed.php                | 31 ++++++++++++++++++++++---------
 p/api/pshb.php                     |  7 +++++++
 3 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 5e845027f..3d8a6deb7 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -305,7 +305,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
 			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
 				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
-				Minz_Log::debug($text);
+				//Minz_Log::debug($text);
 				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 				continue;	//When PubSubHubbub is used, do not pull refresh so often
 			}
@@ -389,7 +389,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 							Minz_Log::warning($text);
 							$pubSubHubbubEnabled = false;
-							$feed->pubSubHubbubEnabled(false);	//To force the renewal of our lease
+							$feed->pubSubHubbubError(true);
 						}
 
 						if (!$entryDAO->hasTransaction()) {
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 7bc60dfc9..ed0a862c3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -359,23 +359,33 @@ class FreshRSS_Feed extends Minz_Model {
 
 	//<PubSubHubbub>
 
-	function pubSubHubbubEnabled($keep = true) {
+	function pubSubHubbubEnabled() {
 		$url = $this->selfUrl ? $this->selfUrl : $this->url;
 		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
 		if ($hubFile = @file_get_contents($hubFilename)) {
 			$hubJson = json_decode($hubFile, true);
-			if (!$keep) {
-				$hubJson['lease_end'] = time() - 60;
-				file_put_contents($hubFilename, json_encode($hubJson));
-				file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
-					. 'Force expire lease for ' . $url . "\n", FILE_APPEND);
-			} elseif ($hubJson && (empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
+			if ($hubJson && empty($hubJson['error']) &&
+				(empty($hubJson['lease_end']) || $hubJson['lease_end'] > time())) {
 				return true;
 			}
 		}
 		return false;
 	}
 
+	function pubSubHubbubError($error = true) {
+		$url = $this->selfUrl ? $this->selfUrl : $this->url;
+		$hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json';
+		$hubFile = @file_get_contents($hubFilename);
+		$hubJson = $hubFile ? json_decode($hubFile, true) : array();
+		if (!isset($hubJson['error']) || $hubJson['error'] !== (bool)$error) {
+			$hubJson['error'] = (bool)$error;
+			file_put_contents($hubFilename, json_encode($hubJson));
+			file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t"
+				. 'Set error to ' . ($error ? 1 : 0) . ' for ' . $url . "\n", FILE_APPEND);
+		}
+		return false;
+	}
+
 	function pubSubHubbubPrepare() {
 		$key = '';
 		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
@@ -389,17 +399,20 @@ class FreshRSS_Feed extends Minz_Model {
 					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					return false;
 				}
-				if (empty($hubJson['lease_end']) || ($hubJson['lease_end'] <= (time() + (3600 * 24)))) {	//TODO: Make a better policy
+				if ((!empty($hubJson['lease_end'])) && ($hubJson['lease_end'] < (time() + (3600 * 23)))) {	//TODO: Make a better policy
 					$text = 'PubSubHubbub lease ends at '
 						. date('c', empty($hubJson['lease_end']) ? time() : $hubJson['lease_end'])
 						. ' and needs renewal: ' . $this->url;
 					Minz_Log::warning($text);
 					file_put_contents(USERS_PATH . '/_/log_pshb.txt', date('c') . "\t" . $text . "\n", FILE_APPEND);
 					$key = $hubJson['key'];	//To renew our lease
+				} elseif (((!empty($hubJson['error'])) || empty($hubJson['lease_end'])) &&
+					(empty($hubJson['lease_start']) || $hubJson['lease_start'] < time() - (3600 * 23))) {	//Do not renew too often
+					$key = $hubJson['key'];	//To renew our lease
 				}
 			} else {
 				@mkdir($path, 0777, true);
-				$key = sha1(FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
+				$key = sha1($path . FreshRSS_Context::$system_conf->salt . uniqid(mt_rand(), true));
 				$hubJson = array(
 					'hub' => $this->hubUrl,
 					'key' => $key,
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 2f7f48cd8..4bb4694b3 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -60,6 +60,10 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	} else {
 		unset($hubJson['lease_end']);
 	}
+	$hubJson['lease_start'] = time();
+	if (!isset($hubJson['error'])) {
+		$hubJson['error'] = true;	//Do not assume that PubSubHubbub works until the first successul push
+	}
 	file_put_contents('./!hub.json', json_encode($hubJson));
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
@@ -120,6 +124,9 @@ if ($nb === 0) {
 	header('HTTP/1.1 410 Gone');
 	logMe('Error: Nobody is subscribed to this feed anymore after all!: ' . $self);
 	die('Nobody is subscribed to this feed anymore after all!');
+} elseif (!empty($hubJson['error'])) {
+	$hubJson['error'] = false;
+	file_put_contents('./!hub.json', json_encode($hubJson));
 }
 
 logMe('PubSubHubbub ' . $self . ' done: ' . $nb);
-- 
cgit v1.2.3


From 694dfa1f8b90d8f693ef39c7099c0e8f23c5c777 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 May 2015 16:37:08 +0200
Subject: PubSubHubbub: remove white list

The tests so far are good. Ready to test more broadly.
https://github.com/FreshRSS/FreshRSS/pull/831
https://github.com/FreshRSS/FreshRSS/issues/312
---
 app/Controllers/feedController.php | 11 ++++-------
 app/Models/Feed.php                |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 3d8a6deb7..957a809cd 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -442,13 +442,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed->faviconPrepare();
-			if (in_array($feed->url(), array('http://push-pub.appspot.com/feed'))) {	//TODO: Remove white-list after testing
-				Minz_Log::debug('PubSubHubbub match ' . $feed->url());
-				if ($feed->pubSubHubbubPrepare()) {
-					Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
-					if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
-						Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-					}
+			if ($feed->pubSubHubbubPrepare()) {
+				Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
+				if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
+					Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
 				}
 			}
 			$feed->unlock();
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index ed0a862c3..bf7ed3967 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -388,7 +388,7 @@ class FreshRSS_Feed extends Minz_Model {
 
 	function pubSubHubbubPrepare() {
 		$key = '';
-		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl) {
+		if (FreshRSS_Context::$system_conf->base_url && $this->hubUrl && $this->selfUrl && @is_dir(PSHB_PATH)) {
 			$path = PSHB_PATH . '/feeds/' . base64url_encode($this->selfUrl);
 			$hubFilename = $path . '/!hub.json';
 			if ($hubFile = @file_get_contents($hubFilename)) {
-- 
cgit v1.2.3


From 8a131b056ee3566c2b54466f650c26c143b7c369 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 14 Jun 2015 16:22:33 +0200
Subject: Force autocomplete off

https://github.com/FreshRSS/FreshRSS/issues/880
Put a space in the user field instead of empty to avoid autocomplete.
Use feed ID in the username/password field name.
---
 app/Controllers/feedController.php         | 6 +++---
 app/Controllers/subscriptionController.php | 6 +++---
 app/views/feed/add.phtml                   | 2 +-
 app/views/helpers/feed/update.phtml        | 8 ++++----
 app/views/subscription/index.phtml         | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 957a809cd..b91f63b5b 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -98,10 +98,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			// HTTP information are useful if feed is protected behind a
 			// HTTP authentication
-			$user = Minz_Request::param('http_user');
-			$pass = Minz_Request::param('http_pass');
+			$user = trim(Minz_Request::param('http_user', ''));
+			$pass = Minz_Request::param('http_pass', '');
 			$http_auth = '';
-			if ($user != '' || $pass != '') {
+			if ($user != '' && $pass != '') {	//TODO: Sanitize
 				$http_auth = $user . ':' . $pass;
 			}
 
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 333565faf..03d3ee15e 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -77,11 +77,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 		Minz_View::prependTitle(_t('sub.title.feed_management') . ' · ' . $this->view->feed->name() . ' · ');
 
 		if (Minz_Request::isPost()) {
-			$user = Minz_Request::param('http_user', '');
-			$pass = Minz_Request::param('http_pass', '');
+			$user = trim(Minz_Request::param('http_user_feed' . $id, ''));
+			$pass = Minz_Request::param('http_pass_feed' . $id, '');
 
 			$httpAuth = '';
-			if ($user != '' || $pass != '') {
+			if ($user != '' && $pass != '') {	//TODO: Sanitize
 				$httpAuth = $user . ':' . $pass;
 			}
 
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 4cdd3f390..35f6fbb12 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -67,7 +67,7 @@
 		<div class="form-group">
 			<label class="group-name" for="http_user"><?php echo _t('sub.feed.auth.username'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
+				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo empty($auth['username']) ? ' ' : $auth['username']; ?>" autocomplete="off" />
 			</div>
 
 			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index b2cf9f93c..12f485ec3 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -144,15 +144,15 @@
 		<legend><?php echo _t('sub.feed.auth.configuration'); ?></legend>
 		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo _t('sub.feed.auth.username'); ?></label>
+			<label class="group-name" for="http_user_feed<?php echo $this->feed->id(); ?>"><?php echo _t('sub.feed.auth.username'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
+				<input type="text" name="http_user_feed<?php echo $this->feed->id(); ?>" id="http_user_feed<?php echo $this->feed->id(); ?>" class="extend" value="<?php echo empty($auth['username']) ? ' ' : $auth['username']; ?>" autocomplete="off" />
 				<?php echo _i('help'); ?> <?php echo _t('sub.feed.auth.help'); ?>
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo _t('sub.feed.auth.password'); ?></label>
+			<label class="group-name" for="http_pass_feed<?php echo $this->feed->id(); ?>"><?php echo _t('sub.feed.auth.password'); ?></label>
 			<div class="group-controls">
-				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
+				<input type="password" name="http_pass_feed<?php echo $this->feed->id(); ?>" id="http_pass_feed<?php echo $this->feed->id(); ?>" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
 		</div>
 
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 331e8244e..2cfe3f33c 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -36,10 +36,10 @@
 
 					<li class="dropdown-header"><?php echo _t('sub.feed.auth.http'); ?></li>
 					<li class="input">
-						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.username'); ?>" />
+						<input type="text" name="http_user" id="http_user_feed" value=" " autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.username'); ?>" />
 					</li>
 					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.password'); ?>" />
+						<input type="password" name="http_pass" id="http_pass_feed" autocomplete="off" placeholder="<?php echo _t('sub.feed.auth.password'); ?>" />
 					</li>
 				</ul>
 			</div>
-- 
cgit v1.2.3


From 079150eee4eebce3549c3d7db84dd0180bdd11e7 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 3 Jul 2015 23:47:18 +0200
Subject: Updated log visibility

In particular, ensure that ERROR is only used for errors that may affect
FreshRSS integrity, and ensure that feed errors are visible also in
production, i.e. visibility of WARNING
https://github.com/FreshRSS/FreshRSS/issues/885
https://github.com/FreshRSS/FreshRSS/issues/884
---
 app/Controllers/authController.php         | 2 +-
 app/Controllers/feedController.php         | 2 +-
 app/Controllers/importExportController.php | 6 +++---
 app/Controllers/updateController.php       | 2 +-
 app/Models/CategoryDAO.php                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 937c0759d..b55892475 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -253,7 +253,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				FreshRSS_Auth::giveAccess();
 				invalidateHttpCache();
 			} else {
-				Minz_Log::error($reason);
+				Minz_Log::warning($reason);
 
 				$res = array();
 				$res['status'] = 'failure';
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b91f63b5b..488d066a9 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -322,7 +322,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$feed->load(false);
 				}
 			} catch (FreshRSS_Feed_Exception $e) {
-				Minz_Log::notice($e->getMessage());
+				Minz_Log::warning($e->getMessage());
 				$feedDAO->updateLastUpdate($feed->id(), true);
 				$feed->unlock();
 				continue;
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 26b163e43..60e467255 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -47,7 +47,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		$status_file = $file['error'];
 
 		if ($status_file !== 0) {
-			Minz_Log::error('File cannot be uploaded. Error code: ' . $status_file);
+			Minz_Log::warning('File cannot be uploaded. Error code: ' . $status_file);
 			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
 			                  array('c' => 'importExport', 'a' => 'index'));
 		}
@@ -69,7 +69,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 			if (!is_resource($zip)) {
 				// zip_open cannot open file: something is wrong
-				Minz_Log::error('Zip archive cannot be imported. Error code: ' . $zip);
+				Minz_Log::warning('Zip archive cannot be imported. Error code: ' . $zip);
 				Minz_Request::bad(_t('feedback.import_export.zip_error'),
 				                  array('c' => 'importExport', 'a' => 'index'));
 			}
@@ -77,7 +77,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 			while (($zipfile = zip_read($zip)) !== false) {
 				if (!is_resource($zipfile)) {
 					// zip_entry() can also return an error code!
-					Minz_Log::error('Zip file cannot be imported. Error code: ' . $zipfile);
+					Minz_Log::warning('Zip file cannot be imported. Error code: ' . $zipfile);
 				} else {
 					$type_zipfile = $this->guessFileType(zip_entry_name($zipfile));
 					if ($type_file !== 'unknown') {
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 4797a3486..84a33fe85 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -63,7 +63,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 		curl_close($c);
 
 		if ($c_status !== 200) {
-			Minz_Log::error(
+			Minz_Log::warning(
 				'Error during update (HTTP code ' . $c_status . '): ' . $c_error
 			);
 
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 189a5f0e4..b5abac519 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -13,7 +13,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
 			return $this->bd->lastInsertId();
 		} else {
 			$info = $stm == null ? array(2 => 'syntax error') : $stm->errorInfo();
-			Minz_Log::error('SQL error addCategory: ' . $info[2]	);
+			Minz_Log::error('SQL error addCategory: ' . $info[2]);
 			return false;
 		}
 	}
-- 
cgit v1.2.3


From ac8bd3d2512dd1bfca43d71ea10202ba9e6a82a6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 15:31:23 +0200
Subject: Add a max_registrations limit

- Allow user to create accounts (not implemented)
- Admin only can set this limit

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 24 ++++++++++++++++++++++++
 app/Models/ConfigurationSetter.php |  3 +++
 app/views/user/manage.phtml        | 19 +++++++++++++++++++
 data/config.default.php            |  4 ++++
 4 files changed, 50 insertions(+)

(limited to 'app/Controllers')

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index ed01b83c5..1c7745753 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -211,4 +211,28 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
+
+	/**
+	 * This action updates the max number of registrations.
+	 *
+	 * Request parameter is:
+	 *   - max-registrations (int >= 0)
+	 */
+	public function setRegistrationAction() {
+		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+			$limits = FreshRSS_Context::$system_conf->limits;
+			$limits['max_registrations'] = Minz_Request::param('max-registrations', 1);
+			FreshRSS_Context::$system_conf->limits = $limits;
+			FreshRSS_Context::$system_conf->save();
+
+			invalidateHttpCache();
+
+			Minz_Session::_param('notification', array(
+				'type' => 'good',
+				'content' => _t('feedback.user.set_registration')
+			));
+		}
+
+		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+	}
 }
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 4bd29ecb0..236bf5b0b 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -352,6 +352,9 @@ class FreshRSS_ConfigurationSetter {
 				'min' => 0,
 				'max' => $max_small_int,
 			),
+			'max_registrations' => array(
+				'min' => 0,
+			),
 		);
 
 		foreach ($values as $key => $value) {
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index fe1b6618b..a7cbf0795 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -3,6 +3,25 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
+	<form method="post" action="<?php echo _url('user', 'setRegistration'); ?>">
+		<legend><?php echo _t('admin.user.registration.allow'); ?></legend>
+
+		<div class="form-group">
+			<label class="group-name" for="max-registrations"><?php echo _t('admin.user.registration.number'); ?></label>
+			<div class="group-controls">
+				<input type="number" id="max-registrations" name="max-registrations" value="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>"/>
+				<?php echo _i('help'); ?> <?php echo _t('admin.user.registration.help'); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
+			</div>
+		</div>
+	</form>
+
 	<form method="post" action="<?php echo _url('user', 'create'); ?>">
 		<legend><?php echo _t('admin.user.create'); ?></legend>
 
diff --git a/data/config.default.php b/data/config.default.php
index 6013b13b8..5db933ff8 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -77,6 +77,10 @@ return array(
 		# Max number of categories for a user.
 		'max_categories' => 16384,
 
+		# Max number of accounts that anonymous users can create
+		#   0 for an unlimited number of accounts
+		#   1 is to not allow user registrations (1 is corresponding to the admin account)
+		'max_registrations' => 1,
 	),
 
 	# Options used by cURL when making HTTP requests, e.g. when the SimplePie library retrieves feeds.
-- 
cgit v1.2.3


From 37f06799589d9bb92ecfa6368197daf187251ab4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 16:03:46 +0200
Subject: First draft for registration form

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php |  6 ++++++
 app/views/auth/formLogin.phtml     |  2 ++
 app/views/auth/register.phtml      | 31 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 app/views/auth/register.phtml

(limited to 'app/Controllers')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index b55892475..1c8ad2193 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -346,4 +346,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action gives possibility to a user to create an account.
+	 */
+	public function registerAction() {
+	}
 }
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 979e17349..75537ee26 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,6 +1,8 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
+	<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
 			<label for="username"><?php echo _t('gen.auth.username'); ?></label>
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
new file mode 100644
index 000000000..f67ecc4d9
--- /dev/null
+++ b/app/views/auth/register.phtml
@@ -0,0 +1,31 @@
+<div class="prompt">
+    <h1><?php echo _t('gen.auth.register'); ?></h1>
+
+    <form method="post" action="<?php echo _url('user', 'create'); ?>">
+        <div>
+            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'); ?></label>
+            <input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" />
+        </div>
+
+        <div>
+            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+            <div class="stick">
+                <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
+                <a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
+            </div>
+            <noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
+        </div>
+
+        <div>
+            <label class="group-name" for="new_user_email"><?php echo _t('gen.auth.email'); ?></label>
+            <input type="email" id="new_user_email" name="new_user_email" class="extend" required="required" autocomplete="off" />
+        </div>
+
+        <div>
+            <button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
+            <a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
+        </div>
+    </form>
+
+    <p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
+</div>
-- 
cgit v1.2.3


From 9fca5c70f33291cacc04e7bdfa01a12c6df3f97c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 12:20:00 +0200
Subject: Add some comments

---
 app/Controllers/userController.php | 19 +++++++++++++++++++
 app/views/auth/register.phtml      |  7 +++++++
 2 files changed, 26 insertions(+)

(limited to 'app/Controllers')

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 1c7745753..c198d1328 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -103,6 +103,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		$this->view->size_user = $entryDAO->size();
 	}
 
+	/**
+	 * This action creates a new user.
+	 *
+	 * Request parameters are:
+	 *   - new_user_language
+	 *   - new_user_name
+	 *   - new_user_passwordPlain
+	 *   - new_user_email
+	 *
+	 * @todo clean up this method. Idea: write a method to init a user with basic information.
+	 */
 	public function createAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = FreshRSS_Context::$system_conf->db;
@@ -178,6 +189,14 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
 	}
 
+	/**
+	 * This action delete an existing user.
+	 *
+	 * Request parameter is:
+	 *   - username
+	 *
+	 * @todo clean up this method. Idea: create a User->clean() method.
+	 */
 	public function deleteAction() {
 		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
 			$db = FreshRSS_Context::$system_conf->db;
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index f67ecc4d9..31ab89d26 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,3 +1,10 @@
+<?php
+    /* TODO list
+     *   - Show help for username and password formats
+     *   - Don't show this page if there is no more free account slots
+     *   - Fix i18n
+    */
+?>
 <div class="prompt">
     <h1><?php echo _t('gen.auth.register'); ?></h1>
 
-- 
cgit v1.2.3


From 02c3546440f961018adc1e2c8e97c16f2aca18fc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 13:52:03 +0200
Subject: Registration action is handled and create a user

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 20 +++++++++++++++++---
 app/views/auth/register.phtml      |  7 +++++++
 lib/lib_rss.php                    | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index c198d1328..46f4f434d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -12,9 +12,14 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 * This action is called before every other action in that class. It is
 	 * the common boiler plate for every action. It is triggered by the
 	 * underlying framework.
+	 *
+	 * @todo clean up the access condition.
 	 */
 	public function firstAction() {
-		if (!FreshRSS_Auth::hasAccess()) {
+		if (!FreshRSS_Auth::hasAccess() && !(
+				Minz_Request::actionName() === 'create' &&
+				!max_registrations_reached()
+		)) {
 			Minz_Error::error(403);
 		}
 	}
@@ -111,11 +116,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 *   - new_user_name
 	 *   - new_user_passwordPlain
 	 *   - new_user_email
+	 *   - r (i.e. a redirection url, optional)
 	 *
 	 * @todo clean up this method. Idea: write a method to init a user with basic information.
+	 * @todo handle r redirection in Minz_Request::forward directly?
 	 */
 	public function createAction() {
-		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+		if (Minz_Request::isPost() && (
+				FreshRSS_Auth::hasAccess('admin') ||
+				!max_registrations_reached()
+		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
@@ -186,7 +196,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+		Minz_Request::forward($redirect_url, true);
 	}
 
 	/**
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 31ab89d26..96c91f411 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -29,6 +29,13 @@
         </div>
 
         <div>
+            <?php
+                $redirect_url = urlencode(Minz_Url::display(
+                    array('c' => 'index', 'a' => 'index'),
+                    'php', true
+                ));
+            ?>
+            <input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
             <button type="submit" class="btn btn-important"><?php echo _t('gen.action.create'); ?></button>
             <a class="btn" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.cancel'); ?></a>
         </div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 0118e0f46..c99e2c7e8 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -266,6 +266,22 @@ function listUsers() {
 }
 
 
+/**
+ * Return if the maximum number of registrations has been reached.
+ *
+ * Note a max_regstrations of 0 means there is no limit.
+ *
+ * @return true if number of users >= max registrations, false else.
+ */
+function max_registrations_reached() {
+	$system_conf = Minz_Configuration::get('system');
+	$limit_registrations = $system_conf->limits['max_registrations'];
+	$number_accounts = count(listUsers());
+
+	return $limit_registrations > 0 && $number_accounts >= $limit_registrations;
+}
+
+
 /**
  * Register and return the configuration for a given user.
  *
-- 
cgit v1.2.3


From f560c44a003ca69644f8e7262dca2f8f7e6932d5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:00:08 +0200
Subject: Hide registration form if max registration reached

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 3 +++
 app/views/auth/formLogin.phtml     | 4 +++-
 app/views/auth/personaLogin.phtml  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 1c8ad2193..223282afb 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -351,5 +351,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 * This action gives possibility to a user to create an account.
 	 */
 	public function registerAction() {
+		if (max_registrations_reached()) {
+			Minz_Error::error(403);
+		}
 	}
 }
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 75537ee26..3a6053065 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,7 +1,9 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
-	<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index 545ed2eac..91349a67e 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -2,6 +2,10 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
+
 	<p>
 		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
 			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
-- 
cgit v1.2.3


From 3a929138b000a45f57b3a6c62d5cfa72b842538c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:22:26 +0200
Subject: Give possibility to delete its own account

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 17 ++++++++++++++---
 app/views/user/profile.phtml       | 22 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 46f4f434d..cebfcd5ec 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -212,11 +212,15 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 * @todo clean up this method. Idea: create a User->clean() method.
 	 */
 	public function deleteAction() {
-		if (Minz_Request::isPost() && FreshRSS_Auth::hasAccess('admin')) {
+		$username = Minz_Request::param('username');
+
+		if (Minz_Request::isPost() && (
+				FreshRSS_Auth::hasAccess('admin') ||
+				Minz_Session::param('currentUser', '_') === $username
+		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
 
-			$username = Minz_Request::param('username');
 			$ok = ctype_alnum($username);
 			$user_data = join_path(DATA_PATH, 'users', $username);
 
@@ -234,6 +238,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				//TODO: delete Persona file
 			}
 			invalidateHttpCache();
+			if (Minz_Session::param('currentUser', '_') === $username) {
+				FreshRSS_Auth::removeAccess();
+			}
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
@@ -242,7 +249,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		Minz_Request::forward(array('c' => 'user', 'a' => 'manage'), true);
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+		Minz_Request::forward($redirect_url, true);
 	}
 
 	/**
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index c44202edd..11097e546 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -57,4 +57,26 @@
 			</div>
 		</div>
 	</form>
+
+	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
+	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<legend><?php echo _t('conf.profile.delete'); ?></legend>
+
+		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('conf.profile.delete.warn'); ?></p>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<?php
+					$redirect_url = urlencode(Minz_Url::display(
+						array('c' => 'index', 'a' => 'index'),
+						'php', true
+					));
+				?>
+				<input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
+				<input type="hidden" name="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('gen.action.remove'); ?></button>
+			</div>
+		</div>
+	</form>
+	<?php } ?>
 </div>
-- 
cgit v1.2.3


From 8751c344f384e19dd2fd2f0b5607ecc2aac58541 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:58:00 +0200
Subject: Ask password to user before deleting its account

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/userController.php | 37 +++++++++++++++++++++++++++----------
 app/views/user/profile.phtml       | 21 +++++++++++++++------
 2 files changed, 42 insertions(+), 16 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index cebfcd5ec..428cd145d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -30,13 +30,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	public function profileAction() {
 		Minz_View::prependTitle(_t('conf.profile.title') . ' · ');
 
+		Minz_View::appendScript(Minz_Url::display(
+			'/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')
+		));
+
 		if (Minz_Request::isPost()) {
 			$ok = true;
 
-			$passwordPlain = Minz_Request::param('passwordPlain', '', true);
+			$passwordPlain = Minz_Request::param('newPasswordPlain', '', true);
 			if ($passwordPlain != '') {
-				Minz_Request::_param('passwordPlain');	//Discard plain-text password ASAP
-				$_POST['passwordPlain'] = '';
+				Minz_Request::_param('newPasswordPlain');	//Discard plain-text password ASAP
+				$_POST['newPasswordPlain'] = '';
 				if (!function_exists('password_hash')) {
 					include_once(LIB_PATH . '/password_compat.php');
 				}
@@ -213,10 +217,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function deleteAction() {
 		$username = Minz_Request::param('username');
+		$redirect_url = urldecode(Minz_Request::param('r', false, true));
+		if (!$redirect_url) {
+			$redirect_url = array('c' => 'user', 'a' => 'manage');
+		}
+
+		$self_deletion = Minz_Session::param('currentUser', '_') === $username;
 
 		if (Minz_Request::isPost() && (
 				FreshRSS_Auth::hasAccess('admin') ||
-				Minz_Session::param('currentUser', '_') === $username
+				$self_deletion
 		)) {
 			$db = FreshRSS_Context::$system_conf->db;
 			require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
@@ -228,6 +238,16 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$default_user = FreshRSS_Context::$system_conf->default_user;
 				$ok &= (strcasecmp($username, $default_user) !== 0);	//It is forbidden to delete the default user
 			}
+			if ($ok && $self_deletion) {
+				// We check the password if it's a self-destruction
+				$nonce = Minz_Session::param('nonce');
+				$challenge = Minz_Request::param('challenge', '');
+
+				$ok &= FreshRSS_FormAuth::checkCredentials(
+					$username, FreshRSS_Context::$user_conf->passwordHash,
+					$nonce, $challenge
+				);
+			}
 			if ($ok) {
 				$ok &= is_dir($user_data);
 			}
@@ -237,10 +257,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 				$ok &= recursive_unlink($user_data);
 				//TODO: delete Persona file
 			}
-			invalidateHttpCache();
-			if (Minz_Session::param('currentUser', '_') === $username) {
+			if ($ok && $self_deletion) {
 				FreshRSS_Auth::removeAccess();
+				$redirect_url = array('c' => 'index', 'a' => 'index');
 			}
+			invalidateHttpCache();
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
@@ -249,10 +270,6 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 			Minz_Session::_param('notification', $notif);
 		}
 
-		$redirect_url = urldecode(Minz_Request::param('r', false, true));
-		if (!$redirect_url) {
-			$redirect_url = array('c' => 'user', 'a' => 'manage');
-		}
 		Minz_Request::forward($redirect_url, true);
 	}
 
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 11097e546..7ae2c7ede 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -18,11 +18,11 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo _t('conf.profile.password_form'); ?></label>
+			<label class="group-name" for="newPasswordPlain"><?php echo _t('conf.profile.password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
-					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
+					<input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+					<a class="btn toggle-password" data-toggle="newPasswordPlain"><?php echo _i('key'); ?></a>
 				</div>
 				<?php echo _i('help'); ?> <?php echo _t('conf.profile.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
@@ -59,21 +59,30 @@
 	</form>
 
 	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
-	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+	<form id="crypto-form" method="post" action="<?php echo _url('user', 'delete'); ?>">
 		<legend><?php echo _t('conf.profile.delete'); ?></legend>
 
 		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.attention'); ?></span> <?php echo _t('conf.profile.delete.warn'); ?></p>
 
+		<div class="form-group">
+			<label class="group-name" for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+			<div class="group-controls">
+					<input type="password" id="passwordPlain" required="required" />
+					<input type="hidden" id="challenge" name="challenge" /><br />
+					<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
+			</div>
+		</div>
+
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<?php
 					$redirect_url = urlencode(Minz_Url::display(
-						array('c' => 'index', 'a' => 'index'),
+						array('c' => 'user', 'a' => 'profile'),
 						'php', true
 					));
 				?>
 				<input type="hidden" name="r" value="<?php echo $redirect_url; ?>" />
-				<input type="hidden" name="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
+				<input type="hidden" name="username" id="username" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<button type="submit" class="btn btn-attention confirm"><?php echo _t('gen.action.remove'); ?></button>
 			</div>
 		</div>
-- 
cgit v1.2.3


From f0a1b26584787e173c8c9cd1a5fea27bb3044f1c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:06:46 +0200
Subject: Add title to the account creation page

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 2 ++
 app/i18n/cz/gen.php                | 1 +
 app/i18n/de/gen.php                | 1 +
 app/i18n/en/gen.php                | 1 +
 app/i18n/fr/gen.php                | 1 +
 5 files changed, 6 insertions(+)

(limited to 'app/Controllers')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 223282afb..aff184263 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -354,5 +354,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (max_registrations_reached()) {
 			Minz_Error::error(403);
 		}
+
+		Minz_View::prependTitle(_t('gen.auth.registration.title') . ' · ');
 	}
 }
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index a89bf6b49..53127998f 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index d6fcfe1e4..f8f4823a6 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 063322cbf..1feb8d6ac 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
+			'title' => 'Account creation',
 		),
 		'reset' => 'Authentication reset',
 		'username' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 5abc7a27b..67d278be4 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
+			'title' => 'Création de compte',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
-- 
cgit v1.2.3


From f4472fc918c1fa1d1cfb2adae6c38a9a261e8c9b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Jul 2015 13:59:40 +0200
Subject: Do not use PubSubHubbub if disabled

See https://github.com/FreshRSS/FreshRSS/issues/865
---
 app/Controllers/feedController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 488d066a9..ec3dce777 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -295,14 +295,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		// Calculate date of oldest entries we accept in DB.
 		$nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1);
 		$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
-		$pshbMinAge = time() - (3600 * 24);	//TODO: Make a configuration.
+
+		// PubSubHubbub support
+		$pubsubhubbubEnabledGeneral = FreshRSS_Context::$system_conf->pubsubhubbub_enabled;
+		$pshbMinAge = time() - (3600 * 24);  //TODO: Make a configuration.
 
 		$updated_feeds = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			$url = $feed->url();	//For detection of HTTP 301
 
-			$pubSubHubbubEnabled = $feed->pubSubHubbubEnabled();
+			$pubSubHubbubEnabled = $pubsubhubbubEnabledGeneral && $feed->pubSubHubbubEnabled();
 			if ((!$simplePiePush) && (!$id) && $pubSubHubbubEnabled && ($feed->lastUpdate() > $pshbMinAge)) {
 				$text = 'Skip pull of feed using PubSubHubbub: ' . $url;
 				//Minz_Log::debug($text);
@@ -442,7 +445,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			}
 
 			$feed->faviconPrepare();
-			if ($feed->pubSubHubbubPrepare()) {
+			if ($pubsubhubbubEnabledGeneral && $feed->pubSubHubbubPrepare()) {
 				Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url());
 				if (!$feed->pubSubHubbubSubscribe(true)) {	//Subscribe
 					Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url());
-- 
cgit v1.2.3