X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_msg.html;h=65460f7b905f8997c92a2fbe4004a462fea5d97e;hp=401f52ebb485f8ba2ea6d940d96737566fd1d1db;hb=fc263806f5e475559a0c4cfdb70a5f1cefe0ffa3;hpb=f921a017cd3dd987bd48e05c7fd462a1ef9cb79d diff --git a/httemplate/search/cust_msg.html b/httemplate/search/cust_msg.html index 401f52ebb..65460f7b9 100644 --- a/httemplate/search/cust_msg.html +++ b/httemplate/search/cust_msg.html @@ -19,7 +19,10 @@ ucfirst($_[0]->msgtype) || $_[0]->msgname }, sub { - join('
', split(/,\s*/, $_[0]->env_to) ) + join('
', + map { encode_entities($_->format) } + Email::Address->parse($_[0]->env_to) + ) }, 'status', sub { encode_entities($_[0]->error) }, @@ -59,8 +62,10 @@ my $conf = new FS::Conf; my $title = 'Outgoing Message Log'; #here is the agent virtualization -my $agentnums_sql = - $FS::CurrentUser::CurrentUser->agentnums_sql( 'table' => 'cust_main' ); +my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql( + 'table' => 'cust_main', + 'null_right' => [ 'View system logs', 'Configuration' ], +); my @where = ( $agentnums_sql ); @@ -124,17 +129,17 @@ my $html_init = qq!
!. '
From '. include('/elements/input-date-field.html', - { 'name' => 'beginning', 'value' => $cgi->param('beginning') } + { 'name' => 'beginning', 'value' => scalar($cgi->param('beginning')) } ). ' To '. include('/elements/input-date-field.html', - { 'name' => 'ending', 'value' => ($cgi->param('ending') || ''), + { 'name' => 'ending', 'value' => (scalar($cgi->param('ending')) || ''), 'noinit' => 1, } ). ' Status '. include('/elements/select.html', 'field' => 'status', - 'curr_value' => $cgi->param('status') || '', + 'curr_value' => scalar($cgi->param('status')) || '', 'options' => [ '', 'failed', 'sent', ], 'labels' => { '' => '(any)', 'failed' => 'failed', @@ -143,12 +148,13 @@ include('/elements/select.html', ' Type '. include('/elements/select.html', 'field' => 'msgtype', - 'curr_value' => $cgi->param('msgtype') || '', - 'options' => [ '', 'invoice', 'receipt', 'admin' ], + 'curr_value' => scalar($cgi->param('msgtype')) || '', + 'options' => [ '', 'invoice', 'receipt', 'admin', 'report' ], 'labels' => { '' => '(any)', 'invoice' => 'Invoices', 'receipt' => 'Receipts', 'admin' => 'Admin notices', + 'report' => 'Reports', }, ) . '