From 8131e83c4676d28b3930a4a2d0160b2f46cc3d33 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 10 Apr 2013 22:48:09 +0400
Subject: mailto: use rawurlencode

---
 plugins/mailto/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mailto')

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index e140bbea7..6c7478b68 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -68,8 +68,8 @@ class MailTo extends Plugin {
 		$content = "";
 		$tpl->generateOutputToString($content);
 
-		$mailto_link = htmlspecialchars("mailto: ?subject=".urlencode($subject).
-			"&body=".urlencode($content));
+		$mailto_link = htmlspecialchars("mailto: ?subject=".rawurlencode($subject).
+			"&body=".rawurlencode($content));
 
 		print __("Clicking the following link to invoke your mail client:");
 
-- 
cgit v1.2.3


From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:23:15 +0400
Subject: remove $link

---
 plugins/mailto/init.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'plugins/mailto')

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 6c7478b68..81b2758b8 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -1,7 +1,5 @@
 <?php
 class MailTo extends Plugin {
-
-	private $link;
 	private $host;
 
 	function about() {
@@ -11,7 +9,6 @@ class MailTo extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
@@ -30,7 +27,7 @@ class MailTo extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -44,7 +41,7 @@ class MailTo extends Plugin {
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 
-		$result = db_query($this->link, "SELECT link, content, title
+		$result = db_query( "SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
-- 
cgit v1.2.3


From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 18:34:18 +0400
Subject: fix blank character after opening bracket in function calls

---
 plugins/mailto/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mailto')

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 81b2758b8..c786cf0dc 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -27,7 +27,7 @@ class MailTo extends Plugin {
 
 	function emailArticle() {
 
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
 		require_once "lib/MiniTemplator.class.php";
 
@@ -41,7 +41,7 @@ class MailTo extends Plugin {
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 
-		$result = db_query( "SELECT link, content, title
+		$result = db_query("SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
-- 
cgit v1.2.3


From 106a3de91c7c8c6c275323152de414253f01127a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 17:31:56 +0400
Subject: plugins: bump API version

---
 plugins/mailto/init.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'plugins/mailto')

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index c786cf0dc..aa6d173f8 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -86,5 +86,9 @@ class MailTo extends Plugin {
 		//return;
 	}
 
+	function api_version() {
+		return 2;
+	}
+
 }
 ?>
-- 
cgit v1.2.3