move published OPML endpoint to public.php

4 files changed, 31 insertions, 16 deletions

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 8076bb303..b0ce2306d 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -737,6 +737,27 @@ class Handler_Public extends Handler {
 		<?php
 	}
 
+	function publishOpml() {
+		$key = clean($_REQUEST["key"]);
+		$pdo = Db::pdo();
+
+		$sth = $pdo->prepare( "SELECT owner_uid
+				FROM ttrss_access_keys WHERE
+				access_key = ? AND feed_id = 'OPML:Publish'");
+		$sth->execute([$key]);
+
+		if ($row = $sth->fetch()) {
+			$owner_uid = $row['owner_uid'];
+
+			$opml = new OPML($_REQUEST);
+			$opml->opml_export("published.opml", $owner_uid, true, false);
+
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+			echo "File not found.";
+		}
+	}
+
 	function cached() {
 		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
 
diff --git a/classes/opml.php b/classes/opml.php
index 78ddb2842..04d287125 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -634,13 +634,10 @@ class OPML extends Handler_Protected {
 		print "$msg<br/>";
 	}
 
-	static function opml_publish_url(){
-
-		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
+	static function get_publish_url(){
+		return get_self_url_prefix() .
+			"/public.php?op=publishOpml&key=" .
 			Feeds::_get_access_key('OPML:Publish', false, $_SESSION["uid"]);
-
-		return $url_path;
 	}
 
 	function get_feed_category($feed_cat, $parent_cat_id = false) {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index cf9e7c95e..8d3f84a03 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1329,14 +1329,14 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function getOPMLKey() {
-		print json_encode(["link" => OPML::opml_publish_url()]);
+		print json_encode(["link" => OPML::get_publish_url()]);
 	}
 
 	function regenOPMLKey() {
 		$this->update_feed_access_key('OPML:Publish',
 			false, $_SESSION["uid"]);
 
-		print json_encode(["link" => OPML::opml_publish_url()]);
+		print json_encode(["link" => OPML::get_publish_url()]);
 	}
 
 	function regenFeedKey() {
diff --git a/classes/rpc.php b/classes/rpc.php
index 20a11b994..95fd0f5ae 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -656,12 +656,10 @@ class RPC extends Handler_Protected {
 		<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>
 		<?php
 
-		$cur_section = "";
 		foreach ($info as $section => $hotkeys) {
-
-			if ($cur_section) print "<li>&nbsp;</li>";
-			print "<li><h3>" . $section . "</h3></li>";
-			$cur_section = $section;
+			?>
+			<li><h3><?= $section ?></h3></li>
+			<?php
 
 			foreach ($hotkeys as $action => $description) {
 
@@ -705,9 +703,8 @@ class RPC extends Handler_Protected {
 				}
 			}
 		}
-		print "</ul>";
-
-	?>
+		?>
+		</ul>
 	<footer class='text-center'>
 		<?= \Controls\submit_tag(__('Close this window')) ?>
 	</footer>