From ea4e11032a649596ab10006a384189445754a226 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Apr 2013 16:36:05 +0400 Subject: mail plugin: fix blank From: header --- plugins/mail/init.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'plugins/mail') diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 40da8720c..574dc1ef3 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -44,8 +44,8 @@ class Mail extends Plugin { if (!$user_name) $user_name = $_SESSION['name']; - $_SESSION['email_replyto'] = $user_email; - $_SESSION['email_fromname'] = $user_name; + print ""; + print ""; require_once "lib/MiniTemplator.class.php"; @@ -134,15 +134,10 @@ class Mail extends Plugin { $reply = array(); - $_SESSION['email_secretkey'] = ''; - - $replyto = strip_tags($_SESSION['email_replyto']); - $fromname = strip_tags($_SESSION['email_fromname']); - $mail = new ttrssMailer(); - $mail->From = $replyto; - $mail->FromName = $fromname; + $mail->From = strip_tags($_REQUEST['from_email']); + $mail->FromName = strip_tags($_REQUEST['from_name']); $mail->AddAddress($_REQUEST['destination']); $mail->IsHTML(false); -- cgit v1.2.3 From 4f032700dbfbbfa35798e05497c8a868eb73476f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Apr 2013 16:50:22 +0400 Subject: ttrssMailer: actually use OOP properly --- plugins/mail/mail.js | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/mail') diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js index 39f753cc0..6166f01c1 100644 --- a/plugins/mail/mail.js +++ b/plugins/mail/mail.js @@ -26,6 +26,7 @@ function emailArticle(id) { new Ajax.Request("backend.php", { parameters: dojo.objectToQuery(this.attr('value')), onComplete: function(transport) { + console.log(transport.responseText); var reply = JSON.parse(transport.responseText); -- cgit v1.2.3 From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 16:23:15 +0400 Subject: remove $link --- plugins/mail/init.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'plugins/mail') diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 574dc1ef3..7adf36fe4 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -1,7 +1,6 @@ link = $host->get_link(); $this->host = $host; $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); @@ -30,13 +28,13 @@ class Mail extends Plugin { function emailArticle() { - $param = db_escape_string($this->link, $_REQUEST['param']); + $param = db_escape_string( $_REQUEST['param']); print ""; print ""; print ""; - $result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE + $result = db_query( "SELECT email, full_name FROM ttrss_users WHERE id = " . $_SESSION["uid"]); $user_email = htmlspecialchars(db_fetch_result($result, 0, "email")); @@ -58,7 +56,7 @@ class Mail extends Plugin { $tpl->setVariable('USER_EMAIL', $user_email, true); $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"]); @@ -149,7 +147,7 @@ class Mail extends Plugin { if (!$rc) { $reply['error'] = $mail->ErrorInfo; } else { - save_email_address($this->link, db_escape_string($this->link, $destination)); + save_email_address( db_escape_string($destination)); $reply['message'] = "UPDATE_COUNTERS"; } @@ -157,7 +155,7 @@ class Mail extends Plugin { } function completeEmails() { - $search = db_escape_string($this->link, $_REQUEST["search"]); + $search = db_escape_string( $_REQUEST["search"]); print "
    "; -- cgit v1.2.3 From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 18:34:18 +0400 Subject: fix blank character after opening bracket in function calls --- plugins/mail/init.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/mail') diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 7adf36fe4..2897068aa 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -28,13 +28,13 @@ class Mail extends Plugin { function emailArticle() { - $param = db_escape_string( $_REQUEST['param']); + $param = db_escape_string($_REQUEST['param']); print ""; print ""; print ""; - $result = db_query( "SELECT email, full_name FROM ttrss_users WHERE + $result = db_query("SELECT email, full_name FROM ttrss_users WHERE id = " . $_SESSION["uid"]); $user_email = htmlspecialchars(db_fetch_result($result, 0, "email")); @@ -56,7 +56,7 @@ class Mail extends Plugin { $tpl->setVariable('USER_EMAIL', $user_email, true); $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"]); @@ -147,7 +147,7 @@ class Mail extends Plugin { if (!$rc) { $reply['error'] = $mail->ErrorInfo; } else { - save_email_address( db_escape_string($destination)); + save_email_address(db_escape_string($destination)); $reply['message'] = "UPDATE_COUNTERS"; } @@ -155,7 +155,7 @@ class Mail extends Plugin { } function completeEmails() { - $search = db_escape_string( $_REQUEST["search"]); + $search = db_escape_string($_REQUEST["search"]); print "
      "; -- cgit v1.2.3 From 106a3de91c7c8c6c275323152de414253f01127a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Apr 2013 17:31:56 +0400 Subject: plugins: bump API version --- plugins/mail/init.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugins/mail') diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 2897068aa..80bc7d417 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -168,6 +168,9 @@ class Mail extends Plugin { print "
    "; } + function api_version() { + return 2; + } } ?> -- cgit v1.2.3