ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index 7129f18..cf93052 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -19,8 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Auth;
 use C4::Output;
 use CGI qw ( -utf8 );
@@ -28,6 +27,7 @@ use C4::Members;
 use C4::Letters;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 use Koha::Patrons;
+use Koha::Patron::Categories;
 
 my $input=new CGI;
 
@@ -40,17 +40,16 @@ unless ( $patron ) {
 }
 my $borrower = $patron->unblessed;
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/notices.tt",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/notices.tt",
                                query => $input,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {borrowers => 1},
+                flagsrequired => {borrowers => 'edit_borrowers'},
                                debug => 1,
                                });
 
-$template->param( $borrower );
-$template->param( picture => 1 ) if $patron->image;
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 # Allow resending of messages in Notices tab
 my $op = $input->param('op') || q{};
@@ -58,6 +57,14 @@ if ( $op eq 'resend_notice' ) {
     my $message_id = $input->param('message_id');
     my $message = C4::Letters::GetMessage( $message_id );
     if ( $message->{borrowernumber} = $borrowernumber ) {
+       # XXX FFZG
+       if ( $message->{message_transport_type} eq 'print' ) {
+           my $dbh = C4::Context->dbh();
+           my $statement = 'UPDATE message_queue SET message_transport_type = ? WHERE message_id = ?';
+           my $sth = $dbh->prepare( $statement );
+           $sth->execute( 'email', $message_id );
+           warn "XXX force message_transport_type $message_id";
+       }
         C4::Letters::ResendMessage( $message_id );
         # redirect to self to avoid form submission on refresh
         print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
@@ -75,13 +82,11 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-$template->param(%$borrower);
-$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
 $template->param(
+    patron             => $patron,
     QUEUED_MESSAGES    => $queued_messages,
     borrowernumber     => $borrowernumber,
     sentnotices        => 1,
-    categoryname       => $patron->category->description,
 );
 output_html_with_http_headers $input, $cookie, $template->output;