View | Details | Raw Unified | Return to bug 27265
Collapse All | Expand All

(-)a/C4/Letters.pm (-4 / +14 lines)
Lines 1230-1237 sub _add_attachments { Link Here
1230
  This function's parameter hash reference takes the following
1230
  This function's parameter hash reference takes the following
1231
  optional named parameters:
1231
  optional named parameters:
1232
   message_transport_type: method of message sending (e.g. email, sms, etc.)
1232
   message_transport_type: method of message sending (e.g. email, sms, etc.)
1233
                           Can be a single string, or an arrayref of strings
1233
   borrowernumber        : who the message is to be sent
1234
   borrowernumber        : who the message is to be sent
1234
   letter_code           : type of message being sent (e.g. PASSWORD_RESET)
1235
   letter_code           : type of message being sent (e.g. PASSWORD_RESET)
1236
                           Can be a single string, or an arrayref of strings
1235
   message_id            : the message_id of the message. In that case the sub will return only 1 result
1237
   message_id            : the message_id of the message. In that case the sub will return only 1 result
1236
   limit                 : maximum number of messages to send
1238
   limit                 : maximum number of messages to send
1237
1239
Lines 1262-1273 sub _get_unsent_messages { Link Here
1262
            push @query_params, $params->{'borrowernumber'};
1264
            push @query_params, $params->{'borrowernumber'};
1263
        }
1265
        }
1264
        if ( $params->{'letter_code'} ) {
1266
        if ( $params->{'letter_code'} ) {
1265
            $statement .= ' AND mq.letter_code = ? ';
1267
            my @letter_codes = ref $params->{'letter_code'} eq "ARRAY" ? @{$params->{'letter_code'}} : $params->{'letter_code'};
1266
            push @query_params, $params->{'letter_code'};
1268
            if ( @letter_codes ) {
1269
                my $q = join( ",", ("?") x @letter_codes );
1270
                $statement .= " AND mq.letter_code IN ( $q ) ";
1271
                push @query_params, @letter_codes;
1272
            }
1267
        }
1273
        }
1268
        if ( $params->{'type'} ) {
1274
        if ( $params->{'type'} ) {
1269
            $statement .= ' AND message_transport_type = ? ';
1275
            my @types = ref $params->{'type'} eq "ARRAY" ? @{$params->{'type'}} : $params->{'type'};
1270
            push @query_params, $params->{'type'};
1276
            if ( @types ) {
1277
                my $q = join( ",", ("?") x @types );
1278
                $statement .= " AND message_transport_type IN ( $q ) ";
1279
                push @query_params, @types;
1280
            }
1271
        }
1281
        }
1272
        if ( $params->{message_id} ) {
1282
        if ( $params->{message_id} ) {
1273
            $statement .= ' AND message_id = ?';
1283
            $statement .= ' AND message_id = ?';
(-)a/misc/cronjobs/process_message_queue.pl (-11 / +10 lines)
Lines 32-39 my $limit = undef; Link Here
32
my $method = 'LOGIN';
32
my $method = 'LOGIN';
33
my $help = 0;
33
my $help = 0;
34
my $verbose = 0;
34
my $verbose = 0;
35
my $type = q{};
35
my @type;
36
my $letter_code;
36
my @letter_code;
37
37
38
GetOptions(
38
GetOptions(
39
    'u|username:s'      => \$username,
39
    'u|username:s'      => \$username,
Lines 42-49 GetOptions( Link Here
42
    'm|method:s'        => \$method,
42
    'm|method:s'        => \$method,
43
    'h|help|?'          => \$help,
43
    'h|help|?'          => \$help,
44
    'v|verbose'         => \$verbose,
44
    'v|verbose'         => \$verbose,
45
    't|type:s'          => \$type,
45
    't|type:s'          => \@type,
46
    'c|code:s'          => \$letter_code,
46
    'c|code:s'          => \@letter_code,
47
);
47
);
48
my $usage = << 'ENDUSAGE';
48
my $usage = << 'ENDUSAGE';
49
49
Lines 56-63 advance_notices.pl script. Link Here
56
This script has the following parameters :
56
This script has the following parameters :
57
    -u --username: username of mail account
57
    -u --username: username of mail account
58
    -p --password: password of mail account
58
    -p --password: password of mail account
59
    -t --type: If supplied, only processes this type of message ( email, sms )
59
    -t --type: If supplied, only processes this type of message ( email, sms ), repeatable
60
    -c --code: If supplied, only processes messages with this letter code
60
    -c --code: If supplied, only processes messages with this letter code, repeatable
61
    -l --limit: The maximum number of messages to process for this run
61
    -l --limit: The maximum number of messages to process for this run
62
    -m --method: authentication method required by SMTP server (See perldoc Sendmail.pm for supported authentication types.)
62
    -m --method: authentication method required by SMTP server (See perldoc Sendmail.pm for supported authentication types.)
63
    -h --help: this message
63
    -h --help: this message
Lines 80-87 if ( C4::Context->config("enable_plugins") ) { Link Here
80
                    {
80
                    {
81
                        verbose     => $verbose,
81
                        verbose     => $verbose,
82
                        limit       => $limit,
82
                        limit       => $limit,
83
                        type        => $type,
83
                        type        => \@type,
84
                        letter_code => $letter_code,
84
                        letter_code => @letter_code,
85
                    }
85
                    }
86
                );
86
                );
87
            }
87
            }
Lines 99-106 C4::Letters::SendQueuedMessages( Link Here
99
        password    => $password,
99
        password    => $password,
100
        method      => $method,
100
        method      => $method,
101
        limit       => $limit,
101
        limit       => $limit,
102
        type        => $type,
102
        type        => \@type,
103
        letter_code => $letter_code,
103
        letter_code => \@letter_code,
104
    }
104
    }
105
);
105
);
106
106
107
- 

Return to bug 27265