mail, mailto: cleanup markup

1 files changed, 15 insertions, 18 deletions

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 4b858eae6..c34b400ce 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -16,7 +16,7 @@ class MailTo extends Plugin {
 	}
 
 	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
-		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email')."</div>";
+		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email (mailto:)')."</div>";
 	}
 
 	function get_js() {
@@ -26,7 +26,7 @@ class MailTo extends Plugin {
 	function hook_article_button($line) {
 		return "<i class='material-icons' style=\"cursor : pointer\"
 					onclick=\"Plugins.Mailto.send(".$line["id"].")\"
-					title='".__('Forward by email')."'>mail_outline</i>";
+					title='".__('Forward by email (mailto:)')."'>mail_outline</i>";
 	}
 
 	function emailArticle() {
@@ -42,7 +42,6 @@ class MailTo extends Plugin {
 		//$tpl->setVariable('USER_EMAIL', $user_email, true);
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-
 		$sth = $this->pdo->prepare("SELECT DISTINCT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($ids_qmarks) AND owner_uid = ?");
@@ -70,25 +69,23 @@ class MailTo extends Plugin {
 		$content = "";
 		$tpl->generateOutputToString($content);
 
-		$mailto_link = htmlspecialchars("mailto:?subject=".rawurlencode($subject).
-			"&body=".rawurlencode($content));
-
-		print __("Clicking the following link to invoke your mail client:");
-
-		print "<div class='panel text-center'>";
-		print "<a target=\"_blank\" href=\"$mailto_link\">".
-			__("Forward selected article(s) by email.")."</a>";
-		print "</div>";
+		$mailto_link = "mailto:?subject=".rawurlencode($subject)."&body=".rawurlencode($content);
 
-		print __("You should be able to edit the message before sending in your mail client.");
+		?>
 
-		print "<p>";
+		<section>
+			<div class='panel text-center'>
+				<a target="_blank" href="<?= htmlspecialchars($mailto_link) ?>">
+					<?= __("Click to open your mail client") ?>
+				</a>
+			</div>
+		</section>
 
-		print "<footer class='text-center'>";
-		print \Controls\submit_tag(__('Close this dialog'));
-		print "</footer>";
+		<footer class='text-center'>
+			<?= \Controls\submit_tag(__('Close this dialog')) ?>
+		</footer>
 
-		//return;
+		<?php
 	}
 
 	function api_version() {