Merge remote-tracking branch 'svnexport/master'

pull/9/head
David Goodwin 9 years ago
commit b7c6bc1399

@ -114,8 +114,10 @@
# http://dag.wieers.com/home-made/apt/packages.php # http://dag.wieers.com/home-made/apt/packages.php
# #
use utf8;
use DBI; use DBI;
use MIME::Base64; use MIME::Base64 qw(encode_base64);
use Encode qw(encode);
use MIME::EncWords qw(:all); use MIME::EncWords qw(:all);
use Email::Valid; use Email::Valid;
use strict; use strict;
@ -550,7 +552,7 @@ sub send_vacation_email {
'from' => $from, 'from' => $from,
'fake_from' => $friendly_from . " <$from>", 'fake_from' => $friendly_from . " <$from>",
'to' => $to, 'to' => $to,
'msg' => encode_base64($body) 'msg' => encode_base64(encode("UTF-8", $body))
); );
if($test_mode == 1) { if($test_mode == 1) {
$logger->info("** TEST MODE ** : Vacation response sent to $to from $from subject $subject (not) sent\n"); $logger->info("** TEST MODE ** : Vacation response sent to $to from $from subject $subject (not) sent\n");

@ -304,7 +304,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Zmień przekierowania wiadomości.';
$PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.'; $PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.';
$PALANG['pUsersVacation_welcome'] = 'Automatyczną odpowiedź.'; $PALANG['pUsersVacation_welcome'] = 'Automatyczna odpowiedź.';
$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' $PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź! (%s)'; # XXX Text changed to: 'Auto response for %s is active!'
$PALANG['pUsersVacation_subject_text'] = 'Poza biurem'; $PALANG['pUsersVacation_subject_text'] = 'Poza biurem';
$PALANG['message'] = 'Wiadomość'; $PALANG['message'] = 'Wiadomość';

Loading…
Cancel
Save