From 2e7f046f65bd6d3a9417484bc4d6c9855cf39f7e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 8 Nov 2010 19:36:24 +0300
Subject: make published OPML use common secret key code

---
 opml.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'opml.php')

diff --git a/opml.php b/opml.php
index 35e36d24a..98f4a95aa 100644
--- a/opml.php
+++ b/opml.php
@@ -134,15 +134,13 @@
 	if ($op == "publish"){
 		$key = db_escape_string($_REQUEST["key"]);
 
-		$result = db_query($link, "SELECT login, owner_uid 
-				FROM ttrss_user_prefs, ttrss_users WHERE
-				pref_name = '_PREFS_PUBLISH_KEY' AND 
-				value = '$key' AND 
-				ttrss_users.id = owner_uid");
+		$result = db_query($link, "SELECT owner_uid
+				FROM ttrss_access_keys WHERE
+				access_key = '$key' AND feed_id = 'OPML:Publish'");
 
 		if (db_num_rows($result) == 1) {
-			$owner = db_fetch_result($result, 0, "owner_uid");
-			return opml_export($link, $owner, true, false);
+			$owner_uid = db_fetch_result($result, 0, "owner_uid");
+			return opml_export($link, $owner_uid, true, false);
 		} else {
 			print "<error>User not found</error>";
 		}
-- 
cgit v1.2.3-54-g00ecf