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

---
 modules/backend-rpc.php  | 6 ++++--
 modules/popup-dialog.php | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index cd1bcb84b..7ccb30692 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -467,8 +467,10 @@
 		if ($subop == "regenOPMLKey") {
 
 			print "<rpc-reply>";
-			set_pref($link, "_PREFS_PUBLISH_KEY", 
-				sha1(uniqid(rand(), true)), $_SESSION["uid"]);
+
+			update_feed_access_key($link, 'OPML:Publish', 
+				false, $_SESSION["uid"]);
+
 			$new_link = opml_publish_url($link);		
 			print "<link><![CDATA[$new_link]]></link>";
 			print "</rpc-reply>";
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 77cf46ede..d68bd1db7 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -163,10 +163,6 @@
 			print "<div id=\"infoBoxTitle\">".__('Public OPML URL')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
-			if (!get_pref($link, "_PREFS_PUBLISH_KEY"))
-				set_pref($link, "_PREFS_PUBLISH_KEY", 
-					sha1(uniqid(rand(), true)));
-
 			$url_path = opml_publish_url($link);
 
 			print __("Your Public OPML URL is:");
-- 
cgit v1.2.3-54-g00ecf