Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
e3929f17
Commit
e3929f17
authored
Jan 14, 2010
by
tbrehm
Browse files
Fixed: FS#998 - Mail filters: Foldernames may not start with a dot
parent
b6ff2e1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
interface/web/mail/form/mail_user_filter.tform.php
View file @
e3929f17
...
...
@@ -109,6 +109,10 @@ $form["tabs"]['filter'] = array (
'target'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'REGEX'
,
'regex'
=>
'/^[a-zA-Z0-9\.\-\_]{0,100}$/'
,
'errmsg'
=>
'target_error_regex'
),
),
'default'
=>
''
,
'value'
=>
''
,
'width'
=>
'30'
,
...
...
interface/web/mail/lib/lang/en_mail_user_filter.lng
View file @
e3929f17
...
...
@@ -6,4 +6,5 @@ $wb["active_txt"] = 'Active';
$wb
[
"rulename_error_empty"
]
=
'Name is empty.'
;
$wb
[
"searchterm_is_empty"
]
=
'Search term is empty.'
;
$wb
[
"source_txt"
]
=
'Source'
;
$wb
[
"target_error_regex"
]
=
'The target may only contain these characters: a-z, 0-9, -, . and _'
;
?>
\ No newline at end of file
interface/web/mail/mail_user_filter_edit.php
View file @
e3929f17
...
...
@@ -62,6 +62,9 @@ class page_action extends tform_actions {
// Set the mailuser_id
$this
->
dataRecord
[
"mailuser_id"
]
=
$mailuser
[
"mailuser_id"
];
// Remove leading dots
if
(
substr
(
$this
->
dataRecord
[
'target'
],
0
,
1
)
==
'.'
)
$this
->
dataRecord
[
'target'
]
=
substr
(
$this
->
dataRecord
[
'target'
],
1
);
parent
::
onSubmit
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment