Commit c3fab8f2 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master'

FS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server

See merge request !196
parents af6cf4d1 91b6ac27
......@@ -94,7 +94,7 @@ $form["tabs"]['mailget'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'source_server_error_isempty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}$/',
'regex' => '/^([\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}|(?:[0-9]{1,3}\.){3}[0-9]{1,3})$/',
'errmsg'=> 'source_server_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