From 8801fb017ccd6e2c052ab449eed3ee1eb5b7e982 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 8 Nov 2010 13:11:56 +0300
Subject: replace old-style published feed with universal secretkey-based
 approach used for all feeds; do not allow user/pass handling in generated
 feed urls; bump schema

---
 modules/popup-dialog.php | 60 ++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

(limited to 'modules/popup-dialog.php')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 54f4a3e61..61efd4c99 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -158,33 +158,6 @@
 			return;
 		}
 
-		if ($id == "pubUrl") {
-
-			print "<div id=\"infoBoxTitle\">".__('Published Articles')."</div>";
-			print "<div class=\"infoBoxContents\">";
-	
-			$url_path = article_publish_url($link);
-
-			print __("Your Published articles feed URL is:");
-
-			print "<div class=\"tagCloudContainer\">";
-			print "<a id='pub_feed_url' href='$url_path' target='_blank'>$url_path</a>";
-			print "</div>";
-
-			print "<div align='center'>";
-
-			print "<button onclick=\"return pubRegenKey()\">".
-				__('Generate new URL')."</button> ";
-
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Close this window')."\">";
-
-			print "</div></div>";
-
-			return;
-		}
-
 		if ($id == "pubOPMLUrl") {
 
 			print "<div id=\"infoBoxTitle\">".__('Public OPML URL')."</div>";
@@ -777,6 +750,39 @@
 			return;
 		}
 
+		if ($id == "generatedFeed") {
+
+			print "<div id=\"infoBoxTitle\">".__('View as RSS')."</div>";
+			print "<div class=\"infoBoxContents\">";
+	
+			$params = explode(":", $param, 3);
+			$feed_id = db_escape_string($params[0]);
+			$is_cat = (bool) $params[1];
+
+			$key = get_feed_access_key($link, $feed_id, $is_cat);
+
+			$url_path = htmlspecialchars($params[2]) . "&key=" . $key;
+
+			print __("You can view this feed as RSS using the following URL:");
+
+			print "<div class=\"tagCloudContainer\">";
+			print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+			print "</div>";
+
+			print "<div align='center'>";
+
+			print "<button onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
+				__('Generate new URL')."</button> ";
+
+			print "<input class=\"button\"
+				type=\"submit\" onclick=\"return closeInfoBox()\" 
+				value=\"".__('Close this window')."\">";
+
+			print "</div></div>";
+
+			return;
+		}
+
 		print "<div id='infoBoxTitle'>Internal Error</div>
 			<div id='infoBoxContents'>
 			<p>Unknown dialog <b>$id</b></p>
-- 
cgit v1.2.3