diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 7be04bf6f..57faece90 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -360,7 +360,7 @@ class User(PermissionsMixin): self.password = row[2].strip() self.first_name = row[3].strip() self.last_name = row[4].strip() - self.is_active = (row[5].strip() == 'True') + self.is_active = (row[5].strip() in ["True", "1", "yes", "y"]) self.save(creator=user) self.set_role(role) if len(row) < 8: diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py index cbc6879c9..4ced8b994 100644 --- a/modoboa/extensions/admin/models/alias.py +++ b/modoboa/extensions/admin/models/alias.py @@ -166,7 +166,7 @@ class Alias(AdminObject): raise Conflict self.address = localpart self.domain = domain - self.enabled = (row[2].strip() == 'True') + self.enabled = (row[2].strip() in ["True", "1", "yes", "y"]) int_rcpts = [] ext_rcpts = [] for rcpt in row[3:]: diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py index 02e50731e..5d8566d62 100644 --- a/modoboa/extensions/admin/models/domain.py +++ b/modoboa/extensions/admin/models/domain.py @@ -158,7 +158,7 @@ class Domain(AdminObject): self.quota = int(row[2].strip()) except ValueError: raise BadRequest(_("Invalid quota value for domain '%s'" % self.name)) - self.enabled = (row[3].strip() == 'True') + self.enabled = (row[3].strip() in ["True", "1", "yes", "y"]) self.save(creator=user) def to_csv(self, csvwriter): diff --git a/modoboa/extensions/admin/models/domain_alias.py b/modoboa/extensions/admin/models/domain_alias.py index 29fe93037..51b542dd0 100644 --- a/modoboa/extensions/admin/models/domain_alias.py +++ b/modoboa/extensions/admin/models/domain_alias.py @@ -50,7 +50,7 @@ class DomainAlias(AdminObject): self.target = Domain.objects.get(name=domname) except Domain.DoesNotExist: raise BadRequest(_("Unknown domain %s" % domname)) - self.enabled = row[3].strip() == 'True' + self.enabled = row[3].strip() in ["True", "1", "yes", "y"] self.save(creator=user) def to_csv(self, csvwriter):