changed the preg_split to explode per fox. fixed the template to

[tt-rss.git] / plugins / mail / init.php

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 7adf36fe4540121c75f5c2cb3f375185d7d08f3d..5b61c2355517c6ab4e0fb9d8d3dae02fba0673f2 100644 (file)
--- 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 "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"sendEmail\">";
 
-               $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, note 
                        FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
                        id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
@@ -70,6 +70,11 @@ class Mail extends Plugin {
                                $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
 
                        $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+                       $tnote = strip_tags($line["note"]);
+                       if( $tnote != ''){
+                               $tpl->setVariable('ARTICLE_NOTE', $tnote, true);
+                               $tpl->addBlock('note');
+                       }
                        $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
 
                        $tpl->addBlock('article');
@@ -136,7 +141,10 @@ class Mail extends Plugin {
 
                $mail->From = strip_tags($_REQUEST['from_email']);
                $mail->FromName = strip_tags($_REQUEST['from_name']);
-               $mail->AddAddress($_REQUEST['destination']);
+               //$mail->AddAddress($_REQUEST['destination']);
+               $addresses = explode(';', $_REQUEST['destination']);
+               foreach($addresses as $nextaddr)
+                       $mail->AddAddress($nextaddr);
 
                $mail->IsHTML(false);
                $mail->Subject = $_REQUEST['subject'];
@@ -147,7 +155,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 +163,7 @@ class Mail extends Plugin {
        }
 
        function completeEmails() {
-               $search = db_escape_string( $_REQUEST["search"]);
+               $search = db_escape_string($_REQUEST["search"]);
 
                print "<ul>";
 
@@ -168,6 +176,9 @@ class Mail extends Plugin {
                print "</ul>";
        }
 
+       function api_version() {
+               return 2;
+       }
 
 }
 ?>