backend: merge with shared-feedbrowser

4 files changed, 268 insertions, 3 deletions

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index f21ca5814..75ce6886a 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -834,6 +834,13 @@
 			return;
 		}
 
+		if ($subop == "genHash") {
+			$hash = sha1(uniqid(rand(), true));
+
+			print json_encode(array("hash" => $hash));
+			return;
+		}
+
 		print json_encode(array("error" => array("code" => 7,
 			"message" => "Unknown method: $subop")));
 	}
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 2eb63af9d..6cb60eef4 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -992,6 +992,61 @@
 			print "</div>";
 		}
 
+		if ($id == "addInstance") {
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"subop\" value=\"add\">";
+
+			print "<div class=\"dlgSec\">".__("Instance")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			/* URL */
+
+			print __("URL:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Instance URL")."\"
+				regExp='^(http|https)://.*'
+				style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
+
+			print "<hr/>";
+
+			$access_key = sha1(uniqid(rand(), true));
+
+			/* Access key */
+
+			print __("Access key:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Access key")."\" regExp='\w{40}'
+				style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
+				value=\"$access_key\">";
+
+			print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
+
+			print "</div>";
+
+			print "<div class=\"dlgButtons\">
+				<div style='float : left'>
+					<button dojoType=\"dijit.form.Button\"
+						onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
+						__('Generate new key')."</button>
+				</div>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
+					__('Create link')."</button>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
+					__('Cancel')."</button></div>";
+
+			return;
+
+
+
+
+		}
+
 		print "</dlg>";
 	}
 ?>
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index f496c782f..4baba572a 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1539,11 +1539,21 @@
 			}
 
 			if ($mode == 1) {
-				$result = db_query($link, "SELECT feed_url, subscribers FROM
+				/* $result = db_query($link, "SELECT feed_url, subscribers FROM
 					ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
 					WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
 					AND owner_uid = '$owner_uid') $search_qpart
-					ORDER BY subscribers DESC LIMIT $limit");
+					ORDER BY subscribers DESC LIMIT $limit"); */
+
+				$result = db_query($link, "SELECT feed_url, title, SUM(subscribers) AS subscribers FROM
+					(SELECT feed_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
+						SELECT feed_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
+					WHERE
+						(SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+							WHERE tf.feed_url = qqq.feed_url
+								AND owner_uid = '$owner_uid') $search_qpart
+					GROUP BY feed_url, title ORDER BY subscribers DESC LIMIT $limit");
+
 			} else if ($mode == 2) {
 				$result = db_query($link, "SELECT *,
 					(SELECT COUNT(*) FROM ttrss_user_entries WHERE
@@ -1603,7 +1613,7 @@
 
 					$rv .= "<li title=\"".htmlspecialchars($details["site_url"])."\"
 						id=\"FBROW-".$details["id"]."\">$check_box".
-						"$feed_icon $feed_url " . htmlspecialchars($details["title"]) .
+						"$feed_icon $feed_url " . htmlspecialchars($line["title"]) .
 						"&nbsp;<span class='subscribers'>($subscribers)</span>
 						$site_url</li>";
 
diff --git a/modules/pref-instances.php b/modules/pref-instances.php
new file mode 100644
index 000000000..d3510c287
--- /dev/null
+++ b/modules/pref-instances.php
@@ -0,0 +1,193 @@
+<?php
+	function module_pref_instances($link) {
+
+		$subop = $_REQUEST['subop'];
+
+		if ($subop == "remove") {
+			$ids = db_escape_string($_REQUEST['ids']);
+
+			db_query($link, "DELETE FROM ttrss_linked_instances WHERE
+				id IN ($ids)");
+
+			return;
+		}
+
+		if ($subop == "add") {
+			$id = db_escape_string($_REQUEST["id"]);
+			$access_url = db_escape_string($_REQUEST["access_url"]);
+			$access_key = db_escape_string($_REQUEST["access_key"]);
+
+			db_query($link, "BEGIN");
+
+			$result = db_query($link, "SELECT id FROM ttrss_linked_instances
+				WHERE access_url = '$access_url'");
+
+			if (db_num_rows($result) == 0) {
+				db_query($link, "INSERT INTO ttrss_linked_instances
+					(access_url, access_key, last_connected, last_status_in, last_status_out)
+					VALUES
+					('$access_url', '$access_key', '1970-01-01', -1, -1)");
+
+			}
+
+			db_query($link, "COMMIT");
+
+			return;
+		}
+
+		if ($subop == "edit") {
+
+			$id = db_escape_string($_REQUEST["id"]);
+
+			$result = db_query($link, "SELECT * FROM ttrss_linked_instances WHERE
+				id = '$id'");
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"id\" value=\"$id\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"subop\" value=\"editSave\">";
+
+			print "<div class=\"dlgSec\">".__("Instance")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			/* URL */
+
+			$access_url = htmlspecialchars(db_fetch_result($result, 0, "access_url"));
+
+			print __("URL:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Instance URL")."\"
+				regExp='^(http|https)://.*'
+				style=\"font-size : 16px; width: 20em\" name=\"access_url\"
+				value=\"$access_url\">";
+
+			print "<hr/>";
+
+			$access_key = htmlspecialchars(db_fetch_result($result, 0, "access_key"));
+
+			/* Access key */
+
+			print __("Access key:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Access key")."\" regExp='\w{40}'
+				style=\"width: 20em\" name=\"access_key\" id=\"instance_edit_key\"
+				value=\"$access_key\">";
+
+			print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
+
+			print "</div>";
+
+			print "<div class=\"dlgButtons\">
+				<div style='float : left'>
+					<button dojoType=\"dijit.form.Button\"
+						onclick=\"return dijit.byId('instanceEditDlg').regenKey()\">".
+						__('Generate new key')."</button>
+				</div>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceEditDlg').execute()\">".
+					__('Save')."</button>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceEditDlg').hide()\"\">".
+					__('Cancel')."</button></div>";
+
+			return;
+		}
+
+		if ($subop == "editSave") {
+			$id = db_escape_string($_REQUEST["id"]);
+			$access_url = db_escape_string($_REQUEST["access_url"]);
+			$access_key = db_escape_string($_REQUEST["access_key"]);
+
+			db_query($link, "UPDATE ttrss_linked_instances SET
+				access_key = '$access_key', access_url = '$access_url',
+				last_connected = '1970-01-01'
+				WHERE id = '$id'");
+
+			return;
+		}
+
+		print "<div id=\"pref-instance-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">";
+		print "<div id=\"pref-instance-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
+
+		print "<div id=\"pref-instance-toolbar\" dojoType=\"dijit.Toolbar\">";
+
+		$sort = db_escape_string($_REQUEST["sort"]);
+
+		if (!$sort || $sort == "undefined") {
+			$sort = "access_url";
+		}
+
+		print "<div dojoType=\"dijit.form.DropDownButton\">".
+				"<span>" . __('Select')."</span>";
+		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div onclick=\"selectTableRows('prefInstanceList', 'all')\"
+			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+		print "<div onclick=\"selectTableRows('prefInstanceList', 'none')\"
+			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+		print "</div></div>";
+
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"addInstance()\">".__('Link instance')."</button>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"editSelectedInstance()\">".__('Edit')."</button>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedInstances()\">".__('Remove')."</button>";
+
+		print "</div>"; #toolbar
+
+		$result = db_query($link, "SELECT *,
+			(SELECT COUNT(*) FROM ttrss_linked_feeds
+				WHERE instance_id = ttrss_linked_instances.id) AS num_feeds
+			FROM ttrss_linked_instances
+			ORDER BY $sort");
+
+		print "<p class=\"insensitive\" style='margin-left : 1em;'>" . __("You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:");
+
+		print " <a href=\"#\" onclick=\"alert('".htmlspecialchars(get_self_url_prefix())."')\">(display url)</a>";
+
+		print "<p><table width='100%' id='prefInstanceList' class='prefInstanceList' cellspacing='0'>";
+
+		print "<tr class=\"title\">
+			<td align='center' width=\"5%\">&nbsp;</td>
+			<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('num_feeds')\">".__('Stored feeds')."</a></td>
+			</tr>";
+
+		$lnum = 0;
+
+		while ($line = db_fetch_assoc($result)) {
+			$class = ($lnum % 2) ? "even" : "odd";
+
+			$id = $line['id'];
+			$this_row_id = "id=\"LIRR-$id\"";
+
+			$line["last_connected"] = make_local_datetime($link, $line["last_connected"], false);
+
+			print "<tr class=\"$class\" $this_row_id>";
+
+			print "<td align='center'><input onclick='toggleSelectRow(this);'
+				type=\"checkbox\" id=\"LICHK-$id\"></td>";
+
+			$onclick = "onclick='editInstance($id, event)' title='".__('Click to edit')."'";
+
+			$access_key = mb_substr($line['access_key'], 0, 4) . '...' .
+				mb_substr($line['access_key'], -4);
+
+			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>" . htmlspecialchars($line['num_feeds']) . "</td>";
+
+			print "</tr>";
+
+			++$lnum;
+		}
+
+		print "</table>";
+
+		print "</div>"; #pane
+		print "</div>"; #container
+
+	}
+?>