scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-31 01:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from XYunknown/master

Browse Source 
Adding SQL Like format for aliases
This commit is contained in:
kaiyou
2016-08-15 22:34:21 +02:00
committed by GitHub
parent b3d7b657ab 6d4243ec66
commit 9d7f89285e
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/freeposte/admin/forms.py
View File

@@ -86,6 +86,8 @@ class UserReplyForm(Form):
class AliasForm(Form): class AliasForm(Form):
localpart = fields.StringField('Alias', [validators.DataRequired()]) localpart = fields.StringField('Alias', [validators.DataRequired()])
wildcard = fields.BooleanField(
'Use SQL Like Syntax (e.g. for catch-all aliases, admin-%@domain.com)')
destination = DestinationField('Destination') destination = DestinationField('Destination')
comment = fields.StringField('Comment') comment = fields.StringField('Comment')
submit = fields.SubmitField('Create') submit = fields.SubmitField('Create')

1
admin/freeposte/admin/models.py
View File

@@ -189,6 +189,7 @@ class Alias(Email):
""" """
domain = db.relationship(Domain, domain = db.relationship(Domain,
backref=db.backref('aliases', cascade='all, delete-orphan')) backref=db.backref('aliases', cascade='all, delete-orphan'))
wildcard = db.Column(db.Boolean(), default=False)
destination = db.Column(CommaSeparatedList, nullable=False, default=[]) destination = db.Column(CommaSeparatedList, nullable=False, default=[])

1
admin/freeposte/admin/templates/alias/create.html
View File

@@ -12,6 +12,7 @@ Create alias
<form class="form" method="post" role="form"> <form class="form" method="post" role="form">
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }} {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
{{ macros.form_field(form.wildcard) }}
{{ macros.form_field(form.destination, id='destination') }} {{ macros.form_field(form.destination, id='destination') }}
{{ macros.form_field(form.comment) }} {{ macros.form_field(form.comment) }}
{{ macros.form_field(form.submit) }} {{ macros.form_field(form.submit) }}

6
postfix/conf/sqlite-virtual_alias_maps.cf
View File

@@ -3,3 +3,9 @@ query =
SELECT destination SELECT destination
FROM alias FROM alias
WHERE alias.email = '%s' WHERE alias.email = '%s'
AND alias.wildcard = 0
UNION SELECT destination
FROM alias
WHERE '%s' LIKE alias.email
AND alias.wildcard = 1
LIMIT 1