fix OPML publishing (2)

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 844afaddf4342ad23498c412a08693813591ff58..cd1bcb84bdf46e070f43a9deaf6316144a477d07 100644 (file)
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -467,7 +467,7 @@
                if ($subop == "regenOPMLKey") {
 
                        print "<rpc-reply>";
-                       set_pref($link, " _PREFS_PUBLISH_KEY", 
+                       set_pref($link, "_PREFS_PUBLISH_KEY", 
                                sha1(uniqid(rand(), true)), $_SESSION["uid"]);
                        $new_link = opml_publish_url($link);            
                        print "<link><![CDATA[$new_link]]></link>";

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 4c8c92b5435b7f90b152c1b5bcf9da03534ac5e2..77cf46edeac33c3dda4b3b7d077eca50133ab20a 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -162,7 +162,11 @@
 
                        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:");

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 30046ddb9a67753e97681b9fb41736962d858854..68fb7717262222a083925842b238c66f5de12ba6 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1446,11 +1446,6 @@
                print "<button onclick=\"gotoExportOpml()\">".
                        __('Export OPML')."</button>";
 
-               if (!get_pref($link, "_PREFS_OPML_PUBLISH_KEY")){
-                       set_pref($link, "_PREFS_OPML_PUBLISH_KEY", 
-                               sha1(uniqid(rand(), true)));
-               }
-
                print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
 
                print "<div class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") .                  "</div>" . "</p>";