diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm index 271781d08..d9a4e7ab9 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm @@ -682,7 +682,7 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.] }, 'customFunctions' => { 'msgFail' => '__badCustomFuncName__', - 'test' => qr/^(?:\w+(?:\s+\w+)*)?$/, + 'test' => qr/^(?:\w+(?:::\w+)*(?:\s+\w+(?:::\w+)*)*)?$/, 'type' => 'text' }, 'dbiAuthChain' => { @@ -1095,8 +1095,6 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- ) ) { - return 0, "__badCustomFuncName__ $f" - unless $f =~ /^[a-zA-Z]\w*$/; $s = "sub $f {1} $s"; } eval $s; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm index 99e4ea20f..f7f6e32f0 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm @@ -225,7 +225,7 @@ sub attributes { }, customFunctions => { type => 'text', - test => qr/^(?:\w+(?:\s+\w+)*)?$/, + test => qr/^(?:\w+(?:::\w+)*(?:\s+\w+(?:::\w+)*)*)?$/, msgFail => "__badCustomFuncName__", documentation => 'List of custom functions' }, @@ -900,8 +900,6 @@ sub attributes { ) ) { - return ( 0, "__badCustomFuncName__ $f" ) - unless ( $f =~ /^[a-zA-Z]\w*$/ ); $s = "sub $f {1} $s"; } eval $s;