From 1f2a7219054872d3cf968ac385a5f529db4a4333 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 13 Mar 2020 14:40:35 +0300
Subject: allow overriding built-in templates via templates.local

---
 plugins/af_comics/filters/af_comics_gocomics.php         |  4 +---
 plugins/af_comics/filters/af_comics_gocomics_farside.php |  3 +--
 plugins/auth_internal/init.php                           |  6 ++----
 plugins/mail/init.php                                    | 14 +++++++++-----
 plugins/mailto/init.php                                  |  6 ++----
 5 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_comics/filters/af_comics_gocomics.php b/plugins/af_comics/filters/af_comics_gocomics.php
index 791dc07d3..2cb49b9bc 100644
--- a/plugins/af_comics/filters/af_comics_gocomics.php
+++ b/plugins/af_comics/filters/af_comics_gocomics.php
@@ -31,13 +31,11 @@ class Af_Comics_Gocomics extends Af_ComicFilter {
 
 			$body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
 
-			require_once 'lib/MiniTemplator.class.php';
-
 			$feed_title = htmlspecialchars($comic[1]);
 			$site_url = htmlspecialchars($site_url);
 			$article_link = htmlspecialchars($article_link);
 
-			$tpl = new MiniTemplator();
+			$tpl = new Templator();
 
 			$tpl->readTemplateFromFile('templates/generated_feed.txt');
 
diff --git a/plugins/af_comics/filters/af_comics_gocomics_farside.php b/plugins/af_comics/filters/af_comics_gocomics_farside.php
index 783907e17..71c5e0059 100644
--- a/plugins/af_comics/filters/af_comics_gocomics_farside.php
+++ b/plugins/af_comics/filters/af_comics_gocomics_farside.php
@@ -25,11 +25,10 @@ class Af_Comics_Gocomics_FarSide extends Af_ComicFilter {
 
 	public function on_fetch($url) {
 		if (preg_match("#^https?://www\.thefarside\.com#", $url)) {
-			require_once 'lib/MiniTemplator.class.php';
 
 			$article_link = htmlspecialchars("https://www.thefarside.com" . date('/Y/m/d'));
 
-			$tpl = new MiniTemplator();
+			$tpl = new Templator();
 
 			$tpl->readTemplateFromFile('templates/generated_feed.txt');
 
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index 8dbc37fb3..ad32d29b9 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -235,11 +235,9 @@ class Auth_Internal extends Plugin implements IAuthModule {
 			if ($row = $sth->fetch()) {
 				$mailer = new Mailer();
 
-				require_once "lib/MiniTemplator.class.php";
+				$tpl = new Templator();
 
-				$tpl = new MiniTemplator;
-
-				$tpl->readTemplateFromFile("templates/password_change_template.txt");
+				$tpl->readTemplateFromFile("password_change_template.txt");
 
 				$tpl->setVariable('LOGIN', $row["login"]);
 				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index e85053566..40d147fc9 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -92,18 +92,20 @@ class Mail extends Plugin {
 		if ($row = $sth->fetch()) {
 			$user_email = htmlspecialchars($row['email']);
 			$user_name = htmlspecialchars($row['full_name']);
+		} else {
+			$user_name = "";
+			$user_email = "";
 		}
 
-		if (!$user_name) $user_name = $_SESSION['name'];
+		if (!$user_name)
+			$user_name = $_SESSION['name'];
 
 		print_hidden("from_email", "$user_email");
 		print_hidden("from_name", "$user_name");
 
-		require_once "lib/MiniTemplator.class.php";
-
-		$tpl = new MiniTemplator;
+		$tpl = new Templator();
 
-		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+		$tpl->readTemplateFromFile("email_article_template.txt");
 
 		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
 		$tpl->setVariable('USER_EMAIL', $user_email, true);
@@ -116,6 +118,8 @@ class Mail extends Plugin {
 
 		if (count($ids) > 1) {
 			$subject = __("[Forwarded]") . " " . __("Multiple articles");
+		} else {
+			$subject = "";
 		}
 
 		while ($line = $sth->fetch()) {
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 421d5fd59..390984b71 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -29,11 +29,9 @@ class MailTo extends Plugin {
 		$ids = explode(",", $_REQUEST['param']);
 		$ids_qmarks = arr_qmarks($ids);
 
-		require_once "lib/MiniTemplator.class.php";
+		$tpl = new Templator();
 
-		$tpl = new MiniTemplator;
-
-		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+		$tpl->readTemplateFromFile("email_article_template.txt");
 
 		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
 		//$tpl->setVariable('USER_EMAIL', $user_email, true);
-- 
cgit v1.2.3