Skip to content

Commit 9ce2ff0

Browse files
author
Till Brehm
committed
Merge branch '6883-add-trim-filter-spamfilter-wblist' into 'develop'
Trim whitespace from email fields in spamfilter whitelist and blacklist forms #6883 Closes #6883 See merge request ispconfig/ispconfig3!2024
2 parents 0ca3fc0 + bb0b998 commit 9ce2ff0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

interface/web/mail/form/spamfilter_blacklist.tform.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
3 => array( 'event' => 'SAVE',
106106
'type' => 'STRIPTAGS'),
107107
4 => array( 'event' => 'SAVE',
108-
'type' => 'STRIPNL')
108+
'type' => 'STRIPNL'),
109+
5 => array( 'event' => 'SAVE',
110+
'type' => 'TRIM')
109111
),
110112
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
111113
'errmsg'=> 'email_error_notempty'),

interface/web/mail/form/spamfilter_whitelist.tform.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
3 => array( 'event' => 'SAVE',
106106
'type' => 'STRIPTAGS'),
107107
4 => array( 'event' => 'SAVE',
108-
'type' => 'STRIPNL')
108+
'type' => 'STRIPNL'),
109+
5 => array( 'event' => 'SAVE',
110+
'type' => 'TRIM')
109111
),
110112
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
111113
'errmsg'=> 'email_error_notempty'),

0 commit comments

Comments
 (0)