From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 31 Oct 2012 12:15:29 +0000 (+0400)
Subject: improve status reporting for linked feeds
X-Git-Tag: 1.6.1~28
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=32532f1c0f6a997060ee050654787b2bfa3329a6;p=tt-rss.git

improve status reporting for linked feeds
---

diff --git a/classes/pref/instances.php b/classes/pref/instances.php
index c017ee9d..0ce39080 100644
--- a/classes/pref/instances.php
+++ b/classes/pref/instances.php
@@ -1,6 +1,12 @@
 <?php
 class Pref_Instances extends Handler_Protected {
 
+	private $status_codes = array(
+		0 	=> "Connection failed",
+		1 	=> "Success",
+		2 	=> "Invalid object received",
+		16	=> "Access denied" );
+
 	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "edit");
 
@@ -167,6 +173,7 @@ class Pref_Instances extends Handler_Protected {
 			<td width=''><a href=\"#\" onclick=\"updateInstanceList('access_url')\">".__('Instance URL')."</a></td>
 			<td width='20%'><a href=\"#\" onclick=\"updateInstanceList('access_key')\">".__('Access key')."</a></td>
 			<td width='10%'><a href=\"#\" onclick=\"updateUsersList('last_connected')\">".__('Last connected')."</a></td>
+			<td width='10%'><a href=\"#\" onclick=\"updateUsersList('last_status_out')\">".__('Status')."</a></td>
 			<td width='10%'><a href=\"#\" onclick=\"updateUsersList('num_feeds')\">".__('Stored feeds')."</a></td>
 			</tr>";
 
@@ -193,6 +200,7 @@ class Pref_Instances extends Handler_Protected {
 			print "<td $onclick>" . htmlspecialchars($line['access_url']) . "</td>";
 			print "<td $onclick>" . htmlspecialchars($access_key) . "</td>";
 			print "<td $onclick>" . htmlspecialchars($line['last_connected']) . "</td>";
+			print "<td $onclick>" . $this->status_codes[$line['last_status_out']] . "</td>";
 			print "<td $onclick>" . htmlspecialchars($line['num_feeds']) . "</td>";
 
 			print "</tr>";
diff --git a/include/functions.php b/include/functions.php
index a81a2c0c..0e98b4a5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5124,6 +5124,12 @@
 				if ($feeds) {
 					if ($feeds['error']) {
 						$status = $feeds['error']['code'] + 10;
+
+						// access denied
+						if ($status == 16) {
+							db_query($link, "DELETE FROM ttrss_linked_feeds
+								WHERE instance_id = '$id'");
+						}
 					} else {
 						$status = 1;