From 5604b0463aadf91ab98eff621ce59179a9c7a797 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Thu, 17 Nov 2016 16:36:41 +0100 Subject: [PATCH] [enh] alias name and forwards should only validate pattern_email --- data/actionsmap/yunohost.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml index 3fd8d70bd..7d62459f4 100644 --- a/data/actionsmap/yunohost.yml +++ b/data/actionsmap/yunohost.yml @@ -126,7 +126,7 @@ user: ask: ask_email required: True pattern: &pattern_email - - !!str ^[\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,})$ + - !!str ".*@.+" - "pattern_email" -p: full: --password @@ -261,9 +261,7 @@ alias: extra: ask: ask_alias_mailforward required: True - pattern: &pattern_listemail - - !!str ^([\w.-]+(\+[\w.-]+)*@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+([^\W\d_]{2,}),?)+$ - - "pattern_listemail" + pattern: *pattern_email ### alias_update() update: @@ -279,13 +277,13 @@ alias: metavar: MAIL nargs: "*" extra: - pattern: *pattern_listemail + pattern: *pattern_email --remove-mailforward: help: List of mailforward addresses to remove, separated by commas without space metavar: MAIL nargs: "*" extra: - pattern: *pattern_listemail + pattern: *pattern_email ### alias_delete() delete: