From 9a2d66c62fc28502a0ef93c0026b42e378e8b384 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 14 Dec 2021 19:00:11 -0800 Subject: [PATCH] email_server: Drop some unused code Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/email_server/audit/ldap.py | 14 -------------- plinth/modules/email_server/forms.py | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/plinth/modules/email_server/audit/ldap.py b/plinth/modules/email_server/audit/ldap.py index e5e5a760c..6a727e490 100644 --- a/plinth/modules/email_server/audit/ldap.py +++ b/plinth/modules/email_server/audit/ldap.py @@ -53,7 +53,6 @@ default_smtps_options = { 'smtpd_relay_restrictions': 'permit_sasl_authenticated,reject' } -MAILSRV_DIR = '/var/lib/plinth/mailsrv' SQLITE_ALIASES = 'sqlite:/etc/postfix/freedombox-aliases.cf' logger = logging.getLogger(__name__) @@ -144,16 +143,3 @@ def action_set_ulookup(): """Handles email_server -i ldap set_ulookup""" with postconf.mutex.lock_all(): fix_alias_maps(check_alias_maps()) - - -def list_find(lst, element, start=None, end=None): - if start is None: - start = 0 - if end is None: - end = len(lst) - if start < 0 or end < 0: - return -1 - try: - return lst.index(element, start, end) - except ValueError: - return -1 diff --git a/plinth/modules/email_server/forms.py b/plinth/modules/email_server/forms.py index 53fac7788..265bfa5dd 100644 --- a/plinth/modules/email_server/forms.py +++ b/plinth/modules/email_server/forms.py @@ -6,26 +6,12 @@ import re from django import forms from django.core.exceptions import ValidationError -from django.core.validators import RegexValidator from django.utils.translation import gettext_lazy as _ from plinth.modules.names.components import DomainName from . import aliases as aliases_module -domain_validator = RegexValidator(r'^[A-Za-z0-9-\.]+$', - _('Enter a valid domain')) -destination_validator = RegexValidator( - r'^[ -~]+$', # ASCII chars from 32 to 126 - _('Enter a valid destination')) - - -class EmailServerForm(forms.Form): - domain = forms.CharField(label=_('domain'), max_length=256) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - def _get_domain_choices(): """Double domain entries for inclusion in the choice field."""