rt 4.0.23

[freeside.git] / rt / share / html / Ticket / Elements / PreviewScrips

diff --git a/rt/share/html/Ticket/Elements/PreviewScrips b/rt/share/html/Ticket/Elements/PreviewScrips
index 75fbc45..bb51ef3 100755 (executable)
--- a/rt/share/html/Ticket/Elements/PreviewScrips
+++ b/rt/share/html/Ticket/Elements/PreviewScrips
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -52,6 +52,8 @@ $TicketObj => undef
 my $Object = $m->notes("DryRun-".$TicketObj->Id) || $TicketObj->DryRun(%ARGS);
 my %recips = %{ $m->notes("DryRun-Recipients-".$TicketObj->Id) || {} };
 return unless $Object;
+
+my %squelched = ProcessTransactionSquelching( \%ARGS );
 </%init>
 <p>
 <&|/l, RT->Config->Get('WebPath')."/Ticket/ModifyPeople.html?id=".$TicketObj->Id,
@@ -75,7 +77,7 @@ return unless $Object;
               <ul>
 %             for my $addr (@addresses) {
                   <li>
-%                 my $checked = 1;
+%                 my $checked = not $squelched{$addr->address};
 %                 $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => $addr, Type => $type, Checked => \$checked);
 %                 $recips{$addr->address}++;
                   <b><%loc($type)%></b>: <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$addr->address%>" id="TxnSendMailTo-<% $addr->address %>-<% $recips{$addr->address} %>" />
@@ -86,7 +88,7 @@ return unless $Object;
               </ul>
 %         }
 %         if (RT->Config->Get('PreviewScripMessages')) {
-              <textarea cols="80" rows="5"><%$scrip->ActionObj->TemplateObj->MIMEObj->as_string%></textarea>
+              <textarea cols="80" rows="5"><% Encode::decode( "UTF-8", $scrip->ActionObj->TemplateObj->MIMEObj->as_string ) %></textarea>
 %         }
           <br />
 %     }
@@ -102,7 +104,7 @@ return unless $Object;
               <ul>
 %             for my $address (@{$data->{$type}}) {
                   <li>
-%                 my $checked = 1;
+%                 my $checked = not $squelched{$address};
 %                 $m->callback(CallbackName => 'BeforeAddress', Ticket => $TicketObj, Address => Email::Address->parse($address), Type => $type, Checked => \$checked);
 %                 $recips{$address}++;
                   <b><%loc($type)%></b>: <input type="checkbox" class="checkbox" name="TxnSendMailTo" <% $checked ? 'checked="checked"' : '' |n%> value="<%$address%>" id="TxnSendMailTo-<% $address %>-<% $recips{$address} %>" />
@@ -116,4 +118,6 @@ return unless $Object;
 %     }
 % }
 
+% $m->callback( CallbackName => 'AfterRecipients', TicketObj => $TicketObj );
+
 % $m->notes("DryRun-Recipients-".$TicketObj->Id, \%recips);