X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Fmail%2Finit.php;h=b2d73d4ebbd35509006e821d6fe4f199f3828366;hb=3e0f2090bfe90756b6a0a8f803ec5c407b50c41e;hp=49de96afd16e299bda3fc1729ce26ae94469a9b3;hpb=e8133ac1cb618545c55b8405faef5f43a5feb636;p=tt-rss.git
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 49de96af..b2d73d4e 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);
+ $host->add_hook($host::HOOK_PREFS_TAB, $this);
}
function get_js() {
return file_get_contents(dirname(__FILE__) . "/mail.js");
}
+ function save() {
+ $addresslist = db_escape_string($_POST["addresslist"]);
+
+ $this->host->set($this, "addresslist", $addresslist);
+
+ echo __("Mail addresses saved.");
+ }
+
+ function hook_prefs_tab($args) {
+ if ($args != "prefPrefs") return;
+
+ print "
";
+
+ print "
" . __("You can set predefined email addressed here (comma-separated list):") . "
";
+
+ print "
";
+
+ print "
";
+ }
+
function hook_article_button($line) {
return "link, $_REQUEST['param']);
-
- $secretkey = sha1(uniqid(rand(), true));
-
- $_SESSION['email_secretkey'] = $secretkey;
+ $param = db_escape_string($_REQUEST['param']);
- print "";
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"));
@@ -49,13 +91,12 @@ 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";
$tpl = new MiniTemplator;
- $tpl_t = new MiniTemplator;
$tpl->readTemplateFromFile("templates/email_article_template.txt");
@@ -63,7 +104,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 DISTINCT link, content, title, note
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
@@ -77,6 +118,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');
@@ -98,16 +144,20 @@ class Mail extends Plugin {
print "";
+ $addresslist = explode(",", $this->host->get($this, "addresslist"));
+
print __('To:');
print " | ";
- print "";
+ name=\"destination\" id=\"emailArticleDlg_destination\">"; */
+
+ print_select("destination", "", $addresslist, 'dojoType="dijit.form.FilteringSelect"');
- print "";
+/* print ""; */
print " |
";
@@ -135,48 +185,37 @@ class Mail extends Plugin {
}
function sendEmail() {
- $secretkey = $_REQUEST['secretkey'];
-
require_once 'classes/ttrssmailer.php';
$reply = array();
- if ($_SESSION['email_secretkey'] &&
- $secretkey == $_SESSION['email_secretkey']) {
-
- $_SESSION['email_secretkey'] = '';
-
- $replyto = strip_tags($_SESSION['email_replyto']);
- $fromname = strip_tags($_SESSION['email_fromname']);
-
- $mail = new ttrssMailer();
+ $mail = new ttrssMailer();
- $mail->From = $replyto;
- $mail->FromName = $fromname;
- $mail->AddAddress($_REQUEST['destination']);
+ $mail->From = strip_tags($_REQUEST['from_email']);
+ $mail->FromName = strip_tags($_REQUEST['from_name']);
+ //$mail->AddAddress($_REQUEST['destination']);
+ $addresses = explode(';', $_REQUEST['destination']);
+ foreach($addresses as $nextaddr)
+ $mail->AddAddress($nextaddr);
- $mail->IsHTML(false);
- $mail->Subject = $_REQUEST['subject'];
- $mail->Body = $_REQUEST['content'];
+ $mail->IsHTML(false);
+ $mail->Subject = $_REQUEST['subject'];
+ $mail->Body = $_REQUEST['content'];
- $rc = $mail->Send();
-
- if (!$rc) {
- $reply['error'] = $mail->ErrorInfo;
- } else {
- save_email_address($this->link, db_escape_string($this->link, $destination));
- $reply['message'] = "UPDATE_COUNTERS";
- }
+ $rc = $mail->Send();
+ if (!$rc) {
+ $reply['error'] = $mail->ErrorInfo;
} else {
- $reply['error'] = "Not authorized.";
+ //save_email_address(db_escape_string($destination));
+ $reply['message'] = "UPDATE_COUNTERS";
}
print json_encode($reply);
}
- function completeEmails() {
- $search = db_escape_string($this->link, $_REQUEST["search"]);
+ /* function completeEmails() {
+ $search = db_escape_string($_REQUEST["search"]);
print "";
@@ -187,8 +226,11 @@ class Mail extends Plugin {
}
print " ";
- }
+ } */
+ function api_version() {
+ return 2;
+ }
}
?>
|