From c89a7fdb9d7cd0f3ba6748a519d433510daab740 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 13 Oct 2021 16:55:36 -0700 Subject: [PATCH] email_server: aliases: Drop unnecessary sanitizing - In the list form, the values are already sanitized as they are retrieved from the database. Don't refuse to manage existing aliases that don't fit the format. - In the create form, the form already sanitizes as necessary. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/email_server/aliases/__init__.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plinth/modules/email_server/aliases/__init__.py b/plinth/modules/email_server/aliases/__init__.py index 6592199a0..d12d70946 100644 --- a/plinth/modules/email_server/aliases/__init__.py +++ b/plinth/modules/email_server/aliases/__init__.py @@ -71,7 +71,6 @@ def put(uid_number, email_name): SELECT ?,?,? WHERE NOT EXISTS( SELECT 1 FROM Alias WHERE email_name=? )""" - email_name = models.sanitize_email_name(email_name) with db_cursor() as cur: cur.execute(s, (email_name, uid_number, 1, email_name)) @@ -80,9 +79,6 @@ def put(uid_number, email_name): def delete(uid_number, alias_list): s = 'DELETE FROM Alias WHERE uid_number=? AND email_name=?' - for i in range(len(alias_list)): - alias_list[i] = models.sanitize_email_name(alias_list[i]) - parameter_seq = ((uid_number, a) for a in alias_list) with db_cursor() as cur: cur.execute('BEGIN') @@ -101,9 +97,6 @@ def set_disabled(uid_number, alias_list): def _set_status(uid_number, alias_list, status): s = 'UPDATE Alias SET status=? WHERE uid_number=? AND email_name=?' - for i in range(len(alias_list)): - alias_list[i] = models.sanitize_email_name(alias_list[i]) - parameter_seq = ((status, uid_number, a) for a in alias_list) with db_cursor() as cur: cur.execute('BEGIN')