dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize some regexps

Browse Source
This commit is contained in:
Xavier Guimard 2016-04-14 16:55:36 +00:00
parent f0193ef167
commit b8181f2ecf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View File

@ -68,7 +68,9 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'keyText' => { 'keyText' => {
'keyTest' => qr/^[a-zA-Z0-9_]+$/, 'keyTest' => qr/^[a-zA-Z0-9_]+$/,
'msgFail' => '__badValue__', 'msgFail' => '__badValue__',
'test' => qr/^.*$/ 'test' => sub {
1;
}
}, },
'keyTextContainer' => { 'keyTextContainer' => {
'keyMsgFail' => '__badKeyName__', 'keyMsgFail' => '__badKeyName__',
@ -778,7 +780,7 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'default' => 'example.com', 'default' => 'example.com',
'msgFail' => '__badDomainName__', 'msgFail' => '__badDomainName__',
'test' => 'test' =>
qr/^(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?))?/, qr/^(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?))?$/,
'type' => 'text' 'type' => 'text'
}, },
'exportedAttr' => { 'exportedAttr' => {

4
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View File

@ -169,7 +169,7 @@ sub types {
}, },
keyText => { keyText => {
keyTest => qr/^[a-zA-Z0-9_]+$/, keyTest => qr/^[a-zA-Z0-9_]+$/,
test => qr/^.*$/, test => sub { 1 },
msgFail => '__badValue__', msgFail => '__badValue__',
}, },
menuApp => { menuApp => {
@ -572,7 +572,7 @@ sub attributes {
}, },
domain => { domain => {
type => 'text', type => 'text',
test => qr/^(?:$Regexp::Common::URI::RFC2396::hostname)?/, test => qr/^(?:$Regexp::Common::URI::RFC2396::hostname)?$/,
msgFail => '__badDomainName__', msgFail => '__badDomainName__',
default => 'example.com', default => 'example.com',
documentation => 'DNS domain', documentation => 'DNS domain',