[Debian-l10n-commits] [ddtp] 01/07: Don't use Mail::Sender as it is non-free. MIME::Entity can do the job also.

[Martijn van Oosterhout]

This is an automated email from the git hooks/post-receive script.

kleptog-guest pushed a commit to branch master
in repository ddtp.

commit 05d8e0bc8e9884cf385bd0d866c04c5c515cbed1
Author: Martijn van Oosterhout <kleptog at svana.org>
Date:   Sat Sep 14 12:26:15 2013 +0000

    Don't use Mail::Sender as it is non-free. MIME::Entity can do the job also.
---
 ddtss/DDTSS_Pg.pm | 26 --------------------------
 ddtss/ddtss-cgi   | 30 ++++++++++++++++++++----------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/ddtss/DDTSS_Pg.pm b/ddtss/DDTSS_Pg.pm
index bbfd8b5..4b71f6b 100644
--- a/ddtss/DDTSS_Pg.pm
+++ b/ddtss/DDTSS_Pg.pm
@@ -4,7 +4,6 @@ use POSIX qw(strftime);
 use Pg_BDB;
 use Data::Dumper;
 use Text::Iconv;
-use Mail::Sender;
 use Algorithm::Diff::XS qw(compact_diff);
 
 use ddts_lib;
@@ -963,31 +962,6 @@ sub process_data
   DDTSS_Log( $db, "$lang/packages/$package/log", time()." processed from todo" );
 }
 
-# Setup Mail::Sender object
-# No longer used for the sending/receiving of data, but it is used for sending verification emails for accounts
-sub setup_email_connection
-{
-  my $db = shift;
-  my ($from,$to,$mailserver,$emaildebug);
-  $db->get("config/clientemail",$from);
-  $db->get("config/serveremail",$to);
-  $db->get("config/mailserver",$mailserver);
-  $db->get("config/debugemail",$emaildebug);
-  
-  if( not defined $mailserver )
-  { $mailserver = "127.0.0.1" }
-  
-  my $sender = new Mail::Sender { smtp => $mailserver, 
-                                 from => $from, 
-                                 to => $to, 
-#                                 to => "<ddtss\@kleptog.org>", 
-                                 subject => 'nothing', 
-                                 on_errors => 'die',
-                                 (defined $emaildebug ? (bcc => $emaildebug) : ()) };
-                               
-  return $sender;
-}
-
 sub DDTSS_Get_commonpackages
 {
   #my $db = shift;
diff --git a/ddtss/ddtss-cgi b/ddtss/ddtss-cgi
index 492aae0..3e9ad80 100755
--- a/ddtss/ddtss-cgi
+++ b/ddtss/ddtss-cgi
@@ -7,6 +7,7 @@ use lib '/org/ddtp.debian.net/ddtss';
 use DDTSS_Pg;
 use LWP::Simple;
 #use Text::Iconv;
+use MIME::Entity;
 use CGI qw/escapeHTML/;
 use Encode;
 use Digest::MD5 qw(md5_hex);
@@ -1881,17 +1882,26 @@ sub display_createlogin
     $db->put( "aliases/$alias/key", $key );
 
     # We want to unlock the database before trying to send the message
-    my $sender = setup_email_connection($db);
-    
+
+    my ($from,$emaildebug);
+    $db->get("config/clientemail",$from);
+    $db->get("config/debugemail",$emaildebug);
+
+    my $email = MIME::Entity->build( Type => 'text/plain',
+                                     From => $from,
+                                     To => $email,
+#                                    To => "<ddtss\@kleptog.org>",
+                                     Subject => 'Confirm DDTSS account',
+                                     (defined $emaildebug ? (Bcc => $emaildebug) : ()),
+                                     Data => "To confirm you account ($alias) on the DDTSS, please follow this link\n".
+                                             "http://$http_host$self/verifylogin?a=$alias&k=$key\n\n".
+                                             "If you did not create an account, please ignore this email.\n".
+                                             "DDTSS (Debian Distributed Translation Server Satelite)\n" );
+
+    $email->send();
+
     DDTSS_Close($db);
-    
-    $sender->MailMsg({to => $email, 
-                      subject => 'Confirm DDTSS account', 
-                      msg => "To confirm you account ($alias) on the DDTSS, please follow this link\n".
-                             "http://$http_host$self/verifylogin?a=$alias&k=$key\n\n".
-                             "If you did not create an account, please ignore this email.\n".
-                             "DDTSS (Debian Distributed Translation Server Satelite)\n"});
-    
+
     goto_main_display("Logon creation succesful, email sent.");
     return;
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/ddtp.git