Bugzilla – Attachment 30725 Details for
Bug 9530
Allow separate 'Reply To' and 'From' email address for notices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9530 making changes to virtualshelves/sendshelf.pl
Bug-9530-making-changes-to-virtualshelvessendshelf.patch (text/plain), 4.71 KB, created by
Chris Cormack
on 2014-08-11 23:00:37 UTC
(
hide
)
Description:
Bug 9530 making changes to virtualshelves/sendshelf.pl
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2014-08-11 23:00:37 UTC
Size:
4.71 KB
patch
obsolete
>From 507b70ceb2d221ae8429f10f05723f8e20ffc097 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Tue, 12 Aug 2014 10:21:32 +1200 >Subject: [PATCH] Bug 9530 making changes to virtualshelves/sendshelf.pl > >To Test > >1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault) >2/ Optionally edit the branch the mail will be sent from, adding email addresses >3/ Send a list from the staff client >4/ Check that the mails have the correct From, Replyto and ReturnPath set > The rules are > If the values are set in the branch use that, else use the syspref >--- > virtualshelves/sendshelf.pl | 54 ++++++++++++++++++++++++--------------------- > 1 file changed, 29 insertions(+), 25 deletions(-) > >diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl >index 9439609..1d41581 100755 >--- a/virtualshelves/sendshelf.pl >+++ b/virtualshelves/sendshelf.pl >@@ -32,10 +32,11 @@ use C4::Biblio; > use C4::Items; > use C4::Output; > use C4::VirtualShelves; >+use Koha::Email; > > my $query = new CGI; > >-my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( >+my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > { > template_name => "virtualshelves/sendshelfform.tt", > query => $query, >@@ -48,15 +49,15 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( > my $shelfid = $query->param('shelfid'); > my $email = $query->param('email'); > >-my $dbh = C4::Context->dbh; >+my $dbh = C4::Context->dbh; > >-if ( $email ) { >- my $email_from = C4::Context->preference('KohaAdminEmailAddress'); >- my $comment = $query->param('comment'); >- >- my %mail = ( >- To => $email, >- From => $email_from >+if ($email) { >+ my $comment = $query->param('comment'); >+ my $message = Koha::Email->new(); >+ my %mail = $message->create_message_headers( >+ { >+ to => $email >+ } > ); > > my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( >@@ -69,9 +70,9 @@ if ( $email ) { > } > ); > >- my @shelf = GetShelf($shelfid); >- my ($items, $totitems) = GetShelfContents($shelfid); >- my $marcflavour = C4::Context->preference('marcflavour'); >+ my @shelf = GetShelf($shelfid); >+ my ( $items, $totitems ) = GetShelfContents($shelfid); >+ my $marcflavour = C4::Context->preference('marcflavour'); > my $iso2709; > my @results; > >@@ -84,9 +85,9 @@ if ( $email ) { > my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); > my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); > my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); >- my $subtitle = GetRecordValue('subtitle', $record, $fw); >+ my $subtitle = GetRecordValue( 'subtitle', $record, $fw ); > >- my @items = GetItemsInfo( $biblionumber ); >+ my @items = GetItemsInfo($biblionumber); > > $dat->{MARCNOTES} = $marcnotesarray; > $dat->{MARCSUBJCTS} = $marcsubjctsarray; >@@ -100,13 +101,14 @@ if ( $email ) { > push( @results, $dat ); > } > >- if (C4::Context->preference('OPACBaseURL')){ >- $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') ); >- } >+ if ( C4::Context->preference('OPACBaseURL') ) { >+ $template2->param( >+ OPACBaseURL => C4::Context->preference('OPACBaseURL') ); >+ } > > $template2->param( > BIBLIO_RESULTS => \@results, >- email_sender => $email_from, >+ email_sender => $mail{'from'}, > comment => $comment, > shelfname => $shelf[1], > ); >@@ -146,7 +148,7 @@ if ( $email ) { > # We set and put the multipart content > $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; > >- my $isofile = encode_base64(encode("UTF-8", $iso2709)); >+ my $isofile = encode_base64( encode( "UTF-8", $iso2709 ) ); > $boundary = '--' . $boundary; > > $mail{body} = <<END_OF_BODY; >@@ -167,8 +169,9 @@ END_OF_BODY > > # Sending mail > if ( sendmail %mail ) { >+ > # do something if it works.... >- $template->param( SENT => "1" ); >+ $template->param( SENT => "1" ); > } > else { > # do something if it doesnt work.... >@@ -179,10 +182,11 @@ END_OF_BODY > $template->param( email => $email ); > output_html_with_http_headers $query, $cookie, $template->output; > >- >-}else{ >- $template->param( shelfid => $shelfid, >- url => "/cgi-bin/koha/virtualshelves/sendshelf.pl", >- ); >+} >+else { >+ $template->param( >+ shelfid => $shelfid, >+ url => "/cgi-bin/koha/virtualshelves/sendshelf.pl", >+ ); > output_html_with_http_headers $query, $cookie, $template->output; > } >-- >2.0.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9530
:
30717
|
30718
|
30719
|
30720
|
30721
|
30722
|
30723
|
30724
|
30725
|
30740
|
30741
|
30742
|
30743
|
30760
|
30761
|
30762
|
30763
|
31169
|
31196
|
31926
|
31927
|
31928
|
31929
|
31930
|
31931
|
31932
|
31933
|
31934
|
31935
|
32799