X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-invoice.cgi;h=b24e0420f435540ff9155e415af3b70c2c151fda;hp=7ab1613eed9009b7172940cfa2fe00e04d6e4a72;hb=949a80c148a8bbeeeec54c5a0be5d73b292423a5;hpb=f4ffa3596c3b8bfc9e862c2a7e8efc68f86207ab

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index 7ab1613ee..b24e0420f 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -1,23 +1,19 @@
-<%
+<% $cgi->redirect("${p}view/cust_main.cgi?$custnum") %>
+<%init>
 
-my $conf = new FS::Conf;
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Resend invoices');
 
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $template = $2;
+my $invnum = $3;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-my $error = send_email(
-  'from'    => $conf->config('invoice_from'),
-  'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
-  'subject' => 'Invoice',
-  'body'    => [ $cust_bill->print_text ],
-);
-eidiot($error) if $error;
+$cust_bill->email({ 'template' => $template }); 
 
 my $custnum = $cust_bill->getfield('custnum');
-print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
 
-%>
+</%init>