Commit 60fa055c authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6270-allow-special-characters-in-folder-name-when-using-e-mail-filter' into 'develop'

Resolve "Allow special characters in folder name when using e-mail filter"

Closes #6270

See merge request !1581
parents d61be8a3 894d9c58
Pipeline #10796 passed with stage
in 14 seconds
......@@ -121,7 +121,7 @@ $form["tabs"]['filter'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\p{Latin}0-9\.\-\_\ \&\/]{0,100}$/u',
'regex' => '/^[\p{Latin}0-9\.\'\-\_\ \&\/]{0,100}$/u',
'errmsg'=> 'target_error_regex'),
),
'default' => '',
......
......@@ -94,7 +94,6 @@ $form["tabs"]['filter'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
//'value' => array('contains'=>'contains_txt','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with')
'value' => array('contains'=>'contains_txt', 'is'=>'is_txt', 'begins'=>'begins_with_txt', 'ends'=>'ends_with_txt', 'regex'=>'regex_txt', 'localpart'=>'localpart_txt', 'domain'=>'domain_txt')
),
'searchterm' => array (
......@@ -122,7 +121,7 @@ $form["tabs"]['filter'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\p{Latin}0-9\.\-\_\ \&\/]{0,100}$/u',
'regex' => '/^[\p{Latin}0-9\.\'\-\_\ \&\/]{0,100}$/u',
'errmsg'=> 'target_error_regex'),
),
'default' => '',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment