Extend OPML preferences pane, to provide more control of Export OPML

    User is prompted for filename, and also whether to include settings.
    Default filename is: TinyTinyRSS.opml

    modules/pref-feeds.php
        Prompt for output OPML filename (Default: TinyTinyRSS.opml )
    opml.php
        Modify to support passing in name=<filename>&settings=[0|1]
    functions.js
        Modify to support passing in name=<filename>&settings=[0|1]

1 files changed, 10 insertions, 4 deletions

diff --git a/opml.php b/opml.php
index 2e1eb84c6..991f93e0c 100644
--- a/opml.php
+++ b/opml.php
@@ -10,12 +10,14 @@
 
 	init_connection($link);
 
-	function opml_export($link, $owner_uid, $hide_private_feeds=false, $include_settings=true) {
+	function opml_export($link, $name, $owner_uid, $hide_private_feeds=false, $include_settings=true) {
 		if (!$_REQUEST["debug"]) {
 			header("Content-type: application/xml+opml");
 		} else {
 			header("Content-type: text/xml");
 		}
+        header("Content-Disposition: attachment; filename=" . $name );
+
 		print "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 
 		print "<opml version=\"1.0\">";
@@ -119,14 +121,18 @@
 	// FIXME there are some brackets issues here
 
 	$op = $_REQUEST["op"];
+    if (!$op) $op = "Export";
+
+    $output_name = $_REQUEST["filename"];
+	if (!$output_name) $output_name = "TinyTinyRSS.opml";
 
-	if (!$op) $op = "Export";
+    $show_settings = $_REQUEST["settings"];
 
 	if ($op == "Export") {
 
 		login_sequence($link);
 		$owner_uid = $_SESSION["uid"];
-		return opml_export($link, $owner_uid);
+		return opml_export($link, $output_name, $owner_uid, false, ($show_settings == 1));
 	}
 
 	if ($op == "publish"){
@@ -138,7 +144,7 @@
 
 		if (db_num_rows($result) == 1) {
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
-			return opml_export($link, $owner_uid, true, false);
+			return opml_export($link, "", $owner_uid, true, false);
 		} else {
 			print "<error>User not found</error>";
 		}