X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Fmail%2Finit.php;h=12e591c54b8f11657039988bea23cb73a4c2a705;hb=2d3ff643609a6767ca0d47cd3a38a3832350be72;hp=a7efcf273ea9d62d8b8b7bdcbb2922df8153f0bc;hpb=991418fa566ff462d9616123168c5f7f839cdc15;p=tt-rss.git

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index a7efcf27..12e591c5 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -13,12 +13,61 @@ class Mail extends Plugin {
 		$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 "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Mail plugin')."\">";
+
+		print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
+
+		print "<form dojoType=\"dijit.form.Form\">";
+
+		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+			evt.preventDefault();
+			if (this.validate()) {
+				console.log(dojo.objectToQuery(this.getValues()));
+				new Ajax.Request('backend.php', {
+					parameters: dojo.objectToQuery(this.getValues()),
+					onComplete: function(transport) {
+						notify_info(transport.responseText);
+					}
+				});
+				//this.reset();
+			}
+			</script>";
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
+
+			$addresslist = $this->host->get($this, "addresslist");
+
+			print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
+				name='addresslist'>$addresslist</textarea>";
+
+			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+				__("Save")."</button>";
+
+			print "</form>";
+
+		print "</div>";
+	}
+
 	function hook_article_button($line) {
 		return "<img src=\"plugins/mail/mail.png\"
 					class='tagsPic' style=\"cursor : pointer\"
@@ -48,7 +97,6 @@ class Mail extends Plugin {
 		require_once "lib/MiniTemplator.class.php";
 
 		$tpl = new MiniTemplator;
-		$tpl_t = new MiniTemplator;
 
 		$tpl->readTemplateFromFile("templates/email_article_template.txt");
 
@@ -56,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("SELECT link, content, title, note 
+		$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"]);
 
@@ -70,8 +118,12 @@ 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->setVariable('ARTICLE_NOTE', strip_tags($line["note"]));
 
 			$tpl->addBlock('article');
 		}
@@ -92,16 +144,20 @@ class Mail extends Plugin {
 
 		print "</td></tr><tr><td>";
 
+		$addresslist = explode(",", $this->host->get($this, "addresslist"));
+
 		print __('To:');
 
 		print "</td><td>";
 
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+/*		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
 				style=\"width : 30em;\"
-				name=\"destination\" id=\"emailArticleDlg_destination\">";
+				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
 
-		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-				style=\"z-index: 30; display : none\"></div>";
+		print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.FilteringSelect"');
+
+/*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
+	style=\"z-index: 30; display : none\"></div>"; */
 
 		print "</td></tr><tr><td>";
 
@@ -138,7 +194,7 @@ class Mail extends Plugin {
 		$mail->From = strip_tags($_REQUEST['from_email']);
 		$mail->FromName = strip_tags($_REQUEST['from_name']);
 		//$mail->AddAddress($_REQUEST['destination']);
-		$addresses = preg_split('/;/', $_REQUEST['destination'],-1,PREG_SPLIT_NO_EMPTY);
+		$addresses = explode(';', $_REQUEST['destination']);
 		foreach($addresses as $nextaddr)
 			$mail->AddAddress($nextaddr);
 
@@ -151,14 +207,14 @@ 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";
 		}
 
 		print json_encode($reply);
 	}
 
-	function completeEmails() {
+	/* function completeEmails() {
 		$search = db_escape_string($_REQUEST["search"]);
 
 		print "<ul>";
@@ -170,7 +226,7 @@ class Mail extends Plugin {
 		}
 
 		print "</ul>";
-	}
+	} */
 
 	function api_version() {
 		return 2;