From 284f718be025325b9b1a0680ee0fd7cdbedcfe43 Mon Sep 17 00:00:00 2001
From: Chris <chris@starforge.co.uk>
Date: Tue, 29 Jan 2013 21:22:55 +0000
Subject: [PATCH] Deprecating the hell out of the email functions.

---
 Webperl/Template.pm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Webperl/Template.pm b/Webperl/Template.pm
index f9b221b..d93aae7 100644
--- a/Webperl/Template.pm
+++ b/Webperl/Template.pm
@@ -120,6 +120,8 @@ package Webperl::Template;
 
 use POSIX qw(strftime);
 use Webperl::Utils qw(path_join superchomp);
+use Carp qw(longmess);
+
 use strict;
 
 our ($errstr, $utfentities, $entities, $ords, @timescales);
@@ -710,6 +712,14 @@ sub build_optionlist {
 # as normal, and prepend an email header using the to and cc fields in the args (bcc
 # is not supported).
 #
+# @deprecated This function should not be used in new code: it is horribly inflexible,
+#             relies heavily on sendmail-based functionality, and is not really part of
+#             the template engine's job anyway. New code should use the facilities
+#             provided by Webperl::Message::Queue - you should send email by calling
+#             Webperl::Message::Queue::queue_message(), using Webperl::Template::load_template()
+#             to load and process the message body before passing it into `queue_message()`
+#             in the `message` argument.
+#
 # @param template The name of the template to load and send.
 # @param args     A reference to a hash containing values to substitute in the template.
 #                 This MUST include 'from', 'to', and 'subject' values!
@@ -720,6 +730,8 @@ sub email_template {
     my $args     = shift;
     my $email;
 
+    print STDERR longmess("Call to deprecated Webperl::Template::email_template()");
+
     # Check we have required fields
     return "No from field specified in email template arguments."    if(!$args -> {"***from***"});
     return "No subject field specified in email template arguments." if(!$args -> {"***subject***"});
@@ -748,12 +760,22 @@ sub email_template {
 # specified email over a pipe to sendmail, sending it to the recipient(s). The
 # email should be complete, including any headers.
 #
+# @deprecated This function should not be used in new code: it is horribly inflexible,
+#             relies heavily on sendmail-based functionality, and is not really part of
+#             the template engine's job anyway. New code should use the facilities
+#             provided by Webperl::Message::Queue - you should send email by calling
+#             Webperl::Message::Queue::queue_message(), using Webperl::Template::load_template()
+#             to load and process the message body before passing it into `queue_message()`
+#             in the `message` argument.
+#
 # @param email The email to send.
 # @return undef if the mail was sent, otherwise an error message is returned.
 sub send_email_sendmail {
     my $self = shift;
     my $email = shift;
 
+    print STDERR longmess("Call to deprecated Webperl::Template::send_email_sendmail()");
+
     open(SENDMAIL, "|".$self -> {"mailcmd"})
         or return "send_email_sendmail: unable to open sendmail pipe: $!";
     print SENDMAIL $email