From 75ecddf8791b1eb2722538530d9cb015e225f9a4 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 18 Oct 2013 16:09:29 +0200
Subject: [PATCH 01/32] Initial support of relay domains.

see #491
---
 modoboa/core/templatetags/core_tags.py        |  12 --
 modoboa/demo/__init__.py                      |   9 +-
 modoboa/extensions/admin/__init__.py          |   5 +
 modoboa/extensions/admin/lib.py               |  30 +++-
 .../admin/migrations/0037_rename_tables.py    |   7 +
 modoboa/extensions/admin/models/__init__.py   |   4 +-
 modoboa/extensions/admin/models/domain.py     |   4 +
 .../extensions/admin/static/admin/js/admin.js | 125 +++++++++++------
 .../admin/templates/admin/domains.html        |   1 +
 .../admin/templates/admin/domains_table.html  |  21 +++
 .../admin/templates/admin/identities.html     |   1 +
 .../admin/templates/admin/listing.html        |   2 +-
 .../admin/templatetags/admin_tags.py          |  92 ++++++++++---
 modoboa/extensions/admin/views/domain.py      |  31 +++--
 modoboa/extensions/amavis/__init__.py         |  40 +++---
 modoboa/extensions/limits/__init__.py         |   8 +-
 .../postfix_relay_domains/__init__.py         | 118 ++++++++++++++++
 .../postfix_relay_domains/app_settings.py     |  14 ++
 .../extensions/postfix_relay_domains/forms.py |  12 ++
 .../postfix_relay_domains/models.py           | 129 ++++++++++++++++++
 .../postfix_relay_domains/js/relay_domains.js |  79 +++++++++++
 .../relaydomain_form.html                     |   7 +
 .../postfix_relay_domains/service_field.html  |   2 +
 .../extensions/postfix_relay_domains/tests.py |  16 +++
 .../extensions/postfix_relay_domains/urls.py  |   9 ++
 .../extensions/postfix_relay_domains/views.py |  87 ++++++++++++
 modoboa/lib/events.py                         |   4 +-
 modoboa/lib/templatetags/lib_tags.py          |  18 +++
 modoboa/lib/webutils.py                       |  11 ++
 modoboa/static/js/global.js                   |  77 ++++++++++-
 modoboa/templates/common/generic_field.html   |   1 +
 modoboa/templates/nlayout.html                |   2 +-
 32 files changed, 864 insertions(+), 114 deletions(-)
 create mode 100644 modoboa/extensions/admin/templates/admin/domains_table.html
 create mode 100644 modoboa/extensions/postfix_relay_domains/__init__.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/app_settings.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/forms.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/models.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
 create mode 100644 modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
 create mode 100644 modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
 create mode 100644 modoboa/extensions/postfix_relay_domains/tests.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/urls.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/views.py

diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py
index 91238b489..b424c1f9f 100644
--- a/modoboa/core/templatetags/core_tags.py
+++ b/modoboa/core/templatetags/core_tags.py
@@ -230,18 +230,6 @@ def get_modoboa_logo():
     return logo
 
 
-@register.simple_tag
-def extra_head_content(user):
-    tpl = template.Template(
-        "{% for sc in static_content %}{{ sc|safe }}{% endfor %}"
-    )
-    return tpl.render(
-        template.Context({
-            'static_content': events.raiseQueryEvent("GetStaticContent", user)
-        })
-    )
-
-
 @register.simple_tag
 def load_optionalmenu(user):
     menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu_middle", user)
diff --git a/modoboa/demo/__init__.py b/modoboa/demo/__init__.py
index 76f5c05b4..ca8931b96 100755
--- a/modoboa/demo/__init__.py
+++ b/modoboa/demo/__init__.py
@@ -43,12 +43,13 @@ def password_change(user):
 
 
 @events.observe("GetStaticContent")
-def get_static_content(user):
-    if not user.mailbox_set.count():
+def get_static_content(caller, user):
+    if caller != 'top' and not user.mailbox_set.count():
         return []
-    return """<script type="text/javascript">
+
+    return ["""<script type="text/javascript">
 $(document).ready(function() {
     $(document).on('click', 'a[name=sendspam]', simple_ajax_request);
     $(document).on('click', 'a[name=sendvirus]', simple_ajax_request);
 });
-</script>"""
+</script>"""]
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index 79c8fad5d..c567fc059 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -15,6 +15,11 @@ admin_events = [
     "CreateDomain",
     "DomainModified",
     "DeleteDomain",
+    "ExtraDomainEntries",
+    "ExtraDomainMenuEntries",
+    "ExtraDomainFilters",
+    "GetDomainActions",
+    "GetDomainModifyLink",
 
     "DomainAliasCreated",
     "DomainAliasDeleted",
diff --git a/modoboa/extensions/admin/lib.py b/modoboa/extensions/admin/lib.py
index 758371f13..bf142a297 100644
--- a/modoboa/extensions/admin/lib.py
+++ b/modoboa/extensions/admin/lib.py
@@ -1,13 +1,16 @@
 # coding: utf-8
 from functools import wraps
+from itertools import chain
 from django.db.models import Q
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.contenttypes.models import ContentType
 from modoboa.core.models import User
-from modoboa.lib import parameters
+from modoboa.lib import parameters, events
 from modoboa.lib.exceptions import ModoboaException
 from modoboa.lib.emailutils import split_mailbox
-from modoboa.extensions.admin.models import Alias
+from modoboa.extensions.admin.models import (
+    Domain, Alias
+)
 
 
 def needs_mailbox():
@@ -65,8 +68,6 @@ def get_identities(user, searchquery=None, idtfilter=None, grpfilter=None):
     :param list grpfilter: group names filters
     :return: a queryset
     """
-    from itertools import chain
-
     accounts = []
     if idtfilter is None or not idtfilter or idtfilter == "account":
         ids = user.objectaccess_set \
@@ -104,3 +105,24 @@ def get_identities(user, searchquery=None, idtfilter=None, grpfilter=None):
         if idtfilter is not None and idtfilter:
             aliases = [al for al in aliases if al.type == idtfilter]
     return chain(accounts, aliases)
+
+
+def get_domains(user, domfilter=None, searchquery=None, **extrafilters):
+    """Return all the domains the user can access.
+
+    :param ``User`` user: user object
+    :param str searchquery: filter
+    :rtype: list
+    :return: a list of domains and/or relay domains
+    """
+    domains = []
+    if domfilter is None or not domfilter or domfilter == 'domain':
+        domains = Domain.objects.get_for_admin(user)
+        if searchquery is not None:
+            q = Q(name__contains=searchquery)
+            q |= Q(domainalias__name__contains=searchquery)
+            domains = domains.filter(q).distinct()
+    extra_domain_entries = events.raiseQueryEvent(
+        'ExtraDomainEntries', user, domfilter, searchquery, **extrafilters
+    )
+    return chain(domains, extra_domain_entries)
diff --git a/modoboa/extensions/admin/migrations/0037_rename_tables.py b/modoboa/extensions/admin/migrations/0037_rename_tables.py
index 077918c22..6b08aabd7 100644
--- a/modoboa/extensions/admin/migrations/0037_rename_tables.py
+++ b/modoboa/extensions/admin/migrations/0037_rename_tables.py
@@ -75,6 +75,13 @@ class Migration(SchemaMigration):
             'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"})
         },
+        u'admin.mailboxoperation': {
+            'Meta': {'object_name': 'MailboxOperation'},
+            'argument': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Mailbox']", 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
         'admin.objectdates': {
             'Meta': {'object_name': 'ObjectDates'},
             'creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
diff --git a/modoboa/extensions/admin/models/__init__.py b/modoboa/extensions/admin/models/__init__.py
index 8edb89898..2a34185d3 100644
--- a/modoboa/extensions/admin/models/__init__.py
+++ b/modoboa/extensions/admin/models/__init__.py
@@ -1,8 +1,10 @@
+from .base import DatesAware
 from .domain import Domain
 from .domain_alias import DomainAlias
 from .mailbox import Mailbox, Quota, MailboxOperation
 from .alias import Alias
 
 __all__ = [
-    'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias', 'MailboxOperation'
+    'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias',
+    'MailboxOperation', 'DatesAware'
 ]
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index c4d7d5a36..d497d8260 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -56,6 +56,10 @@ class Domain(DatesAware):
     def mbalias_count(self):
         return self.alias_set.count()
 
+    @property
+    def tags(self):
+        return [{"name": "domain", "label": _("Domain"), "type": "dom"}]
+
     @property
     def admins(self):
         """Return the domain administrators of this domain
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index 0e7c225be..f811d322b 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -1,3 +1,8 @@
+/**
+ * @module admin
+ * @desc Utility classes for the admin application
+ */
+
 var Admin = function(options) {
     Listing.call(this, options);
 };
@@ -12,6 +17,7 @@ Admin.prototype = {
         Listing.prototype.initialize.call(this, options);
         this.options = $.extend({}, this.defaults, this.options);
         this.options.defcallback = $.proxy(this.list_cb, this);
+        this.tag_handlers = {};
 
         this.navobj = new History(this.options);
 
@@ -37,12 +43,61 @@ Admin.prototype = {
     list_cb: function(data) {
         $("#listing").html(data.table);
         this.update_listing(data);
+        $("a.filter").click($.proxy(this.filter_by_tag, this));
     },
 
     listen: function() {
         $("#searchform").submit($.proxy(this.do_search, this));
     },
 
+    register_tag_handler: function(name, handler) {
+        this.tag_handlers[name] = handler;
+        if (this.navobj.getparam(name + "filter") != undefined) {
+            var text = this.navobj.getparam(name + "filter");
+            $("#searchform").parent().after(this.make_tag(text, name));
+        }
+    },
+
+    generic_tag_handler: function(tag, $link) {
+        if (this.navobj.getparam(tag + "filter") == undefined && $link.hasClass(tag)) {
+            var text = $link.attr("name");
+            this.navobj.setparam(tag + "filter", text).update();
+            $("#searchform").parent().after(this.make_tag(text, tag));
+            return true;
+        }
+        return false;
+    },
+
+    make_tag: function(text, type) {
+        var $tag = $("<a />", {"name": type, "class" : "btn btn-mini", "html": text});
+        var $i = $("<i />", {"class" : "icon-remove"}).prependTo($tag);
+
+        $tag.click($.proxy(this.remove_tag, this));
+        return $tag;
+    },
+
+    remove_tag: function(e) {
+        var $tag = $(e.target);
+
+        if ($tag.is("i")) {
+            $tag = $tag.parent();
+        }
+        e.preventDefault();
+        this.navobj.delparam($tag.attr("name") + "filter").update();
+        $tag.remove();
+    },
+
+    filter_by_tag: function(e) {
+        var $link = $(e.target);
+        e.preventDefault();
+
+        for (var name in this.tag_handlers) {
+            if (this.tag_handlers[name].apply(this, [name, $link])) {
+                break;
+            }
+        }
+    },
+
     do_search: function(e) {
         e.preventDefault();
         var squery = $("#searchquery").val();
@@ -104,6 +159,11 @@ var Domains = function(options) {
 };
 
 Domains.prototype = {
+    initialize: function(options) {
+        Admin.prototype.initialize.call(this, options);
+        this.register_tag_handler("dom", this.generic_tag_handler);
+    },
+
     list_cb: function(data) {
         Admin.prototype.list_cb.call(this, data);
         var deloptions = (data.handle_mailboxes)
@@ -120,6 +180,11 @@ Domains.prototype = {
             checkboxes: deloptions,
             success_cb: $.proxy(this.reload_listing, this)
         });
+        $("a[name=delrelaydomain]").confirm({
+            question: function() { return this.$element.attr('title'); },
+            method: "DELETE",
+            success_cb: $.proxy(this.reload_listing, this)
+        });
     },
 
     change_inputs_state: function(value) {
@@ -193,6 +258,17 @@ Domains.prototype = {
             });
         }, this));
         $(document).trigger('domform_init');
+    },
+
+    rdomainform_cb: function() {
+        $(".submit").one('click', $.proxy(function(e) {
+            simple_ajax_form_post2(e, {
+                formid: "rdomform",
+                error_cb: $.proxy(this.rdomainform_cb, this),
+                reload_on_success: false,
+                success_cb: $.proxy(this.reload_listing, this)
+            });
+        }, this));
     }
 
 };
@@ -209,14 +285,8 @@ var Identities = function(options) {
 Identities.prototype = {
     initialize: function(options) {
         Admin.prototype.initialize.call(this, options);
-        if (this.navobj.getparam("idtfilter") != undefined) {
-            var text = this.navobj.getparam("idtfilter");
-            $("#searchform").parent().after(this.make_tag(text, "idt"));
-        }
-        if (this.navobj.getparam("grpfilter") != undefined) {
-            var text = this.navobj.getparam("grpfilter");
-            $("#searchform").parent().after(this.make_tag(text, "grp"));
-        }
+        this.register_tag_handler("idt", this.generic_tag_handler);
+        this.register_tag_handler("grp", this.grp_tag_handler);
     },
 
     listen: function() {
@@ -237,7 +307,6 @@ Identities.prototype = {
         if (data.handle_mailboxes == "yes") {
             deloptions = {keepdir: gettext("Do not delete mailbox directory")};
         }
-        $("a.filter").click($.proxy(this.filter_by_tag, this));
 
         $("a[name=delaccount]").confirm({
             question: function() { return this.$element.attr('title'); },
@@ -252,46 +321,20 @@ Identities.prototype = {
         });
     },
 
-    make_tag: function(text, type) {
-        var $tag = $("<a />", {"name": type, "class" : "btn btn-mini", "html": text});
-        var $i = $("<i />", {"class" : "icon-remove"}).prependTo($tag);
-
-        $tag.click($.proxy(this.remove_tag, this));
-        return $tag;
-    },
-
-    remove_tag: function(e) {
-        var $tag = $(e.target);
-
-        if ($tag.is("i")) {
-            $tag = $tag.parent();
-        }
-        e.preventDefault();
-        this.navobj.delparam($tag.attr("name") + "filter").update();
-        $tag.remove();
-    },
-
-    filter_by_tag: function(e) {
-        var $link = $(e.target);
-        e.preventDefault();
-
-        if (this.navobj.getparam("idtfilter") == undefined && $link.hasClass("idt")) {
-            var text = $link.attr("name");
-            this.navobj.setparam("idtfilter", text).update();
-            $("#searchform").parent().after(this.make_tag(text, "idt"));
-            return;
-        }
-        if (this.navobj.getparam("grpfilter") == undefined && $link.hasClass("grp")) {
+    grp_tag_handler: function(tag, $link) {
+        if (this.navobj.getparam(tag + "filter") == undefined && $link.hasClass(tag)) {
             var text = $link.attr("name");
             this.navobj
                 .setparam("idtfilter", "account")
-                .setparam("grpfilter", text)
+                .setparam(tag + "filter", text)
                 .update();
             if ($("a[name=idt]").length == 0) {
                 $("#searchform").parent().after(this.make_tag("account", "idt"));
             }
-            $("#searchform").parent().after(this.make_tag(text, "grp"));
+            $("#searchform").parent().after(this.make_tag(text, tag));
+            return true;
         }
+        return false;
     },
 
     simpleuser_mode: function() {
diff --git a/modoboa/extensions/admin/templates/admin/domains.html b/modoboa/extensions/admin/templates/admin/domains.html
index 65163e602..d32690232 100644
--- a/modoboa/extensions/admin/templates/admin/domains.html
+++ b/modoboa/extensions/admin/templates/admin/domains.html
@@ -7,5 +7,6 @@ $(document).ready(function() {
     admin = new Domains();
 });
 </script>
+{% extra_static_content "domains" user %}
 {% endblock %}
 {% block actions %}{% domains_menu "domains" user %}{% endblock %}
diff --git a/modoboa/extensions/admin/templates/admin/domains_table.html b/modoboa/extensions/admin/templates/admin/domains_table.html
new file mode 100644
index 000000000..b3f16ba9d
--- /dev/null
+++ b/modoboa/extensions/admin/templates/admin/domains_table.html
@@ -0,0 +1,21 @@
+{% load i18n admin_tags lib_tags %}
+<table id="{{ tableid }}" class="table {{ styles }}">
+  <thead>
+    <tr>
+      <th id="identity" class="sortable" data-sort_order="identity" width="">{% trans "Name" %}</th>
+      <th id="name_or_rcpt" class="sortable" data-sort_order="name_or_rcpt" width="">{% trans "Alias(es)" %}</th>
+      <th id="tags" class="sortable" data-sort_order="tags" width="">{% trans "Tags" %}</th>
+      <th id="actions" width="">{% trans "Actions" %}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for domain in domains %}
+    <tr id="{{ domain.id }}" class="{% if not domain.enabled %}muted{% endif %}" name="{{ forloop.counter }}">
+      <td name="name">{% domain_modify_link domain %}</td>
+      <td name="aliases">{% domain_aliases domain %} </td>
+      <td name="tags">{% render_tags domain.tags %}</td>
+      <td name="actions">{% domain_actions user domain %}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
diff --git a/modoboa/extensions/admin/templates/admin/identities.html b/modoboa/extensions/admin/templates/admin/identities.html
index 82e172a6d..632a6f31c 100644
--- a/modoboa/extensions/admin/templates/admin/identities.html
+++ b/modoboa/extensions/admin/templates/admin/identities.html
@@ -20,5 +20,6 @@ $(document).ready(function() {
     admin = new Identities();
 });
 </script>
+{% extra_static_content "identities" user %}
 {% endblock %}
 {% block actions %}{% identities_menu user %}{% endblock %}
diff --git a/modoboa/extensions/admin/templates/admin/listing.html b/modoboa/extensions/admin/templates/admin/listing.html
index 513512d17..cbcbbbc86 100644
--- a/modoboa/extensions/admin/templates/admin/listing.html
+++ b/modoboa/extensions/admin/templates/admin/listing.html
@@ -1,4 +1,4 @@
-{% extends "admin/header.html" %}{% load i18n admin_tags lib_tags %}
+{% extends "admin/header.html" %}{% load i18n admin_tags %}
 {% block html_head %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/jquery.sortable.css" />
diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py
index 6736fbbe9..e1fee75c9 100644
--- a/modoboa/extensions/admin/templatetags/admin_tags.py
+++ b/modoboa/extensions/admin/templatetags/admin_tags.py
@@ -15,6 +15,16 @@ genders = {
 
 @register.simple_tag
 def domains_menu(selection, user):
+    """Specific menu for domain related operations.
+
+    Corresponds to the menu visible on the left column when you go to
+    Domains.
+
+    :param str selection: menu entry currently selected
+    :param ``User`` user: connected user
+    :rtype: str
+    :return: rendered menu (as HTML)
+    """
     if not user.has_perm("admin.add_domain"):
         return ""
 
@@ -25,6 +35,9 @@ def domains_menu(selection, user):
          "modal": True,
          "modalcb": "admin.newdomain_cb",
          "url": reverse("modoboa.extensions.admin.views.domain.newdomain")},
+    ]
+    entries += events.raiseQueryEvent("ExtraDomainMenuEntries", user)
+    entries += [
         {"name": "import",
          "label": _("Import"),
          "img": "icon-folder-open",
@@ -111,23 +124,28 @@ def identities_menu(user):
 
 
 @register.simple_tag
-def domain_actions(user, domid):
-    from modoboa.extensions.admin.models import Domain
+def domain_actions(user, domain):
+    actions = []
+    if domain.__class__.__name__ == 'Domain':
+        actions = [
+            {"name": "listidentities",
+             "url": reverse("modoboa.extensions.admin.views.identity.identities") + "#list/?searchquery=@%s" % domain.name,
+             "title": _("View the domain's identities"),
+             "img": "icon-user"}
+        ]
+        if user.has_perm("admin.delete_domain"):
+            actions.append({
+                "name": "deldomain",
+                "url": reverse(
+                    "modoboa.extensions.admin.views.domain.deldomain",
+                    args=[domain.id]
+                ),
+                "title": _("Delete %s?" % domain.name),
+                "img": "icon-trash"
+            })
+    else:
+        actions = events.raiseQueryEvent('GetDomainActions', user, domain)
 
-    domain = Domain.objects.get(pk=domid)
-    actions = [
-        {"name": "listidentities",
-         "url": reverse("modoboa.extensions.admin.views.identity.identities") + "#list/?searchquery=@%s" % domain.name,
-         "title": _("View the domain's identities"),
-         "img": "icon-user"}
-    ]
-    if user.has_perm("admin.delete_domain"):
-        actions.append({
-            "name": "deldomain",
-            "url": reverse("modoboa.extensions.admin.views.domain.deldomain", args=[domid]),
-            "title": _("Delete %s?" % domain.name),
-            "img": "icon-trash"
-        })
     return render_actions(actions)
 
 
@@ -153,8 +171,50 @@ def identity_actions(user, ident):
     return render_actions(actions)
 
 
+@register.simple_tag
+def domain_modify_link(domain):
+    linkdef = {"label": domain.name, "modal": True}
+    if domain.__class__.__name__ == "Domain":
+        linkdef["url"] = reverse(
+            "modoboa.extensions.admin.views.domain.editdomain",
+            args=[domain.id]
+        )
+        linkdef["modalcb"] = "admin.domainform_cb"
+    else:
+        tmp = events.raiseDictEvent('GetDomainModifyLink', domain)
+        for key in ['url', 'modalcb']:
+            linkdef[key] = tmp[key]
+    return render_link(linkdef)
+
+
+@register.simple_tag
+def domain_aliases(domain):
+    """Display domain aliases of this domain.
+
+    :param domain:
+    :rtype: str
+    """
+    if domain.__class__.__name__ == "Domain":
+        if not domain.domainalias_set.count():
+            return '---'
+        res = ""
+        for da in domain.domainalias_set.all():
+            res += "%s<br/>" % da.name
+        return res
+    return '---'
+
+
 @register.simple_tag
 def identity_modify_link(identity, active_tab='default'):
+    """Return the appropriate modification link.
+
+    According to the identity type, a specific modification link (URL)
+    must be used.
+
+    :param identity: a ``User`` or ``Alias`` instance
+    :param str active_tab: the tab to display
+    :rtype: str
+    """
     linkdef = {"label": identity.identity, "modal": True}
     if identity.__class__.__name__ == "User":
         linkdef["url"] = reverse(
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 91f2c1669..0b9d83ab8 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -15,13 +15,13 @@ from modoboa.lib.webutils import (
 from modoboa.lib.formutils import CreationWizard
 from modoboa.lib.exceptions import PermDeniedException
 from modoboa.lib.templatetags.lib_tags import pagination_bar
-from modoboa.extensions.admin.tables import DomainsTable
 from modoboa.extensions.admin.lib import get_sort_order, get_listing_page
 from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import Domain, Mailbox
 from modoboa.extensions.admin.forms import (
     DomainForm, DomainFormGeneral, DomainFormOptions
 )
+from modoboa.extensions.admin.lib import get_domains
 
 
 @login_required
@@ -35,17 +35,28 @@ def index(request):
 )
 def _domains(request):
     sort_order, sort_dir = get_sort_order(request.GET, "name")
-    domains = Domain.objects.get_for_admin(request.user)
-    squery = request.GET.get("searchquery", None)
-    if squery is not None:
-        q = Q(name__contains=squery)
-        q |= Q(domainalias__name__contains=squery)
-        domains = domains.filter(q).distinct()
+    filters = dict(
+        (flt, request.GET.get(flt, None))
+        for flt in ['domfilter', 'searchquery']
+        + events.raiseQueryEvent('ExtraDomainFilters')
+    )
+    domainlist = get_domains(
+        request.user, **filters
+    )
     if sort_order in ["name", "domainalias__name"]:
-        domains = domains.order_by("%s%s" % (sort_dir, sort_order))
-    page = get_listing_page(domains, request.GET.get("page", 1))
+        domainlist = sorted(
+            domainlist,
+            key=lambda d: getattr(d, sort_order), reverse=sort_dir == '-'
+        )
+    else:
+        domainlist = sorted(domainlist, key=lambda d: d.tags[0],
+                            reverse=sort_dir == '-')
+    page = get_listing_page(domainlist, request.GET.get("page", 1))
     return ajax_simple_response({
-        "table": DomainsTable(request, page.object_list).render(),
+        "table": _render_to_string(request, 'admin/domains_table.html', {
+            'domains': domainlist,
+            'tableid': 'domains'
+        }),
         "page": page.number,
         "paginbar": pagination_bar(page),
         "handle_mailboxes": parameters.get_admin("HANDLE_MAILBOXES",
diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index 9abc912ed..a376a9a34 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -95,13 +95,14 @@ def on_delete_domain(domain):
 
 
 @events.observe("GetStaticContent")
-def extra_static_content(user):
+def extra_static_content(caller, user):
     if user.group == "SimpleUsers":
         return []
 
-    tpl = Template("""<script type="text/javascript">
+    if caller == 'top' and parameters.get_admin("USER_CAN_RELEASE") == 'no':
+        tpl = Template("""<script type="text/javascript">
 $(document).ready(function() {
-    {% if user_can_release == "no" %}var poller = new Poller("{{ url }}", {
+    var poller = new Poller("{{ url }}", {
         interval: {{ interval }},
         success_cb: function(data) {
             var $link = $("#nbrequests");
@@ -112,22 +113,27 @@ $(document).ready(function() {
                 $link.parent().addClass('hidden');
             }
         }
-    });{% endif %}
-
-    $(document).bind('domform_init', function() {
-        activate_widget.call($('#id_spam_subject_tag2_act'));
     });
-});
-</script>""")
+</script>
+""")
+        return [tpl.render(
+            Context({
+                'url': reverse("modoboa.extensions.amavis.views.nbrequests"),
+                'interval': int(parameters.get_admin("CHECK_REQUESTS_INTERVAL")) * 1000,
+                'text': _("pending requests"),
+            })
+        )]
 
-    return [tpl.render(
-        Context(dict(
-            url=reverse("modoboa.extensions.amavis.views.nbrequests"),
-            interval=int(parameters.get_admin("CHECK_REQUESTS_INTERVAL")) * 1000,
-            text=_("pending requests"),
-            user_can_release=parameters.get_admin("USER_CAN_RELEASE")
-        ))
-    )]
+    if caller == 'domains':
+        tpl = Template("""<script type="text/javascript">
+$(document).bind('domform_init', function() {
+    activate_widget.call($('#id_spam_subject_tag2_act'));
+});
+</script>
+""")
+
+        return [tpl.render(Context({}))]
+    return []
 
 
 @events.observe("TopNotifications")
diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py
index 2a22f37e8..5c991598f 100644
--- a/modoboa/extensions/limits/__init__.py
+++ b/modoboa/extensions/limits/__init__.py
@@ -116,10 +116,12 @@ def fill_account_instances(user, account, instances):
 
 
 @events.observe("GetStaticContent")
-def get_static_content(user):
+def get_static_content(caller, user):
+    if caller not in ['domains', 'identities']:
+        return []
     if user.group == "SimpleUsers":
         return []
-    return """<style>
+    return ["""<style>
 .resource {
     margin: 5px 0;
 }
@@ -137,4 +139,4 @@ $(document).ready(function() {
     $(".progress").tooltip();
 });
 </script>
-"""
+"""]
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
new file mode 100644
index 000000000..d10aedf05
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -0,0 +1,118 @@
+# coding: utf-8
+from django.core.urlresolvers import reverse
+from django.template import Template, Context
+from django.conf import settings
+from django.utils.translation import ugettext_lazy
+from django.db.models import Q
+from modoboa.lib import events, parameters
+from modoboa.core.extensions import ModoExtension, exts_pool
+from .models import RelayDomain, Service
+
+extension_events = [
+    "RelayDomainCreated",
+]
+
+
+class PostfixRelayDomains(ModoExtension):
+    name = "postfix_relay_domains"
+    label = "Postfix relay domains"
+    version = "1.0"
+    description = ugettext_lazy("Relay domains support for Postfix")
+
+    def init(self):
+        """Initialisation method.
+
+        Only run once, when the extension is enabled. Populates the
+        service table with default entries.
+        """
+        for service_name in ['relay', 'smtp']:
+            Service.objects.get_or_create(name=service_name)
+
+    def load(self):
+        from .app_settings import AdminParametersForm
+
+        parameters.register(AdminParametersForm, ugettext_lazy("Relay domains"))
+        events.declare(extension_events)
+
+    def destroy(self):
+        events.unregister('GetExtraDomainEntries', extra_domain_entries)
+
+exts_pool.register_extension(PostfixRelayDomains)
+
+
+@events.observe('GetStaticContent')
+def static_content(caller, user):
+    if caller != 'domains':
+        return []
+
+    t = Template("""<script src="{{ STATIC_URL }}postfix_relay_domains/js/relay_domains.js" type="text/javascript"></script>
+<script type="text/javascript">
+  var rdomain;
+  $(document).ready(function() {
+    rdomain = new RelayDomains({});
+  });
+</script>
+""")
+    return [t.render(Context({'STATIC_URL': settings.STATIC_URL}))]
+
+
+@events.observe('ExtraDomainFilters')
+def extra_domain_filters():
+    return ['srvfilter']
+
+
+@events.observe('ExtraDomainMenuEntries')
+def extra_domain_menu_entries(user):
+    return [
+        {"name": "newrelaydomain",
+         "label": ugettext_lazy("Add relay domain"),
+         "img": "icon-plus",
+         "modal": True,
+         "modalcb": "rdomain.domainform_cb",
+         "url": reverse(
+             "modoboa.extensions.postfix_relay_domains.views.create"
+         )},
+    ]
+
+
+@events.observe('ExtraDomainEntries')
+def extra_domain_entries(user, domfilter, searchquery, **extrafilters):
+    if domfilter is not None and domfilter and domfilter != 'relaydomain':
+        return []
+    relay_domains = RelayDomain.objects.get_for_admin(user)
+    if searchquery is not None:
+        q = Q(name__contains=searchquery)
+        relay_domains = relay_domains.filter(q).distinct()
+    if 'srvfilter' in extrafilters and extrafilters['srvfilter']:
+        relay_domains = relay_domains.filter(
+            Q(service__name=extrafilters['srvfilter'])
+        )
+    return relay_domains
+
+
+@events.observe('GetDomainModifyLink')
+def rdomain_modify_link(domain):
+    if not isinstance(domain, RelayDomain):
+        return {}
+    return {
+        'url': reverse(
+            'modoboa.extensions.postfix_relay_domains.views.edit',
+            args=[domain.id]
+        ),
+        'modalcb': 'rdomain.domainform_cb'
+    }
+
+
+@events.observe('GetDomainActions')
+def rdomain_actions(user, domain):
+    if not isinstance(domain, RelayDomain):
+        return []
+    if not user.has_perm("postfix_relay_domains.delete_relaydomain"):
+        return []
+    return [{
+        "name": "delrelaydomain",
+        "url": reverse("modoboa.extensions.postfix_relay_domains.views.delete",
+                       args=[domain.id]),
+        "title": ugettext_lazy("Delete %s?" % domain.name),
+        "img": "icon-trash"
+    }]
diff --git a/modoboa/extensions/postfix_relay_domains/app_settings.py b/modoboa/extensions/postfix_relay_domains/app_settings.py
new file mode 100644
index 000000000..d84de1aec
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/app_settings.py
@@ -0,0 +1,14 @@
+from django import forms
+from django.utils.translation import ugettext_lazy
+from modoboa.lib.formutils import SeparatorField
+from modoboa.lib import parameters
+
+
+class AdminParametersForm(parameters.AdminParametersForm):
+    app = "postfix_relay_domains"
+
+    master_cf_path = forms.CharField(
+        label=ugettext_lazy("Postfix's master.cf path"),
+        initial="/etc/postfix/master.cf",
+        help_text=ugettext_lazy('Path to the master.cf configuration file')
+    )
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
new file mode 100644
index 000000000..03bc8d49d
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -0,0 +1,12 @@
+from django import forms
+from .models import RelayDomain
+
+
+class RelayDomainForm(forms.ModelForm):
+
+    class Meta:
+        model = RelayDomain
+        exclude = ['dates']
+        widgets = {
+            'service': forms.Select(attrs={'class': 'span2'})
+        }
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
new file mode 100644
index 000000000..58a3012c4
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -0,0 +1,129 @@
+import reversion
+from django.db import models
+from django.db.models.manager import Manager
+from django.contrib.contenttypes import generic
+from django.utils.translation import ugettext as _, ugettext_lazy
+from modoboa.core.models import ObjectAccess
+from modoboa.lib import events, parameters
+from modoboa.lib.permissions import ungrant_access_to_object
+from modoboa.extensions.admin.models import DatesAware
+
+
+class RelayDomainManager(Manager):
+
+    def get_for_admin(self, admin):
+        """Return the relay domains belonging to this admin.
+
+        The result is a ``QuerySet`` object, so this function can be used
+        to fill ``ModelChoiceField`` objects.
+        """
+        if admin.is_superuser:
+            return self.get_query_set()
+        return self.get_query_set().filter(owners__user=admin)
+
+
+class ServiceManager(Manager):
+
+    def load_from_master_cf(self):
+        """Load services from the master.cf file.
+
+        Parse the configuration file to update the service table. New
+        entries are saved and outdated ones (ie. present in the
+        database but not in the file) are removed.
+        """
+        with open(parameters.get_admin('MASTER_CF_PATH')) as fp:
+            content = fp.read()
+        services = []
+        for line in content.split('\n'):
+            if not line or line.startswith('#'):
+                continue
+            parts = line.strip().split()
+            if len(parts) != 8:
+                continue
+            if parts[7] != 'smtp':
+                continue
+            srv, created = self.get_or_create(name=parts[0])
+            services.append(parts[0])
+        to_delete = []
+        for service in self.all():
+            if not service.name in services:
+                to_delete.append(service.name)
+        Service.objects.filter(name__in=to_delete()).delete()
+
+
+class Service(models.Model):
+    name = models.CharField(
+        ugettext_lazy('name'), max_length=100, unique=True,
+        help_text=ugettext_lazy('The service name')
+    )
+
+    objects = ServiceManager()
+
+    def __str__(self):
+        return self.name
+
+
+class RelayDomain(DatesAware):
+    """Relay domain.
+
+    A relay domain differs from a usual domaine because its final
+    destination is not reached yet. It must be accepted by the MTA but
+    it will then be transfered to another one.
+    """
+    name = models.CharField(
+        ugettext_lazy('name'), max_length=100, unique=True,
+        help_text=ugettext_lazy('The domain name')
+    )
+    target_host = models.CharField(
+        ugettext_lazy('target host'), max_length=255,
+        help_text=ugettext_lazy('')
+    )
+    service = models.ForeignKey(Service, default='relay')
+    enabled = models.BooleanField(
+        ugettext_lazy('enabled'),
+        help_text=ugettext_lazy('Check to activate this domain')
+    )
+    verify_recipients = models.BooleanField(
+        ugettext_lazy('verify recipients'),
+        help_text=ugettext_lazy('')
+    )
+
+    owners = generic.GenericRelation(ObjectAccess)
+
+    objects = RelayDomainManager()
+
+    class Meta:
+        ordering = ['name']
+
+    @property
+    def tags(self):
+        return [
+            {"name": "relaydomain", "label": _("Relay Domain"), "type": "dom"},
+            {"name": self.service.name, "label": "%s:" % self.service.name, 
+             "type": "srv", "color": "info"}
+        ]
+
+    def __str__(self):
+        return self.name
+
+    def post_create(self, creator):
+        from modoboa.lib.permissions import grant_access_to_object
+        grant_access_to_object(creator, self, is_owner=True)
+        events.raiseEvent("RelayDomainCreated", creator, self)
+
+    def save(self, *args, **kwargs):
+        if "creator" in kwargs:
+            creator = kwargs["creator"]
+            del kwargs["creator"]
+        else:
+            creator = None
+        super(RelayDomain, self).save(*args, **kwargs)
+        if creator is not None:
+            self.post_create(creator)
+
+    def delete(self):
+        events.raiseEvent("RelayDomainDeleted", self)
+        ungrant_access_to_object(self)
+        super(RelayDomain, self).delete()
+
+reversion.register(RelayDomain)
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
new file mode 100644
index 000000000..ac410165b
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -0,0 +1,79 @@
+/**
+ * @module relay_domains
+ * @desc Utility class to manage relay domains.
+ */
+
+var RelayDomains = function(options) {
+    this.initialize(options);
+};
+
+RelayDomains.prototype = {
+    constructor: RelayDomains,
+
+    defaults: {
+    },
+
+    initialize: function(options) {
+        this.options = $.extend({}, this.defaults, options);
+        admin.register_tag_handler("srv", this.srv_tag_handler);
+    },
+
+    launch_scan: function(e) {
+        var $link = get_target(e);
+
+        e.preventDefault();
+        $.ajax({
+            type: "POST",
+            url: $link.attr("href")
+        }).done(function(data) {
+            var $widget = $('#id_service');
+
+            $widget.empty();
+            $.each(data, function(label, id) {
+                $widget.append($('<option />', {
+                    value: id,
+                    html: label
+                }));
+            });
+            $('.modal-body').prepend(
+                build_success_alert(gettext('Services updated'))
+            );
+        }).fail(function(jqxhr) {
+            if (jqxhr.getResponseHeader('Content-Type') != 'application/json') {
+                return;
+            }
+            var result = $.parseJSON(jqxhr.responseText);
+            $('.modal-body').prepend(
+                build_error_alert(result[0])
+            );
+        });
+    },
+
+    domainform_cb: function() {
+        $('#btnscan').click(this.launch_scan);
+        $(".submit").one('click', $.proxy(function(e) {
+            simple_ajax_form_post2(e, {
+                formid: "rdomform",
+                error_cb: $.proxy(this.domainform_cb, this),
+                reload_on_success: false,
+                success_cb: $.proxy(admin.reload_listing, admin)
+            });
+        }, this));
+    },
+
+    srv_tag_handler: function(tag, $link) {
+        if (this.navobj.getparam(tag + "filter") == undefined && $link.hasClass(tag)) {
+            var text = $link.attr("name");
+            this.navobj
+                .setparam("domfilter", "relaydomain")
+                .setparam(tag + "filter", text)
+                .update();
+            if ($("a[name=dom]").length == 0) {
+                $("#searchform").parent().after(this.make_tag("relaydomain", "dom"));
+            }
+            $("#searchform").parent().after(this.make_tag(text, tag));
+            return true;
+        }
+        return false;
+    }
+};
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
new file mode 100644
index 000000000..0c809b33f
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
@@ -0,0 +1,7 @@
+{% extends "common/generic_modal_form.html" %}{% load lib_tags %}{% block formbody %}
+{% render_field form.name %}
+{% render_field form.target_host %}
+{% include "postfix_relay_domains/service_field.html" with field=form.service %}
+{% render_field form.enabled %}
+{% render_field form.verify_recipients %}
+{% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
new file mode 100644
index 000000000..c5ebd63a8
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/service_field.html
@@ -0,0 +1,2 @@
+{% extends "common/generic_field.html" %}{% load i18n %}
+{% block extra_controls %}<a id="btnscan" class="btn btn-success" style="margin-bottom: 8px" href="{% url 'modoboa.extensions.postfix_relay_domains.views.scan_for_services' %}">{% trans "Scan" %}</a>{% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/tests.py b/modoboa/extensions/postfix_relay_domains/tests.py
new file mode 100644
index 000000000..501deb776
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/tests.py
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)
diff --git a/modoboa/extensions/postfix_relay_domains/urls.py b/modoboa/extensions/postfix_relay_domains/urls.py
new file mode 100644
index 000000000..85d1986cf
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/urls.py
@@ -0,0 +1,9 @@
+from django.conf.urls import patterns
+
+urlpatterns = patterns(
+    'modoboa.extensions.postfix_relay_domains.views',
+    (r'^relaydomains/new/', 'create'),
+    (r'^relaydomains/(?P<rdom_id>\d+)/edit/$', 'edit'),
+    (r'^relaydomains/(?P<rdom_id>\d+)/delete/$', 'delete'),
+    (r'^relaydomains/scan_services/$', 'scan_for_services'),
+)
diff --git a/modoboa/extensions/postfix_relay_domains/views.py b/modoboa/extensions/postfix_relay_domains/views.py
new file mode 100644
index 000000000..3d73ad77f
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/views.py
@@ -0,0 +1,87 @@
+from django.shortcuts import render
+from django.db import transaction
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.views.decorators.http import require_http_methods
+from django.contrib.auth.decorators import (
+    login_required, permission_required, user_passes_test
+)
+from modoboa.lib import events
+from modoboa.lib.exceptions import ModoboaException, PermDeniedException
+from modoboa.lib.webutils import render_to_json_response
+from .models import RelayDomain, Service
+from .forms import RelayDomainForm
+
+
+@login_required
+@permission_required("admin.add_relaydomain")
+@transaction.commit_on_success
+def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
+    commonctx = {"title": _("New relay domain"),
+                 "action_label": _("Create"),
+                 "action_classes": "submit",
+                 "action": reverse(create),
+                 "formid": "rdomform"}
+    if request.method == 'POST':
+        form = RelayDomainForm(request.POST)
+        if form.is_valid():
+            rdom = form.save()
+            rdom.post_create(request.user)
+            return render_to_json_response(
+                {"respmsg": _("Relay domain created")}
+            )
+        return render_to_json_response(form.errors, status=400)
+    commonctx['form'] = RelayDomainForm()
+    return render(request, tplname, commonctx)
+
+
+@login_required
+@permission_required("admin.change_relaydomain")
+def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'):
+    rdom = RelayDomain.objects.get(pk=rdom_id)
+    if not request.user.can_access(rdom):
+        raise PermDeniedException
+    if request.method == 'POST':
+        form = RelayDomainForm(request.POST, instance=rdom)
+        if form.is_valid():
+            form.save()
+            events.raiseEvent('RelayDomainModified', rdom)
+            return render_to_json_response(
+                {'respmsg': _('Relay domain modified')}
+            )
+        return render_to_json_response(form.errors, status=400)
+    ctx = {
+        'action': reverse(edit, args=[rdom.id]),
+        'formid': 'rdomform',
+        'title': rdom.name,
+        'action_label': _("Update"),
+        'action_classes': "submit",
+        'form': RelayDomainForm(instance=rdom)
+    }
+    return render(request, tplname, ctx)
+
+
+@login_required
+@permission_required("admin.delete_relaydomain")
+def delete(request, rdom_id):
+    rdom = RelayDomain.objects.get(pk=rdom_id)
+    if not request.user.can_access(rdom):
+        raise PermDeniedException
+    rdom.delete()
+    return render_to_json_response({
+        'status': 'ok', 'respmsg': _('Relay domain deleted')
+    })
+
+
+@login_required
+@user_passes_test(lambda u: u.is_superuser)
+@require_http_methods(["POST"])
+def scan_for_services(request):
+    try:
+        Service.objects.load_from_master_cf()
+    except IOError as e:
+        return render_to_json_response([str(e)], status=500)
+
+    return render_to_json_response(
+        dict((srv.name, srv.id) for srv in Service.objects.all())
+    )
diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py
index 5abb9df6d..66aa23270 100644
--- a/modoboa/lib/events.py
+++ b/modoboa/lib/events.py
@@ -132,7 +132,7 @@ def raiseEvent(event, *args, **kwargs):
     return 1
 
 
-def raiseQueryEvent(event, *args):
+def raiseQueryEvent(event, *args, **kwargs):
     """Raise a specific event and wait for answers from callbacks
 
     Any additional keyword argument will be passed to registered
@@ -144,7 +144,7 @@ def raiseQueryEvent(event, *args):
     if not event in events or not event in callbacks.keys():
         return result
     for callback in callbacks[event].values():
-        result += callback(*args)
+        result += callback(*args, **kwargs)
     return result
 
 
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 4dbbde54f..dce73a1b3 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -4,6 +4,7 @@ from django import template
 from django.template import Template, Context
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy
+from modoboa.lib import events
 from modoboa.lib.formutils import SeparatorField
 
 register = template.Library()
@@ -146,3 +147,20 @@ def render_tags(tags):
 {% endfor %}
 """)
     return t.render(Context({"tags": tags}))
+
+
+@register.simple_tag
+def extra_static_content(caller, user):
+    """Get extra static content from extensions.
+
+    :param str caller: the application (location) responsible for the call
+    :param ``User`` user: connected user
+    """
+    tpl = template.Template(
+        "{% for sc in static_content %}{{ sc|safe }}{% endfor %}"
+    )
+    return tpl.render(
+        template.Context({
+            'static_content': events.raiseQueryEvent("GetStaticContent", caller, user)
+        })
+    )
diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py
index aa47ea23e..7bbfbc136 100644
--- a/modoboa/lib/webutils.py
+++ b/modoboa/lib/webutils.py
@@ -100,6 +100,17 @@ def ajax_simple_response(content, **response_kwargs):
     return HttpResponse(simplejson.dumps(content), **response_kwargs)
 
 
+def render_to_json_response(context, **response_kwargs):
+    """Simple shortcut to render a JSON response.
+
+    :param dict context: response content
+    :return: ``HttpResponse`` object
+    """
+    data = simplejson.dumps(context)
+    response_kwargs['content_type'] = 'application/json'
+    return HttpResponse(data, **response_kwargs)
+
+
 def static_url(path):
     """Returns the correct static url for a given file
 
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index d58a2a1d4..b3b0ef4e9 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -80,11 +80,20 @@ function modalbox_autowidth(e) {
 /*
  * Simple shorcut do create a bootstrap alert box (error mode)
  */
-function build_error_alert(msg) {
-    return $('<div class="alert alert-error"> \
+function build_alert_box(msg, level) {
+    return $('<div class="alert alert-' + level + '"> \
 <a class="close" data-dismiss="alert" href="#">&times;</a>' + msg + "</div>");
 }
 
+function build_error_alert(msg) {
+    return build_alert_box(msg, 'error');
+}
+
+function build_success_alert(msg) {
+    return build_alert_box(msg, 'success');
+}
+
+
 /*
  * '.keys()' method support for old browsers :p
  */
@@ -149,6 +158,70 @@ function simple_ajax_form_post(e, options) {
     });
 }
 
+/*
+ * Replacement
+ */
+function simple_ajax_form_post2(e, options) {
+    e.preventDefault();
+    var $form = (options.formid != undefined) ? $("#" + options.formid) : $("form");
+    var defaults = {reload_on_success: true, reload_mode: 'full', modal: true};
+    var opts = $.extend({}, defaults, options);
+    var args = $form.serialize();
+
+    if (options.extradata != undefined) {
+        args += "&" + options.extradata;
+    }
+    $.ajax({
+        type: "POST",
+        url: $form.attr("action"),
+        data: args
+    }).done(function(data) {
+        $("#modalbox").modal('hide');
+        if (opts.success_cb != undefined) {
+            opts.success_cb(data);
+            return;
+        }
+        if (opts.reload_on_success) {
+            if (opts.reload_mode == 'full') {
+                window.location.reload();
+            } else {
+                history.update(true);
+            }
+        }
+        if (data.respmsg) {
+            $("body").notify('success', data.respmsg, 2000);
+        }
+    }).fail(function(jqxhr) {
+        if (jqxhr.status != 400) {
+            return;
+        }
+        var result = $.parseJSON(jqxhr.responseText);
+        $.each(result, function(id, value) {
+            var fullid = "id_" + id;
+            var $widget = $("#" + fullid);
+            var spanid = fullid + "-error";
+            var $span = $("#" + spanid);
+
+            if (!$widget.parents(".control-group").hasClass("error")) {
+                $widget.parents(".control-group").addClass("error");
+            }
+            if (!$span.length) {
+                $span = $("<span />", {
+                    "class": "help-inline",
+                    "html": value[0],
+                    "id": spanid
+                });
+                $widget.parents(".controls").append($span);
+            } else {
+                $span.html(value[0]);
+            }
+        });
+        if (opts.error_cb) {
+            opts.error_cb(result);
+        }
+    });
+}
+
 /*
  * The following code prevents a bug under IE7 because fullpath is
  * returned instead of a relative one. (even if mootools uses
diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index c7cca54d3..05dd55fc8 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -8,5 +8,6 @@
       <input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act" {% if activator_value %}checked='checked'{% else %}{% if deactivate_if_empty and field.value == None %}checked='checked'{% endif %}{% endif %}/>{{ activator_label }}
     </label>{% endif %}
     {% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
+    {% block extra_controls %}{% endblock %}
   </div>
 </div>
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 446f6ca48..6ed5af67e 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -23,7 +23,7 @@
     <script type="text/javascript">
       set_static_url("{{ STATIC_URL }}");
     </script>
-    {% extra_head_content user %}
+    {% extra_static_content "top" user %}
     {% block html_head %}{% endblock %}
   </head>
 

From 83c4d9c5ac8b6d45176ee0bd5d6a24a79e4a8fbb Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 18 Oct 2013 16:45:15 +0200
Subject: [PATCH 02/32] Fixes.

see #491
---
 modoboa/extensions/admin/tables.py            | 41 +------------------
 modoboa/extensions/amavis/__init__.py         |  1 +
 .../postfix_relay_domains/models.py           |  2 +-
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/modoboa/extensions/admin/tables.py b/modoboa/extensions/admin/tables.py
index 6ab552161..d8f4f1c8d 100644
--- a/modoboa/extensions/admin/tables.py
+++ b/modoboa/extensions/admin/tables.py
@@ -1,45 +1,6 @@
 # coding: utf-8
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import tables
-from templatetags.admin_tags import domain_actions
-
-
-class DomainsTable(tables.Table):
-    tableid = "objects_table"
-    idkey = "id"
-    styles = "table"
-
-    name = tables.LinkColumn(
-        "name", label=ugettext_lazy("Name"),
-        urlpattern="modoboa.extensions.admin.views.domain.editdomain",
-        title=_("Edit domain"), modal=True, modalcb="admin.domainform_cb",
-        sortable=True, sort_order="name"
-    )
-    domaliases = tables.Column(
-        "domainalias_set", label=ugettext_lazy("Alias(es)"), safe=True,
-        sortable=True, sort_order="domainalias__name"
-    )
-    actions = tables.ActionColumn("actions", label=ugettext_lazy("Actions"),
-                                  defvalue=domain_actions)
-
-    cols_order = ["name", "domaliases", "actions"]
-
-    def __init__(self, request, doms):
-        super(DomainsTable, self).__init__(request)
-        self.populate(self._rows_from_model(doms))
-
-    def parse_domainalias_set(self, aliases):
-        if not len(aliases.all()):
-            return "---"
-        res = ""
-        for da in aliases.all():
-            res += "%s<br/>" % da.name
-        return res
-
-    def row_class(self, request, domain):
-        if not domain.enabled:
-            return "muted"
-        return ""
 
 
 class ExtensionsTable(tables.Table):
diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index a376a9a34..b5013daa9 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -114,6 +114,7 @@ $(document).ready(function() {
             }
         }
     });
+});
 </script>
 """)
         return [tpl.render(
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 58a3012c4..34a78106d 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -48,7 +48,7 @@ class ServiceManager(Manager):
         for service in self.all():
             if not service.name in services:
                 to_delete.append(service.name)
-        Service.objects.filter(name__in=to_delete()).delete()
+        Service.objects.filter(name__in=to_delete).delete()
 
 
 class Service(models.Model):

From 6444c71a03820551c1f46076b1fc21c23c013a67 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 19 Oct 2013 09:35:29 +0200
Subject: [PATCH 03/32] Support added to relay domain aliases.

I've also refactored some code.
see #491
---
 doc/extending/events.rst                      | 16 ++--
 modoboa/extensions/admin/__init__.py          | 11 +--
 modoboa/extensions/admin/models/__init__.py   |  4 +-
 modoboa/extensions/admin/models/alias.py      | 22 +----
 modoboa/extensions/admin/models/base.py       | 37 +++++++--
 modoboa/extensions/admin/models/domain.py     | 21 +----
 .../extensions/admin/models/domain_alias.py   | 25 +-----
 modoboa/extensions/admin/models/mailbox.py    | 14 +---
 .../extensions/admin/static/admin/js/admin.js | 12 ---
 .../admin/templates/admin/domains_table.html  |  4 +-
 .../admin/templatetags/admin_tags.py          | 18 ++--
 modoboa/extensions/admin/views/domain.py      |  2 +-
 modoboa/extensions/amavis/__init__.py         |  8 +-
 modoboa/extensions/limits/controls.py         |  8 +-
 .../extensions/postfix_autoreply/__init__.py  | 32 +++----
 .../postfix_relay_domains/__init__.py         |  8 ++
 .../extensions/postfix_relay_domains/forms.py | 83 ++++++++++++++++++-
 .../postfix_relay_domains/models.py           | 44 +++++-----
 .../postfix_relay_domains/js/relay_domains.js |  5 +-
 .../relaydomain_form.html                     |  1 +
 .../extensions/postfix_relay_domains/views.py |  4 +-
 21 files changed, 215 insertions(+), 164 deletions(-)

diff --git a/doc/extending/events.rst b/doc/extending/events.rst
index 76bcf0493..083ed7750 100644
--- a/doc/extending/events.rst
+++ b/doc/extending/events.rst
@@ -144,8 +144,8 @@ this account is concerned by a specific form.
 Callbacks listening to this event must return a list containing one
 Boolean.
 
-CreateDomain
-============
+DomainCreated
+=============
 
 Raised when a new domain is created. 
 
@@ -156,8 +156,8 @@ Raised when a new domain is created.
 * ``user`` corresponds to the ``User`` object creating the domain (its owner)
 * ``domain`` is a ``Domain`` instance
 
-CreateMailbox
-=============
+MailboxCreated
+==============
 
 Raised when a new mailbox is created.
 
@@ -168,8 +168,8 @@ Raised when a new mailbox is created.
 * ``user`` is the new mailbox's owner (``User`` instance)
 * ``mailbox`` is the new mailbox (``Mailbox`` instance)
 
-DeleteDomain
-============
+DomainDeleted
+=============
 
 Raised when an existing domain is about to be deleted.
 
@@ -179,8 +179,8 @@ Raised when an existing domain is about to be deleted.
 
 * ``domain`` is a ``Domain`` instance
 
-DeleteMailbox
-=============
+MailboxDeleted
+==============
 
 Raised when an existing mailbox is about to be deleted. 
 
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index c567fc059..f5737f288 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -12,21 +12,22 @@ from modoboa.extensions.admin.models import (
 
 
 admin_events = [
-    "CreateDomain",
+    "DomainCreated",
     "DomainModified",
-    "DeleteDomain",
+    "DomainDeleted",
     "ExtraDomainEntries",
     "ExtraDomainMenuEntries",
     "ExtraDomainFilters",
     "GetDomainActions",
     "GetDomainModifyLink",
+    "GetDomainAliasQuerySet",
 
     "DomainAliasCreated",
     "DomainAliasDeleted",
 
-    "CreateMailbox",
-    "DeleteMailbox",
-    "ModifyMailbox",
+    "MailboxCreated",
+    "MailboxDeleted",
+    "MailboxModified",
 
     "MailboxAliasCreated",
     "MailboxAliasDeleted",
diff --git a/modoboa/extensions/admin/models/__init__.py b/modoboa/extensions/admin/models/__init__.py
index 2a34185d3..641eff9ad 100644
--- a/modoboa/extensions/admin/models/__init__.py
+++ b/modoboa/extensions/admin/models/__init__.py
@@ -1,4 +1,4 @@
-from .base import DatesAware
+from .base import AdminObject
 from .domain import Domain
 from .domain_alias import DomainAlias
 from .mailbox import Mailbox, Quota, MailboxOperation
@@ -6,5 +6,5 @@ from .alias import Alias
 
 __all__ = [
     'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias',
-    'MailboxOperation', 'DatesAware'
+    'MailboxOperation', 'AdminObject'
 ]
diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py
index 134bf62d8..e0ec8ca57 100644
--- a/modoboa/extensions/admin/models/alias.py
+++ b/modoboa/extensions/admin/models/alias.py
@@ -5,12 +5,12 @@ from modoboa.lib import events
 from modoboa.lib.emailutils import split_mailbox
 from modoboa.lib.exceptions import PermDeniedException
 from modoboa.extensions.admin.exceptions import AdminError
-from .base import DatesAware
+from .base import AdminObject
 from .domain import Domain
 from .mailbox import Mailbox
 
 
-class Alias(DatesAware):
+class Alias(AdminObject):
     address = models.CharField(
         ugettext_lazy('address'), max_length=254,
         help_text=ugettext_lazy("The alias address (without the domain part). For a 'catch-all' address, just enter an * character.")
@@ -29,6 +29,7 @@ class Alias(DatesAware):
         ugettext_lazy('enabled'),
         help_text=ugettext_lazy("Check to activate this alias")
     )
+    _objectname = 'MailboxAlias'
 
     class Meta:
         permissions = (
@@ -80,8 +81,7 @@ class Alias(DatesAware):
 
     def post_create(self, creator):
         from modoboa.lib.permissions import grant_access_to_object
-        grant_access_to_object(creator, self, is_owner=True)
-        events.raiseEvent("MailboxAliasCreated", creator, self)
+        super(Alias, self).post_create(creator)
         if creator.is_superuser:
             for admin in self.domain.admins:
                 grant_access_to_object(admin, self)
@@ -96,14 +96,7 @@ class Alias(DatesAware):
             del kwargs['int_rcpts']
         else:
             int_rcpts = []
-        if "creator" in kwargs:
-            creator = kwargs["creator"]
-            del kwargs["creator"]
-        else:
-            creator = None
         super(Alias, self).save(*args, **kwargs)
-        if creator is not None:
-            self.post_create(creator)
         curaliases = self.aliases.all()
         curmboxes = self.mboxes.all()
         for t in int_rcpts:
@@ -120,13 +113,6 @@ class Alias(DatesAware):
             if not t in int_rcpts:
                 self.mboxes.remove(t)
 
-    def delete(self):
-        from modoboa.lib.permissions import ungrant_access_to_object
-
-        events.raiseEvent("MailboxAliasDeleted", self)
-        ungrant_access_to_object(self)
-        super(Alias, self).delete()
-
     def get_recipients(self):
         """Return the recipients list
 
diff --git a/modoboa/extensions/admin/models/base.py b/modoboa/extensions/admin/models/base.py
index ad94fee92..5f3fd61a3 100644
--- a/modoboa/extensions/admin/models/base.py
+++ b/modoboa/extensions/admin/models/base.py
@@ -1,4 +1,8 @@
 from django.db import models
+from modoboa.lib import events
+from modoboa.lib.permissions import (
+    grant_access_to_object, ungrant_access_to_object
+)
 
 
 class ObjectDates(models.Model):
@@ -27,7 +31,7 @@ class ObjectDates(models.Model):
         obj.dates = dates
 
 
-class DatesAware(models.Model):
+class AdminObject(models.Model):
     """Abstract model to support dates
 
     Inherit from this model to automatically add the "dates" feature
@@ -35,14 +39,11 @@ class DatesAware(models.Model):
     saves.
     """
     dates = models.ForeignKey(ObjectDates)
+    _objectname = None
 
     class Meta:
         abstract = True
 
-    def save(self, *args, **kwargs):
-        ObjectDates.set_for_object(self)
-        super(DatesAware, self).save(*args, **kwargs)
-
     @property
     def creation(self):
         return self.dates.creation
@@ -50,3 +51,29 @@ class DatesAware(models.Model):
     @property
     def last_modification(self):
         return self.dates.last_modification
+
+    @property
+    def objectname(self):
+        if self._objectname is None:
+            return self.__class__.__name__
+        return self._objectname
+
+    def post_create(self, creator):
+        grant_access_to_object(creator, self, is_owner=True)
+        events.raiseEvent("%sCreated" % self.objectname, creator, self)
+
+    def save(self, *args, **kwargs):
+        ObjectDates.set_for_object(self)
+        if "creator" in kwargs:
+            creator = kwargs["creator"]
+            del kwargs["creator"]
+        else:
+            creator = None
+        super(AdminObject, self).save(*args, **kwargs)
+        if creator is not None:
+            self.post_create(creator)
+
+    def delete(self):
+        events.raiseEvent("%sDeleted" % self.objectname, self)
+        ungrant_access_to_object(self)
+        super(AdminObject, self).delete()
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index d497d8260..3e4294070 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -6,7 +6,7 @@ from django.contrib.contenttypes import generic
 from modoboa.lib import events, parameters
 from modoboa.core.models import User, ObjectAccess
 from modoboa.extensions.admin.exceptions import AdminError
-from .base import DatesAware
+from .base import AdminObject
 
 
 class DomainManager(Manager):
@@ -22,7 +22,7 @@ class DomainManager(Manager):
         return self.get_query_set().filter(owners__user=admin)
 
 
-class Domain(DatesAware):
+class Domain(AdminObject):
     name = models.CharField(ugettext_lazy('name'), max_length=100, unique=True,
                             help_text=ugettext_lazy("The domain name"))
     quota = models.IntegerField(
@@ -116,28 +116,11 @@ class Domain(DatesAware):
         if parameters.get_admin("AUTO_ACCOUNT_REMOVAL") == "yes":
             for account in User.objects.filter(mailbox__domain__name=self.name):
                 account.delete(fromuser, keepdir)
-        events.raiseEvent("DeleteDomain", self)
-        ungrant_access_to_object(self)
         super(Domain, self).delete()
 
     def __str__(self):
         return self.name
 
-    def post_create(self, creator):
-        from modoboa.lib.permissions import grant_access_to_object
-        grant_access_to_object(creator, self, is_owner=True)
-        events.raiseEvent("CreateDomain", creator, self)
-
-    def save(self, *args, **kwargs):
-        if "creator" in kwargs:
-            creator = kwargs["creator"]
-            del kwargs["creator"]
-        else:
-            creator = None
-        super(Domain, self).save(*args, **kwargs)
-        if creator is not None:
-            self.post_create(creator)
-
     def from_csv(self, user, row):
         if len(row) < 4:
             raise AdminError(_("Invalid line"))
diff --git a/modoboa/extensions/admin/models/domain_alias.py b/modoboa/extensions/admin/models/domain_alias.py
index 2e7727327..3d087dc11 100644
--- a/modoboa/extensions/admin/models/domain_alias.py
+++ b/modoboa/extensions/admin/models/domain_alias.py
@@ -3,11 +3,11 @@ from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import events
 from modoboa.extensions.admin.exceptions import AdminError
-from .base import DatesAware
+from .base import AdminObject
 from .domain import Domain
 
 
-class DomainAlias(DatesAware):
+class DomainAlias(AdminObject):
     name = models.CharField(ugettext_lazy("name"), max_length=100, unique=True,
                             help_text=ugettext_lazy("The alias name"))
     target = models.ForeignKey(
@@ -28,27 +28,6 @@ class DomainAlias(DatesAware):
     def __unicode__(self):
         return self.name
 
-    def post_create(self, creator):
-        from modoboa.lib.permissions import grant_access_to_object
-        grant_access_to_object(creator, self, is_owner=True)
-        events.raiseEvent("DomainAliasCreated", creator, self)
-
-    def save(self, *args, **kwargs):
-        if "creator" in kwargs:
-            creator = kwargs["creator"]
-            del kwargs["creator"]
-        else:
-            creator = None
-        super(DomainAlias, self).save(*args, **kwargs)
-        if creator is not None:
-            self.post_create(creator)
-
-    def delete(self):
-        from modoboa.lib.permissions import ungrant_access_to_object
-        events.raiseEvent("DomainAliasDeleted", self)
-        ungrant_access_to_object(self)
-        super(DomainAlias, self).delete()
-
     def from_csv(self, user, row):
         """Create a domain alias from a CSV row
 
diff --git a/modoboa/extensions/admin/models/mailbox.py b/modoboa/extensions/admin/models/mailbox.py
index 0150558f5..ab1da3584 100644
--- a/modoboa/extensions/admin/models/mailbox.py
+++ b/modoboa/extensions/admin/models/mailbox.py
@@ -12,7 +12,7 @@ from modoboa.lib import parameters, events
 from modoboa.lib.sysutils import exec_cmd
 from modoboa.core.models import User
 from modoboa.extensions.admin.exceptions import AdminError
-from .base import DatesAware
+from .base import AdminObject
 from .domain import Domain
 
 
@@ -46,7 +46,7 @@ class MailboxManager(Manager):
         return self.get_query_set().filter(qf)
 
 
-class Mailbox(DatesAware):
+class Mailbox(AdminObject):
     address = models.CharField(
         ugettext_lazy('address'), max_length=252,
         help_text=ugettext_lazy("Mailbox address (without the @domain.tld part)")
@@ -186,8 +186,7 @@ class Mailbox(DatesAware):
 
     def post_create(self, creator):
         from modoboa.lib.permissions import grant_access_to_object
-        grant_access_to_object(creator, self, True)
-        events.raiseEvent("CreateMailbox", creator, self)
+        super(Mailbox, self).post_create(creator)
         if creator.is_superuser and not self.user.has_perm("admin.add_domain"):
             # A super user is creating a new mailbox. Give
             # access to that mailbox (and the associated
@@ -199,14 +198,7 @@ class Mailbox(DatesAware):
                 grant_access_to_object(admin, self.user)
 
     def save(self, *args, **kwargs):
-        if "creator" in kwargs:
-            creator = kwargs["creator"]
-            del kwargs["creator"]
-        else:
-            creator = None
         super(Mailbox, self).save(*args, **kwargs)
-        if creator is not None:
-            self.post_create(creator)
         try:
             q = self.quota_value
         except Quota.DoesNotExist:
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index f811d322b..87f1a51c3 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -259,18 +259,6 @@ Domains.prototype = {
         }, this));
         $(document).trigger('domform_init');
     },
-
-    rdomainform_cb: function() {
-        $(".submit").one('click', $.proxy(function(e) {
-            simple_ajax_form_post2(e, {
-                formid: "rdomform",
-                error_cb: $.proxy(this.rdomainform_cb, this),
-                reload_on_success: false,
-                success_cb: $.proxy(this.reload_listing, this)
-            });
-        }, this));
-    }
-
 };
 
 Domains.prototype = $.extend({}, Admin.prototype, Domains.prototype);
diff --git a/modoboa/extensions/admin/templates/admin/domains_table.html b/modoboa/extensions/admin/templates/admin/domains_table.html
index b3f16ba9d..c2e5ec105 100644
--- a/modoboa/extensions/admin/templates/admin/domains_table.html
+++ b/modoboa/extensions/admin/templates/admin/domains_table.html
@@ -2,8 +2,8 @@
 <table id="{{ tableid }}" class="table {{ styles }}">
   <thead>
     <tr>
-      <th id="identity" class="sortable" data-sort_order="identity" width="">{% trans "Name" %}</th>
-      <th id="name_or_rcpt" class="sortable" data-sort_order="name_or_rcpt" width="">{% trans "Alias(es)" %}</th>
+      <th id="name" class="sortable" data-sort_order="name" width="">{% trans "Name" %}</th>
+      <th id="aliases" width="">{% trans "Alias(es)" %}</th>
       <th id="tags" class="sortable" data-sort_order="tags" width="">{% trans "Tags" %}</th>
       <th id="actions" width="">{% trans "Actions" %}</th>
     </tr>
diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py
index e1fee75c9..7b9a7c5f7 100644
--- a/modoboa/extensions/admin/templatetags/admin_tags.py
+++ b/modoboa/extensions/admin/templatetags/admin_tags.py
@@ -195,13 +195,19 @@ def domain_aliases(domain):
     :rtype: str
     """
     if domain.__class__.__name__ == "Domain":
-        if not domain.domainalias_set.count():
+        qset = domain.domainalias_set
+    else:
+        qset = events.raiseQueryEvent('GetDomainAliasQuerySet', domain)
+        if not qset:
             return '---'
-        res = ""
-        for da in domain.domainalias_set.all():
-            res += "%s<br/>" % da.name
-        return res
-    return '---'
+        qset = qset[0]
+
+    if not qset.count():
+        return '---'
+    res = ''
+    for alias in qset.all():
+        res += '%s<br/>' % alias.name
+    return res
 
 
 @register.simple_tag
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 0b9d83ab8..302fdc5af 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -43,7 +43,7 @@ def _domains(request):
     domainlist = get_domains(
         request.user, **filters
     )
-    if sort_order in ["name", "domainalias__name"]:
+    if sort_order == 'name':
         domainlist = sorted(
             domainlist,
             key=lambda d: getattr(d, sort_order), reverse=sort_dir == '-'
diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index b5013daa9..69e63e056 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -62,8 +62,8 @@ def menu(target, user):
     return []
 
 
-@events.observe("CreateDomain")
-def on_create_domain(user, domain):
+@events.observe("DomainCreated")
+def on_domain_created(user, domain):
     from .models import Users, Policy
     p = Policy.objects.create(policy_name=domain.name)
     Users.objects.create(email="@%s" % domain.name, fullname=domain.name,
@@ -82,8 +82,8 @@ def on_domain_modified(domain):
         u.save()
 
 
-@events.observe("DeleteDomain")
-def on_delete_domain(domain):
+@events.observe("DomainDeleted")
+def on_domain_deleted(domain):
     from .models import Users
 
     try:
diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py
index c8c6829d1..18a7b96c2 100644
--- a/modoboa/extensions/limits/controls.py
+++ b/modoboa/extensions/limits/controls.py
@@ -66,12 +66,12 @@ def move_pool_resource(owner, user):
     user.limitspool.delete()
 
 
-@events.observe('CreateDomain')
+@events.observe('DomainCreated')
 def inc_nb_domains(user, domain):
     inc_limit(user, 'domains_limit')
 
 
-@events.observe('DeleteDomain')
+@events.observe('DomainDeleted')
 def dec_nb_domains(domain):
     owner = get_object_owner(domain)
     dec_limit(owner, 'domains_limit')
@@ -99,12 +99,12 @@ def dec_nb_domaliases(domainaliases):
         dec_limit(owner, 'domain_aliases_limit')
 
 
-@events.observe('CreateMailbox')
+@events.observe('MailboxCreated')
 def inc_nb_mailboxes(user, mailbox):
     inc_limit(user, 'mailboxes_limit')
 
 
-@events.observe('DeleteMailbox')
+@events.observe('MailboxDeleted')
 def dec_nb_mailboxes(mailboxes):
     from modoboa.extensions.admin.models import Mailbox
 
diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py
index 7f09472f6..fdbebf511 100644
--- a/modoboa/extensions/postfix_autoreply/__init__.py
+++ b/modoboa/extensions/postfix_autoreply/__init__.py
@@ -25,7 +25,7 @@ class PostfixAutoreply(ModoExtension):
             try:
                 Transport.objects.get(domain="autoreply.%s" % dom.name)
             except Transport.DoesNotExist:
-                onCreateDomain(None, dom)
+                onDomainCreated(None, dom)
             else:
                 continue
 
@@ -33,18 +33,18 @@ class PostfixAutoreply(ModoExtension):
                 try:
                     Alias.objects.get(full_address=mb.full_address)
                 except Alias.DoesNotExist:
-                    onCreateMailbox(None, mb)
+                    onMailboxCreated(None, mb)
 
     def load(self):
         from modoboa.extensions.postfix_autoreply.app_settings import ParametersForm
         parameters.register(ParametersForm, ugettext_lazy("Automatic replies"))
 
     def destroy(self):
-        events.unregister("CreateDomain", onCreateDomain)
-        events.unregister("DeleteDomain", onDeleteDomain)
-        events.unregister("CreateMailbox", onCreateMailbox)
-        events.unregister("DeleteMailbox", onDeleteMailbox)
-        events.unregister("ModifyMailbox", onModifyMailbox)
+        events.unregister("DomainCreated", onDomainCreated)
+        events.unregister("DomainDeleted", onDomainDeleted)
+        events.unregister("MailboxCreated", onMailboxCreated)
+        events.unregister("MailboxDeleted", onMailboxDeleted)
+        events.unregister("MailboxModified", onModifyMailbox)
         events.unregister("UserMenuDisplay", menu)
         parameters.unregister()
 
@@ -80,8 +80,8 @@ def menu(target, user):
     ]
 
 
-@events.observe("CreateDomain")
-def onCreateDomain(user, domain):
+@events.observe("DomainCreated")
+def onDomainCreated(user, domain):
     transport = Transport()
     transport.domain = "autoreply.%s" % domain.name
     transport.method = "autoreply:"
@@ -101,13 +101,13 @@ def onDomainModified(domain):
         al.save()
 
 
-@events.observe("DeleteDomain")
-def onDeleteDomain(domain):
+@events.observe("DomainDeleted")
+def onDomainDeleted(domain):
     Transport.objects.filter(domain="autoreply.%s" % domain.name).delete()
 
 
-@events.observe("CreateMailbox")
-def onCreateMailbox(user, mailbox):
+@events.observe("MailboxCreated")
+def onMailboxCreated(user, mailbox):
     alias = Alias()
     alias.full_address = mailbox.full_address
     alias.autoreply_address = \
@@ -115,8 +115,8 @@ def onCreateMailbox(user, mailbox):
     alias.save()
 
 
-@events.observe("DeleteMailbox")
-def onDeleteMailbox(mailboxes):
+@events.observe("MailboxDeleted")
+def onMailboxDeleted(mailboxes):
     from modoboa.extensions.admin.models import Mailbox
 
     if isinstance(mailboxes, Mailbox):
@@ -130,7 +130,7 @@ def onDeleteMailbox(mailboxes):
             alias.delete()
 
 
-@events.observe("ModifyMailbox")
+@events.observe("MailboxModified")
 def onModifyMailbox(mailbox, oldmailbox):
     if oldmailbox.full_address == mailbox.full_address:
         return
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index d10aedf05..7b77ca7b8 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -82,6 +82,7 @@ def extra_domain_entries(user, domfilter, searchquery, **extrafilters):
     relay_domains = RelayDomain.objects.get_for_admin(user)
     if searchquery is not None:
         q = Q(name__contains=searchquery)
+        q |= Q(relaydomainalias__name__contains=searchquery)
         relay_domains = relay_domains.filter(q).distinct()
     if 'srvfilter' in extrafilters and extrafilters['srvfilter']:
         relay_domains = relay_domains.filter(
@@ -103,6 +104,13 @@ def rdomain_modify_link(domain):
     }
 
 
+@events.observe('GetDomainAliasQuerySet')
+def get_da_query_set(domain):
+    if domain.__class__.__name__ != 'RelayDomain':
+        return []
+    return [domain.relaydomainalias_set]
+
+
 @events.observe('GetDomainActions')
 def rdomain_actions(user, domain):
     if not isinstance(domain, RelayDomain):
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index 03bc8d49d..ed60012da 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -1,8 +1,20 @@
 from django import forms
-from .models import RelayDomain
+from django.http import QueryDict
+from django.utils.translation import ugettext_lazy
+from modoboa.lib.formutils import DynamicForm, DomainNameField
+from modoboa.extensions.admin.models import Domain
+from .models import RelayDomain, RelayDomainAlias
 
 
-class RelayDomainForm(forms.ModelForm):
+class RelayDomainForm(forms.ModelForm, DynamicForm):
+    aliases = DomainNameField(
+        label=ugettext_lazy("Alias(es)"),
+        required=False,
+        help_text=ugettext_lazy(
+            "Alias(es) of this relay domain. Indicate only one name per input"
+            ", press ENTER to add a new input."
+        )
+    )
 
     class Meta:
         model = RelayDomain
@@ -10,3 +22,70 @@ class RelayDomainForm(forms.ModelForm):
         widgets = {
             'service': forms.Select(attrs={'class': 'span2'})
         }
+
+    def __init__(self, *args, **kwargs):
+        super(RelayDomainForm, self).__init__(*args, **kwargs)
+        if args and isinstance(args[0], QueryDict):
+            self._load_from_qdict(args[0], "aliases", DomainNameField)
+        elif 'instance' in kwargs:
+            rd = kwargs['instance']
+            for pos, rdalias in enumerate(rd.relaydomainalias_set.all()):
+                name = "aliases_%d" % (pos + 1)
+                self._create_field(forms.CharField, name, rdalias.name, 3)
+
+    def clean(self):
+        super(RelayDomainForm, self).clean()
+        if self._errors:
+            raise forms.ValidationError(self._errors)
+        cleaned_data = self.cleaned_data
+        # try:
+        #     DomainAlias.objects.get(name=name)
+        # except DomainAlias.DoesNotExist:
+        #     pass
+        # else:
+        #     self._errors["name"] = self.error_class([_("An alias with this name already exists")])
+        #     del cleaned_data["name"]
+
+        for k in cleaned_data.keys():
+            if not k.startswith("aliases"):
+                continue
+            if cleaned_data[k] == "":
+                del cleaned_data[k]
+                continue
+            try:
+                Domain.objects.get(name=cleaned_data[k])
+            except Domain.DoesNotExist:
+                pass
+            else:
+                self._errors[k] = self.error_class([_("A domain with this name already exists")])
+                del cleaned_data[k]
+
+        return cleaned_data
+
+    def save(self, user, commit=True):
+        """Custom save method
+
+        """
+        rd = super(RelayDomainForm, self).save(commit=False)
+        if commit:
+            rd.save()
+            for k, v in self.cleaned_data.iteritems():
+                if not k.startswith("aliases"):
+                    continue
+                if v in ["", None]:
+                    continue
+                try:
+                    rd.relaydomainalias_set.get(name=v)
+                except RelayDomainAlias.DoesNotExist:
+                    pass
+                else:
+                    continue
+                #events.raiseEvent("CanCreate", user, "domain_aliases")
+                al = RelayDomainAlias(name=v, target=rd, enabled=rd.enabled)
+                al.save(creator=user)
+
+            for rdalias in rd.relaydomainalias_set.all():
+                if not filter(lambda name: self.cleaned_data[name] == rdalias.name,
+                              self.cleaned_data.keys()):
+                    rdalias.delete()
+        return rd
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 34a78106d..ac2a167c0 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.core.models import ObjectAccess
 from modoboa.lib import events, parameters
 from modoboa.lib.permissions import ungrant_access_to_object
-from modoboa.extensions.admin.models import DatesAware
+from modoboa.extensions.admin.models import AdminObject
 
 
 class RelayDomainManager(Manager):
@@ -63,7 +63,7 @@ class Service(models.Model):
         return self.name
 
 
-class RelayDomain(DatesAware):
+class RelayDomain(AdminObject):
     """Relay domain.
 
     A relay domain differs from a usual domaine because its final
@@ -106,24 +106,24 @@ class RelayDomain(DatesAware):
     def __str__(self):
         return self.name
 
-    def post_create(self, creator):
-        from modoboa.lib.permissions import grant_access_to_object
-        grant_access_to_object(creator, self, is_owner=True)
-        events.raiseEvent("RelayDomainCreated", creator, self)
-
-    def save(self, *args, **kwargs):
-        if "creator" in kwargs:
-            creator = kwargs["creator"]
-            del kwargs["creator"]
-        else:
-            creator = None
-        super(RelayDomain, self).save(*args, **kwargs)
-        if creator is not None:
-            self.post_create(creator)
-
-    def delete(self):
-        events.raiseEvent("RelayDomainDeleted", self)
-        ungrant_access_to_object(self)
-        super(RelayDomain, self).delete()
-
 reversion.register(RelayDomain)
+
+
+class RelayDomainAlias(AdminObject):
+    name = models.CharField(
+        ugettext_lazy("name"), max_length=100, unique=True,
+        help_text=ugettext_lazy("The alias name")
+    )
+    target = models.ForeignKey(
+        RelayDomain, verbose_name=ugettext_lazy('target'),
+        help_text=ugettext_lazy("The relay domain this alias points to")
+    )
+    enabled = models.BooleanField(
+        ugettext_lazy('enabled'),
+        help_text=ugettext_lazy("Check to activate this alias")
+    )
+
+    def __str__(self):
+        return self.name
+
+reversion.register(RelayDomainAlias)
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
index ac410165b..830e3e977 100644
--- a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -51,10 +51,11 @@ RelayDomains.prototype = {
 
     domainform_cb: function() {
         $('#btnscan').click(this.launch_scan);
-        $(".submit").one('click', $.proxy(function(e) {
+        $('input:text:visible:first').focus();
+        $("#id_aliases").dynamic_input();
+        $(".submit").on('click', $.proxy(function(e) {
             simple_ajax_form_post2(e, {
                 formid: "rdomform",
-                error_cb: $.proxy(this.domainform_cb, this),
                 reload_on_success: false,
                 success_cb: $.proxy(admin.reload_listing, admin)
             });
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
index 0c809b33f..99edce36b 100644
--- a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
@@ -2,6 +2,7 @@
 {% render_field form.name %}
 {% render_field form.target_host %}
 {% include "postfix_relay_domains/service_field.html" with field=form.service %}
+{% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
 {% render_field form.verify_recipients %}
 {% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/views.py b/modoboa/extensions/postfix_relay_domains/views.py
index 3d73ad77f..0a4281d0d 100644
--- a/modoboa/extensions/postfix_relay_domains/views.py
+++ b/modoboa/extensions/postfix_relay_domains/views.py
@@ -25,7 +25,7 @@ def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
     if request.method == 'POST':
         form = RelayDomainForm(request.POST)
         if form.is_valid():
-            rdom = form.save()
+            rdom = form.save(request.user)
             rdom.post_create(request.user)
             return render_to_json_response(
                 {"respmsg": _("Relay domain created")}
@@ -44,7 +44,7 @@ def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'
     if request.method == 'POST':
         form = RelayDomainForm(request.POST, instance=rdom)
         if form.is_valid():
-            form.save()
+            form.save(request.user)
             events.raiseEvent('RelayDomainModified', rdom)
             return render_to_json_response(
                 {'respmsg': _('Relay domain modified')}

From d7a2e5c30b196cf62d112e06c610b91a4604ae97 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 19 Oct 2013 18:32:11 +0200
Subject: [PATCH 04/32] Better error validation.

see #491
---
 modoboa/extensions/admin/__init__.py          |  1 +
 modoboa/extensions/admin/forms/domain.py      | 57 ++++++++++++------
 modoboa/extensions/admin/lib.py               | 10 ++++
 modoboa/extensions/admin/views/domain.py      |  2 +-
 .../postfix_relay_domains/__init__.py         | 10 +++-
 .../extensions/postfix_relay_domains/forms.py | 59 +++++++++++++------
 .../postfix_relay_domains/models.py           |  4 +-
 modoboa/static/js/global.js                   |  2 +
 8 files changed, 104 insertions(+), 41 deletions(-)

diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index f5737f288..22e84f0c7 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -21,6 +21,7 @@ admin_events = [
     "GetDomainActions",
     "GetDomainModifyLink",
     "GetDomainAliasQuerySet",
+    "CheckDomainName",
 
     "DomainAliasCreated",
     "DomainAliasDeleted",
diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index 2bc9a842a..59682ae6c 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -16,7 +16,10 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
     aliases = DomainNameField(
         label=ugettext_lazy("Alias(es)"),
         required=False,
-        help_text=ugettext_lazy("Alias(es) of this domain. Indicate only one name per input, press ENTER to add a new input.")
+        help_text=ugettext_lazy(
+            "Alias(es) of this domain. Indicate only one name per input, "
+            "press ENTER to add a new input."
+        )
     )
 
     class Meta:
@@ -41,35 +44,48 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
                 self._create_field(forms.CharField, name, dalias.name, 3)
 
     def clean(self):
+        """Custom fields validation.
+
+        We want to prevent duplicate names between domains and domain
+        aliases. Extensions have the possibility to declare other
+        objects (see *CheckDomainName* event).
+
+        The validation way is not very smart...
+        """
         super(DomainFormGeneral, self).clean()
-        if len(self._errors):
+        if self._errors:
             raise forms.ValidationError(self._errors)
 
         cleaned_data = self.cleaned_data
         name = cleaned_data["name"]
-
-        try:
-            DomainAlias.objects.get(name=name)
-        except DomainAlias.DoesNotExist:
-            pass
-        else:
-            self._errors["name"] = self.error_class([_("An alias with this name already exists")])
-            del cleaned_data["name"]
-
+        dtypes = events.raiseQueryEvent('CheckDomainName')
+        for dtype, label in [(DomainAlias, _('domain alias'))] + dtypes:
+            try:
+                dtype.objects.get(name=name)
+            except dtype.DoesNotExist:
+                pass
+            else:
+                self._errors["name"] = self.error_class(
+                    [_("A %s with this name already exists" % unicode(label))]
+                )
+                del cleaned_data["name"]
+                break
         for k in cleaned_data.keys():
             if not k.startswith("aliases"):
                 continue
             if cleaned_data[k] == "":
                 del cleaned_data[k]
                 continue
-            try:
-                Domain.objects.get(name=cleaned_data[k])
-            except Domain.DoesNotExist:
-                pass
-            else:
-                self._errors[k] = self.error_class([_("A domain with this name already exists")])
+            for dtype, label in [(Domain, _('domain'))] + dtypes:
+                try:
+                    dtype.objects.get(name=cleaned_data[k])
+                except dtype.DoesNotExist:
+                    continue
+                self._errors[k] = self.error_class(
+                    [_("A %s with this name already exists" % unicode(label))]
+                )
                 del cleaned_data[k]
-
+                break
         return cleaned_data
 
     def update_mailbox_quotas(self, domain):
@@ -148,7 +164,10 @@ class DomainFormOptions(forms.Form):
     dom_admin_username = forms.CharField(
         label=ugettext_lazy("Name"),
         initial="admin",
-        help_text=ugettext_lazy("The administrator's name. Don't include the domain's name here, it will be automatically appended."),
+        help_text=ugettext_lazy(
+            "The administrator's name. Don't include the domain's name here, "
+            "it will be automatically appended."
+        ),
         widget=forms.widgets.TextInput(attrs={"class": "input-small"}),
         required=False
     )
diff --git a/modoboa/extensions/admin/lib.py b/modoboa/extensions/admin/lib.py
index bf142a297..7f8ad30bc 100644
--- a/modoboa/extensions/admin/lib.py
+++ b/modoboa/extensions/admin/lib.py
@@ -49,6 +49,16 @@ def get_sort_order(qdict, default, allowed_values=None):
 
 
 def get_listing_page(objects, pagenum):
+    """Return specific a listing page.
+
+    A page contains a limited number of elements (see
+    ITEMS_PER_PAGE). If the given page number is wrong, the first page
+    will be always returned.
+
+    :param list objects: object list to paginate
+    :param int pagenum: page number
+    :return: a ``Page`` object
+    """
     paginator = Paginator(
         objects, int(parameters.get_admin("ITEMS_PER_PAGE", app="core"))
     )
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 302fdc5af..812cc4928 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -54,7 +54,7 @@ def _domains(request):
     page = get_listing_page(domainlist, request.GET.get("page", 1))
     return ajax_simple_response({
         "table": _render_to_string(request, 'admin/domains_table.html', {
-            'domains': domainlist,
+            'domains': page.object_list,
             'tableid': 'domains'
         }),
         "page": page.number,
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index 7b77ca7b8..912da41f4 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy
 from django.db.models import Q
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
-from .models import RelayDomain, Service
+from .models import RelayDomain, RelayDomainAlias, Service
 
 extension_events = [
     "RelayDomainCreated",
@@ -124,3 +124,11 @@ def rdomain_actions(user, domain):
         "title": ugettext_lazy("Delete %s?" % domain.name),
         "img": "icon-trash"
     }]
+
+
+@events.observe('CheckDomainName')
+def check_domain_name():
+    return [
+        (RelayDomain, ugettext_lazy('relay domain')),
+        (RelayDomainAlias, ugettext_lazy('relay domain alias'))
+    ]
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index ed60012da..f3100bd68 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -1,8 +1,8 @@
 from django import forms
 from django.http import QueryDict
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib.formutils import DynamicForm, DomainNameField
-from modoboa.extensions.admin.models import Domain
+from modoboa.extensions.admin.models import Domain, DomainAlias
 from .models import RelayDomain, RelayDomainAlias
 
 
@@ -34,37 +34,60 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
                 self._create_field(forms.CharField, name, rdalias.name, 3)
 
     def clean(self):
+        """Custom fields validaton.
+
+        We want to prevent duplicate names between domains, relay
+        domains, domain aliases and relay domain aliases.
+
+        The validation way is not very smart...
+        """
         super(RelayDomainForm, self).clean()
         if self._errors:
             raise forms.ValidationError(self._errors)
         cleaned_data = self.cleaned_data
-        # try:
-        #     DomainAlias.objects.get(name=name)
-        # except DomainAlias.DoesNotExist:
-        #     pass
-        # else:
-        #     self._errors["name"] = self.error_class([_("An alias with this name already exists")])
-        #     del cleaned_data["name"]
+        for dtype, label in [(Domain, _('domain')),
+                             (DomainAlias, _('domain alias')),
+                             (RelayDomainAlias, _('relay domain alias'))]:
+            try:
+                dtype.objects.get(name=cleaned_data['name'])
+            except dtype.DoesNotExist:
+                pass
+            else:
+                self._errors["name"] = self.error_class(
+                    [_("A %s with this name already exists" % label)]
+                )
+                del cleaned_data["name"]
+                break
 
         for k in cleaned_data.keys():
             if not k.startswith("aliases"):
                 continue
-            if cleaned_data[k] == "":
+            if not cleaned_data[k]:
                 del cleaned_data[k]
                 continue
-            try:
-                Domain.objects.get(name=cleaned_data[k])
-            except Domain.DoesNotExist:
-                pass
-            else:
-                self._errors[k] = self.error_class([_("A domain with this name already exists")])
-                del cleaned_data[k]
+            for dtype, name in [(RelayDomain, _('relay domain')),
+                                (DomainAlias, _('domain alias')),
+                                (Domain, _('domain'))]:
+                try:
+                    dtype.objects.get(name=cleaned_data[k])
+                except dtype.DoesNotExist:
+                    pass
+                else:
+                    self._errors[k] = self.error_class(
+                        [_("A %s with this name already exists" % name)]
+                    )
+                    del cleaned_data[k]
+                    break
 
         return cleaned_data
 
     def save(self, user, commit=True):
-        """Custom save method
+        """Custom save method.
 
+        As relay domain aliases are defined using the same form as
+        relay domains, we need to save them manually.
+
+        :param ``User`` user: connected user
         """
         rd = super(RelayDomainForm, self).save(commit=False)
         if commit:
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index ac2a167c0..2900b5c35 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -76,7 +76,7 @@ class RelayDomain(AdminObject):
     )
     target_host = models.CharField(
         ugettext_lazy('target host'), max_length=255,
-        help_text=ugettext_lazy('')
+        help_text=ugettext_lazy('Remote destination of this domain')
     )
     service = models.ForeignKey(Service, default='relay')
     enabled = models.BooleanField(
@@ -85,7 +85,7 @@ class RelayDomain(AdminObject):
     )
     verify_recipients = models.BooleanField(
         ugettext_lazy('verify recipients'),
-        help_text=ugettext_lazy('')
+        help_text=ugettext_lazy('Check for valid recipients')
     )
 
     owners = generic.GenericRelation(ObjectAccess)
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index b3b0ef4e9..1016c0672 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -196,6 +196,8 @@ function simple_ajax_form_post2(e, options) {
             return;
         }
         var result = $.parseJSON(jqxhr.responseText);
+        $("div.error").removeClass("error");
+        $("span.help-inline").remove();
         $.each(result, function(id, value) {
             var fullid = "id_" + id;
             var $widget = $("#" + fullid);

From f91ef1adf250cfdc9f6dae6cf55cba7c7868dc67 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 28 Oct 2013 18:36:42 +0100
Subject: [PATCH 05/32] wip: relay domains support

* Unit tests added (limits application)
* Added support for limits
* Big changes were required
* Using standard HTTP codes to identify errors (json)
* Custom exceptions have been reworked (not finished yet)

see #491
---
 modoboa/core/__init__.py                      |   5 +-
 modoboa/core/exceptions.py                    |  14 -
 modoboa/core/extensions.py                    |   7 +
 modoboa/core/models.py                        |  23 +-
 modoboa/core/views/admin.py                   |  27 +-
 modoboa/core/views/user.py                    |  27 +-
 modoboa/extensions/admin/__init__.py          |   6 +-
 modoboa/extensions/admin/exceptions.py        |  19 -
 modoboa/extensions/admin/forms/account.py     | 145 +++++---
 modoboa/extensions/admin/forms/alias.py       |  34 +-
 modoboa/extensions/admin/forms/domain.py      |  41 ++-
 modoboa/extensions/admin/forms/forward.py     |  10 +-
 .../commands/handle_mailbox_operations.py     |   4 +-
 modoboa/extensions/admin/models/alias.py      |  18 +-
 modoboa/extensions/admin/models/domain.py     |   6 +-
 .../extensions/admin/models/domain_alias.py   |   7 +-
 modoboa/extensions/admin/models/mailbox.py    |   8 +-
 .../extensions/admin/static/admin/js/admin.js |  24 +-
 .../admin/{dlistform.html => aliasform.html}  |   3 +-
 .../templates/admin/domain_options_form.html  |   3 +-
 modoboa/extensions/admin/tests/account.py     |  47 ++-
 modoboa/extensions/admin/tests/alias.py       |  20 +-
 modoboa/extensions/admin/tests/domain.py      |  16 +-
 .../extensions/admin/tests/domain_alias.py    |   4 +-
 modoboa/extensions/admin/views/alias.py       |  77 ++--
 modoboa/extensions/admin/views/domain.py      | 134 +++----
 modoboa/extensions/admin/views/identity.py    | 116 +++---
 modoboa/extensions/admin/views/user.py        |  50 +--
 modoboa/extensions/limits/__init__.py         |  22 +-
 modoboa/extensions/limits/app_settings.py     |   4 +
 modoboa/extensions/limits/controls.py         |  85 ++---
 modoboa/extensions/limits/forms.py            |  71 ++--
 modoboa/extensions/limits/lib.py              |  24 ++
 modoboa/extensions/limits/models.py           |  61 ++-
 modoboa/extensions/limits/tests.py            | 346 +++++++++++++++++-
 modoboa/extensions/postfix_autoreply/views.py |  20 +-
 .../postfix_relay_domains/__init__.py         |  71 +++-
 .../postfix_relay_domains/app_settings.py     |   1 -
 .../extensions/postfix_relay_domains/forms.py |  33 +-
 .../postfix_relay_domains/limits_controls.py  |  31 ++
 .../postfix_relay_domains/js/relay_domains.js |  11 +-
 .../extensions/postfix_relay_domains/tests.py |  25 +-
 .../extensions/postfix_relay_domains/views.py |  45 +--
 modoboa/extensions/sievefilters/lib.py        |   5 +-
 .../static/sievefilters/js/lib.js             |  49 ++-
 .../templates/sievefilters/index.html         |   4 +-
 modoboa/extensions/sievefilters/views.py      | 121 +++---
 modoboa/extensions/webmail/forms.py           |  13 +-
 .../webmail/static/webmail/js/webmail.js      |   4 +-
 modoboa/extensions/webmail/views.py           |  74 ++--
 modoboa/lib/events.py                         |  15 +-
 modoboa/lib/exceptions.py                     |  49 ++-
 modoboa/lib/formutils.py                      |  42 ++-
 modoboa/lib/middleware.py                     |  12 +-
 modoboa/lib/parameters.py                     |  19 +-
 modoboa/lib/permissions.py                    |   4 +-
 modoboa/lib/singleton.py                      |  15 +
 modoboa/lib/tests.py                          |  17 +-
 modoboa/static/js/confirmation.js             |  34 +-
 modoboa/static/js/creation_wizard.js          |  56 ++-
 modoboa/static/js/global.js                   | 123 +++----
 modoboa/static/js/twocols_nav.js              |  33 +-
 62 files changed, 1484 insertions(+), 950 deletions(-)
 delete mode 100644 modoboa/core/exceptions.py
 delete mode 100644 modoboa/extensions/admin/exceptions.py
 rename modoboa/extensions/admin/templates/admin/{dlistform.html => aliasform.html} (67%)
 create mode 100644 modoboa/extensions/postfix_relay_domains/limits_controls.py
 create mode 100644 modoboa/lib/singleton.py

diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py
index 824c49add..8e81e7145 100644
--- a/modoboa/core/__init__.py
+++ b/modoboa/core/__init__.py
@@ -15,6 +15,7 @@ base_events = [
     "RoleChanged",
     "GetExtraRoles",
     "PasswordChange",
+    "UserCanSetRole",
 
     "UserMenuDisplay",
     "AdminMenuDisplay",
@@ -32,7 +33,9 @@ base_events = [
     "ExtraAdminContent",
 
     "ExtraUprefsRoutes",
-    "ExtraUprefsJS"
+    "ExtraUprefsJS",
+
+    "GetExtraParameters"
 ]
 
 
diff --git a/modoboa/core/exceptions.py b/modoboa/core/exceptions.py
deleted file mode 100644
index 063db7ad9..000000000
--- a/modoboa/core/exceptions.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-:mod:`exceptions` --- Custom exceptions of the admin. application
------------------------------------------------------------------
-"""
-
-from modoboa.lib.exceptions import ModoboaException
-
-
-class AdminError(ModoboaException):
-    """
-    Just a Custom exception to identify errors coming from the admin
-    application.
-    """
-    pass
diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py
index 4b399bd24..ecd65de4a 100644
--- a/modoboa/core/extensions.py
+++ b/modoboa/core/extensions.py
@@ -49,6 +49,13 @@ class ExtensionsPool(object):
             self.extensions[name]["instance"] = self.extensions[name]["cls"]()
         return self.extensions[name]["instance"]
 
+    def is_extension_enabled(self, name):
+        from modoboa.core.models import Extension
+
+        if not name in self.extensions:
+            return False
+        return Extension.objects.get(name=name).enabled
+
     def get_extension_infos(self, name):
         instance = self.get_extension(name)
         if instance is None:
diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index 4af548ad3..db0050044 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -17,10 +17,11 @@ from django.contrib.auth.models import (
     UserManager, Group, AbstractBaseUser, PermissionsMixin
 )
 from modoboa.lib import events, md5crypt, parameters
-from modoboa.lib.exceptions import PermDeniedException
+from modoboa.lib.exceptions import (
+    PermDeniedException, InternalError, BadRequest
+)
 from modoboa.lib.sysutils import exec_cmd
 from modoboa.core.extensions import exts_pool
-from modoboa.core.exceptions import AdminError
 
 try:
     from modoboa.lib.ldaputils import *
@@ -72,7 +73,9 @@ class User(AbstractBaseUser, PermissionsMixin):
             get_object_owner, grant_access_to_object, ungrant_access_to_object
 
         if fromuser == self:
-            raise AdminError(_("You can't delete your own account"))
+            raise PermDeniedException(
+                _("You can't delete your own account")
+            )
 
         if not fromuser.can_access(self):
             raise PermDeniedException
@@ -133,15 +136,15 @@ class User(AbstractBaseUser, PermissionsMixin):
             self.password = self._crypt_password(raw_value)
         else:
             if not ldap_available:
-                raise AdminError(
+                raise InternalError(
                     _("Failed to update password: LDAP module not installed")
                 )
 
             ab = LDAPAuthBackend()
             try:
                 ab.update_user_password(self.username, curvalue, raw_value)
-            except LDAPException, e:
-                raise AdminError(_("Failed to update password: %s" % str(e)))
+            except LDAPException as e:
+                raise InternalError(_("Failed to update password: %s" % str(e)))
         events.raiseEvent(
             "PasswordUpdated", self, raw_value, self.pk is None
         )
@@ -197,7 +200,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         try:
             return self.groups.all()[0].name
         except IndexError:
-            return "SimpleUsers"
+            return "---"
 
     @property
     def enabled(self):
@@ -318,7 +321,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         :param crypt_password:
         """
         if len(row) < 7:
-            raise AdminError(_("Invalid line"))
+            raise BadRequest(_("Invalid line"))
         role = row[6].strip()
         if not user.is_superuser and not role in ["SimpleUsers", "DomainAdmins"]:
             raise PermDeniedException(
@@ -327,11 +330,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         self.username = row[1].strip()
         if role == "SimpleUsers":
             if (len(row) < 8 or not row[7].strip()):
-                raise AdminError(
+                raise BadRequest(
                     _("The simple user '%s' must have a valid email address" % self.username)
                 )
             if self.username != row[7].strip():
-                raise AdminError(
+                raise BadRequest(
                     _("username and email fields must not differ for '%s'" % self.username)
                 )
 
diff --git a/modoboa/core/views/admin.py b/modoboa/core/views/admin.py
index fdd377cb2..678c41caf 100644
--- a/modoboa/core/views/admin.py
+++ b/modoboa/core/views/admin.py
@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import (
 )
 from modoboa.lib import parameters
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string
+    _render_to_string, render_to_json_response
 )
 from modoboa.lib.listing import get_sort_order, get_listing_page
 from modoboa.core.models import Extension, Log
@@ -24,7 +24,7 @@ def viewsettings(request, tplname='core/settings_header.html'):
 @login_required
 @user_passes_test(lambda u: u.is_superuser)
 def viewparameters(request, tplname='core/parameters.html'):
-    return ajax_simple_response({
+    return render_to_json_response({
         "status": "ok",
         "left_selection": "parameters",
         "content": _render_to_string(request, tplname, {
@@ -42,12 +42,10 @@ def saveparameters(request):
             form.save()
             form.to_django_settings()
             continue
-        return ajax_simple_response({
-            "status": "ko", "prefix": form.app, "errors": form.errors
-        })
-    return ajax_simple_response(dict(
-        status="ok", respmsg=_("Parameters saved")
-    ))
+        return render_to_json_response(
+            {'form_errors': form.errors, 'prefix': form.app}, status=400
+        )
+    return render_to_json_response(_("Parameters saved"))
 
 
 @login_required
@@ -68,8 +66,7 @@ def viewextensions(request, tplname='core/extensions.html'):
             ext["selection"] = False
 
     tbl = ExtensionsTable(request, exts)
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": _render_to_string(request, tplname, {"extensions": tbl})
     })
 
@@ -91,16 +88,13 @@ def saveextensions(request):
         if not ext in found:
             ext.off()
 
-    return ajax_simple_response(dict(
-        status="ok", respmsg=_("Modifications applied.")
-    ))
+    return render_to_json_response(_("Modifications applied."))
 
 
 @login_required
 @user_passes_test(lambda u: u.is_superuser)
 def information(request, tplname="core/information.html"):
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": render_to_string(tplname, {})
     })
 
@@ -118,8 +112,7 @@ def logs(request, tplname="core/logs.html"):
         Log.objects.all().order_by("%s%s" % (sort_dir, sort_order)),
         request.GET.get("page", 1)
     )
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": render_to_string(tplname, {
             "logs": page.object_list,
         }),
diff --git a/modoboa/core/views/user.py b/modoboa/core/views/user.py
index c42054526..d3cb2e8ac 100644
--- a/modoboa/core/views/user.py
+++ b/modoboa/core/views/user.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext as _
 from django.contrib.auth.decorators import login_required
 from modoboa.lib import events, parameters
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string
+    _render_to_string, render_to_json_response
 )
 from modoboa.lib.cryptutils import encrypt
 from modoboa.core.forms import ProfileForm
@@ -32,17 +32,11 @@ def profile(request, tplname='core/user_profile.html'):
             form.save()
             if update_password and form.cleaned_data["confirmation"] != "":
                 request.session["password"] = encrypt(form.cleaned_data["confirmation"])
-            return ajax_simple_response(dict(
-                status="ok", respmsg=_("Profile updated")
-            ))
-        return ajax_simple_response({
-            "status": "ko",
-            "errors": form.errors
-        })
+            return render_to_json_response(_("Profile updated"))
+        return render_to_json_response({'form_errors': form.errors}, status=400)
 
     form = ProfileForm(update_password, instance=request.user)
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": _render_to_string(request, tplname, {
             "form": form
         })
@@ -57,16 +51,13 @@ def preferences(request):
             if form.is_valid():
                 form.save()
                 continue
-            return ajax_simple_response({
-                "status": "ko", "prefix": form.app, "errors": form.errors
-            })
+            return render_to_json_response({
+                "prefix": form.app, "form_errors": form.errors
+            }, status=400)
 
-        return ajax_simple_response({
-            "status": "ok", "respmsg": _("Preferences saved")
-        })
+        return render_to_json_response(_("Preferences saved"))
 
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": _render_to_string(request, "core/user_preferences.html", {
             "forms": parameters.get_user_forms(request.user)
         })
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index 22e84f0c7..7cfd3d63a 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -3,14 +3,12 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.core.urlresolvers import reverse
 from modoboa.core.extensions import ModoExtension, exts_pool
 from modoboa.lib import parameters, events
-from modoboa.lib.exceptions import PermDeniedException
+from modoboa.lib.exceptions import PermDeniedException, BadRequest
 from modoboa.lib.emailutils import split_mailbox
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import (
     Domain, DomainAlias, Mailbox, Alias
 )
 
-
 admin_events = [
     "DomainCreated",
     "DomainModified",
@@ -146,7 +144,7 @@ def import_account_mailbox(user, account, row):
         try:
             domain = Domain.objects.get(name=domname)
         except Domain.DoesNotExist:
-            raise AdminError(
+            raise BadRequest(
                 _("Account import failed (%s): domain does not exist" % account.username)
             )
         if not user.can_access(domain):
diff --git a/modoboa/extensions/admin/exceptions.py b/modoboa/extensions/admin/exceptions.py
deleted file mode 100644
index d0414b27b..000000000
--- a/modoboa/extensions/admin/exceptions.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding: utf-8
-"""
-:mod:`exceptions` --- Custom exceptions of the admin. application
------------------------------------------------------------------
-"""
-
-from modoboa.lib.exceptions import ModoboaException
-
-
-class AdminError(ModoboaException):
-    """
-    Just a Custom exception to identify errors coming from the admin
-    application.
-    """
-    pass
-
-
-class BadDestination(Exception):
-    pass
diff --git a/modoboa/extensions/admin/forms/account.py b/modoboa/extensions/admin/forms/account.py
index bcbc54c86..c8afb5fae 100644
--- a/modoboa/extensions/admin/forms/account.py
+++ b/modoboa/extensions/admin/forms/account.py
@@ -2,14 +2,13 @@ from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.http import QueryDict
 from modoboa.lib import events, parameters
-from modoboa.lib.exceptions import PermDeniedException
+from modoboa.lib.exceptions import PermDeniedException, Conflict, NotFound
 from modoboa.lib.permissions import get_account_roles
 from modoboa.lib.emailutils import split_mailbox
 from modoboa.lib.formutils import (
     DomainNameField, DynamicForm, TabForms
 )
 from modoboa.core.models import User
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import (
     Domain, Mailbox, Alias
 )
@@ -22,7 +21,9 @@ class AccountFormGeneral(forms.ModelForm):
         choices=[('', ugettext_lazy("Choose"))],
         help_text=ugettext_lazy("What level of permission this user will have")
     )
-    password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
+    password1 = forms.CharField(
+        label=_("Password"), widget=forms.PasswordInput
+    )
     password2 = forms.CharField(
         label=ugettext_lazy("Confirmation"),
         widget=forms.PasswordInput,
@@ -90,7 +91,7 @@ class AccountFormGeneral(forms.ModelForm):
     def save(self, commit=True):
         account = super(AccountFormGeneral, self).save(commit=False)
         if self.user == account and not self.cleaned_data["is_active"]:
-            raise AdminError(_("You can't disable your own account"))
+            raise PermDeniedException(_("You can't disable your own account"))
         if commit:
             if "password1" in self.cleaned_data \
                and self.cleaned_data["password1"] != "":
@@ -105,14 +106,21 @@ class AccountFormMail(forms.Form, DynamicForm):
     quota = forms.IntegerField(
         label=ugettext_lazy("Quota"),
         required=False,
-        help_text=_("Quota in MB for this mailbox. Define a custom value or use domain's default one. Leave empty to define an unlimited value (not allowed for domain administrators)."),
+        help_text=_("Quota in MB for this mailbox. Define a custom value or "
+                    "use domain's default one. Leave empty to define an "
+                    "unlimited value (not allowed for domain "
+                    "administrators)."),
         widget=forms.widgets.TextInput(attrs={"class": "span1"})
     )
     quota_act = forms.BooleanField(required=False)
     aliases = forms.EmailField(
         label=ugettext_lazy("Alias(es)"),
         required=False,
-        help_text=ugettext_lazy("Alias(es) of this mailbox. Indicate only one address per input, press ENTER to add a new input. Use the '*' character to create a 'catchall' alias (ex: *@domain.tld).")
+        help_text=ugettext_lazy(
+            "Alias(es) of this mailbox. Indicate only one address per input, "
+            "press ENTER to add a new input. Use the '*' character to create "
+            "a 'catchall' alias (ex: *@domain.tld)."
+        )
     )
 
     def __init__(self, *args, **kwargs):
@@ -143,6 +151,52 @@ class AccountFormMail(forms.Form, DynamicForm):
         """Ensure lower case emails"""
         return self.cleaned_data["email"].lower()
 
+    def create_mailbox(self, user, account):
+        locpart, domname = split_mailbox(self.cleaned_data["email"])
+        try:
+            domain = Domain.objects.get(name=domname)
+        except Domain.DoesNotExist:
+            raise NotFound(_("Domain does not exist"))
+        if not user.can_access(domain):
+            raise PermDeniedException
+        try:
+            Mailbox.objects.get(address=locpart, domain=domain)
+        except Mailbox.DoesNotExist:
+            pass
+        else:
+            raise Conflict(
+                _("Mailbox %s already exists" % self.cleaned_data["email"])
+            )
+        events.raiseEvent("CanCreate", user, "mailboxes")
+        self.mb = Mailbox(address=locpart, domain=domain, user=account,
+                          use_domain_quota=self.cleaned_data["quota_act"])
+        self.mb.set_quota(self.cleaned_data["quota"], 
+                          user.has_perm("admin.add_domain"))
+        self.mb.save(creator=user)
+
+    def update_mailbox(self, user, account):
+        newaddress = None
+        if self.cleaned_data["email"] != self.mb.full_address:
+            newaddress = self.cleaned_data["email"]
+        elif account.group == "SimpleUsers" and account.username != self.mb.full_address:
+            newaddress = account.username
+        if newaddress is not None:
+            local_part, domname = split_mailbox(newaddress)
+            try:
+                domain = Domain.objects.get(name=domname)
+            except Domain.DoesNotExist:
+                raise NotFound(_("Domain does not exist"))
+            if not user.can_access(domain):
+                raise PermDeniedException
+            self.mb.rename(local_part, domain)
+
+        self.mb.use_domain_quota = self.cleaned_data["quota_act"]
+        override_rules = True \
+            if not self.mb.quota or user.has_perm("admin.add_domain") \
+            else False
+        self.mb.set_quota(self.cleaned_data["quota"], override_rules)
+        self.mb.save()
+
     def save(self, user, account):
         if self.cleaned_data["email"] == "":
             return None
@@ -151,74 +205,43 @@ class AccountFormMail(forms.Form, DynamicForm):
             self.cleaned_data["quota"] = None
 
         if not hasattr(self, "mb") or self.mb is None:
-            locpart, domname = split_mailbox(self.cleaned_data["email"])
-            try:
-                domain = Domain.objects.get(name=domname)
-            except Domain.DoesNotExist:
-                raise AdminError(_("Domain does not exist"))
-            if not user.can_access(domain):
-                raise PermDeniedException
-            try:
-                Mailbox.objects.get(address=locpart, domain=domain)
-            except Mailbox.DoesNotExist:
-                pass
-            else:
-                raise AdminError(_("Mailbox %s already exists" % self.cleaned_data["email"]))
-            events.raiseEvent("CanCreate", user, "mailboxes")
-            self.mb = Mailbox(address=locpart, domain=domain, user=account,
-                              use_domain_quota=self.cleaned_data["quota_act"])
-            self.mb.set_quota(self.cleaned_data["quota"], 
-                              user.has_perm("admin.add_domain"))
-            self.mb.save(creator=user)
+            self.create_mailbox(user, account)
         else:
-            newaddress = None
-            if self.cleaned_data["email"] != self.mb.full_address:
-                newaddress = self.cleaned_data["email"]
-            elif account.group == "SimpleUsers" and account.username != self.mb.full_address:
-                newaddress = account.username
-            if newaddress is not None:
-                local_part, domname = split_mailbox(newaddress)
-                try:
-                    domain = Domain.objects.get(name=domname)
-                except Domain.DoesNotExist:
-                    raise AdminError(_("Domain does not exist"))
-                if not user.can_access(domain):
-                    raise PermDeniedException
-                self.mb.rename(local_part, domain)
-
-            self.mb.use_domain_quota = self.cleaned_data["quota_act"]
-            override_rules = True \
-                if not self.mb.quota or user.has_perm("admin.add_domain") \
-                else False
-            self.mb.set_quota(self.cleaned_data["quota"], override_rules)
-            self.mb.save()
+            self.update_mailbox(user, account)
 
         account.email = self.cleaned_data["email"]
         account.save()
 
+        aliases = []
         for name, value in self.cleaned_data.iteritems():
             if not name.startswith("aliases"):
                 continue
             if value == "":
                 continue
-            local_part, domname = split_mailbox(value)
-            try:
-                self.mb.alias_set.get(address=local_part, domain__name=domname)
-            except Alias.DoesNotExist:
-                pass
-            else:
-                continue
-            events.raiseEvent("CanCreate", user, "mailbox_aliases")
-            al = Alias(address=local_part, enabled=account.is_active)
-            al.domain = Domain.objects.get(name=domname)
-            al.save(int_rcpts=[self.mb], creator=user)
+            aliases.append(value)
 
         for alias in self.mb.alias_set.all():
-            if len(alias.get_recipients()) >= 2:
-                continue
-            if not len(filter(lambda name: self.cleaned_data[name] == alias.full_address,
-                              self.cleaned_data.keys())):
+            if not alias.full_address in aliases:
+                if len(alias.get_recipients()) >= 2:
+                    continue
                 alias.delete()
+            else:
+                aliases.remove(alias.full_address)
+        if aliases:
+            events.raiseEvent(
+                "CanCreate", user, "mailbox_aliases", len(aliases)
+            )
+            for alias in aliases:
+                local_part, domname = split_mailbox(alias)
+                try:
+                    self.mb.alias_set.get(address=local_part, domain__name=domname)
+                except Alias.DoesNotExist:
+                    pass
+                else:
+                    continue
+                al = Alias(address=local_part, enabled=account.is_active)
+                al.domain = Domain.objects.get(name=domname)
+                al.save(int_rcpts=[self.mb], creator=user)
 
         return self.mb
 
diff --git a/modoboa/extensions/admin/forms/alias.py b/modoboa/extensions/admin/forms/alias.py
index 89bfe4e68..555b98802 100644
--- a/modoboa/extensions/admin/forms/alias.py
+++ b/modoboa/extensions/admin/forms/alias.py
@@ -1,11 +1,11 @@
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.http import QueryDict
+from modoboa.lib.exceptions import BadRequest, NotFound, Conflict
 from modoboa.lib.emailutils import split_mailbox
 from modoboa.lib.formutils import (
     DynamicForm
 )
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import (
     Domain, Mailbox, Alias
 )
@@ -14,11 +14,17 @@ from modoboa.extensions.admin.models import (
 class AliasForm(forms.ModelForm, DynamicForm):
     email = forms.EmailField(
         label=ugettext_lazy("Email address"),
-        help_text=ugettext_lazy("The distribution list address. Use the '*' character to create a 'catchall' address (ex: *@domain.tld).")
+        help_text=ugettext_lazy(
+            "The distribution list address. Use the '*' character to create a "
+            "'catchall' address (ex: *@domain.tld)."
+        )
     )
     recipients = forms.EmailField(
         label=ugettext_lazy("Recipients"), required=False,
-        help_text=ugettext_lazy("Mailbox(es) this alias will point to. Indicate only one address per input, press ENTER to add a new input.")
+        help_text=ugettext_lazy(
+            "Mailbox(es) this alias will point to. Indicate only one address "
+            "per input, press ENTER to add a new input."
+        )
     )
 
     class Meta:
@@ -58,7 +64,9 @@ class AliasForm(forms.ModelForm, DynamicForm):
         except Domain.DoesNotExist:
             raise forms.ValidationError(_("Domain does not exist"))
         if not self.user.can_access(domain):
-            raise forms.ValidationError(_("You don't have access to this domain"))
+            raise forms.ValidationError(
+                _("You don't have access to this domain")
+            )
         return self.cleaned_data["email"]
 
     def set_recipients(self):
@@ -78,7 +86,9 @@ class AliasForm(forms.ModelForm, DynamicForm):
                 continue
             local_part, domname = split_mailbox(v)
             if domname is None:
-                raise AdminError("%s %s" % (_("Invalid mailbox"), v))
+                raise BadRequest(
+                    u"%s %s" % (_("Invalid mailbox"), v)
+                )
             try:
                 domain = Domain.objects.get(name=domname)
             except Domain.DoesNotExist:
@@ -94,20 +104,26 @@ class AliasForm(forms.ModelForm, DynamicForm):
                     try:
                         rcpt = Mailbox.objects.get(domain=domain, address=local_part)
                     except Mailbox.DoesNotExist:
-                        raise AdminError(_("Local recipient %s not found" % v))
+                        raise NotFound(
+                            _("Local recipient %s not found" % v)
+                        )
                 if rcpt in self.int_rcpts:
-                    raise AdminError(_("Recipient %s already present" % v))
+                    raise Conflict(
+                        _("Recipient %s already present" % v)
+                    )
                 self.int_rcpts += [rcpt]
                 total += 1
                 continue
 
             if v in self.ext_rcpts:
-                raise AdminError(_("Recipient %s already present" % v))
+                raise Conflict(
+                    _("Recipient %s already present" % v)
+                )
             self.ext_rcpts += [v]
             total += 1
 
         if total == 0:
-            raise AdminError(_("No recipient defined"))
+            raise BadRequest(_("No recipient defined"))
 
     def save(self, commit=True):
         alias = super(AliasForm, self).save(commit=False)
diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index 59682ae6c..c3686fdc9 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -2,11 +2,11 @@ from django import forms
 from django.http import QueryDict
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import events
+from modoboa.lib.exceptions import Conflict
 from modoboa.lib.formutils import (
     DomainNameField, YesNoField, DynamicForm, TabForms
 )
 from modoboa.core.models import User
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import (
     Domain, DomainAlias, Mailbox, Alias, Quota
 )
@@ -126,25 +126,29 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
             d.save()
             Mailbox.objects.filter(domain=d, use_domain_quota=True) \
                 .update(quota=d.quota)
+            aliases = []
             for k, v in self.cleaned_data.iteritems():
                 if not k.startswith("aliases"):
                     continue
                 if v in ["", None]:
                     continue
-                try:
-                    d.domainalias_set.get(name=v)
-                except DomainAlias.DoesNotExist:
-                    pass
-                else:
-                    continue
-                events.raiseEvent("CanCreate", user, "domain_aliases")
-                al = DomainAlias(name=v, target=d, enabled=d.enabled)
-                al.save(creator=user)
-
+                aliases.append(v)
             for dalias in d.domainalias_set.all():
-                if not len(filter(lambda name: self.cleaned_data[name] == dalias.name,
-                                  self.cleaned_data.keys())):
+                if not dalias.name in aliases:
                     dalias.delete()
+                else:
+                    aliases.remove(dalias.name)
+            if aliases:
+                events.raiseEvent("CanCreate", user, "domain_aliases", len(aliases))
+                for alias in aliases:
+                    try:
+                        d.domainalias_set.get(name=alias)
+                    except DomainAlias.DoesNotExist:
+                        pass
+                    else:
+                        continue
+                    al = DomainAlias(name=alias, target=d, enabled=d.enabled)
+                    al.save(creator=user)
 
             if old_mail_homes is not None:
                 self.update_mailbox_quotas(d)
@@ -179,8 +183,11 @@ class DomainFormOptions(forms.Form):
         required=False
     )
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, user, *args, **kwargs):
         super(DomainFormOptions, self).__init__(*args, **kwargs)
+        if False in events.raiseQueryEvent('UserCanSetRole', user, 'DomainAdmins'):
+            self.fields = {}
+            return
         if args:
             if args[0].get("create_dom_admin", "no") == "yes":
                 self.fields["dom_admin_username"].required = True
@@ -192,6 +199,8 @@ class DomainFormOptions(forms.Form):
         return self.cleaned_data["dom_admin_username"]
 
     def save(self, user, domain):
+        if not self.fields:
+            return
         if self.cleaned_data["create_dom_admin"] == "no":
             return
         username = "%s@%s" % (self.cleaned_data["dom_admin_username"], domain.name)
@@ -200,7 +209,8 @@ class DomainFormOptions(forms.Form):
         except User.DoesNotExist:
             pass
         else:
-            raise AdminError(_("User '%s' already exists" % username))
+            raise Conflict(_("User '%s' already exists" % username))
+        events.raiseEvent("CanCreate", user, "mailboxes")
         da = User(username=username, email=username, is_active=True)
         da.set_password("password")
         da.save()
@@ -212,6 +222,7 @@ class DomainFormOptions(forms.Form):
         mb.save(creator=user)
 
         if self.cleaned_data["create_aliases"] == "yes":
+            events.raiseEvent("CanCreate", user, "mailbox_aliases")
             al = Alias(address="postmaster", domain=domain, enabled=True)
             al.save(int_rcpts=[mb], creator=user)
 
diff --git a/modoboa/extensions/admin/forms/forward.py b/modoboa/extensions/admin/forms/forward.py
index fa1e7a53a..9cf7eb643 100644
--- a/modoboa/extensions/admin/forms/forward.py
+++ b/modoboa/extensions/admin/forms/forward.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
+from modoboa.lib.exceptions import BadRequest, PermDeniedException
 from modoboa.lib.emailutils import split_mailbox
-from modoboa.extensions.admin.exceptions import BadDestination
 from modoboa.extensions.admin.models import (
     Domain
 )
@@ -28,10 +28,14 @@ class ForwardForm(forms.Form):
         for d in rawdata.split(","):
             local_part, domname = split_mailbox(d)
             if not local_part or not domname or not len(domname):
-                raise BadDestination("Invalid mailbox syntax for %s" % d)
+                raise BadRequest("Invalid mailbox syntax for %s" % d)
             try:
                 Domain.objects.get(name=domname)
             except Domain.DoesNotExist:
                 self.dests += [d]
             else:
-                raise BadDestination(_("You can't define a forward to a local destination. Please ask your administrator to create an alias instead."))
+                raise PermDeniedException(
+                    _("You can't define a forward to a local destination. "
+                      "Please ask your administrator to create an alias "
+                      "instead.")
+                )
diff --git a/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py b/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py
index 56a5d24a1..056b4a55e 100644
--- a/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py
+++ b/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py
@@ -4,8 +4,8 @@ from optparse import make_option
 from django.core.management.base import BaseCommand
 from modoboa.lib import parameters
 from modoboa.lib.sysutils import exec_cmd
+from modoboa.lib.exceptions import InternalError
 from modoboa.extensions.admin import AdminConsole
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import MailboxOperation
 
 
@@ -83,7 +83,7 @@ class Command(BaseCommand):
                 continue
             try:
                 f(ope)
-            except (OperationError, AdminError) as e:
+            except (OperationError, InternalError) as e:
                 self.logger.critical('%s failed (reason: %s)',
                                      ope, str(e).encode('utf-8'))
             else:
diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py
index e0ec8ca57..e8720ef5e 100644
--- a/modoboa/extensions/admin/models/alias.py
+++ b/modoboa/extensions/admin/models/alias.py
@@ -1,19 +1,23 @@
 import reversion
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
-from modoboa.lib import events
 from modoboa.lib.emailutils import split_mailbox
-from modoboa.lib.exceptions import PermDeniedException
-from modoboa.extensions.admin.exceptions import AdminError
+from modoboa.lib.exceptions import PermDeniedException, BadRequest
 from .base import AdminObject
 from .domain import Domain
 from .mailbox import Mailbox
 
 
 class Alias(AdminObject):
+    """
+    Mailbox alias.
+    """
     address = models.CharField(
         ugettext_lazy('address'), max_length=254,
-        help_text=ugettext_lazy("The alias address (without the domain part). For a 'catch-all' address, just enter an * character.")
+        help_text=ugettext_lazy(
+            "The alias address (without the domain part). For a 'catch-all' "
+            "address, just enter an * character."
+        )
     )
     domain = models.ForeignKey(Domain)
     mboxes = models.ManyToManyField(
@@ -139,12 +143,12 @@ class Alias(AdminObject):
 
         """
         if len(row) < expected_elements:
-            raise AdminError(_("Invalid line: %s" % row))
+            raise BadRequest(_("Invalid line: %s" % row))
         localpart, domname = split_mailbox(row[1].strip())
         try:
             domain = Domain.objects.get(name=domname)
         except Domain.DoesNotExist:
-            raise AdminError(_("Domain '%s' does not exist" % domname))
+            raise BadRequest(_("Domain '%s' does not exist" % domname))
         if not user.can_access(domain):
             raise PermDeniedException
         self.address = localpart
@@ -171,7 +175,7 @@ class Alias(AdminObject):
                     target = Mailbox.objects.get(address=localpart, 
                                                  domain__name=domname)
                 except Mailbox.DoesNotExist:
-                    raise AdminError(_("Local recipient %s not found" % rcpt))
+                    raise BadRequest(_("Local recipient %s not found" % rcpt))
             int_rcpts += [target]
         self.save(int_rcpts=int_rcpts, ext_rcpts=ext_rcpts, creator=user)
 
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index 3e4294070..7a0b909df 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -4,8 +4,8 @@ from django.db.models.manager import Manager
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.contrib.contenttypes import generic
 from modoboa.lib import events, parameters
+from modoboa.lib.exceptions import BadRequest
 from modoboa.core.models import User, ObjectAccess
-from modoboa.extensions.admin.exceptions import AdminError
 from .base import AdminObject
 
 
@@ -123,12 +123,12 @@ class Domain(AdminObject):
 
     def from_csv(self, user, row):
         if len(row) < 4:
-            raise AdminError(_("Invalid line"))
+            raise BadRequest(_("Invalid line"))
         self.name = row[1].strip()
         try:
             self.quota = int(row[2].strip())
         except ValueError:
-            raise AdminError(_("Invalid quota value for domain '%s'" % self.name))
+            raise BadRequest(_("Invalid quota value for domain '%s'" % self.name))
         self.enabled = (row[3].strip() == 'True')
         self.save(creator=user)
 
diff --git a/modoboa/extensions/admin/models/domain_alias.py b/modoboa/extensions/admin/models/domain_alias.py
index 3d087dc11..382ba74e3 100644
--- a/modoboa/extensions/admin/models/domain_alias.py
+++ b/modoboa/extensions/admin/models/domain_alias.py
@@ -1,8 +1,7 @@
 import reversion
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
-from modoboa.lib import events
-from modoboa.extensions.admin.exceptions import AdminError
+from modoboa.lib.exceptions import BadRequest
 from .base import AdminObject
 from .domain import Domain
 
@@ -37,13 +36,13 @@ class DomainAlias(AdminObject):
         :param row: a list containing the alias definition
         """
         if len(row) < 4:
-            raise AdminError(_("Invalid line"))
+            raise BadRequest(_("Invalid line"))
         self.name = row[1].strip()
         domname = row[2].strip()
         try:
             self.target = Domain.objects.get(name=domname)
         except Domain.DoesNotExist:
-            raise AdminError(_("Unknown domain %s" % domname))
+            raise BadRequest(_("Unknown domain %s" % domname))
         self.enabled = row[3].strip() == 'True'
         self.save(creator=user)
 
diff --git a/modoboa/extensions/admin/models/mailbox.py b/modoboa/extensions/admin/models/mailbox.py
index ab1da3584..a16e478a0 100644
--- a/modoboa/extensions/admin/models/mailbox.py
+++ b/modoboa/extensions/admin/models/mailbox.py
@@ -9,9 +9,9 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
 from modoboa.lib import parameters, events
+from modoboa.lib.exceptions import BadRequest, InternalError
 from modoboa.lib.sysutils import exec_cmd
 from modoboa.core.models import User
-from modoboa.extensions.admin.exceptions import AdminError
 from .base import AdminObject
 from .domain import Domain
 
@@ -110,7 +110,7 @@ class Mailbox(AdminObject):
                 "doveadm user %s -f home" % self.full_address, **options
             ) 
             if code:
-                raise AdminError(_("Failed to retrieve mailbox location (%s)" % output))
+                raise InternalError(_("Failed to retrieve mailbox location (%s)" % output))
             self.__mail_home = output.strip()
         return self.__mail_home
 
@@ -158,13 +158,13 @@ class Mailbox(AdminObject):
             else:
                 self.quota = 0
         elif int(value) > self.domain.quota and not override_rules:
-            raise AdminError(
+            raise BadRequest(
                 _("Quota is greater than the allowed domain's limit (%dM)" % self.domain.quota)
             )
         else:
             self.quota = value
         if not self.quota and self.domain.quota and not override_rules:
-            raise AdminError(_("A quota is required"))
+            raise BadRequest(_("A quota is required"))
 
     def get_quota(self):
         """Get quota limit.
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index 87f1a51c3..313bc332e 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -143,8 +143,8 @@ Admin.prototype = {
 
     reload_listing: function(data) {
         this.navobj.update(true);
-        if (data.respmsg) {
-            $("body").notify("success", data.respmsg, 2000);
+        if (data) {
+            $("body").notify("success", data, 2000);
         }
     }
 };
@@ -180,11 +180,7 @@ Domains.prototype = {
             checkboxes: deloptions,
             success_cb: $.proxy(this.reload_listing, this)
         });
-        $("a[name=delrelaydomain]").confirm({
-            question: function() { return this.$element.attr('title'); },
-            method: "DELETE",
-            success_cb: $.proxy(this.reload_listing, this)
-        });
+        $(document).trigger('domain_listing_refresh');
     },
 
     change_inputs_state: function(value) {
@@ -239,7 +235,7 @@ Domains.prototype = {
                 1: this.optionsform_prefill
             },
             error_callbacks: {
-                1: this.generalform_init,
+                //1: this.generalform_init,
                 2: $.proxy(this.optionsform_init, this)
             },
             success_callback: $.proxy(this.reload_listing, this)
@@ -397,11 +393,7 @@ Identities.prototype = {
         $("#wizard").cwizard({
             formid: "newaccount_form",
             transition_callbacks: {
-                1: this.mailform_prefill
-            },
-            error_callbacks: {
-                1: $.proxy(this.generalform_init, this),
-                2: $.proxy(this.mailform_init, this)
+                2: this.mailform_prefill
             },
             success_callback: $.proxy(this.reload_listing, this)
         });
@@ -409,10 +401,9 @@ Identities.prototype = {
 
     editaccount_cb: function() {
         this.accountform_init();
-        $('.submit').one('click', $.proxy(function(e) {
+        $('.submit').on('click', $.proxy(function(e) {
             simple_ajax_form_post(e, {
                 formid: "accountform",
-                error_cb: $.proxy(this.editaccount_cb, this),
                 reload_on_success: false,
                 success_cb: $.proxy(this.reload_listing, this)
             });
@@ -425,10 +416,9 @@ Identities.prototype = {
             choices: get_domains_list
         });
         $("#id_recipients").dynamic_input();
-        $(".submit").one('click', $.proxy(function(e) {
+        $(".submit").on('click', $.proxy(function(e) {
             simple_ajax_form_post(e, {
                 formid: "aliasform",
-                error_cb: $.proxy(this.aliasform_cb, this),
                 reload_on_success: false,
                 success_cb: $.proxy(this.reload_listing, this)
             });
diff --git a/modoboa/extensions/admin/templates/admin/dlistform.html b/modoboa/extensions/admin/templates/admin/aliasform.html
similarity index 67%
rename from modoboa/extensions/admin/templates/admin/dlistform.html
rename to modoboa/extensions/admin/templates/admin/aliasform.html
index 20f3cd51d..6a13e26c9 100644
--- a/modoboa/extensions/admin/templates/admin/dlistform.html
+++ b/modoboa/extensions/admin/templates/admin/aliasform.html
@@ -1,5 +1,4 @@
-{% extends "common/generic_modal_form.html" %}
-{% load lib_tags %}
+{% extends "common/generic_modal_form.html" %}{% load lib_tags %}
 {% block formbody %}
 {% render_field form.email %}
 {% render_fields_group form "recipients" %}
diff --git a/modoboa/extensions/admin/templates/admin/domain_options_form.html b/modoboa/extensions/admin/templates/admin/domain_options_form.html
index c8acba112..b1c050f85 100644
--- a/modoboa/extensions/admin/templates/admin/domain_options_form.html
+++ b/modoboa/extensions/admin/templates/admin/domain_options_form.html
@@ -1,4 +1,5 @@
-{% load i18n lib_tags %}
+{% load i18n lib_tags %}{% if form.fields %}
 {% render_field form.create_dom_admin %}
 {% render_field_appended form.dom_admin_username "@" %}
 {% render_field form.create_aliases %}
+{% else %}<div class="alert alert-warning">{% trans "You can't create a new domain administrator" %}</div>{% endif %}
diff --git a/modoboa/extensions/admin/tests/account.py b/modoboa/extensions/admin/tests/account.py
index fa8773bc1..6f316eb17 100644
--- a/modoboa/extensions/admin/tests/account.py
+++ b/modoboa/extensions/admin/tests/account.py
@@ -19,9 +19,9 @@ class AccountTestCase(ModoTestCase):
             username="tester@test.com", first_name="Tester", last_name="Toto",
             password1="toto", password2="toto", role="SimpleUsers",
             quota_act=True,
-            is_active=True, email="tester@test.com", stepid=2
+            is_active=True, email="tester@test.com", stepid='step2'
         )
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.newaccount"),
             values
         )
@@ -39,26 +39,26 @@ class AccountTestCase(ModoTestCase):
         self.assertEqual(mb.domain.mailbox_count, 3)
 
         values["username"] = "pouet@test.com"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[account.id]),
             values
         )
         mb = Mailbox.objects.get(pk=mb.id)
         self.assertEqual(mb.full_address, "pouet@test.com")
-        self.check_ajax_get(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.delaccount",
                     args=[account.id]),
             {}
         )
 
-    def _set_quota(self, email, value, expected_status="ok"):
+    def _set_quota(self, email, value, expected_status=200):
         account = User.objects.get(username=email)
         values = {
             "username": email, "role": "SimpleUsers", "quota_act": False,
             "is_active": True, "quota": value, "email": email
         }
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[account.id]),
             values, status=expected_status
@@ -70,7 +70,7 @@ class AccountTestCase(ModoTestCase):
     def test_set_nul_quota_as_domainadmin(self):
         self.clt.logout()
         self.assertTrue(self.clt.login(username="admin@test.com", password="toto"))
-        self._set_quota("user@test.com", 0, "ko")
+        self._set_quota("user@test.com", 0, 424)
         self.clt.logout()
         self.assertTrue(self.clt.login(username="admin@test2.com", password="toto"))
         self._set_quota("user@test2.com", 0)
@@ -92,25 +92,24 @@ class PermissionsTestCase(ModoTestCase):
         self.clt.logout()
 
     def test_domain_admins(self):
-        self.values["role"] = "DomainAdmins"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[self.user.id]),
             self.values
         )
-        self.assertEqual(self.user.group == "DomainAdmins", True)
+        self.assertEqual(self.user.group, "DomainAdmins")
 
         self.values["role"] = "SimpleUsers"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[self.user.id]),
             self.values
         )
-        self.assertEqual(self.user.group == 'DomainAdmins', False)
+        self.assertNotEqual(self.user.group, 'DomainAdmins')
 
     def test_superusers(self):
         self.values["role"] = "SuperAdmins"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[self.user.id]),
             self.values
@@ -118,7 +117,7 @@ class PermissionsTestCase(ModoTestCase):
         self.assertEqual(User.objects.get(username="user@test.com").is_superuser, True)
 
         self.values["role"] = "SimpleUsers"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[self.user.id]),
             self.values
@@ -135,7 +134,7 @@ class PermissionsTestCase(ModoTestCase):
             password1="", password2="",
             quota=10, is_active=True, email="admin@test.com"
         )
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[admin.id]),
             values
@@ -144,7 +143,7 @@ class PermissionsTestCase(ModoTestCase):
         self.assertEqual(admin.can_access(Domain.objects.get(name="test.com")), True)
 
         values["role"] = "SuperAdmins"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[admin.id]),
             values
@@ -178,25 +177,23 @@ class PermissionsTestCase(ModoTestCase):
             username="superadmin2@test.com", first_name="Super",
             last_name="Admin", password1="toto", password2="toto",
             role="SuperAdmins", is_active=True,
-            email="superadmin2@test.com", stepid=2
+            email="superadmin2@test.com", stepid='step2'
         )
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.newaccount"),
             values
         )
         account = User.objects.get(username="superadmin2@test.com")
         self.clt.logout()
         self.clt.login(username="admin@test.com", password="toto")
-        self.check_ajax_get(
+        self.ajax_get(
             reverse("modoboa.extensions.admin.views.identity.delaccount",
                     args=[account.id]),
-            {},
-            status="ko", respmsg="Permission denied"
+            {}, 403
         )
-        self.check_ajax_get(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.delaccount",
-                    args=[account.id]), {},
-            status="ko", respmsg="Permission denied"
+                    args=[account.id]), {}, 403
         )
 
     def test_domainadmin_dlist_local_domain_not_owned(self):
@@ -208,6 +205,6 @@ class PermissionsTestCase(ModoTestCase):
             recipients_1="user@test2.com",
             enabled=True
         )
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.newdlist"), values
         )
diff --git a/modoboa/extensions/admin/tests/alias.py b/modoboa/extensions/admin/tests/alias.py
index 1cb9a277d..ff6fbc840 100644
--- a/modoboa/extensions/admin/tests/alias.py
+++ b/modoboa/extensions/admin/tests/alias.py
@@ -21,7 +21,7 @@ class AliasTestCase(ModoTestCase):
             is_active=user.is_active, email="user@test.com",
             aliases="toto@test.com", aliases_1="titi@test.com"
         )
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[user.id]),
             values
@@ -29,7 +29,7 @@ class AliasTestCase(ModoTestCase):
         self.assertEqual(user.mailbox_set.all()[0].alias_set.count(), 2)
 
         del values["aliases_1"]
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.editaccount",
                     args=[user.id]),
             values
@@ -42,7 +42,7 @@ class AliasTestCase(ModoTestCase):
                       recipients_1="admin@test.com",
                       recipients_2="ext@titi.com",
                       enabled=True)
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.newdlist"), values
         )
         user = User.objects.get(username="user@test.com")
@@ -53,14 +53,14 @@ class AliasTestCase(ModoTestCase):
         dlist = Alias.objects.get(address="all", domain__name="test.com")
         self.assertEqual(len(dlist.get_recipients()), 3)
         del values["recipients_1"]
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.editalias",
                     args=[dlist.id]),
             values
         )
         self.assertEqual(dlist.get_recipients_count(), 2)
 
-        self.check_ajax_get(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%d" \
                 % dlist.id, {}
         )
@@ -69,21 +69,21 @@ class AliasTestCase(ModoTestCase):
 
     def test_forward(self):
         values = dict(email="forward2@test.com", recipients="rcpt@dest.com")
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.newforward"), values
         )
         fwd = Alias.objects.get(address="forward2", domain__name="test.com")
         self.assertEqual(fwd.get_recipients_count(), 1)
 
         values["recipients"] = "rcpt2@dest.com"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.editalias",
                     args=[fwd.id]),
             values
         )
         self.assertEqual(fwd.get_recipients_count(), 1)
 
-        self.check_ajax_get(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%d" \
                 % fwd.id, {}
         )
@@ -92,7 +92,7 @@ class AliasTestCase(ModoTestCase):
 
     def test_forward_and_local_copies(self):
         values = dict(email="user@test.com", recipients="rcpt@dest.com")
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.newforward"), values
         )
         fwd = Alias.objects.get(address="user", domain__name="test.com")
@@ -100,7 +100,7 @@ class AliasTestCase(ModoTestCase):
 
         values["recipients"] = "rcpt@dest.com"
         values["recipients_1"] = "user@test.com"
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.alias.editalias", args=[fwd.id]),
             values
         )
diff --git a/modoboa/extensions/admin/tests/domain.py b/modoboa/extensions/admin/tests/domain.py
index 234e0f117..929afd3c8 100644
--- a/modoboa/extensions/admin/tests/domain.py
+++ b/modoboa/extensions/admin/tests/domain.py
@@ -19,9 +19,9 @@ class DomainTestCase(ModoTestCase):
         """
         values = {
             "name": "pouet.com", "quota": 100, "create_dom_admin": "no",
-            "stepid": 2
+            "stepid": 'step2'
         }
-        self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.newdomain"), values)
+        self.ajax_post(reverse("modoboa.extensions.admin.views.domain.newdomain"), values)
         dom = Domain.objects.get(name="pouet.com")
         self.assertEqual(dom.name, "pouet.com")
         self.assertEqual(dom.quota, 100)
@@ -35,9 +35,9 @@ class DomainTestCase(ModoTestCase):
         values = {
             "name": "pouet.com", "quota": 100, "create_dom_admin": "yes",
             "dom_admin_username": "toto", "create_aliases": "yes",
-            "stepid": 2
+            "stepid": 'step2'
         }
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.newdomain"),
             values
         )
@@ -53,9 +53,9 @@ class DomainTestCase(ModoTestCase):
         values = {
             "name": "pouet.com", "quota": 0, "create_dom_admin": "yes",
             "dom_admin_username": "toto", "create_aliases": "yes",
-            "stepid": 2
+            "stepid": 'step2'
         }
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.newdomain"),
             values
         )
@@ -75,7 +75,7 @@ class DomainTestCase(ModoTestCase):
             "name": "pouet.com", "quota": 100, "enabled": True
         }
         dom = Domain.objects.get(name="test.com")
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.editdomain",
                     args=[dom.id]), 
             values
@@ -88,7 +88,7 @@ class DomainTestCase(ModoTestCase):
         """Test the removal of a domain
         """
         dom = Domain.objects.get(name="test.com")
-        self.check_ajax_get(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.deldomain",
                     args=[dom.id]),
             {}
diff --git a/modoboa/extensions/admin/tests/domain_alias.py b/modoboa/extensions/admin/tests/domain_alias.py
index d79e2a645..9930d0d16 100644
--- a/modoboa/extensions/admin/tests/domain_alias.py
+++ b/modoboa/extensions/admin/tests/domain_alias.py
@@ -31,7 +31,7 @@ class DomainAliasTestCase(ModoTestCase):
         dom = Domain.objects.get(name="test.com")
         values = dict(name=dom.name, quota=dom.quota, enabled=dom.enabled,
                       aliases="domalias.net", aliases_1="domalias.com")
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.editdomain",
                     args=[dom.id]),
             values
@@ -39,7 +39,7 @@ class DomainAliasTestCase(ModoTestCase):
         self.assertEqual(dom.domainalias_set.count(), 2)
 
         del values["aliases_1"]
-        self.check_ajax_post(
+        self.ajax_post(
             reverse("modoboa.extensions.admin.views.domain.editdomain",
                     args=[dom.id]),
             values
diff --git a/modoboa/extensions/admin/views/alias.py b/modoboa/extensions/admin/views/alias.py
index b03c32fd3..c8410615f 100644
--- a/modoboa/extensions/admin/views/alias.py
+++ b/modoboa/extensions/admin/views/alias.py
@@ -6,59 +6,50 @@ from django.contrib.auth.decorators import (
     login_required, permission_required
 )
 from modoboa.lib import events
-from modoboa.lib.webutils import ajax_response, ajax_simple_response
-from modoboa.lib.exceptions import PermDeniedException
-from modoboa.extensions.admin.exceptions import AdminError
+from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.exceptions import PermDeniedException, Conflict
 from modoboa.extensions.admin.forms import AliasForm
 from modoboa.extensions.admin.models import Alias
 
 
-def _validate_alias(request, form, successmsg, tplname, commonctx, callback=None):
+def _validate_alias(request, form, successmsg, callback=None):
     """Alias validation
 
     Common function shared between creation and modification actions.
     """
-    error = None
     if form.is_valid():
         form.set_recipients()
         try:
             alias = form.save()
         except IntegrityError:
-            raise AdminError(_("Alias with this name already exists"))
+            raise Conflict(_("Alias with this name already exists"))
         if callback:
             callback(request.user, alias)
-        return ajax_simple_response({"status": "ok", "respmsg": successmsg})
+        return render_to_json_response(successmsg)
 
-    if "targets" in request.POST:
-        targets = request.POST.getlist("targets")
-        commonctx["targets"] = targets[:-1]
-
-    commonctx["form"] = form
-    commonctx["error"] = error
-    return ajax_response(request, status="ko", template=tplname, **commonctx)
+    return render_to_json_response({'form_errors': form.errors}, status=400)
 
 
 def _new_alias(request, title, action, successmsg,
-               tplname="common/generic_modal_form.html"):
+               tplname="admin/aliasform.html"):
     events.raiseEvent("CanCreate", request.user, "mailbox_aliases")
-    ctx = {
-        "title": title,
-        "action": action,
-        "formid": "aliasform",
-        "action_label": _("Create"),
-        "action_classes": "submit"
-    }
     if request.method == "POST":
         def callback(user, alias):
             alias.post_create(user)
 
         form = AliasForm(request.user, request.POST)
         return _validate_alias(
-            request, form, successmsg, tplname, ctx, callback
+            request, form, successmsg, callback
         )
 
-    form = AliasForm(request.user)
-    ctx["form"] = form
+    ctx = {
+        "title": title,
+        "action": action,
+        "formid": "aliasform",
+        "action_label": _("Create"),
+        "action_classes": "submit",
+        "form": AliasForm(request.user)
+    }
     return render(request, tplname, ctx)
 
 
@@ -94,29 +85,29 @@ def newforward(request):
 
 @login_required
 @permission_required("admin.change_alias")
-def editalias(request, alid, tplname="common/generic_modal_form.html"):
+@transaction.commit_on_success
+def editalias(request, alid, tplname="admin/aliasform.html"):
     alias = Alias.objects.get(pk=alid)
     if not request.user.can_access(alias):
         raise PermDeniedException
-    ctx = dict(
-        action=reverse(editalias, args=[alias.id]),
-        formid="aliasform",
-        title=alias.full_address,
-        action_label=_("Update"),
-        action_classes="submit"
-    )
-    if len(alias.get_recipients()) >= 2:
-        successmsg = _("Distribution list modified")
-    elif alias.extmboxes != "":
-        successmsg = _("Forward modified")
-    else:
-        successmsg = _("Alias modified")
     if request.method == "POST":
+        if len(alias.get_recipients()) >= 2:
+            successmsg = _("Distribution list modified")
+        elif alias.extmboxes != "":
+            successmsg = _("Forward modified")
+        else:
+            successmsg = _("Alias modified")
         form = AliasForm(request.user, request.POST, instance=alias)
-        return _validate_alias(request, form, successmsg, tplname, ctx)
+        return _validate_alias(request, form, successmsg)
 
-    form = AliasForm(request.user, instance=alias)
-    ctx["form"] = form
+    ctx = {
+        'action': reverse(editalias, args=[alias.id]),
+        'formid': 'aliasform',
+        'title': alias.full_address,
+        'action_label': _('Update'),
+        'action_classes': 'submit',
+        'form': AliasForm(request.user, instance=alias)
+    }
     return render(request, tplname, ctx)
 
 
@@ -141,4 +132,4 @@ def delalias(request):
         alias.delete()
 
     msg = ungettext(msg, msgs, len(selection))
-    return ajax_simple_response({"status": "ok", "respmsg": msg})
+    return render_to_json_response(msg)
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 812cc4928..29b43132c 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -2,7 +2,6 @@ from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext as _, ungettext
 from django.core.urlresolvers import reverse
 from django.db import transaction
-from django.db.models import Q
 from django.shortcuts import render
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.contrib.auth.decorators import (
@@ -10,13 +9,15 @@ from django.contrib.auth.decorators import (
 )
 from modoboa.lib import parameters, events
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string
+    ajax_simple_response, _render_to_string,
+    render_to_json_response
 )
 from modoboa.lib.formutils import CreationWizard
-from modoboa.lib.exceptions import PermDeniedException
+from modoboa.lib.exceptions import (
+    ModoboaException, PermDeniedException, BadRequest
+)
 from modoboa.lib.templatetags.lib_tags import pagination_bar
 from modoboa.extensions.admin.lib import get_sort_order, get_listing_page
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.models import Domain, Mailbox
 from modoboa.extensions.admin.forms import (
     DomainForm, DomainFormGeneral, DomainFormOptions
@@ -90,50 +91,49 @@ def domains_list(request):
 def newdomain(request, tplname="common/wizard_forms.html"):
     events.raiseEvent("CanCreate", request.user, "domains")
 
-    def newdomain_cb(steps):
-        genform = steps[0]["form"]
-        genform.is_valid()
-        domain = genform.save(request.user)
-        domain.post_create(request.user)
-        steps[1]["form"].save(request.user, domain)
-
-    commonctx = {"title": _("New domain"),
-                 "action_label": _("Create"),
-                 "action_classes": "submit",
-                 "action": reverse(newdomain),
-                 "formid": "domform"}
-    cwizard = CreationWizard(newdomain_cb)
+    cwizard = CreationWizard()
     cwizard.add_step(DomainFormGeneral, _("General"),
                      [dict(classes="btn-inverse next", label=_("Next"))],
                      formtpl="admin/domain_general_form.html")
-    cwizard.add_step(DomainFormOptions, _("Options"),
-                     [dict(classes="btn-primary submit", label=_("Create")),
-                      dict(classes="btn-inverse prev", label=_("Previous"))],
-                     formtpl="admin/domain_options_form.html")
+    cwizard.add_step(
+        DomainFormOptions, _("Options"),
+        [dict(classes="btn-primary submit", label=_("Create")),
+         dict(classes="btn-inverse prev", label=_("Previous"))],
+        formtpl="admin/domain_options_form.html",
+        new_args=[request.user]
+    )
 
     if request.method == "POST":
         retcode, data = cwizard.validate_step(request)
         if retcode == -1:
-            raise AdminError(data)
+            raise BadRequest(data)
         if retcode == 1:
-            return ajax_simple_response(dict(
-                status="ok", title=cwizard.get_title(data + 1), stepid=data
-            ))
-        if retcode == 2:
-            return ajax_simple_response(
-                dict(status="ok", respmsg=_("Domain created"))
+            return render_to_json_response(
+                {'title': cwizard.get_title(data + 1), 'stepid': data}
             )
+        if retcode == 2:
+            genform = cwizard.steps[0]["form"]
+            domain = genform.save(request.user)
+            domain.post_create(request.user)
+            try:
+                cwizard.steps[1]["form"].save(request.user, domain)
+            except ModoboaException as e:
+                transaction.rollback()
+                raise
+            return render_to_json_response(_("Domain created"))
+        return render_to_json_response({
+            'stepid': data, 'form_errors': cwizard.errors
+        }, status=400)
 
-        from modoboa.lib.templatetags.lib_tags import render_form
-        return ajax_simple_response(dict(
-            status="ko", stepid=data,
-            form=render_form(cwizard.steps[data]["form"])
-        ))
-
+    ctx = {"title": _("New domain"),
+           "action_label": _("Create"),
+           "action_classes": "submit",
+           "action": reverse(newdomain),
+           "formid": "domform"}
     cwizard.create_forms()
-    commonctx.update(steps=cwizard.steps)
-    commonctx.update(subtitle="1. %s" % cwizard.steps[0]['title'])
-    return render(request, tplname, commonctx)
+    ctx.update(steps=cwizard.steps)
+    ctx.update(subtitle="1. %s" % cwizard.steps[0]['title'])
+    return render(request, tplname, ctx)
 
 
 @login_required
@@ -144,44 +144,32 @@ def editdomain(request, dom_id, tplname="admin/editdomainform.html"):
     if not request.user.can_access(domain):
         raise PermDeniedException
 
+    instances = dict(general=domain)
+    events.raiseEvent("FillDomainInstances", request.user, domain, instances)
+    if request.method == "POST":
+        domain.oldname = domain.name
+        form = DomainForm(request.user, request.POST, instances=instances)
+        if form.is_valid():
+            form.save(request.user)
+            events.raiseEvent("DomainModified", domain)
+            return render_to_json_response(_("Domain modified"))
+        return render_to_json_response({
+            'form_errors': form.errors
+        }, status=400)
+
     domadmins = [u for u in domain.admins
                  if request.user.can_access(u) and not u.is_superuser]
     if not request.user.is_superuser:
         domadmins = [u for u in domadmins if u.group == "DomainAdmins"]
-
-    instances = dict(general=domain)
-    events.raiseEvent("FillDomainInstances", request.user, domain, instances)
-
-    commonctx = {"title": domain.name,
-                 "action_label": _("Update"),
-                 "action_classes": "submit",
-                 "action": reverse(editdomain, args=[dom_id]),
-                 "formid": "domform",
-                 "domain": domain}
-    if request.method == "POST":
-        error = None
-        domain.oldname = domain.name
-        form = DomainForm(request.user, request.POST, instances=instances)
-        if form.is_valid():
-            try:
-                form.save(request.user)
-            except AdminError, e:
-                error = str(e)
-            else:
-                events.raiseEvent("DomainModified", domain)
-                return ajax_simple_response({
-                    "status": "ok", "respmsg": _("Domain modified")
-                })
-
-        commonctx["tabs"] = form
-        return ajax_simple_response({
-            "status": "ko", "respmsg": error,
-            "content": _render_to_string(request, tplname, commonctx)
-        })
-
-    commonctx["tabs"] = DomainForm(request.user, instances=instances)
-    commonctx["domadmins"] = domadmins
-    return render(request, tplname, commonctx)
+    ctx = {"title": domain.name,
+           "action_label": _("Update"),
+           "action_classes": "submit",
+           "action": reverse(editdomain, args=[dom_id]),
+           "formid": "domform",
+           "domain": domain,
+           "tabs": DomainForm(request.user, instances=instances),
+           "domadmins": domadmins}
+    return render(request, tplname, ctx)
 
 
 @login_required
@@ -198,8 +186,8 @@ def deldomain(request, dom_id):
     if not request.user.can_access(dom):
         raise PermDeniedException
     if mb and mb.domain == dom:
-        raise AdminError(_("You can't delete your own domain"))
+        raise PermDeniedException(_("You can't delete your own domain"))
     dom.delete(request.user, keepdir)
 
     msg = ungettext("Domain deleted", "Domains deleted", 1)
-    return ajax_simple_response({"status": "ok", "respmsg": msg})
+    return render_to_json_response(msg)
diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py
index a2f1e1bc4..7ab550a68 100644
--- a/modoboa/extensions/admin/views/identity.py
+++ b/modoboa/extensions/admin/views/identity.py
@@ -7,9 +7,12 @@ from django.contrib.auth.decorators import (
 )
 from django.views.decorators.csrf import ensure_csrf_cookie
 from modoboa.lib import parameters, events
-from modoboa.lib.exceptions import PermDeniedException
+from modoboa.lib.exceptions import (
+    ModoboaException, PermDeniedException, BadRequest
+)
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string, ajax_response
+    ajax_simple_response, _render_to_string,
+    render_to_json_response
 )
 from modoboa.lib.formutils import CreationWizard
 from modoboa.lib.templatetags.lib_tags import pagination_bar
@@ -18,7 +21,6 @@ from modoboa.extensions.admin.models import Mailbox, Domain
 from modoboa.extensions.admin.lib import (
     get_sort_order, get_listing_page, get_identities
 )
-from modoboa.extensions.admin.exceptions import AdminError
 from modoboa.extensions.admin.forms import (
     AccountForm, AccountFormGeneral, AccountFormMail
 )
@@ -99,7 +101,7 @@ def list_quotas(request, tplname="admin/quotas.html"):
             order_by=["%s%s" % (sort_dir, sort_order)]
         )
     else:
-        raise AdminError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     page = get_listing_page(mboxes, request.GET.get("page", 1))
     return ajax_simple_response({
         "status": "ok",
@@ -115,35 +117,7 @@ def list_quotas(request, tplname="admin/quotas.html"):
 @permission_required("core.add_user")
 @transaction.commit_on_success
 def newaccount(request, tplname='common/wizard_forms.html'):
-    def create_account(steps):
-        """Account creation callback
-
-        Called when all creation steps have been validated.
-
-        :param steps: the steps data
-        """
-        genform = steps[0]["form"]
-        genform.is_valid()
-        account = genform.save()
-        account.post_create(request.user)
-
-        mailform = steps[1]["form"]
-        try:
-            mailform.save(request.user, account)
-        except AdminError:
-            # A bit uggly: transaction management doesn't work very
-            # well with nested functions. Need to wait for django 1.6
-            # and atomicity.
-            account.delete(request.user, False)
-            raise
-
-    ctx = dict(
-        title=_("New account"),
-        action=reverse(newaccount),
-        formid="newaccount_form",
-        submit_label=_("Create")
-    )
-    cwizard = CreationWizard(create_account)
+    cwizard = CreationWizard()
     cwizard.add_step(AccountFormGeneral, _("General"),
                      [dict(classes="btn-inverse next", label=_("Next"))],
                      new_args=[request.user])
@@ -155,22 +129,35 @@ def newaccount(request, tplname='common/wizard_forms.html'):
     if request.method == "POST":
         retcode, data = cwizard.validate_step(request)
         if retcode == -1:
-            raise AdminError(data)
+            raise BadRequest(data)
         if retcode == 1:
-            return ajax_simple_response(dict(
-                status="ok", title=cwizard.get_title(data + 1), stepid=data
-            ))
+            return render_to_json_response(
+                {'title': cwizard.get_title(data + 1), 'stepid': data}
+            )
         if retcode == 2:
-            return ajax_simple_response(dict(
-                status="ok", respmsg=_("Account created")
-            ))
-
-        from modoboa.lib.templatetags.lib_tags import render_form
-        return ajax_simple_response(dict(
-            status="ko", stepid=data,
-            form=render_form(cwizard.steps[data]["form"])
-        ))
+            genform = cwizard.steps[0]["form"]
+            account = genform.save()
+            try:
+                account.post_create(request.user)
+                mailform = cwizard.steps[1]["form"]
+                mailform.save(request.user, account)
+            except ModoboaException:
+                # A bit uggly: transaction management doesn't work very
+                # well with nested functions. Need to wait for django 1.6
+                # and atomicity.
+                account.delete(request.user, False)
+                raise
+            return render_to_json_response(_("Account created"))
+        return render_to_json_response({
+            'stepid': data, 'form_errors': cwizard.errors
+        }, status=400)
 
+    ctx = {
+        'title': _("New account"),
+        'action': reverse(newaccount),
+        'formid': 'newaccount_form',
+        'submit_label': _("Create")
+    }
     cwizard.create_forms()
     ctx.update(steps=cwizard.steps)
     ctx.update(subtitle="1. %s" % cwizard.steps[0]['title'])
@@ -191,14 +178,6 @@ def editaccount(request, accountid, tplname="common/tabforms.html"):
     instances = dict(general=account, mail=mb, perms=account)
     events.raiseEvent("FillAccountInstances", request.user, account, instances)
 
-    ctx = dict(
-        title=account.username,
-        formid="accountform",
-        action=reverse(editaccount, args=[accountid]),
-        action_label=_("Update"),
-        action_classes="submit"
-    )
-
     if request.method == "POST":
         classes = {}
         form = AccountForm(request.user, request.POST,
@@ -209,15 +188,17 @@ def editaccount(request, accountid, tplname="common/tabforms.html"):
             if form.is_valid(optional_only=True):
                 events.raiseEvent("AccountModified", account, form.account)
                 form.save()
-                return ajax_simple_response(
-                    dict(status="ok", respmsg=_("Account updated"))
-                )
-            transaction.rollback()
+                return render_to_json_response(_("Account updated"))
+        return render_to_json_response({'form_errors': form.errors}, status=400)
 
-        ctx["tabs"] = form
-        return ajax_response(request, status="ko", template=tplname, **ctx)
-
-    ctx["tabs"] = AccountForm(request.user, instances=instances)
+    ctx = {
+        'title': account.username,
+        'formid': 'accountform',
+        'action': reverse(editaccount, args=[accountid]),
+        'action_label': _('Update'),
+        'action_classes': 'submit',
+        'tabs': AccountForm(request.user, instances=instances)
+    }
     active_tab_id = request.GET.get("active_tab", "default")
     if active_tab_id != "default":
         ctx["tabs"].active_id = active_tab_id
@@ -229,11 +210,10 @@ def editaccount(request, accountid, tplname="common/tabforms.html"):
 @transaction.commit_on_success
 def delaccount(request, accountid):
     keepdir = True if request.POST.get("keepdir", "false") == "true" else False
-
     User.objects.get(pk=accountid).delete(request.user, keep_mb_dir=keepdir)
-
-    msg = ungettext("Account deleted", "Accounts deleted", 1)
-    return ajax_simple_response({"status": "ok", "respmsg": msg})
+    return render_to_json_response(
+        ungettext("Account deleted", "Accounts deleted", 1)
+    )
 
 
 @login_required
@@ -242,12 +222,12 @@ def remove_permission(request):
     domid = request.GET.get("domid", None)
     daid = request.GET.get("daid", None)
     if domid is None or daid is None:
-        raise AdminError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     try:
         account = User.objects.get(pk=daid)
         domain = Domain.objects.get(pk=domid)
     except (User.DoesNotExist, Domain.DoesNotExist):
-        raise AdminError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     if not request.user.can_access(account) or not request.user.can_access(domain):
         raise PermDeniedException
     domain.remove_admin(account)
diff --git a/modoboa/extensions/admin/views/user.py b/modoboa/extensions/admin/views/user.py
index 37fdd6d09..7c0382c41 100644
--- a/modoboa/extensions/admin/views/user.py
+++ b/modoboa/extensions/admin/views/user.py
@@ -2,10 +2,9 @@ from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 from modoboa.lib.exceptions import ModoboaException
 from modoboa.lib.webutils import (
-    ajax_response, ajax_simple_response, _render_to_string
+    render_to_json_response, _render_to_string
 )
 from modoboa.extensions.admin.lib import needs_mailbox
-from modoboa.extensions.admin.exceptions import BadDestination
 from modoboa.extensions.admin.models import Alias, Mailbox
 from modoboa.extensions.admin.forms import ForwardForm
 
@@ -13,12 +12,7 @@ from modoboa.extensions.admin.forms import ForwardForm
 @login_required
 @needs_mailbox()
 def forward(request, tplname='admin/forward.html'):
-    try:
-        mb = request.user.mailbox_set.all()[0]
-    except IndexError:
-        raise ModoboaException(
-            _("You need a mailbox in order to define a forward")
-        )
+    mb = request.user.mailbox_set.all()[0]
     try:
         al = Alias.objects.get(address=mb.address,
                                domain__name=mb.domain.name)
@@ -28,28 +22,23 @@ def forward(request, tplname='admin/forward.html'):
         form = ForwardForm(request.POST)
         error = None
         if form.is_valid():
-            try:
-                if al is None:
-                    al = Alias()
-                    al.address = mb.address
-                    al.domain = mb.domain
-                    al.enabled = mb.user.is_active
-                intdests = []
-                if form.cleaned_data["keepcopies"]:
-                    intdests += [mb]
-                form.parse_dest()
-                al.save(int_rcpts=intdests, ext_rcpts=form.dests)
-                if request.user.group != "SimpleUsers":
-                    al.post_create(request.user)
-                return ajax_response(request, respmsg=_("Forward updated"))
-            except BadDestination, e:
-                error = str(e)
+            if al is None:
+                al = Alias()
+                al.address = mb.address
+                al.domain = mb.domain
+                al.enabled = mb.user.is_active
+            intdests = []
+            if form.cleaned_data["keepcopies"]:
+                intdests += [mb]
+            form.parse_dest()
+            al.save(int_rcpts=intdests, ext_rcpts=form.dests)
+            if request.user.group != "SimpleUsers":
+                al.post_create(request.user)
+            return render_to_json_response(_("Forward updated"))
 
-        return ajax_simple_response(dict(
-            status="ko",
-            errors=form.errors,
-            respmsg=error
-        ))
+        return render_to_json_response(
+            {'form_errors': form.errors}, status=400
+        )
 
     form = ForwardForm()
     if al is not None:
@@ -60,8 +49,7 @@ def forward(request, tplname='admin/forward.html'):
             pass
         else:
             form.fields["keepcopies"].initial = True
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": _render_to_string(request, tplname, {
             "form": form
         })
diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py
index 5c991598f..7f49c549f 100644
--- a/modoboa/extensions/limits/__init__.py
+++ b/modoboa/extensions/limits/__init__.py
@@ -10,16 +10,22 @@ from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
+from .models import LimitTemplates
 from .forms import ResourcePoolForm
 import controls
 
+levents = [
+    'GetExtraLimitTemplates'
+]
+
 
 class Limits(ModoExtension):
     name = "limits"
     label = "Limits"
     version = "1.0"
     description = ugettext_lazy(
-        "Per administrator resources to limit the number of objects they can create"
+        "Per administrator resources to limit the number of objects "
+        "they can create"
     )
 
     def init(self):
@@ -48,6 +54,7 @@ class Limits(ModoExtension):
     def load(self):
         from modoboa.extensions.limits.app_settings import ParametersForm
         parameters.register(ParametersForm, ugettext_lazy("Limits"))
+        events.declare(levents)
 
     def destroy(self):
         parameters.unregister()
@@ -74,7 +81,13 @@ def display_pool_usage(user, target, currentpage):
         if user.has_perm("admin.add_domain"):
             names += ["domain_admins_limit"]
     else:
-        names = ["domains_limit", "domain_aliases_limit"]
+        names = [
+            tpl[0] for tpl in LimitTemplates().templates
+            if tpl[0] not in ["domain_admins_limit", "mailboxes_limit",
+                              "mailbox_aliases_limit"]
+            and (len(tpl) == 3 or tpl[3] == user.group)
+        ]
+
     limits = user.limitspool.limit_set.filter(name__in=names, maxvalue__gt=0)
     if len(limits) == 0:
         return []
@@ -85,7 +98,8 @@ def display_pool_usage(user, target, currentpage):
 def extra_account_form(user, account=None):
     if not user.group in ["SuperAdmins", "Resellers"]:
         return []
-    if account is not None and not account.group in ["Resellers", "DomainAdmins"]:
+    if account is not None and \
+            not account.group in ["Resellers", "DomainAdmins"]:
         return []
 
     return [
@@ -126,7 +140,7 @@ def get_static_content(caller, user):
     margin: 5px 0;
 }
 
-.resource .progress { 
+.resource .progress {
     margin-bottom: 0px;
 }
 
diff --git a/modoboa/extensions/limits/app_settings.py b/modoboa/extensions/limits/app_settings.py
index 6ce6665cb..e5b510cff 100644
--- a/modoboa/extensions/limits/app_settings.py
+++ b/modoboa/extensions/limits/app_settings.py
@@ -39,3 +39,7 @@ class ParametersForm(AdminParametersForm):
         help_text=_("Maximum number of allowed aliases for a new administrator"),
         widget=forms.widgets.TextInput(attrs={"class": "span1"})
     )
+
+    def __init__(self, *args, **kwargs):
+        super(AdminParametersForm, self).__init__(*args, **kwargs)
+        self._load_extra_parameters('A')
diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py
index 18a7b96c2..7ddd2f212 100644
--- a/modoboa/extensions/limits/controls.py
+++ b/modoboa/extensions/limits/controls.py
@@ -6,43 +6,27 @@
 """
 from modoboa.lib import events
 from modoboa.lib.permissions import get_object_owner
-from .lib import LimitReached
-from .models import limits_tpl, LimitsPool
+from .lib import LimitReached, inc_limit_usage, dec_limit_usage
+from .models import LimitTemplates, LimitsPool
 
 
-def check_limit(user, lname):
+def check_limit(user, lname, count=1):
     """Check if a user has reached a defined limit
 
     We check if the user will not reach the given limit after this
     creation.
 
-    Raise a ``LimitReached`` exception if the limit is reached.
-
     :param user: a ``User`` object
+    :param int count: the number of objects the user tries to create
+    :raises: ``LimitReached``
     """
     try:
-        if user.limitspool.will_be_reached(lname):
+        if user.limitspool.will_be_reached(lname, count):
             raise LimitReached(user.limitspool.get_limit(lname))
     except LimitsPool.DoesNotExist:
         pass
 
 
-def inc_limit(user, lname):
-    try:
-        user.limitspool.inc_curvalue(lname)
-    except LimitsPool.DoesNotExist:
-        pass
-
-
-def dec_limit(user, lname):
-    if user is None:
-        return
-    try:
-        user.limitspool.dec_curvalue(lname)
-    except LimitsPool.DoesNotExist:
-        pass
-
-
 def move_pool_resource(owner, user):
     """Move resource from one pool to another
 
@@ -54,7 +38,7 @@ def move_pool_resource(owner, user):
     except LimitsPool.DoesNotExist:
         return
     if not owner.is_superuser:
-        for ltpl in limits_tpl:
+        for ltpl in LimitTemplates().templates:
             l = user.limitspool.get_limit(ltpl[0])
             if l.maxvalue < 0:
                 continue
@@ -68,13 +52,13 @@ def move_pool_resource(owner, user):
 
 @events.observe('DomainCreated')
 def inc_nb_domains(user, domain):
-    inc_limit(user, 'domains_limit')
+    inc_limit_usage(user, 'domains_limit')
 
 
 @events.observe('DomainDeleted')
 def dec_nb_domains(domain):
     owner = get_object_owner(domain)
-    dec_limit(owner, 'domains_limit')
+    dec_limit_usage(owner, 'domains_limit')
     for domalias in domain.domainalias_set.all():
         dec_nb_domaliases(domalias)
     for mailbox in domain.mailbox_set.all():
@@ -85,7 +69,7 @@ def dec_nb_domains(domain):
 
 @events.observe('DomainAliasCreated')
 def inc_nb_domaliases(user, domalias):
-    inc_limit(user, 'domain_aliases_limit')
+    inc_limit_usage(user, 'domain_aliases_limit')
 
 
 @events.observe('DomainAliasDeleted')
@@ -96,12 +80,12 @@ def dec_nb_domaliases(domainaliases):
         domainaliases = [domainaliases]
     for domainalias in domainaliases:
         owner = get_object_owner(domainalias)
-        dec_limit(owner, 'domain_aliases_limit')
+        dec_limit_usage(owner, 'domain_aliases_limit')
 
 
 @events.observe('MailboxCreated')
 def inc_nb_mailboxes(user, mailbox):
-    inc_limit(user, 'mailboxes_limit')
+    inc_limit_usage(user, 'mailboxes_limit')
 
 
 @events.observe('MailboxDeleted')
@@ -112,23 +96,23 @@ def dec_nb_mailboxes(mailboxes):
         mailboxes = [mailboxes]
     for mailbox in mailboxes:
         owner = get_object_owner(mailbox)
-        dec_limit(owner, 'mailboxes_limit')
+        dec_limit_usage(owner, 'mailboxes_limit')
 
 
 @events.observe('MailboxAliasCreated')
 def inc_nb_mbaliases(user, mailboxalias):
-    inc_limit(user, 'mailbox_aliases_limit')
+    inc_limit_usage(user, 'mailbox_aliases_limit')
 
 
 @events.observe('MailboxAliasDeleted')
 def dec_nb_mbaliases(mailboxalias):
     owner = get_object_owner(mailboxalias)
-    dec_limit(owner, 'mailbox_aliases_limit')
+    dec_limit_usage(owner, 'mailbox_aliases_limit')
 
 
 @events.observe('CanCreate')
-def can_create_new_object(user, objtype):
-    check_limit(user, '%s_limit' % objtype)
+def can_create_new_object(user, objtype, count=1):
+    check_limit(user, '%s_limit' % objtype, count)
 
 
 @events.observe("AccountCreated")
@@ -140,12 +124,31 @@ def create_pool(user):
 
     if user.belongs_to_group("DomainAdmins"):
         check_limit(owner, 'domain_admins_limit')
-        inc_limit(owner, 'domain_admins_limit')
+        inc_limit_usage(owner, 'domain_admins_limit')
 
     if user.group in ["DomainAdmins", "Resellers"]:
-        p = LimitsPool(user=user)
-        p.save()
-        p.create_limits()
+        p, created = LimitsPool.objects.get_or_create(user=user)
+        p.create_limits(owner)
+
+
+@events.observe("UserCanSetRole")
+def user_can_set_role(user, role):
+    """Check if the user can still set this role.
+
+    The only interesting case concerns resellers defining new domain
+    administrators. We want to check if they are allowed to do this
+    operation before any modification is made to :keyword:`account`.
+
+    :param ``User`` user: connected user
+    :param str newrole: role to check
+    """
+    if role == 'DomainAdmins':
+        lname = 'domain_admins_limit'
+    else:
+        return [True]
+    if user.is_superuser or not user.limitspool.will_be_reached(lname):
+        return [True]
+    return [False]
 
 
 @events.observe("AccountModified")
@@ -164,19 +167,19 @@ def on_account_modified(old, new):
         except LimitsPool.DoesNotExist:
             p = LimitsPool(user=new)
             p.save()
-            p.create_limits()
+            p.create_limits(owner)
 
     if not new.group in ["DomainAdmins", "Resellers"]:
         move_pool_resource(owner, new)
 
     if old.oldgroup == "DomainAdmins":
         if new.group != "DomainAdmins":
-            dec_limit(owner, 'domain_admins_limit')
+            dec_limit_usage(owner, 'domain_admins_limit')
         return
 
     if new.group == "DomainAdmins":
         check_limit(owner, 'domain_admins_limit')
-        inc_limit(owner, 'domain_admins_limit')
+        inc_limit_usage(owner, 'domain_admins_limit')
 
 
 @events.observe("AccountDeleted")
@@ -188,4 +191,4 @@ def on_account_deleted(account, byuser, **kwargs):
     move_pool_resource(owner, account)
 
     if account.group == "DomainAdmins":
-        dec_limit(owner, 'domain_admins_limit')
+        dec_limit_usage(owner, 'domain_admins_limit')
diff --git a/modoboa/extensions/limits/forms.py b/modoboa/extensions/limits/forms.py
index 8a5ac4fcf..a763284e2 100644
--- a/modoboa/extensions/limits/forms.py
+++ b/modoboa/extensions/limits/forms.py
@@ -1,44 +1,26 @@
 # coding: utf-8
-
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import parameters
-from .models import limits_tpl
+from .models import LimitTemplates
 from .lib import BadLimitValue, UnsufficientResource
 
 
 class ResourcePoolForm(forms.Form):
-    domain_admins_limit = forms.IntegerField(
-        label=ugettext_lazy("Domain admins"),
-        help_text=ugettext_lazy("Maximum number of domain administrators this user can create")
-    )
-    domains_limit = forms.IntegerField(
-        label=ugettext_lazy("Domains"),
-        help_text=ugettext_lazy("Maximum number of domains this user can create")
-    )
-    domain_aliases_limit = forms.IntegerField(
-        label=ugettext_lazy("Domain aliases"),
-        help_text=ugettext_lazy("Maximum number of domain aliases this user can create")
-    )
-    mailboxes_limit = forms.IntegerField(
-        label=ugettext_lazy("Mailboxes"),
-        help_text=ugettext_lazy("Maximum number of mailboxes this user can create")
-    )
-    mailbox_aliases_limit = forms.IntegerField(
-        label=ugettext_lazy("Mailbox aliases"),
-        help_text=ugettext_lazy("Maximum number of mailbox aliases this user can create")
-    )
 
     def __init__(self, *args, **kwargs):
+        self.account = None
         if "instance" in kwargs:
             self.account = kwargs["instance"]
             del kwargs["instance"]
         super(ResourcePoolForm, self).__init__(*args, **kwargs)
+        for tpl in LimitTemplates().templates:
+            if len(tpl) > 3 and self.account is not None and self.account.group != tpl[3]:
+                continue
+            self.fields[tpl[0]] = forms.IntegerField(
+                label=tpl[1], help_text=tpl[2]
+            )
         if hasattr(self, "account"):
-            if self.account.group != "Resellers":
-                del self.fields["domain_admins_limit"]
-                del self.fields["domains_limit"]
-                del self.fields["domain_aliases_limit"]
             self.load_from_user(self.account)
 
     def check_limit_value(self, lname):
@@ -46,29 +28,30 @@ class ResourcePoolForm(forms.Form):
             raise forms.ValidationError(_("Invalid limit"))
         return self.cleaned_data[lname]
 
-    def clean_domains_limit(self):
-        return self.check_limit_value("domains_limit")
-
-    def clean_domain_aliases_limit(self):
-        return self.check_limit_value("domain_aliases_limit")
-
-    def clean_mailboxes_limit(self):
-        return self.check_limit_value("mailboxes_limit")
-
-    def clean_mailbox_aliases_limit(self):
-        return self.check_limit_value("mailbox_aliases_limit")
+    def clean(self):
+        cleaned_data = super(ResourcePoolForm, self).clean()
+        for lname in self.fields.keys():
+            if not lname in self._errors and cleaned_data[lname] < -1:
+                self._errors[lname] = self.error_class([_('Invalid limit')])
+                del cleaned_data[lname]
+        return cleaned_data
 
     def load_from_user(self, user):
-        for l in limits_tpl:
-            if not l[0] in self.fields:
-                continue
-            self.fields[l[0]].initial = user.limitspool.getmaxvalue(l[0])
+        for lname in self.fields.keys():
+            self.fields[lname].initial = user.limitspool.getmaxvalue(lname)
             # The following lines will become useless in a near
             # future.
-            if self.fields[l[0]].initial == -2:
-                self.fields[l[0]].initial = parameters.get_admin("DEFLT_%s" % l[0].upper())
+            if self.fields[lname].initial == -2:
+                self.fields[lname].initial = parameters.get_admin("DEFLT_%s" % lname.upper())
 
     def allocate_from_pool(self, limit, pool):
+        """Allocate resource using an existing pool.
+
+        When a reseller creates a domain administrator, he generally
+        assigns him resource to create new objetcs. As a reseller may
+        also be limited, the resource he gives is taken from its own
+        pool.
+        """
         ol = pool.get_limit(limit.name)
         if ol.maxvalue == -2:
             raise BadLimitValue(_("Your resources are not initialized yet"))
@@ -92,7 +75,7 @@ class ResourcePoolForm(forms.Form):
         from modoboa.lib.permissions import get_object_owner
 
         owner = get_object_owner(self.account)
-        for ltpl in limits_tpl:
+        for ltpl in LimitTemplates().templates:
             if not ltpl[0] in self.cleaned_data:
                 continue
             l = self.account.limitspool.limit_set.get(name=ltpl[0])
diff --git a/modoboa/extensions/limits/lib.py b/modoboa/extensions/limits/lib.py
index 5a395b86c..a4f7b2f1d 100644
--- a/modoboa/extensions/limits/lib.py
+++ b/modoboa/extensions/limits/lib.py
@@ -6,9 +6,12 @@
 """
 from django.utils.translation import ugettext as _
 from modoboa.lib.exceptions import ModoboaException
+from .models import LimitsPool
 
 
 class LimitReached(ModoboaException):
+    http_code = 403
+
     def __init__(self, limit):
         self.limit = limit
 
@@ -17,6 +20,8 @@ class LimitReached(ModoboaException):
 
 
 class UnsufficientResource(ModoboaException):
+    http_code = 424
+
     def __init__(self, limit):
         self.limit = limit
 
@@ -26,3 +31,22 @@ class UnsufficientResource(ModoboaException):
 
 class BadLimitValue(ModoboaException):
     pass
+
+
+def inc_limit_usage(user, lname):
+    """Increase a given limit usage.
+
+    """
+    try:
+        user.limitspool.inc_curvalue(lname)
+    except LimitsPool.DoesNotExist:
+        pass
+
+
+def dec_limit_usage(user, lname):
+    if user is None:
+        return
+    try:
+        user.limitspool.dec_curvalue(lname)
+    except LimitsPool.DoesNotExist:
+        pass
diff --git a/modoboa/extensions/limits/models.py b/modoboa/extensions/limits/models.py
index 80f521289..c249aa27b 100644
--- a/modoboa/extensions/limits/models.py
+++ b/modoboa/extensions/limits/models.py
@@ -2,27 +2,53 @@
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import parameters
+from modoboa.lib.singleton import Singleton
 from django.conf import settings
+from modoboa.lib import events
 
-limits_tpl = [
-    ("domain_admins_limit", ugettext_lazy("Domain admins")),
-    ("domains_limit", ugettext_lazy("Domains")),
-    ("domain_aliases_limit", ugettext_lazy("Domain aliases")),
-    ("mailboxes_limit", ugettext_lazy("Mailboxes")),
-    ("mailbox_aliases_limit", ugettext_lazy("Mailbox aliases"))
-]
+
+class LimitTemplates(Singleton):
+
+    def __init__(self):
+        self.templates = [
+            ("domain_admins_limit", ugettext_lazy("Domain admins"),
+             ugettext_lazy("Maximum number of domain administrators this user can create"),
+             'Resellers'),
+            ("domains_limit", ugettext_lazy("Domains"),
+             ugettext_lazy("Maximum number of domains this user can create"),
+             'Resellers'),
+            ("domain_aliases_limit", ugettext_lazy("Domain aliases"),
+             ugettext_lazy("Maximum number of domain aliases this user can create"),
+             'Resellers'),
+            ("mailboxes_limit", ugettext_lazy("Mailboxes"),
+             ugettext_lazy("Maximum number of mailboxes this user can create")),
+            ("mailbox_aliases_limit", ugettext_lazy("Mailbox aliases"),
+             ugettext_lazy("Maximum number of mailbox aliases this user can create"))
+        ]
+        self.templates += events.raiseQueryEvent('GetExtraLimitTemplates')
 
 
 class LimitsPool(models.Model):
     user = models.OneToOneField(settings.AUTH_USER_MODEL)
 
-    def create_limits(self):
-        for ltpl in limits_tpl:
-            l = Limit()
-            l.name = ltpl[0]
-            l.pool = self
-            l.maxvalue = int(parameters.get_admin("DEFLT_%s" % ltpl[0].upper()))
-            l.save()
+    def create_limits(self, creator):
+        """Create limits for this pool.
+
+        All limits defined into ``LimitTemplates`` will be created. If
+        the creator is a super administrator, the default maximum values
+        will be used.
+
+        :param ``User`` creator: user creating this pool
+        """
+        for ltpl in LimitTemplates().templates:
+            try:
+                Limit.objects.get(name=ltpl[0], pool=self)
+            except Limit.DoesNotExist:
+                maxvalue = int(parameters.get_admin("DEFLT_%s" % ltpl[0].upper())) \
+                    if creator.is_superuser else 0
+                Limit.objects.create(
+                    name=ltpl[0], pool=self, maxvalue=maxvalue
+                )
 
     def getcurvalue(self, lname):
         l = self.limit_set.get(name=lname)
@@ -32,6 +58,11 @@ class LimitsPool(models.Model):
         l = self.limit_set.get(name=lname)
         return l.maxvalue
 
+    def set_maxvalue(self, lname, value):
+        l = self.limit_set.get(name=lname)
+        l.maxvalue = value
+        l.save()
+
     def inc_curvalue(self, lname, nb=1):
         l = self.limit_set.get(name=lname)
         l.curvalue += nb
@@ -92,7 +123,7 @@ class Limit(models.Model):
 
     @property
     def label(self):
-        for l in limits_tpl:
+        for l in LimitTemplates().templates:
             if l[0] == self.name:
                 return l[1]
         return ""
diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py
index 410b9f30c..0bae19785 100644
--- a/modoboa/extensions/limits/tests.py
+++ b/modoboa/extensions/limits/tests.py
@@ -1,8 +1,13 @@
 from django.core.urlresolvers import reverse
 from modoboa.lib.tests import ExtTestCase
-from modoboa.core.factories import UserFactory
-from modoboa.extensions.admin.factories import DomainFactory, MailboxFactory
+from modoboa.lib import parameters
 from modoboa.core.models import User
+from modoboa.core.factories import UserFactory
+from modoboa.extensions.admin.factories import (
+    DomainFactory, MailboxFactory, populate_database
+)
+from modoboa.extensions.admin.models import Alias, Domain, DomainAlias
+from modoboa.extensions.limits.models import LimitTemplates
 
 
 class PermissionsTestCase(ExtTestCase):
@@ -26,13 +31,342 @@ class PermissionsTestCase(ExtTestCase):
         values = dict(
             username="reseller@test.com", first_name="Reseller", last_name="",
             password1="toto", password2="toto", role="Resellers",
-            is_active=True, email="reseller@test.com", stepid=2
+            is_active=True, email="reseller@test.com", stepid='step2'
         )
-        self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.newaccount"), values)
+        self.ajax_post(reverse("modoboa.extensions.admin.views.identity.newaccount"), values)
         account = User.objects.get(username="reseller@test.com")
         self.clt.logout()
         self.clt.login(username="admin@test.com", password="toto")
-        self.check_ajax_get(
+        resp = self.ajax_post(
             reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]),
-            {}, status="ko", respmsg="Permission denied"
+            {}, status=403
         )
+        self.assertEqual(resp, "Permission denied")
+
+
+class ResourceTestCase(ExtTestCase):
+    fixtures = ["initial_users.json"]
+    name = "limits"
+
+    def setUp(self):
+        super(ResourceTestCase, self).setUp()
+        populate_database()
+        for tpl in LimitTemplates().templates:
+            parameters.save_admin('DEFLT_%s' % tpl[0].upper(), 2, app='limits')
+
+    def _create_account(self, username, role='SimpleUsers', status=200):
+        values = dict(
+            username=username, first_name="Tester", last_name="Toto",
+            password1="toto", password2="toto", role=role,
+            quota_act=True,
+            is_active=True, email=username, stepid='step2',
+        )
+        return self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.newaccount"),
+            values, status
+        )
+
+    def _create_alias(self, email, rcpt='user@test.com', status=200):
+        values = dict(
+            email=email, recipients=rcpt, enabled=True
+        )
+        return self.ajax_post(
+            reverse("modoboa.extensions.admin.views.alias.newalias"),
+            values, status
+        )
+
+    def _create_domain(self, name, status=200, withtpl=False):
+        values = {
+            "name": name, "quota": 100, "create_dom_admin": "no",
+            "create_aliases": "no", "stepid": 'step2'
+        }
+        if withtpl:
+            values['create_dom_admin'] = 'yes'
+            values['dom_admin_username'] = 'admin'
+            values['create_aliases'] = 'yes'
+        return self.ajax_post(
+            reverse("modoboa.extensions.admin.views.domain.newdomain"),
+            values, status
+        )
+
+    def _domain_alias_operation(self, optype, domain, name, status=200):
+        dom = Domain.objects.get(name=domain)
+        values = {
+            'name': dom.name, 'quota': dom.quota, 'enabled': dom.enabled,
+        }
+        aliases = [alias.name for alias in dom.domainalias_set.all()]
+        if optype == 'add':
+            aliases.append(name)
+        else:
+            aliases.remove(name)
+        for cpt, alias in enumerate(aliases):
+            fname = 'aliases' if not cpt else 'aliases_%d' % cpt
+            values[fname] = alias
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.domain.editdomain",
+                    args=[dom.id]),
+            values, status
+        )
+
+    def _check_limit(self, name, curvalue, maxvalue):
+        l = self.user.limitspool.get_limit('%s_limit' % name)
+        self.assertEqual(l.curvalue, curvalue)
+        self.assertEqual(l.maxvalue, maxvalue)
+
+
+class DomainAdminTestCase(ResourceTestCase):
+
+    def setUp(self):
+        super(DomainAdminTestCase, self).setUp()
+        self.user = User.objects.get(username='admin@test.com')
+        self.user.limitspool.set_maxvalue('mailboxes_limit', 2)
+        self.user.limitspool.set_maxvalue('mailbox_aliases_limit', 2)
+        self.clt.logout()
+        self.clt.login(username='admin@test.com', password='toto')
+
+    def test_mailboxes_limit(self):        
+        self._create_account('tester1@test.com')
+        self._check_limit('mailboxes', 1, 2)
+        self._create_account('tester2@test.com')
+        self._check_limit('mailboxes', 2, 2)
+        resp = self._create_account('tester3@test.com', status=403)
+        self._check_limit('mailboxes', 2, 2)
+        self.ajax_post(
+            reverse('modoboa.extensions.admin.views.identity.delaccount',
+                    args=[User.objects.get(username='tester2@test.com').id]),
+            {}
+        )
+        self._check_limit('mailboxes', 1, 2)
+
+    def test_aliases_limit(self):
+        self._create_alias('alias1@test.com')
+        self._check_limit('mailbox_aliases', 1, 2)
+        self._create_alias('alias2@test.com')
+        self._check_limit('mailbox_aliases', 2, 2)
+        resp = self._create_alias('alias3@test.com', status=403)
+        self._check_limit('mailbox_aliases', 2, 2)
+        self.ajax_post(
+            reverse('modoboa.extensions.admin.views.alias.delalias') + '?selection=%d' \
+                % Alias.objects.get(address='alias2', domain__name='test.com').id,
+            {}
+        )
+        self._check_limit('mailbox_aliases', 1, 2)
+
+    def test_aliases_limit_through_account_form(self):
+        user = User.objects.get(username='user@test.com')
+        values = dict(
+            username=user.username, role=user.group,
+            is_active=user.is_active, email=user.email, quota_act=True,
+            aliases="alias1@test.com", aliases_1="alias2@test.com"
+        )
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values
+        )
+        Alias.objects.get(address='alias1', domain__name='test.com')
+        self._check_limit('mailbox_aliases', 2, 2)
+
+
+class ResellerTestCase(ResourceTestCase):
+
+    def setUp(self):
+        super(ResellerTestCase, self).setUp()
+        self.user = UserFactory.create(
+            username='reseller', groups=('Resellers',)
+        )
+        self.clt.logout()
+        self.clt.login(username='reseller', password='toto')
+
+    def test_domains_limit(self):
+        self._create_domain('domain1.tld')
+        self._check_limit('domains', 1, 2)
+        self._create_domain('domain2.tld')
+        self._check_limit('domains', 2, 2)
+        resp = self._create_domain('domain3.tld', 403)
+        self._check_limit('domains', 2, 2)
+        self.ajax_post(
+            reverse('modoboa.extensions.admin.views.domain.deldomain',
+                    args=[Domain.objects.get(name='domain2.tld').id]),
+            {}
+        )
+        self._check_limit('domains', 1, 2)
+
+    def test_domain_aliases_limit(self):
+        self._create_domain('pouet.com')
+        self._domain_alias_operation('add', 'pouet.com', 'domain_alias1.tld')
+        self._check_limit('domain_aliases', 1, 2)
+        self._domain_alias_operation('add', 'pouet.com', 'domain_alias2.tld')
+        self._check_limit('domain_aliases', 2, 2)
+        resp = self._domain_alias_operation(
+            'add', 'pouet.com', 'domain_alias3.tld', 403
+        )
+        self._check_limit('domain_aliases', 2, 2)
+        self._domain_alias_operation('delete', 'pouet.com', 'domain_alias2.tld')
+        self._check_limit('domain_aliases', 1, 2)
+
+    def test_domain_admins_limit(self):
+        self._create_domain('domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        self._check_limit('domain_admins', 1, 2)
+        self._create_account('admin2@domain.tld', role='DomainAdmins')
+        self._check_limit('domain_admins', 2, 2)
+        resp = self._create_account('admin3@domain.tld', role='DomainAdmins', status=400)
+        self.assertEqual(
+            resp['form_errors']['role'][0],
+            'Select a valid choice. DomainAdmins is not one of the available choices.'
+        )
+        self._check_limit('domain_admins', 2, 2)
+        
+        self.user.limitspool.set_maxvalue('mailboxes_limit', 3)
+        self._create_account('user1@domain.tld')
+        user = User.objects.get(username='user1@domain.tld')
+        values = {
+            'username': user.username, 'role': 'DomainAdmins', 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email
+        }
+        resp = self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values, status=400
+        )
+        self.assertEqual(
+            resp['form_errors']['role'][0],
+            'Select a valid choice. DomainAdmins is not one of the available choices.'
+        )
+        self._check_limit('domain_admins', 2, 2)
+
+    def test_domain_admin_resource_are_empty(self):
+        self._create_domain('domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        domadmin = User.objects.get(username='admin1@domain.tld')
+        for l in ['mailboxes', 'mailbox_aliases']:
+            self.assertEqual(
+                domadmin.limitspool.get_limit('%s_limit' % l).maxvalue, 0
+            )
+
+    def test_domain_admins_limit_from_domain_tpl(self):
+        self.user.limitspool.set_maxvalue('domains_limit', 3)
+        self._create_domain('domain1.tld', withtpl=True)
+        self._create_domain('domain2.tld', withtpl=True)
+        self._check_limit('domain_admins', 2, 2)
+        self._check_limit('domains', 2, 3)
+        resp = self._create_domain('domain3.tld', status=200, withtpl=True)
+        self._check_limit('domain_admins', 2, 2)
+        self._check_limit('domains', 3, 3)
+
+    def test_allocate_from_pool(self):
+        self._create_domain('domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        user = User.objects.get(username='admin1@domain.tld')
+
+        # Give 1 mailbox and 2 aliases to the admin -> should work
+        values = {
+            'username': user.username, 'role': user.group, 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email,
+            'mailboxes_limit': 1, 'mailbox_aliases_limit': 2
+        }
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values
+        )
+        self._check_limit('mailboxes', 1, 1)
+        self._check_limit('mailbox_aliases', 0, 0)
+
+        # Delete the admin -> resources should go back to the
+        # reseller's pool
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.delaccount",
+                    args=[user.id]),
+            {}
+        )
+        self._check_limit('mailboxes', 0, 2)
+        self._check_limit('mailbox_aliases', 0, 2)
+
+    def test_restore_resources(self):
+        self._create_domain('domain.tld')
+        dom = Domain.objects.get(name='domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        user = User.objects.get(username='admin1@domain.tld')
+        values = {
+            'username': user.username, 'role': user.group, 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email,
+            'mailboxes_limit': 1, 'mailbox_aliases_limit': 2
+        }
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values
+        )
+        dom.add_admin(user)
+        self.clt.logout()
+        self.clt.login(username='admin1@domain.tld', password='toto')
+        self._create_account('user1@domain.tld')
+        self._create_alias('alias1@domain.tld', 'user1@domain.tld')
+        self._create_alias('alias2@domain.tld', 'user1@domain.tld')
+        self.clt.logout()
+        self.clt.login(username='reseller', password='toto')
+        # Delete the admin -> resources should go back to the
+        # reseller's pool
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.delaccount",
+                    args=[user.id]),
+            {}
+        )
+        self._check_limit('mailboxes', 1, 2)
+        self._check_limit('mailbox_aliases', 2, 2)
+
+    def test_change_role(self):
+        self._create_domain('domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        user = User.objects.get(username='admin1@domain.tld')
+
+        # Give 1 mailbox and 2 aliases to the admin -> should work
+        values = {
+            'username': user.username, 'role': user.group, 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email,
+            'mailboxes_limit': 1, 'mailbox_aliases_limit': 2
+        }
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values
+        )
+        self._check_limit('mailboxes', 1, 1)
+        self._check_limit('mailbox_aliases', 0, 0)
+
+        # Change admin role to SimpleUser -> resources should go back
+        # to the reseller.
+        values = {
+            'username': user.username, 'role': 'SimpleUsers', 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email,
+        }
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values
+        )
+        self._check_limit('mailboxes', 1, 2)
+        self._check_limit('mailbox_aliases', 0, 2)
+        
+
+    def test_allocate_too_much(self):
+        self._create_domain('domain.tld')
+        self._create_account('admin1@domain.tld', role='DomainAdmins')
+        user = User.objects.get(username='admin1@domain.tld')
+
+        # Give 2 mailboxes and 3 aliases to the admin -> should fail.
+        values = {
+            'username': user.username, 'role': user.group, 'quota_act': True,
+            'is_active': user.is_active, 'email': user.email,
+            'mailboxes_limit': 2, 'mailbox_aliases_limit': 3
+        }
+        resp = self.ajax_post(
+            reverse("modoboa.extensions.admin.views.identity.editaccount",
+                    args=[user.id]),
+            values, 424
+        )
+        self.assertEqual(resp, 'Not enough resources')
+        self._check_limit('mailboxes', 1, 2)
+        self._check_limit('mailbox_aliases', 0, 2)
diff --git a/modoboa/extensions/postfix_autoreply/views.py b/modoboa/extensions/postfix_autoreply/views.py
index 2766d533e..7b234966b 100644
--- a/modoboa/extensions/postfix_autoreply/views.py
+++ b/modoboa/extensions/postfix_autoreply/views.py
@@ -3,7 +3,7 @@ from datetime import date
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string
+    render_to_json_response, _render_to_string
 )
 from modoboa.extensions.admin.lib import needs_mailbox
 from modoboa.extensions.admin.models import Mailbox
@@ -29,24 +29,20 @@ def autoreply(request, tplname="postfix_autoreply/autoreply.html"):
             arm.untildate = form.cleaned_data["untildate"]
             arm.mbox = mb
             arm.save()
-            return ajax_simple_response(dict(
-                status="ok",
-                respmsg=_("Auto reply message updated successfully.")
-            ))
+            return render_to_json_response(
+                _("Auto reply message updated successfully.")
+            )
 
-        return ajax_simple_response({
-            "status": "ko",
-            "errors": form.errors,
-            "onload_cb": "autoreply_cb"
-        })
+        return render_to_json_response(
+            {"form_errors": form.errors}, status=400
+        )
 
     form = ARmessageForm(instance=arm)
     if arm is not None:
         form.fields['untildate'].initial = arm.untildate
     else:
         form.fields['untildate'].initial = date.today()
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "content": _render_to_string(request, tplname, {"form": form}),
         "onload_cb": "autoreply_cb"
     })
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index 912da41f4..151462236 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 from django.core.urlresolvers import reverse
+from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.template import Template, Context
 from django.conf import settings
 from django.utils.translation import ugettext_lazy
@@ -10,6 +12,9 @@ from .models import RelayDomain, RelayDomainAlias, Service
 
 extension_events = [
     "RelayDomainCreated",
+    "RelayDomainDeleted",
+    "RelayDomainAliasCreated",
+    "RelayDomainAliasDeleted"
 ]
 
 
@@ -27,15 +32,41 @@ class PostfixRelayDomains(ModoExtension):
         """
         for service_name in ['relay', 'smtp']:
             Service.objects.get_or_create(name=service_name)
+        if not exts_pool.is_extension_enabled('limits'):
+            return
+
+        from modoboa.core.models import User
+        from modoboa.extensions.limits import controls
+
+        for u in User.objects.all():
+            controls.create_pool(u)
+
+        grp = Group.objects.get(name='Resellers')
+        for model in [RelayDomain, RelayDomainAlias, Service]:
+            ct = ContentType.objects.get_for_model(model)
+            name = model.__name__.lower()
+            for action in ['add', 'change', 'delete']:
+                grp.permissions.add(
+                    Permission.objects.get(
+                        content_type=ct, codename='%s_%s' % (action, name)
+                    )
+                )
+        grp.save()
 
     def load(self):
         from .app_settings import AdminParametersForm
 
-        parameters.register(AdminParametersForm, ugettext_lazy("Relay domains"))
+        parameters.register(
+            AdminParametersForm, ugettext_lazy("Relay domains")
+        )
         events.declare(extension_events)
+        if not exts_pool.is_extension_enabled('limits'):
+            return
+        import limits_controls
 
     def destroy(self):
         events.unregister('GetExtraDomainEntries', extra_domain_entries)
+        events.unregister('GetExtraParameters', extra_parameters)
 
 exts_pool.register_extension(PostfixRelayDomains)
 
@@ -132,3 +163,41 @@ def check_domain_name():
         (RelayDomain, ugettext_lazy('relay domain')),
         (RelayDomainAlias, ugettext_lazy('relay domain alias'))
     ]
+
+
+@events.observe('GetExtraLimitTemplates')
+def extra_limit_templates():
+    return [
+        ('relay_domains_limit', ugettext_lazy('Relay domains'),
+         ugettext_lazy('Maximum number of relay domains this user can create'),
+         'Resellers'),
+        ("relay_domain_aliases_limit", ugettext_lazy("Relay domain aliases"),
+         ugettext_lazy('Maximum number of relay domain aliases this user can create'),
+         'Resellers'),
+    ]
+
+
+@events.observe('GetExtraParameters')
+def extra_parameters(app, level):
+    from django import forms
+
+    if app != 'limits' or level != 'A':
+        return {}
+    return {
+        'deflt_relay_domains_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domains"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domains for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        ),
+        'deflt_relay_domain_aliases_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domain aliases"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domain aliases for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        )
+    }
diff --git a/modoboa/extensions/postfix_relay_domains/app_settings.py b/modoboa/extensions/postfix_relay_domains/app_settings.py
index d84de1aec..49d17ae0c 100644
--- a/modoboa/extensions/postfix_relay_domains/app_settings.py
+++ b/modoboa/extensions/postfix_relay_domains/app_settings.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import ugettext_lazy
-from modoboa.lib.formutils import SeparatorField
 from modoboa.lib import parameters
 
 
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index f3100bd68..767caeb3a 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.http import QueryDict
 from django.utils.translation import ugettext as _, ugettext_lazy
+from modoboa.lib import events
 from modoboa.lib.formutils import DynamicForm, DomainNameField
 from modoboa.extensions.admin.models import Domain, DomainAlias
 from .models import RelayDomain, RelayDomainAlias
@@ -92,23 +93,31 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
         rd = super(RelayDomainForm, self).save(commit=False)
         if commit:
             rd.save()
+            aliases = []
             for k, v in self.cleaned_data.iteritems():
                 if not k.startswith("aliases"):
                     continue
                 if v in ["", None]:
                     continue
-                try:
-                    rd.relaydomainalias_set.get(name=v)
-                except RelayDomainAlias.DoesNotExist:
-                    pass
-                else:
-                    continue
-                #events.raiseEvent("CanCreate", user, "domain_aliases")
-                al = RelayDomainAlias(name=v, target=rd, enabled=rd.enabled)
-                al.save(creator=user)
-
+                aliases.append(v)
             for rdalias in rd.relaydomainalias_set.all():
-                if not filter(lambda name: self.cleaned_data[name] == rdalias.name,
-                              self.cleaned_data.keys()):
+                if not rdalias.name in aliases:
                     rdalias.delete()
+                else:
+                    aliases.remove(rdalias.name)
+            if aliases:
+                events.raiseEvent(
+                    "CanCreate", user, "relay_domain_aliases", len(aliases)
+                )
+                for alias in aliases:
+                    try:
+                        rd.relaydomainalias_set.get(name=alias)
+                    except RelayDomainAlias.DoesNotExist:
+                        pass
+                    else:
+                        continue
+                    al = RelayDomainAlias(
+                        name=alias, target=rd, enabled=rd.enabled
+                    )
+                    al.save(creator=user)
         return rd
diff --git a/modoboa/extensions/postfix_relay_domains/limits_controls.py b/modoboa/extensions/postfix_relay_domains/limits_controls.py
new file mode 100644
index 000000000..9966945e7
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/limits_controls.py
@@ -0,0 +1,31 @@
+from modoboa.lib import events
+from modoboa.lib.permissions import get_object_owner
+from modoboa.extensions.limits.lib import inc_limit_usage, dec_limit_usage
+from .models import RelayDomainAlias
+
+
+@events.observe('RelayDomainCreated')
+def inc_relaydomains_count(user, rdomain):
+    inc_limit_usage(user, 'relay_domains_limit')
+
+
+@events.observe('RelayDomainDeleted')
+def dec_relaydomains_count(rdomain):
+    owner = get_object_owner(rdomain)
+    dec_limit_usage(owner, 'relay_domains_limit')
+    for rdomalias in rdomain.relaydomainalias_set.all():
+        dec_rdomaliases_count(rdomalias)
+
+
+@events.observe('RelayDomainAliasCreated')
+def inc_rdomaliases_count(user, rdomalias):
+    inc_limit_usage(user, 'relay_domain_aliases_limit')
+
+
+@events.observe('RelayDomainAliasDeleted')
+def dec_rdomaliases_count(rdomainaliases):
+    if isinstance(rdomainaliases, RelayDomainAlias):
+        rdomainaliases = [rdomainaliases]
+    for rdomainalias in rdomainaliases:
+        owner = get_object_owner(rdomainalias)
+        dec_limit_usage(owner, 'relay_domain_aliases_limit')
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
index 830e3e977..f14188ee0 100644
--- a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -16,6 +16,15 @@ RelayDomains.prototype = {
     initialize: function(options) {
         this.options = $.extend({}, this.defaults, options);
         admin.register_tag_handler("srv", this.srv_tag_handler);
+        $(document).bind('domain_listing_refresh', this.listing_refresh_cb);
+    },
+
+    listing_refresh_cb: function() {
+        $("a[name=delrelaydomain]").confirm({
+            question: function() { return this.$element.attr('title'); },
+            method: "DELETE",
+            success_cb: $.proxy(admin.reload_listing, admin)
+        });
     },
 
     launch_scan: function(e) {
@@ -54,7 +63,7 @@ RelayDomains.prototype = {
         $('input:text:visible:first').focus();
         $("#id_aliases").dynamic_input();
         $(".submit").on('click', $.proxy(function(e) {
-            simple_ajax_form_post2(e, {
+            simple_ajax_form_post(e, {
                 formid: "rdomform",
                 reload_on_success: false,
                 success_cb: $.proxy(admin.reload_listing, admin)
diff --git a/modoboa/extensions/postfix_relay_domains/tests.py b/modoboa/extensions/postfix_relay_domains/tests.py
index 501deb776..dab97161c 100644
--- a/modoboa/extensions/postfix_relay_domains/tests.py
+++ b/modoboa/extensions/postfix_relay_domains/tests.py
@@ -1,16 +1,13 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
+from modoboa.lib.tests import ExtTestCase
+from modoboa.extensions.admin import factories
 
 
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)
+class RelayDomainsTestCase(ExtTestCase):
+    fixtures = ["initial_users.json"]
+    name = "postfix_relay_domains"
+
+    def setUp(self):
+        super(RelayDomainsTestCase, self).setUp()
+        factories.populate_database()
+
+    
diff --git a/modoboa/extensions/postfix_relay_domains/views.py b/modoboa/extensions/postfix_relay_domains/views.py
index 0a4281d0d..5eded6ca3 100644
--- a/modoboa/extensions/postfix_relay_domains/views.py
+++ b/modoboa/extensions/postfix_relay_domains/views.py
@@ -4,24 +4,20 @@ from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_http_methods
 from django.contrib.auth.decorators import (
-    login_required, permission_required, user_passes_test
+    login_required, permission_required
 )
 from modoboa.lib import events
-from modoboa.lib.exceptions import ModoboaException, PermDeniedException
+from modoboa.lib.exceptions import PermDeniedException
 from modoboa.lib.webutils import render_to_json_response
 from .models import RelayDomain, Service
 from .forms import RelayDomainForm
 
 
 @login_required
-@permission_required("admin.add_relaydomain")
+@permission_required("postfix_relay_domains.add_relaydomain")
 @transaction.commit_on_success
 def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
-    commonctx = {"title": _("New relay domain"),
-                 "action_label": _("Create"),
-                 "action_classes": "submit",
-                 "action": reverse(create),
-                 "formid": "rdomform"}
+    events.raiseEvent("CanCreate", request.user, "relay_domains")
     if request.method == 'POST':
         form = RelayDomainForm(request.POST)
         if form.is_valid():
@@ -30,13 +26,21 @@ def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
             return render_to_json_response(
                 {"respmsg": _("Relay domain created")}
             )
-        return render_to_json_response(form.errors, status=400)
-    commonctx['form'] = RelayDomainForm()
-    return render(request, tplname, commonctx)
+        return render_to_json_response(
+            {'form_errors': form.errors}, status=400
+        )
+
+    ctx = {"title": _("New relay domain"),
+           "action_label": _("Create"),
+           "action_classes": "submit",
+           "action": reverse(create),
+           "formid": "rdomform",
+           "form": RelayDomainForm()}
+    return render(request, tplname, ctx)
 
 
 @login_required
-@permission_required("admin.change_relaydomain")
+@permission_required("postfix_relay_domains.change_relaydomain")
 def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'):
     rdom = RelayDomain.objects.get(pk=rdom_id)
     if not request.user.can_access(rdom):
@@ -46,10 +50,11 @@ def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'
         if form.is_valid():
             form.save(request.user)
             events.raiseEvent('RelayDomainModified', rdom)
-            return render_to_json_response(
-                {'respmsg': _('Relay domain modified')}
-            )
-        return render_to_json_response(form.errors, status=400)
+            return render_to_json_response(_('Relay domain modified'))
+
+        return render_to_json_response(
+            {'form_errors': form.errors}, status=400
+        )
     ctx = {
         'action': reverse(edit, args=[rdom.id]),
         'formid': 'rdomform',
@@ -62,19 +67,17 @@ def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'
 
 
 @login_required
-@permission_required("admin.delete_relaydomain")
+@permission_required("postfix_relay_domains.delete_relaydomain")
 def delete(request, rdom_id):
     rdom = RelayDomain.objects.get(pk=rdom_id)
     if not request.user.can_access(rdom):
         raise PermDeniedException
     rdom.delete()
-    return render_to_json_response({
-        'status': 'ok', 'respmsg': _('Relay domain deleted')
-    })
+    return render_to_json_response(_('Relay domain deleted'))
 
 
 @login_required
-@user_passes_test(lambda u: u.is_superuser)
+@permission_required("postfix_relay_domains.add_service")
 @require_http_methods(["POST"])
 def scan_for_services(request):
     try:
diff --git a/modoboa/extensions/sievefilters/lib.py b/modoboa/extensions/sievefilters/lib.py
index 3cd57d338..6d6b7e1ae 100644
--- a/modoboa/extensions/sievefilters/lib.py
+++ b/modoboa/extensions/sievefilters/lib.py
@@ -5,11 +5,12 @@ from sievelib.managesieve import Client, Error
 from sievelib.parser import Parser
 from sievelib.factory import FiltersSet
 from modoboa.lib import parameters
+from modoboa.lib.exceptions import ModoboaException
 from modoboa.lib.connections import ConnectionsManager, ConnectionError
 
 
-class SieveClientError(Exception):
-    pass
+class SieveClientError(ModoboaException):
+    http_code = 424
 
 
 class SieveClient(object):
diff --git a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
index 7854c0c13..3c8336806 100644
--- a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
+++ b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
@@ -18,15 +18,13 @@ function removefilter(evt) {
 
     $.ajax({
         url: $this.attr("href"),
-        dataType: 'json',
-        success: function(response) {
-            if (response.status == "ok") {
-                history.update(true);
-                $("body").notify('success', response.respmsg, 2000);
-            } else {
-                $("body").notify('error', response.respmsg);
-            }
-        }
+        dataType: 'json'
+    }).done(function(response) {
+        history.update(true);
+        $("body").notify('success', response, 2000);
+    }).fail(function(jqxhr) {
+        var response = $.parseJSON(jqxhr.responseText);
+        $("body").notify('error', response);
     });
 }
 
@@ -181,16 +179,14 @@ function toggle_filter_state(event) {
     event.preventDefault();
     $.ajax({
         url: $this.attr("href"),
-        dataType: 'json',
-        success: function(response) {
-            if (response.status == "ok") {
-                $this.html(response.label);
-                $this.attr("class", "");
-                $this.addClass(response.color);
-            } else {
-                $("body").notify('error', response.respmsg);
-            }
-        }
+        dataType: 'json'
+    }).done(function(response) {
+        $this.html(response.label);
+        $this.attr("class", "");
+        $this.addClass(response.color);
+    }).fail(function(jqhxr) {
+        var response = $.parseJSON(jqxhr.responseText);
+        $("body").notify('error', response);
     });
 }
 
@@ -200,11 +196,13 @@ function move_filter(event) {
     event.preventDefault();
     $.ajax({
         url: $this.attr('href'),
-        dataType: 'json',
-        success: function(response) {
-            $("#set_content").html(response.content);
-            init_filters_list();
-        }
+        dataType: 'json'
+    }).done(function(response) {
+        $("#set_content").html(response.content);
+        init_filters_list();
+    }).fail(function(jqxhr) {
+        var response = $.parseJSON(jqxhr.responseText);
+        $("body").notify('error', response);
     });
 }
 
@@ -234,11 +232,10 @@ function filtersetform_cb() {
     $("#newfiltersset").find("input").keypress(function(e) {
         if (e.which == 13) e.preventDefault();
     });
-    $(".submit").one('click', function(e) {
+    $(".submit").on('click', function(e) {
         simple_ajax_form_post(e, {
             formid: "newfiltersset",
             reload_on_success: false,
-            error_cb: filtersetform_cb,
             success_cb: filterset_created
         });
     });
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index 2430cafdc..817d6fd51 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -34,11 +34,11 @@ function filterform_cb() {
         }
     });
 
-    $(".submit").one('click', function(e) {
+    $(".submit").on('click', function(e) {
         var counters = "conds=" + $dc.fields_cnt + "&actions=" + $da.fields_cnt;
 
         simple_ajax_form_post(e, {
-            error_cb: filterform_cb,
+            formid: 'filterform',
             reload_mode: 'history',
             extradata: counters
         });
diff --git a/modoboa/extensions/sievefilters/views.py b/modoboa/extensions/sievefilters/views.py
index 31fce1b29..0352a23d4 100644
--- a/modoboa/extensions/sievefilters/views.py
+++ b/modoboa/extensions/sievefilters/views.py
@@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from modoboa.lib import parameters
 from modoboa.lib.webutils import _render_error, \
-    ajax_response, ajax_simple_response
+    ajax_response, render_to_json_response
 from modoboa.lib.connections import ConnectionError
 from modoboa.extensions.admin.lib import needs_mailbox
 from .lib import SieveClient, SieveClientError
@@ -54,8 +54,12 @@ def index(request, tplname="sievefilters/index.html"):
 @needs_mailbox()
 def get_templates(request, ftype):
     if ftype == "condition":
-        return ajax_simple_response(FilterForm([], [], request).cond_templates)
-    return ajax_simple_response(FilterForm([], [], request).action_templates)
+        return render_to_json_response(
+            FilterForm([], [], request).cond_templates
+        )
+    return render_to_json_response(
+        FilterForm([], [], request).action_templates
+    )
 
 
 @login_required
@@ -87,8 +91,8 @@ def getfs(request, name):
 
     menu = '<ul id="fsetmenu" class="nav nav-list"><li class="nav-header">%s</li>%s</ul>' % \
         (_("Actions"), fset_menu(editormode, name))
-    resp = dict(status="ok", menu=menu, content=htmlcontent)
-    return ajax_simple_response(resp)
+    resp = dict(menu=menu, content=htmlcontent)
+    return render_to_json_response(resp)
 
 
 def build_filter_ctx(ctx, form):
@@ -119,13 +123,12 @@ def submitfilter(request, setname, okmsg, tplname, tplctx, update=False, sc=None
             fset.updatefilter(
                 oldname, fltname, conditions, actions, match_type
             )
-        try:
-            sc.pushscript(fset.name, str(fset))
-        except SieveClientError as e:
-            return ajax_response(request, "ko", respmsg=str(e))
-        return ajax_response(request, respmsg=okmsg, ajaxnav=True)
-    tplctx = build_filter_ctx(tplctx, form)
-    return ajax_response(request, status="ko", template=tplname, **tplctx)
+        sc.pushscript(fset.name, str(fset))
+        return render_to_json_response(okmsg)
+    #tplctx = build_filter_ctx(tplctx, form)
+    #return ajax_response(request, status="ko", template=tplname, **tplctx)
+
+    return render_to_json_response({'form_errors': form.errors}, status=400)
 
 
 @login_required
@@ -186,8 +189,8 @@ def removefilter(request, setname, fname):
     fset = sc.getscript(setname, format="fset")
     if fset.removefilter(fname.encode("utf-8")):
         sc.pushscript(fset.name, str(fset))
-        return ajax_response(request, respmsg=_("Filter removed"))
-    return ajax_response(request, "ko", respmsg=_("Failed to remove filter"))
+        return render_to_json_response(_("Filter removed"))
+    return render_to_json_response(_("Failed to remove filter"), status=500)
 
 
 @login_required
@@ -208,37 +211,28 @@ def savefs(request, name):
 @login_required
 @needs_mailbox()
 def new_filters_set(request, tplname="common/generic_modal_form.html"):
+    if request.method == "POST":
+        form = FiltersSetForm(request.POST)
+        if form.is_valid():
+            sc = SieveClient(user=request.user.username,
+                             password=request.session["password"])
+            sc.pushscript(form.cleaned_data["name"], "# Empty script",
+                          form.cleaned_data["active"])
+            return render_to_json_response({
+                "url": form.cleaned_data["name"],
+                "active": form.cleaned_data["active"],
+                "respmsg": _("Filters set created")
+            })
+        return render_to_json_response({'form_errors': form.errors}, status=400)
+
     ctx = {"title": _("Create a new filters set"),
            "formid": "newfiltersset",
            "action_label": _("Create"),
            "action_classes": "submit",
            "action": reverse(new_filters_set),
            "withmenu": False,
-           "withunseen": False}
-    if request.method == "POST":
-        form = FiltersSetForm(request.POST)
-        error = None
-        if form.is_valid():
-            sc = SieveClient(user=request.user.username,
-                             password=request.session["password"])
-            try:
-                sc.pushscript(form.cleaned_data["name"], "# Empty script",
-                              form.cleaned_data["active"])
-            except SieveClientError, e:
-                error = str(e)
-            else:
-                return ajax_simple_response({
-                    "status": "ok",
-                    "url": form.cleaned_data["name"],
-                    "active": form.cleaned_data["active"],
-                    "respmsg": _("Filters set created")
-                })
-
-        ctx["form"] = form
-        ctx["error"] = error
-        return ajax_response(request, status="ko", template=tplname, **ctx)
-
-    ctx["form"] = FiltersSetForm()
+           "withunseen": False,
+           "form": FiltersSetForm()}
     return render(request, tplname, ctx)
 
 
@@ -247,13 +241,10 @@ def new_filters_set(request, tplname="common/generic_modal_form.html"):
 def remove_filters_set(request, name):
     sc = SieveClient(user=request.user.username,
                      password=request.session["password"])
-    try:
-        sc.deletescript(name)
-    except SieveClientError, e:
-        return ajax_simple_response(dict(status="ko", respmsg=str(e)))
+    sc.deletescript(name)
     acs, scripts = sc.listscripts()
-    return ajax_simple_response(dict(
-        status="ok", respmsg=_("Filters set deleted"), newfs=acs
+    return render_to_json_response(dict(
+        respmsg=_("Filters set deleted"), newfs=acs
     ))
 
 
@@ -293,24 +284,19 @@ def toggle_filter_state(request, setname, fname):
                      password=request.session["password"])
     if type(fname) is unicode:
         fname = fname.encode("utf-8")
-    try:
-        fset = sc.getscript(setname, format="fset")
-        if fset.is_filter_disabled(fname):
-            ret = fset.enablefilter(fname)
-            newstate = _("yes")
-            color = "green"
-        else:
-            ret = fset.disablefilter(fname)
-            newstate = _("no")
-            color = "red"
-        if not ret:
-            pass
-        sc.pushscript(setname, str(fset))
-    except SieveClientError, e:
-        return ajax_response(request, "ko", respmsg=str(e))
-
-    return ajax_simple_response({
-        "status": "ok",
+    fset = sc.getscript(setname, format="fset")
+    if fset.is_filter_disabled(fname):
+        ret = fset.enablefilter(fname)
+        newstate = _("yes")
+        color = "green"
+    else:
+        ret = fset.disablefilter(fname)
+        newstate = _("no")
+        color = "red"
+    if not ret:
+        pass
+    sc.pushscript(setname, str(fset))
+    return render_to_json_response({
         "label": newstate,
         "color": color
     })
@@ -319,12 +305,9 @@ def toggle_filter_state(request, setname, fname):
 def move_filter(request, setname, fname, direction):
     sc = SieveClient(user=request.user.username,
                      password=request.session["password"])
-    try:
-        fset = sc.getscript(setname, format="fset")
-        fset.movefilter(fname.encode("utf-8"), direction)
-        sc.pushscript(setname, str(fset))
-    except (SieveClientError), e:
-        return ajax_response(request, "ko", respmsg=str(e))
+    fset = sc.getscript(setname, format="fset")
+    fset.movefilter(fname.encode("utf-8"), direction)
+    sc.pushscript(setname, str(fset))
     return ajax_response(
         request, template="sievefilters/guieditor.html", fs=fset
     )
diff --git a/modoboa/extensions/webmail/forms.py b/modoboa/extensions/webmail/forms.py
index fb0ba3729..aa6a0bb04 100644
--- a/modoboa/extensions/webmail/forms.py
+++ b/modoboa/extensions/webmail/forms.py
@@ -7,13 +7,20 @@ class ComposeMailForm(forms.Form):
     to = forms.CharField(label=_("To"))
     cc = forms.CharField(label=_("Cc"), required=False)
     cci = forms.CharField(label=_("Cci"), required=False)
-    subject = forms.CharField(label=_("Subject"), max_length=255, required=False)
+    subject = forms.CharField(
+        label=_("Subject"), max_length=255, required=False
+    )
+    origmsgid = forms.CharField(
+        label="", widget=forms.HiddenInput(), required=False
+    )
 
-    origmsgid = forms.CharField(label="", widget=forms.HiddenInput(), required=False)
 
 class FolderForm(forms.Form):
-    oldname = forms.CharField(label="", widget=forms.HiddenInput(), required=False)
+    oldname = forms.CharField(
+        label="", widget=forms.HiddenInput(), required=False
+    )
     name = forms.CharField()
 
+
 class AttachmentForm(forms.Form):
     attachment = forms.FileField(label=_("Select a file"))
diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index 8ddd4c5b8..829c477ac 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -893,13 +893,12 @@ Webmail.prototype = {
         $("#mboxform").find("input").keypress(function(e) {
             if (e.which == 13) e.preventDefault();
         });
-        $(".submit").one('click', $.proxy(function(e) {
+        $(".submit").on('click', $.proxy(function(e) {
             var $link = $("#folders2 li.active").children("a");
 
             simple_ajax_form_post(e, {
                 reload_on_success: false,
                 formid: "mboxform",
-                error_cb: this.mboxform_cb,
                 extradata: ($link.length) ? "parent_folder=" + $link.attr("href") : "",
                 success_cb: $.proxy(this.mboxform_success, this)
             });
@@ -907,6 +906,7 @@ Webmail.prototype = {
     },
 
     mboxform_success: function(data) {
+        $("body").notify('success', data.respmsg, 2000);
         if (data.oldmb === undefined) {
             this.add_mailbox_to_tree(data.parent, data.newmb);
         } else if (data.newmb) {
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 4c7c29257..5291f8a7a 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -12,7 +12,8 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.gzip import gzip_page
 from modoboa.lib import parameters
 from modoboa.lib.webutils import (
-    _render_to_string, ajax_response, ajax_simple_response
+    _render_to_string, ajax_response, ajax_simple_response,
+    render_to_json_response
 )
 from modoboa.extensions.admin.lib import needs_mailbox
 from .exceptions import WebmailError
@@ -132,6 +133,19 @@ def compact(request, name):
 def newfolder(request, tplname="webmail/folder.html"):
     mbc = IMAPconnector(user=request.user.username,
                         password=request.session["password"])
+
+    if request.method == "POST":
+        form = FolderForm(request.POST)
+        if form.is_valid():
+            pf = request.POST.get("parent_folder", None)
+            mbc.create_folder(form.cleaned_data["name"], pf)
+            return render_to_json_response({
+                'respmsg': _("Mailbox created"),
+                'newmb': form.cleaned_data["name"], 'parent': pf
+            })
+
+        return render_to_json_response({'form_errors': form.errors}, status=400)
+
     ctx = {"title": _("Create a new mailbox"),
            "formid": "mboxform",
            "action": reverse(newfolder),
@@ -140,24 +154,9 @@ def newfolder(request, tplname="webmail/folder.html"):
            "withunseen": False,
            "selectonly": True,
            "mboxes": mbc.getmboxes(request.user),
-           "hdelimiter": mbc.hdelimiter}
-
-    if request.method == "POST":
-        form = FolderForm(request.POST)
-        if form.is_valid():
-            pf = request.POST.get("parent_folder", None)
-            mbc.create_folder(form.cleaned_data["name"], pf)
-            return ajax_simple_response(dict(
-                status="ok", respmsg=_("Mailbox created"), 
-                newmb=form.cleaned_data["name"], parent=pf
-            ))
-
-        ctx["form"] = form
-        ctx["selected"] = None
-        return ajax_response(request, status="ko", template=tplname, **ctx)
-
-    ctx["form"] = FolderForm()
-    ctx["selected"] = None
+           "hdelimiter": mbc.hdelimiter,
+           "form": FolderForm(),
+           "selected": None}
     return render(request, tplname, ctx)
 
 
@@ -179,9 +178,10 @@ def editfolder(request, tplname="webmail/folder.html"):
         form = FolderForm(request.POST)
         if form.is_valid():
             pf = request.POST.get("parent_folder", None)
-            ctx["selected"] = pf
-            oldname, oldparent = separate_mailbox(request.POST["oldname"], sep=mbc.hdelimiter)
-            res = dict(status="ok", respmsg=_("Mailbox updated"))
+            oldname, oldparent = separate_mailbox(
+                request.POST["oldname"], sep=mbc.hdelimiter
+            )
+            res = {'respmsg': _("Mailbox updated")}
             if form.cleaned_data["name"] != oldname \
                     or (pf != oldparent):
                 newname = form.cleaned_data["name"] if pf is None \
@@ -193,21 +193,27 @@ def editfolder(request, tplname="webmail/folder.html"):
                 res["newparent"] = pf
                 if "mbox" in request.session:
                     del request.session["mbox"]
-            return ajax_simple_response(res)
+            return render_to_json_response(res)
 
-        ctx["mboxes"] = mbc.getmboxes(request.user)
-        ctx["form"] = form
-        return ajax_response(request, status="ko", template=tplname, **ctx)
+        return render_to_json_response({'form_errors': form.errors}, status=400)
 
     name = request.GET.get("name", None)
     if name is None:
         raise WebmailError(_("Invalid request"))
     shortname, parent = separate_mailbox(name, sep=mbc.hdelimiter)
-    ctx["mboxes"] = mbc.getmboxes(request.user, until_mailbox=parent)
-    ctx["form"] = FolderForm()
+    ctx = {"title": _("Edit mailbox"),
+           "formid": "mboxform",
+           "action": reverse(editfolder),
+           "action_label": _("Update"),
+           "action_classes": "submit",
+           "withunseen": False,
+           "selectonly": True,
+           "hdelimiter": mbc.hdelimiter,
+           "mboxes": mbc.getmboxes(request.user, until_mailbox=parent),
+           "form": FolderForm(),
+           "selected": parent}
     ctx["form"].fields["oldname"].initial = name
     ctx["form"].fields["name"].initial = shortname
-    ctx["selected"] = parent
     return render(request, tplname, ctx)
 
 
@@ -377,11 +383,11 @@ def render_compose(request, form, posturl, email=None, insert_signature=False):
         randid = set_compose_session(request)
 
     attachments = request.session["compose_mail"]["attachments"]
-    if len(attachments):
-        short_att_list = "(%s)" \
-            % ", ".join(map(lambda att: att["fname"],
-                            attachments[:2] + [{"fname": "..."}] \
-                                if len(attachments) > 2 else attachments))
+    if attachments:
+        short_att_list = "(%s)" % ", ".join(
+            [att['fname'] for att in (attachments[:2] + [{"fname": "..."}]
+             if len(attachments) > 2 else attachments)]
+        )
     else:
         short_att_list = ""
     content = _render_to_string(request, "webmail/compose.html", {
diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py
index 66aa23270..b2e778bbb 100644
--- a/modoboa/lib/events.py
+++ b/modoboa/lib/events.py
@@ -91,7 +91,7 @@ class observe(object):
                         return []
                 else:
                     if not ext.enabled:
-                        return []
+                        return None
             elif not modname in settings.MODOBOA_APPS:
                 return []
             return f(*args, **kwargs)
@@ -144,7 +144,12 @@ def raiseQueryEvent(event, *args, **kwargs):
     if not event in events or not event in callbacks.keys():
         return result
     for callback in callbacks[event].values():
-        result += callback(*args, **kwargs)
+        tmp = callback(*args, **kwargs)
+        if tmp is None:
+            # Callback is registered but associated extension is
+            # disabled.
+            continue
+        result += tmp
     return result
 
 
@@ -158,10 +163,14 @@ def raiseDictEvent(event, *args):
     :return: a dictionnary
     """
     result = {}
-    if not event in events or not event in callbacks.keys():
+    if not event in events or not event in callbacks:
         return result
     for callback in callbacks[event].values():
         tmp = callback(*args)
+        if tmp is None:
+            # Callback is registered but associated extension is
+            # disabled.
+            continue
         for k, v in tmp.iteritems():
             result[k] = v
     return result
diff --git a/modoboa/lib/exceptions.py b/modoboa/lib/exceptions.py
index 026b72bd7..82c1135f0 100644
--- a/modoboa/lib/exceptions.py
+++ b/modoboa/lib/exceptions.py
@@ -8,10 +8,57 @@ from django.utils.translation import ugettext as _
 
 
 class ModoboaException(Exception):
-    pass
+    """
+    Base class for Modoboa custom exceptions.
+    """
+    http_code = None
+
+    def __init__(self, *args, **kwargs):
+        if 'http_code' in kwargs:
+            self.http_code = kwargs['http_code']
+            del kwargs['http_code']
+        super(ModoboaException, self).__init__(*args, **kwargs)
+
+
+class InternalError(ModoboaException):
+    """
+    Use this exception for system errors, missing dependencies, etc.
+    """
+    http_code = 500
+
+
+class BadRequest(ModoboaException):
+    """
+    Use this exception when received data doesn't validate a specific
+    format (example: wrong CSV line) or doesn't respect validation
+    rules.
+    """
+    http_code = 400
+
+
+class NotFound(ModoboaException):
+    """
+    Use this exception to indicate the requested resource could not be
+    found.
+    """
+    http_code = 404
+
+
+class Conflict(ModoboaException):
+    """
+    Use this exception to indicate that the request could not be
+    processed because of conflict in the request.
+    """
+    http_code = 409
 
 
 class PermDeniedException(ModoboaException):
+    """
+    Use this exception when a user tries to do something he is not
+    allowed to.
+    """
+    http_code = 403
+
     def __init__(self, msg=None):
         self.msg = msg
 
diff --git a/modoboa/lib/formutils.py b/modoboa/lib/formutils.py
index fa4e62cb3..f74fbec32 100644
--- a/modoboa/lib/formutils.py
+++ b/modoboa/lib/formutils.py
@@ -10,10 +10,20 @@ from django.utils.html import conditional_escape
 
 
 class CreationWizard(object):
-    def __init__(self, done_cb):
+    def __init__(self, done_cb=None):
         self.steps = []
         self.done_cb = done_cb
 
+    @property
+    def errors(self):
+        result = {}
+        for step in self.steps:
+            for name, value in step['form'].errors.items():
+                if name == '__all__':
+                    continue
+                result[name] = value
+        return result
+
     def add_step(self, cls, title, buttons, formtpl=None, new_args=None):
         self.steps += [dict(cls=cls, title=title, buttons=buttons,
                             formtpl=formtpl, new_args=new_args)]
@@ -33,19 +43,23 @@ class CreationWizard(object):
             return -1, _("Invalid request")
 
         stepid = stepid.replace("step", "")
-        stepid = int(stepid) - 1
-        if stepid < 0 or stepid >= len(self.steps):
+        stepid = int(stepid)
+        if stepid < 0 or stepid > len(self.steps):
             return -1, _("Invalid request")
         self.create_forms(request.POST)
-        if self.steps[stepid]["form"].is_valid():
-            if stepid == len(self.steps) - 1:
+        statuses = []
+        for cpt in xrange(0, stepid):
+            statuses.append(self.steps[cpt]["form"].is_valid())
+        if False in statuses:
+            return 0, stepid
+        if stepid == len(self.steps):
+            if self.done_cb is not None:
                 self.done_cb(self.steps)
-                return 2, None
-            return 1, stepid
-        return 0, stepid
+            return 2, None
+        return 1, stepid
 
     def get_title(self, stepid):
-        return "%d. %s" % (stepid + 1, self.steps[stepid]["title"])
+        return "%d. %s" % (stepid, self.steps[stepid - 1]["title"])
 
 
 class DynamicForm(object):
@@ -109,6 +123,16 @@ class TabForms(object):
     def _before_is_valid(self, form):
         return True
 
+    @property
+    def errors(self):
+        result = {}
+        for f in self.forms:
+            for name, value in f['instance'].errors.items():
+                if name == '__all__':
+                    continue
+                result[name] = value
+        return result
+    
     def is_valid(self, mandatory_only=False, optional_only=False):
         to_remove = []
         for f in self.forms:
diff --git a/modoboa/lib/middleware.py b/modoboa/lib/middleware.py
index 7b7fc1f15..44f08dd07 100644
--- a/modoboa/lib/middleware.py
+++ b/modoboa/lib/middleware.py
@@ -3,7 +3,9 @@ import re
 from django.http import Http404, HttpResponseRedirect
 from modoboa.core.models import Extension
 from modoboa.core.extensions import exts_pool
-from modoboa.lib.webutils import _render_error, ajax_response
+from modoboa.lib.webutils import (
+    _render_error, ajax_response, render_to_json_response
+)
 from modoboa.lib.exceptions import ModoboaException
 
 
@@ -41,6 +43,10 @@ class CommonExceptionCatcher(object):
             return _render_error(
                 request, user_context=dict(error=str(exception))
             )
-        return ajax_response(
-            request, status="ko", respmsg=unicode(exception), norefresh=True
+        if exception.http_code is None:
+            return ajax_response(
+                request, status="ko", respmsg=unicode(exception), norefresh=True
+            )
+        return render_to_json_response(
+            unicode(exception), status=exception.http_code
         )
diff --git a/modoboa/lib/parameters.py b/modoboa/lib/parameters.py
index 97a3ab270..61d3372d7 100644
--- a/modoboa/lib/parameters.py
+++ b/modoboa/lib/parameters.py
@@ -11,9 +11,9 @@ Only super users will be able to access this part of the web interface.
 import inspect
 import re
 from django import forms
+from . import events
 from exceptions import ModoboaException
 
-
 _params = {'A': {}, 'U': {}}
 
 
@@ -28,7 +28,12 @@ class NotDefined(ModoboaException):
 
 
 class GenericParametersForm(forms.Form):
+    """Base class for parameter forms.
+
+    Each extension has the possibility to define global parameters.
+    """
     app = None
+    visibility_rules = None
 
     def __init__(self, *args, **kwargs):
         if self.app is None:
@@ -38,10 +43,12 @@ class GenericParametersForm(forms.Form):
         super(GenericParametersForm, self).__init__(*args, **kwargs)
 
         self.visirules = {}
-        if hasattr(self, "visibility_rules"):
+        if self.visibility_rules is not None:
             for key, rule in self.visibility_rules.items():
                 field, value = rule.split("=")
-                visibility = {"field": "id_%s-%s" % (self.app, field), "value": value}
+                visibility = {
+                    "field": "id_%s-%s" % (self.app, field), "value": value
+                }
                 self.visirules["%s-%s" % (self.app, key)] = visibility
 
         if not args:
@@ -50,6 +57,11 @@ class GenericParametersForm(forms.Form):
     def _load_initial_values(self):
         raise NotImplementedError
 
+    def _load_extra_parameters(self, level):
+        params = events.raiseDictEvent('GetExtraParameters', self.app, level)
+        for pname, pdef in params.items():
+            self.fields[pname] = pdef
+
     def _save_parameter(self, p, name, value):
         if p.value == value:
             return
@@ -101,6 +113,7 @@ class AdminParametersForm(GenericParametersForm):
                 pass
         return values
 
+
 class UserParametersForm(GenericParametersForm):
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user") if "user" in kwargs else None
diff --git a/modoboa/lib/permissions.py b/modoboa/lib/permissions.py
index ce5dcb9d7..8b93a2d8c 100644
--- a/modoboa/lib/permissions.py
+++ b/modoboa/lib/permissions.py
@@ -18,7 +18,9 @@ def get_account_roles(user):
     std_roles = [("SimpleUsers", _("Simple user"))]
     if user.is_superuser:
         std_roles += [("SuperAdmins",  _("Super administrator"))]
-    if user.has_perm("admin.add_domain"):
+    filters = events.raiseQueryEvent('UserCanSetRole', user, 'DomainAdmins')
+    if user.has_perm("admin.add_domain") and \
+            (not filters or True in filters):
         std_roles += [("DomainAdmins", _("Domain administrator"))]
     std_roles += events.raiseQueryEvent("GetExtraRoles", user)
     return sorted(std_roles, key=lambda role: role[1])
diff --git a/modoboa/lib/singleton.py b/modoboa/lib/singleton.py
new file mode 100644
index 000000000..3fd8f0c17
--- /dev/null
+++ b/modoboa/lib/singleton.py
@@ -0,0 +1,15 @@
+
+
+# works in Python 2 & 3
+class _Singleton(type):
+    _instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = \
+                super(_Singleton, cls).__call__(*args, **kwargs)
+        return cls._instances[cls]
+
+
+class Singleton(_Singleton('SingletonMeta', (object,), {})):
+    pass
diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py
index 0a0330294..8601f8682 100644
--- a/modoboa/lib/tests.py
+++ b/modoboa/lib/tests.py
@@ -13,20 +13,17 @@ class ModoTestCase(TestCase):
         self.clt = Client()
         self.assertEqual(self.clt.login(username=username, password=password), True)
 
-    def check_ajax_request(self, method, url, params, status="ok", **kwargs):
+    def ajax_request(self, method, url, params, status=200):
         response = getattr(self.clt, method) \
             (url, params, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        self.assertEqual(response.status_code, 200)
-        obj = simplejson.loads(response.content)
-        self.assertEqual(obj["status"], status)
-        for kw, v in kwargs.items():
-            self.assertEqual(obj[kw], v)
+        self.assertEqual(response.status_code, status)
+        return simplejson.loads(response.content)
 
-    def check_ajax_post(self, *args, **kwargs):
-        self.check_ajax_request("post", *args, **kwargs)
+    def ajax_post(self, *args, **kwargs):
+        return self.ajax_request('post', *args, **kwargs)
 
-    def check_ajax_get(self, *args, **kwargs):
-        self.check_ajax_request("get", *args, **kwargs)
+    def ajax_get(self, *args, **kwargs):
+        return self.ajax_request('get', *args, **kwargs)
 
 
 class ExtTestCase(ModoTestCase):
diff --git a/modoboa/static/js/confirmation.js b/modoboa/static/js/confirmation.js
index 59bd9314d..3d6296be9 100644
--- a/modoboa/static/js/confirmation.js
+++ b/modoboa/static/js/confirmation.js
@@ -87,29 +87,25 @@
                  }
                  params += $(this).attr("name") + "=true";
              });
-
              $.ajax({
                  cache: false,
                  method: this.options.method,
                  data: params,
-                 url: this.$element.attr('href'),
-                 complete: $.proxy(function(XMLHttpRequest, textStatus) {
-                     var data;
-                     try {
-                         data = $.parseJSON(XMLHttpRequest.responseText);
-                     } catch (e) {
-                         data = { status: 'ko', respmsg: gettext('Internal Error') };
-                     }
-                     if (data.status == "ok") {
-                         if (this.options.success_cb != undefined) {
-                             this.options.success_cb(data);
-                             return;
-                         }
-                         window.location.reload();
-                     } else {
-                         $("body").notify("error", data.respmsg);
-                     }
-                 }, this)
+                 url: this.$element.attr('href')
+             }).done($.proxy(function(data) {
+                 if (this.options.success_cb != undefined) {
+                     this.options.success_cb(data);
+                     return;
+                 }
+                 window.location.reload();
+             }, this)).fail(function(jqxhr) {
+                 var data;
+                 try {
+                     data = $.parseJSON(jqxhr.responseText);
+                 } catch (e) {
+                     data = gettext('Internal Error');
+                 }
+                 $("body").notify("error", data);
              });
              this.box.remove();
          }
diff --git a/modoboa/static/js/creation_wizard.js b/modoboa/static/js/creation_wizard.js
index 25c4d2cce..a04e4bb82 100644
--- a/modoboa/static/js/creation_wizard.js
+++ b/modoboa/static/js/creation_wizard.js
@@ -12,6 +12,7 @@
             this.$element.carousel({pause: true});
             this.$element.carousel("pause");
             this.listen();
+            this.titles = {};
             $('input:text:visible:first').focus();
         },
 
@@ -21,16 +22,28 @@
             $(".submit").on("click", $.proxy(this.submit, this));
         },
 
+        get_current_step_id: function() {
+            return $(".item.active").attr("id");
+        },
+
+        get_current_title: function() {
+            return $(".modal-header").find("small").html();
+        },
+
+        set_current_title: function(title) {
+            $(".modal-header").find("small").html(title);
+        },
+
         post: function(last) {
             var $form = (this.options.formid) ? $('#' + this.options.formid) : $('form');
-            var data = $form.serialize() + "&stepid=" + $(".item.active").attr("id");
+            var data = $form.serialize() + "&stepid=" + this.get_current_step_id();
 
-            $.post($form.attr("action"), data, $.proxy(function(resp) {
-                if (resp.status == "ok") {
+            $.ajax({type: 'POST', url: $form.attr("action"), data: data})
+                .done($.proxy(function(resp) {
                     if (!last) {
                         var stepid = resp.stepid + 1;
                         $('input:text:visible:first').focus();
-                        $(".modal-header").find("small").html(resp.title);
+                        this.set_current_title(resp.title);
                         if (this.options.transition_callbacks[stepid] != undefined) {
                             this.options.transition_callbacks[stepid]();
                         }
@@ -43,20 +56,23 @@
                             window.location.reload();
                         }
                     }
-                    return;
-                }
-                if (resp.stepid != undefined && resp.form != undefined) {
-                    var stepid = resp.stepid + 1;
-                    $("#step" + stepid).html(resp.form);
-                    if (this.options.error_callbacks[stepid] != undefined) {
-                        this.options.error_callbacks[stepid]();
+                }, this))
+                .fail($.proxy(function(jqxhr) {
+                    var resp = $.parseJSON(jqxhr.responseText);
+                    if (resp.stepid != undefined) {
+                        var stepid = resp.stepid;
+                        display_form_errors("step" + stepid, resp);
+                        if (this.options.error_callbacks[stepid] != undefined) {
+                            this.options.error_callbacks[stepid]();
+                        }
+                        $('input:text:visible:first').focus();
+                        if (resp.respmsg) {
+                            $(".modal-body").prepend(build_error_alert(resp.respmsg));
+                        }
+                        return;
                     }
-                    $('input:text:visible:first').focus();
-                }
-                if (resp.respmsg) {
-                    $(".modal-body").prepend(build_error_alert(resp.respmsg));
-                }
-            }, this));
+                    $(".modal-body").prepend(build_error_alert(resp));
+                }, this));
         },
 
         update_buttons: function() {
@@ -66,6 +82,8 @@
 
         next: function(evt) {
             evt.preventDefault();
+            var step_id = this.get_current_step_id();
+            this.titles[step_id] = this.get_current_title();
             this.$element.on('slid', this.update_buttons);
             this.post(false);
         },
@@ -74,6 +92,7 @@
             evt.preventDefault();
             this.$element.on('slid', this.update_buttons);
             this.$element.carousel('prev');
+            this.set_current_title(this.titles[this.get_current_step_id()]);
         },
 
         submit: function(evt) {
@@ -98,7 +117,8 @@
     };
 
     $.fn.cwizard.defaults = {
-        transition_callbacks: {}
+        transition_callbacks: {},
+        error_callbacks: {}
     };
 
 })(jQuery);
\ No newline at end of file
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index 1016c0672..5b28f076b 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -31,8 +31,11 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         $(href).modal('open');
         return;
     }
-    $.get(href, function(data) {
+    $.ajax({type: "GET", url: href}).done(function(data) {
         if (typeof data === "object") {
+            /*
+             * Compatibility with the old way...
+             */
             if (data.status == "ko" && data.respmsg) {
                 $("body").notify("error", data.respmsg);
             }
@@ -67,6 +70,9 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         if (css != undefined) {
             $div.css(css);
         }
+    }).fail(function(jqxhr) {
+        var data = $.parseJSON(jqxhr.responseText);
+        $("body").notify("error", data);
     });
 }
 
@@ -111,57 +117,46 @@ if (!Object.keys) {
 }
 
 /*
- * Simple function that sends a form using an 'ajax' post request.
- *
- * The function is intended to be used in a modal environment.
+ * Clean all errors in a given form.
  */
-function simple_ajax_form_post(e, options) {
-    e.preventDefault();
-    var $form = (options.formid !== undefined) ? $("#" + options.formid) : $("form");
-    var defaults = {reload_on_success: true, reload_mode: 'full', modal: true};
-    var opts = $.extend({}, defaults, options);
-    var args = $form.serialize();
+function clean_form_errors(formid) {
+    $("#" + formid + " div.error").removeClass("error");
+    $("#" + formid + " span.help-inline").remove();
+}
 
-    if (options.extradata != undefined) {
-        args += "&" + options.extradata;
-    }
-    $.post($form.attr("action"), args, function(data) {
-        if (data.status == "ok") {
-            $("#modalbox").modal('hide');
-            if (opts.success_cb != undefined) {
-                opts.success_cb(data);
-                return;
-            }
-            if (opts.reload_on_success) {
-                if (opts.reload_mode == 'full') {
-                    window.location.reload();
-                } else {
-                    history.update(true);
-                }
-            }
-            if (data.respmsg) {
-                $("body").notify('success', data.respmsg, 2000);
-            }
+/*
+ * Display validation errors for a given form.
+ */
+function display_form_errors(formid, data) {
+    clean_form_errors(formid);
+    $.each(data.form_errors, function(id, value) {
+        var fullid = "id_" + (data.prefix ? data.prefix + "-" : "") + id;
+        var $widget = $("#" + formid + " #" + fullid);
+        var spanid = fullid + "-error";
+        var $span = $("#" + spanid);
+
+        if (!$widget.parents(".control-group").hasClass("error")) {
+            $widget.parents(".control-group").addClass("error");
+        }
+        if (!$span.length) {
+            $span = $("<span />", {
+                "class": "help-inline",
+                "html": value[0],
+                "id": spanid
+            });
+            $widget.parents(".controls").append($span);
         } else {
-            if (opts.modal) {
-                if (data.content != "") {
-                    $('.modal').html(data.content);
-                }
-                if (data.respmsg) {
-                    $('.modal-body').prepend(build_error_alert(data.respmsg));
-                }
-            }
-            if (opts.error_cb != undefined) {
-                opts.error_cb(data);
-            }
+            $span.html(value[0]);
         }
     });
 }
 
 /*
- * Replacement
+ * Simple function that sends a form using an 'ajax' post request.
+ *
+ * The function is intended to be used in a modal environment.
  */
-function simple_ajax_form_post2(e, options) {
+function simple_ajax_form_post(e, options) {
     e.preventDefault();
     var $form = (options.formid != undefined) ? $("#" + options.formid) : $("form");
     var defaults = {reload_on_success: true, reload_mode: 'full', modal: true};
@@ -176,7 +171,9 @@ function simple_ajax_form_post2(e, options) {
         url: $form.attr("action"),
         data: args
     }).done(function(data) {
-        $("#modalbox").modal('hide');
+        if (opts.modal) {
+            $("#modalbox").modal('hide');
+        }
         if (opts.success_cb != undefined) {
             opts.success_cb(data);
             return;
@@ -188,38 +185,22 @@ function simple_ajax_form_post2(e, options) {
                 history.update(true);
             }
         }
-        if (data.respmsg) {
-            $("body").notify('success', data.respmsg, 2000);
+        if (data) {
+            $("body").notify('success', data, 2000);
         }
     }).fail(function(jqxhr) {
-        if (jqxhr.status != 400) {
-            return;
-        }
-        var result = $.parseJSON(jqxhr.responseText);
-        $("div.error").removeClass("error");
-        $("span.help-inline").remove();
-        $.each(result, function(id, value) {
-            var fullid = "id_" + id;
-            var $widget = $("#" + fullid);
-            var spanid = fullid + "-error";
-            var $span = $("#" + spanid);
-
-            if (!$widget.parents(".control-group").hasClass("error")) {
-                $widget.parents(".control-group").addClass("error");
-            }
-            if (!$span.length) {
-                $span = $("<span />", {
-                    "class": "help-inline",
-                    "html": value[0],
-                    "id": spanid
-                });
-                $widget.parents(".controls").append($span);
+        var data = $.parseJSON(jqxhr.responseText);
+        if (data.form_errors) {
+            display_form_errors(options.formid, data);
+        } else {
+            if (opts.modal) {
+                $('.modal-body').prepend(build_error_alert(data));
             } else {
-                $span.html(value[0]);
+                $('body').notify('error', data);
             }
-        });
+        }
         if (opts.error_cb) {
-            opts.error_cb(result);
+            opts.error_cb(data);
         }
     });
 }
diff --git a/modoboa/static/js/twocols_nav.js b/modoboa/static/js/twocols_nav.js
index d8d3ed337..8c955c2f4 100644
--- a/modoboa/static/js/twocols_nav.js
+++ b/modoboa/static/js/twocols_nav.js
@@ -25,41 +25,11 @@ TwocolsNav.prototype = {
                 formid: this.options.formid,
                 modal: false,
                 reload_on_success: false,
-                error_cb: $.proxy(this.display_errors, this),
                 success_cb: $.proxy(this.save_cb, this)
             });
         }, this));
     },
 
-    display_errors: function(data) {
-        if (data.errors === undefined || !data.errors.length) {
-            if (data.respmsg) {
-                $("body").notify("error", data.respmsg);
-            }
-            return;
-        }
-        $.each(data.errors, function(id, value) {
-            var fullid = "id_" + (data.prefix ? data.prefix + "-" : "") + id;
-            var $widget = $("#" + fullid);
-            var spanid = fullid + "-error";
-            var $span = $("#" + spanid);
-
-            if (!$widget.parents(".control-group").hasClass("error")) {
-                $widget.parents(".control-group").addClass("error");
-            }
-            if (!$span.length) {
-                $span = $("<span />", {
-                    "class": "help-inline",
-                    "html": value[0],
-                    "id": spanid
-                });
-                $widget.parents(".controls").append($span);
-            } else {
-                $span.html(value[0]);
-            }
-        });
-    },
-
     update_content: function(data) {
         if (data.content) {
             $('#' + this.options.divid).html(data.content);
@@ -134,6 +104,7 @@ TwocolsNav.prototype = {
     },
 
     save_cb: function(data) {
+        clean_form_errors(this.options.formid);
         if (this.options.reload_exceptions) {
             for (var i = 0; i < this.options.reload_exceptions.length; i++) {
                 if (this.navobj.getbaseurl() == this.options.reload_exceptions[i]) {
@@ -142,7 +113,7 @@ TwocolsNav.prototype = {
                 }
             }
         }
-        $("body").notify("success", data.respmsg, 2000);
+        $("body").notify("success", data, 2000);
     },
 
     load_section: function(e) {

From 0c2a27bdbae6bf0cf06a1f99aceceb2afa116dae Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 29 Oct 2013 21:31:37 +0100
Subject: [PATCH 06/32] ajax_simple_response removed.

see #491
---
 modoboa/demo/views.py                         |  12 +-
 modoboa/extensions/admin/views/domain.py      |   7 +-
 modoboa/extensions/admin/views/identity.py    |  12 +-
 .../amavis/static/amavis/js/quarantine.js     |  20 ++-
 .../amavis/static/amavis/js/selfservice.js    |  11 +-
 modoboa/extensions/amavis/views.py            |  28 ++--
 .../postfix_relay_domains/js/relay_domains.js |   6 +-
 .../static/sievefilters/js/lib.js             |  46 ++----
 .../extensions/stats/static/stats/js/stats.js |   4 -
 modoboa/extensions/stats/views.py             |  13 +-
 .../webmail/static/webmail/js/webmail.js      | 134 +++++++-----------
 modoboa/extensions/webmail/views.py           |  39 +++--
 modoboa/lib/webutils.py                       |  11 --
 modoboa/static/js/confirmation.js             |  12 +-
 modoboa/static/js/creation_wizard.js          |  64 ++++-----
 modoboa/static/js/global.js                   |  37 +++--
 modoboa/static/js/history.js                  |  24 ++--
 modoboa/static/js/poller.js                   |  25 ++--
 18 files changed, 212 insertions(+), 293 deletions(-)

diff --git a/modoboa/demo/views.py b/modoboa/demo/views.py
index 19b9e14ea..18e2a8427 100755
--- a/modoboa/demo/views.py
+++ b/modoboa/demo/views.py
@@ -3,10 +3,11 @@ import os
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
-from modoboa.lib.webutils import ajax_simple_response
+from modoboa.lib.webutils import render_to_json_response
 from modoboa.lib.emailutils import sendmail_simple, sendmail_fromfile
 from modoboa.lib.decorators import needs_mailbox
 
+
 @login_required
 @needs_mailbox()
 def send_virus(request):
@@ -14,8 +15,9 @@ def send_virus(request):
                                       os.path.join(settings.MODOBOA_DIR,
                                                    "tmp/virus.msg"))
     if status:
-        return ajax_simple_response(dict(status="ok", respmsg=_("Message sent")))
-    return ajax_simple_response(dict(status="ko", respmsg=error))
+        return render_to_json_response(_("Message sent"))
+    return render_to_json_response(error, status=500)
+
 
 @login_required
 @needs_mailbox()
@@ -38,5 +40,5 @@ XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X
 You should send this test mail from an account outside of your network.
 """)
     if status:
-        return ajax_simple_response(dict(status="ok", respmsg=_("Message sent")))
-    return ajax_simple_response(dict(status="ko", respmsg=error))
+        return render_to_json_response(_("Message sent"))
+    return render_to_json_response(respmsg=error, status=500)
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 29b43132c..38cd61f10 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -9,8 +9,7 @@ from django.contrib.auth.decorators import (
 )
 from modoboa.lib import parameters, events
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string,
-    render_to_json_response
+    _render_to_string, render_to_json_response
 )
 from modoboa.lib.formutils import CreationWizard
 from modoboa.lib.exceptions import (
@@ -53,7 +52,7 @@ def _domains(request):
         domainlist = sorted(domainlist, key=lambda d: d.tags[0],
                             reverse=sort_dir == '-')
     page = get_listing_page(domainlist, request.GET.get("page", 1))
-    return ajax_simple_response({
+    return render_to_json_response({
         "table": _render_to_string(request, 'admin/domains_table.html', {
             'domains': page.object_list,
             'tableid': 'domains'
@@ -82,7 +81,7 @@ def domains(request, tplname="admin/domains.html"):
 @permission_required("core.add_user")
 def domains_list(request):
     doms = [dom.name for dom in Domain.objects.get_for_admin(request.user)]
-    return ajax_simple_response(doms)
+    return render_to_json_response(doms)
 
 
 @login_required
diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py
index 7ab550a68..e44ac9d87 100644
--- a/modoboa/extensions/admin/views/identity.py
+++ b/modoboa/extensions/admin/views/identity.py
@@ -11,8 +11,7 @@ from modoboa.lib.exceptions import (
     ModoboaException, PermDeniedException, BadRequest
 )
 from modoboa.lib.webutils import (
-    ajax_simple_response, _render_to_string,
-    render_to_json_response
+    _render_to_string, render_to_json_response
 )
 from modoboa.lib.formutils import CreationWizard
 from modoboa.lib.templatetags.lib_tags import pagination_bar
@@ -44,7 +43,7 @@ def _identities(request):
         objects = sorted(idents_list, key=lambda o: o.tags[0],
                          reverse=sort_dir == '-')
     page = get_listing_page(objects, request.GET.get("page", 1))
-    return ajax_simple_response({
+    return render_to_json_response({
         "table": _render_to_string(request, "admin/identities_table.html", {
             "identities": page.object_list,
             "tableid": "objects_table"
@@ -74,7 +73,7 @@ def accounts_list(request):
     accs = User.objects.filter(is_superuser=False) \
         .exclude(groups__name='SimpleUsers')
     res = [a.username for a in accs.all()]
-    return ajax_simple_response(res)
+    return render_to_json_response(res)
 
 
 @login_required
@@ -103,8 +102,7 @@ def list_quotas(request, tplname="admin/quotas.html"):
     else:
         raise BadRequest(_("Invalid request"))
     page = get_listing_page(mboxes, request.GET.get("page", 1))
-    return ajax_simple_response({
-        "status": "ok",
+    return render_to_json_response({
         "page": page.number,
         "paginbar": pagination_bar(page),
         "table": _render_to_string(request, tplname, {
@@ -231,4 +229,4 @@ def remove_permission(request):
     if not request.user.can_access(account) or not request.user.can_access(domain):
         raise PermDeniedException
     domain.remove_admin(account)
-    return ajax_simple_response({"status": "ok"})
+    return render_to_json_response({})
diff --git a/modoboa/extensions/amavis/static/amavis/js/quarantine.js b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
index 699c37252..bb4b8ff57 100644
--- a/modoboa/extensions/amavis/static/amavis/js/quarantine.js
+++ b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
@@ -117,9 +117,8 @@ Quarantine.prototype = {
             url: $link.attr("href"),
             data: "action=" + name + "&selection=" + selection.join(","),
             type: 'POST',
-            dataType: 'json',
-            success: $.proxy(this.action_cb, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(this.action_cb, this));
     },
 
     release_selection: function(e) {
@@ -139,9 +138,8 @@ Quarantine.prototype = {
         }
         $.ajax({
             url: $link.attr("href"),
-            dataType: 'json',
-            success: $.proxy(this.action_cb, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(this.action_cb, this));
     },
 
     release: function(e) {
@@ -175,11 +173,11 @@ Quarantine.prototype = {
         if (!$rawheaders.length) {
             $.ajax({
                 url: $link.attr("href"),
-                success: $.proxy(function(data) {
-                    $mailcontent.find("#table-container").append($(data));
-                    this.show_rawheaders($mailcontent);
-                }, this)
-            });
+                global: false
+            }).done($.proxy(function(data) {
+                $mailcontent.find("#table-container").append($(data));
+                this.show_rawheaders($mailcontent);
+            }, this));
             return;
         }
         this.show_rawheaders($mailcontent);
diff --git a/modoboa/extensions/amavis/static/amavis/js/selfservice.js b/modoboa/extensions/amavis/static/amavis/js/selfservice.js
index 8aecf6d04..d634f9bfa 100644
--- a/modoboa/extensions/amavis/static/amavis/js/selfservice.js
+++ b/modoboa/extensions/amavis/static/amavis/js/selfservice.js
@@ -7,14 +7,9 @@ function send_action(e, message) {
     }
     $.ajax({
         url: $link.attr("href"),
-        dataType: 'json',
-        success: function(data) {
-            if (data.status == "ok") {
-                $("body").notify("success", data.respmsg, 2000);
-            } else {
-                $("body").notify("error", data.respmsg);
-            }
-        }
+        dataType: 'json'
+    }).done(function(data) {
+        $("body").notify("success", data, 2000);
     });
 }
 
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index 261110f2c..f1973b966 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -10,13 +10,15 @@ from django.contrib.auth.decorators \
     import login_required, user_passes_test
 from django.db.models import Q
 from modoboa.lib import parameters
-from modoboa.lib.exceptions import ModoboaException
+from modoboa.lib.exceptions import ModoboaException, BadRequest
 from modoboa.lib.webutils import (
-    getctx, ajax_response, ajax_simple_response
+    getctx, ajax_response, render_to_json_response
 )
 from modoboa.lib.email_listing import parse_search_parameters
 from modoboa.extensions.admin.models import Mailbox, Domain
-from templatetags.amavis_tags import quar_menu, viewm_menu
+from modoboa.extensions.amavis.templatetags.amavis_tags import (
+    quar_menu, viewm_menu
+)
 from .lib import selfservice, AMrelease
 from .sql_listing import SQLlisting, SQLemail, get_wrapper
 from .models import Msgrcpt
@@ -79,7 +81,7 @@ def _listing(request):
                 rcptfilter = request.session["pattern"]
                 continue
             else:
-                raise Exception("unsupported search criteria %s" % c)
+                raise BadRequest("unsupported search criteria %s" % c)
             flt = nfilter if flt is None else flt | nfilter
 
     msgs = get_wrapper().get_mails(request, rcptfilter)
@@ -202,14 +204,14 @@ def check_mail_id(request, mail_id):
 def delete_selfservice(request, mail_id):
     rcpt = request.GET.get("rcpt", None)
     if rcpt is None:
-        raise ModoboaException(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     try:
         msgrcpt = get_wrapper().get_recipient_message(rcpt, mail_id)
         msgrcpt.rs = 'D'
         msgrcpt.save()
     except Msgrcpt.DoesNotExist:
-        raise ModoboaException(_("Invalid request"))
-    return ajax_simple_response(dict(status="ok", respmsg=_("Message deleted")))
+        raise BadRequest(_("Invalid request"))
+    return render_to_json_response(_("Message deleted"))
 
 
 @selfservice(delete_selfservice)
@@ -241,13 +243,13 @@ def release_selfservice(request, mail_id):
     rcpt = request.GET.get("rcpt", None)
     secret_id = request.GET.get("secret_id", None)
     if rcpt is None or secret_id is None:
-        raise ModoboaException(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     try:
         msgrcpt = get_wrapper().get_recipient_message(rcpt, mail_id)
     except Msgrcpt.DoesNotExist:
-        raise ModoboaException(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     if secret_id != msgrcpt.mail.secret_id:
-        raise ModoboaException(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     if parameters.get_admin("USER_CAN_RELEASE") == "no":
         msgrcpt.rs = 'p'
         msg = _("Request sent")
@@ -258,9 +260,9 @@ def release_selfservice(request, mail_id):
             rcpt.rs = 'R'
             msg = _("Message released")
         else:
-            raise ModoboaException(result)
+            raise BadRequest(result)
     msgrcpt.save()
-    return ajax_simple_response(dict(status="ok", respmsg=msg))
+    return render_to_json_response(msg)
 
 
 @selfservice(release_selfservice)
@@ -329,4 +331,4 @@ def process(request):
 @user_passes_test(lambda u: u.group != 'SimpleUsers')
 def nbrequests(request):
     result = get_wrapper().get_pending_requests(request.user)
-    return ajax_simple_response(dict(status="ok", requests=result))
+    return render_to_json_response({'requests': result})
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
index f14188ee0..fc454ab39 100644
--- a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -33,7 +33,8 @@ RelayDomains.prototype = {
         e.preventDefault();
         $.ajax({
             type: "POST",
-            url: $link.attr("href")
+            url: $link.attr("href"),
+            global: false
         }).done(function(data) {
             var $widget = $('#id_service');
 
@@ -48,9 +49,6 @@ RelayDomains.prototype = {
                 build_success_alert(gettext('Services updated'))
             );
         }).fail(function(jqxhr) {
-            if (jqxhr.getResponseHeader('Content-Type') != 'application/json') {
-                return;
-            }
             var result = $.parseJSON(jqxhr.responseText);
             $('.modal-body').prepend(
                 build_error_alert(result[0])
diff --git a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
index 3c8336806..700a4e423 100644
--- a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
+++ b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js
@@ -22,9 +22,6 @@ function removefilter(evt) {
     }).done(function(response) {
         history.update(true);
         $("body").notify('success', response, 2000);
-    }).fail(function(jqxhr) {
-        var response = $.parseJSON(jqxhr.responseText);
-        $("body").notify('error', response);
     });
 }
 
@@ -75,20 +72,15 @@ function loadfs(response) {
 function send_command(cmd, extracb) {
     $.ajax({
         url: cmd,
-        dataType: 'json',
-        success: function(response) {
-            if (response.status == "ko") {
-                $("body").notify('error', response.respmsg);
-            } else {
-                if (extracb != undefined) {
-                    extracb(response);
-                }
-                if (!response.norefresh) {
-                    history.update(true);
-                }
-                $("body").notify('success', response.respmsg, 2000);
-            }
+        dataType: 'json'
+    }).done(function(response) {
+        if (extracb != undefined) {
+            extracb(response);
         }
+        if (!response.norefresh) {
+            history.update(true);
+        }
+        $("body").notify('success', response.respmsg, 2000);
     });
 }
 
@@ -121,14 +113,9 @@ function savefs(evt) {
         url: $editor.attr("action"),
         type: $editor.attr("method"),
         dataType: 'json',
-        data: $editor.serialize(),
-        success: function(response) {
-            if (response.status == "ko") {
-                $("body").notify('error', response.respmsg);
-            } else {
-                $("body").notify('success', response.respmsg, 2000);
-            }
-        }
+        data: $editor.serialize()
+    }).done(function(response) {
+        $("body").notify('success', response.respmsg, 2000);
     });
 }
 
@@ -184,9 +171,6 @@ function toggle_filter_state(event) {
         $this.html(response.label);
         $this.attr("class", "");
         $this.addClass(response.color);
-    }).fail(function(jqhxr) {
-        var response = $.parseJSON(jqxhr.responseText);
-        $("body").notify('error', response);
     });
 }
 
@@ -200,9 +184,6 @@ function move_filter(event) {
     }).done(function(response) {
         $("#set_content").html(response.content);
         init_filters_list();
-    }).fail(function(jqxhr) {
-        var response = $.parseJSON(jqxhr.responseText);
-        $("body").notify('error', response);
     });
 }
 
@@ -254,8 +235,9 @@ function fetch_templates(url, container) {
     $.ajax({
         url: url,
         async: false,
-        dataType: 'json',
-        success: function(data) { result = data; }
+        dataType: 'json'
+    }).done(function(data) {
+        result = data;
     });
     return result;
 }
\ No newline at end of file
diff --git a/modoboa/extensions/stats/static/stats/js/stats.js b/modoboa/extensions/stats/static/stats/js/stats.js
index 557ef7786..fcf21a5ff 100644
--- a/modoboa/extensions/stats/static/stats/js/stats.js
+++ b/modoboa/extensions/stats/static/stats/js/stats.js
@@ -79,10 +79,6 @@ Stats.prototype = {
     },
 
     graphs_cb: function(data) {
-        if (data.status == "ko") {
-            $("body").notify("error", data.respmsg);
-            return;
-        }
         if (data.content) {
             $(".tab-pane.active").html(data.content);
         }
diff --git a/modoboa/extensions/stats/views.py b/modoboa/extensions/stats/views.py
index b9fee9083..accd7608f 100644
--- a/modoboa/extensions/stats/views.py
+++ b/modoboa/extensions/stats/views.py
@@ -7,7 +7,7 @@ from django.contrib.auth.decorators import (
 from modoboa.lib import events
 from modoboa.lib.exceptions import ModoboaException, PermDeniedException
 from modoboa.lib.webutils import (
-    _render_to_string, ajax_simple_response
+    _render_to_string, render_to_json_response
 )
 from modoboa.extensions.admin.models import (
     Domain
@@ -50,7 +50,7 @@ def graphs(request):
     if searchq in [None, "global"]:
         if not request.user.is_superuser:
             if not Domain.objects.get_for_admin(request.user).count():
-                return ajax_simple_response({"status": "ok"})
+                return render_to_json_response({})
             tplvars.update(
                 domain=Domain.objects.get_for_admin(request.user)[0].name
             )
@@ -59,7 +59,7 @@ def graphs(request):
     else:
         domain = Domain.objects.filter(name__contains=searchq)
         if domain.count() != 1:
-            return ajax_simple_response({"status": "ok"})
+            return render_to_json_response({})
         if not request.user.can_access(domain[0]):
             raise PermDeniedException
         tplvars.update(domain=domain[0].name)
@@ -83,7 +83,6 @@ def graphs(request):
     else:
         tplvars['graphs'] = gsets[gset].get_graph_names()
 
-    return ajax_simple_response(dict(
-        status="ok",
-        content=_render_to_string(request, "stats/graphs.html", tplvars)
-    ))
+    return render_to_json_response({
+        'content': _render_to_string(request, "stats/graphs.html", tplvars)
+    })
diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index 829c477ac..d3440efd7 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -261,8 +261,8 @@ Webmail.prototype = {
      * Poller callback.
      */
     poller_cb: function(data) {
-        for (var mb in data.counters) {
-            this.set_unseen_messages(mb, parseInt(data.counters[mb]));
+        for (var mb in data) {
+            this.set_unseen_messages(mb, parseInt(data[mb]));
         }
     },
 
@@ -341,14 +341,10 @@ Webmail.prototype = {
             url: this.options.submboxes_url,
             dataType: 'json',
             async: async,
-            data: "topmailbox=" + parent.attr("name"),
-            success: $.proxy(function(data) {
-                if (data.status == "ko") {
-                    return;
-                }
-                this.inject_mailboxes(parent, data.mboxes);
-            }, this)
-        });
+            data: "topmailbox=" + parent.attr("name")
+        }).done($.proxy(function(data) {
+            this.inject_mailboxes(parent, data);
+        }, this));
     },
 
     /*
@@ -482,17 +478,12 @@ Webmail.prototype = {
 
         $.ajax({
             url: $link.attr("href") + "?name=" + $selected.attr("href"),
-            dataType: 'json',
-            success: $.proxy(function(data) {
-                if (data.status == "ok") {
-                    this.remove_mbox_from_tree(this.navobject.getparam("mbox"));
-                    this.poller.resume();
-                    $("body").notify("success", gettext("Mailbox removed"), 2000);
-                } else {
-                    $("body").notify("error", data.respmsg);
-                }
-            }, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(function(data) {
+            this.remove_mbox_from_tree(this.navobject.getparam("mbox"));
+            this.poller.resume();
+            $("body").notify("success", gettext("Mailbox removed"), 2000);
+        }, this));
     },
 
     /*
@@ -587,25 +578,19 @@ Webmail.prototype = {
         $.ajax({
             url: $link.attr("href"),
             data: "ids=" + selection.join(","),
-            dataType: 'json',
-            success: $.proxy(this.mark_callback, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(this.mark_callback, this));
     },
 
     send_mb_action: function(url, cb) {
         $.ajax({
             url: url,
-            dataType: 'json',
-            success: $.proxy(function(data) {
-                if (data.status == "ko") {
-                    $("body").notify("error", data.respmsg);
-                    return;
-                }
-                if (cb != undefined) {
-                    cb.apply(this, [data]);
-                }
-            }, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(function(data) {
+            if (cb != undefined) {
+                cb.apply(this, [data]);
+            }
+        }, this));
     },
 
     empty: function(e) {
@@ -629,8 +614,8 @@ Webmail.prototype = {
         e.preventDefault();
         $.ajax({
             url: $link.attr("href"),
-            success: $.proxy(this.delete_callback, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(this.delete_callback, this));
     },
 
     delete_messages: function(e) {
@@ -658,9 +643,8 @@ Webmail.prototype = {
         this.change_unseen_messages(this.options.trash, unseen_cnt);
         $.ajax({
             url: $link.attr("href"),
-            data: {mbox: this.get_current_mailbox(), selection: selection},
-            success: $.proxy(this.delete_callback, this)
-        });
+            data: {mbox: this.get_current_mailbox(), selection: selection}
+        }).done($.proxy(this.delete_callback, this));
     },
 
     display_mode: function(e, value) {
@@ -737,8 +721,18 @@ Webmail.prototype = {
             data: args,
             dataType: 'json',
             type: 'POST',
-            success: $.proxy(this.sendmail_callback, this)
-        });
+            global: false
+        }).done($.proxy(function(data) {
+            this._listmailbox_loader(null, $("#folders").find("li[class*=active]").children("a"));
+            $("body").notify("success", gettext("Message sent"), 2000);
+        }, this)).fail($.proxy(function(jqxhr) {
+            var data = $.parseJSON(jqxhr.responseText);
+            this.navobject.get_callback("compose")(data);
+            if (data.respmsg != undefined) {
+                $("body").notify("error", data.respmsg);
+            }
+            $("a[name=sendmail]").attr("disabled", null);
+        }, this));
     },
 
     /*
@@ -833,19 +827,6 @@ Webmail.prototype = {
         });
     },
 
-    sendmail_callback: function(data) {
-        if (data.status == "ko") {
-            this.navobject.get_callback("compose")(data);
-            if (data.respmsg != undefined) {
-                $("body").notify("error", data.respmsg);
-            }
-            $("a[name=sendmail]").attr("disabled", null);
-            return;
-        }
-        this._listmailbox_loader(null, $("#folders").find("li[class*=active]").children("a"));
-        $("body").notify("success", gettext("Message sent"), 2000);
-    },
-
     /*
      * Callback of the 'viewmail' action
      */
@@ -859,10 +840,6 @@ Webmail.prototype = {
     },
 
     mark_callback: function(data) {
-        if (data.status == "ko") {
-            $("body").notify("error", data.respmsg);
-            return;
-        }
         if (data.action == "read") {
             this.htmltable.current_selection().removeClass("unseen");
         } else {
@@ -874,16 +851,13 @@ Webmail.prototype = {
     },
 
     delete_callback: function(data) {
-        if (data.status == "ok") {
-            var msg = (data.respmsg) ? data.respmsg : gettext("Message deleted");
-            this.go_back_to_listing();
-            if (this.get_current_mailbox() != this.options.trash) {
-                $("a[name=totrash]").removeClass("disabled");
-            }
-            $("body").notify("success", msg, 2000);
-        } else {
-            $("body").notify("error", data.respmsg);
+        var msg = (data.respmsg) ? data.respmsg : gettext("Message deleted");
+
+        this.go_back_to_listing();
+        if (this.get_current_mailbox() != this.options.trash) {
+            $("a[name=totrash]").removeClass("disabled");
         }
+        $("body").notify("success", msg, 2000);
     },
 
     /*
@@ -972,10 +946,9 @@ Webmail.prototype = {
         var $this = $(this);
 
         $.ajax({
-            url: $this.attr("href"),
-            success: function() {
-                $this.parent().remove();
-            }
+            url: $this.attr("href")
+        }).done(function() {
+            $this.parent().remove();
         });
     },
 
@@ -1069,18 +1042,13 @@ Webmail.prototype = {
                 $.ajax({
                     url: plug.options.move_url,
                     data: "msgset=" + selection.join() + "&to=" + to,
-                    dataType: 'json',
-                    success: function(data) {
-                        if (data.status == "ok") {
-                            if (unseen_cnt) {
-                                plug.change_unseen_messages(from, -unseen_cnt);
-                                plug.change_unseen_messages(to, unseen_cnt);
-                            }
-                            plug.listmailbox_callback(data);
-                        } else {
-                            $("body").notify("error", data.respmsg);
-                        }
+                    dataType: 'json'
+                }).done(function(data) {
+                    if (unseen_cnt) {
+                        plug.change_unseen_messages(from, -unseen_cnt);
+                        plug.change_unseen_messages(to, unseen_cnt);
                     }
+                    plug.listmailbox_callback(data);
                 });
             }
         });
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 5291f8a7a..58e4c949b 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -12,8 +12,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.gzip import gzip_page
 from modoboa.lib import parameters
 from modoboa.lib.webutils import (
-    _render_to_string, ajax_response, ajax_simple_response,
-    render_to_json_response
+    _render_to_string, ajax_response, render_to_json_response
 )
 from modoboa.extensions.admin.lib import needs_mailbox
 from .exceptions import WebmailError
@@ -23,7 +22,7 @@ from .lib import (
     decode_payload, AttachmentUploadHandler,
     save_attachment, ImapListing, EmailSignature,
     clean_attachments, set_compose_session, send_mail,
-    ImapEmail
+    ImapEmail, ReplyModifier, ForwardModifier
 )
 from templatetags import webmail_tags
 
@@ -66,8 +65,7 @@ def move(request):
     mbc = get_imapconnector(request)
     mbc.move(request.GET["msgset"], request.session["mbox"], request.GET["to"])
     resp = listmailbox(request, request.session["mbox"], update_session=False)
-    resp.update(status="ok")
-    return ajax_simple_response(resp)
+    return render_to_json_response(resp)
 
 
 @login_required
@@ -85,8 +83,7 @@ def delete(request):
     message = ungettext("%(count)d message deleted",
                         "%(count)d messages deleted",
                         count) % {"count": count}
-    resp = dict(status="ok", respmsg=message)
-    return ajax_simple_response(resp)
+    return render_to_json_response(message)
 
 
 @login_required
@@ -102,10 +99,10 @@ def mark(request, name):
     except AttributeError:
         raise WebmailError(_("Unknown action"))
 
-    return ajax_simple_response(
-        dict(status="ok", action=status, mbox=name,
-             unseen=imapc.unseen_messages(name))
-    )
+    return render_to_json_response({
+        'action': status, 'mbox': name,
+        'unseen': imapc.unseen_messages(name)
+    })
 
 
 @login_required
@@ -115,9 +112,9 @@ def empty(request, name):
         raise WebmailError(_("Invalid request"))
     get_imapconnector(request).empty(name)
     content = "<div class='alert alert-info'>%s</div>" % _("Empty mailbox")
-    return ajax_simple_response(dict(
-        status="ok", listing=content, mailbox=name
-    ))
+    return render_to_json_response({
+        'listing': content, 'mailbox': name
+    })
 
 
 @login_required
@@ -125,7 +122,7 @@ def empty(request, name):
 def compact(request, name):
     imapc = get_imapconnector(request)
     imapc.compact(name)
-    return ajax_simple_response(dict(status="ok"))
+    return render_to_json_response({})
 
 
 @login_required
@@ -484,7 +481,7 @@ def viewmail(request):
 def submailboxes(request):
     topmailbox = request.GET.get('topmailbox', '')
     mboxes = get_imapconnector(request).getmboxes(request.user, topmailbox)
-    return ajax_simple_response(dict(status="ok", mboxes=mboxes))
+    return render_to_json_response(mboxes)
 
 
 @login_required
@@ -498,7 +495,7 @@ def check_unseen_messages(request):
     imapc = get_imapconnector(request)
     for mb in mboxes:
         counters[mb] = imapc.unseen_messages(mb)
-    return ajax_simple_response(dict(status="ok", counters=counters))
+    return render_to_json_response(counters)
 
 
 @login_required
@@ -570,6 +567,8 @@ def index(request):
             pass
 
     response.update(callback=action)
-    if not "status" in response:
-        response.update(status="ok")
-    return ajax_simple_response(response)
+    http_status = 200
+    if "status" in response:
+        del response['status']
+        http_status = 400
+    return render_to_json_response(response, status=http_status)
diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py
index 7bbfbc136..8723b50c6 100644
--- a/modoboa/lib/webutils.py
+++ b/modoboa/lib/webutils.py
@@ -89,17 +89,6 @@ def ajax_response(request, status="ok", respmsg=None,
     return HttpResponse(simplejson.dumps(jsonctx), mimetype="application/json")
 
 
-def ajax_simple_response(content, **response_kwargs):
-    """Simple AJAX response
-
-    No extra formatting is done. The content is passed directly to simplejon.
-
-    :param content: the response's content (list, dict, string)
-    """
-    response_kwargs["content_type"] = "application/json"
-    return HttpResponse(simplejson.dumps(content), **response_kwargs)
-
-
 def render_to_json_response(context, **response_kwargs):
     """Simple shortcut to render a JSON response.
 
diff --git a/modoboa/static/js/confirmation.js b/modoboa/static/js/confirmation.js
index 3d6296be9..bf2fe35bd 100644
--- a/modoboa/static/js/confirmation.js
+++ b/modoboa/static/js/confirmation.js
@@ -89,7 +89,7 @@
              });
              $.ajax({
                  cache: false,
-                 method: this.options.method,
+                 type: this.options.method,
                  data: params,
                  url: this.$element.attr('href')
              }).done($.proxy(function(data) {
@@ -98,15 +98,7 @@
                      return;
                  }
                  window.location.reload();
-             }, this)).fail(function(jqxhr) {
-                 var data;
-                 try {
-                     data = $.parseJSON(jqxhr.responseText);
-                 } catch (e) {
-                     data = gettext('Internal Error');
-                 }
-                 $("body").notify("error", data);
-             });
+             }, this));
              this.box.remove();
          }
      };
diff --git a/modoboa/static/js/creation_wizard.js b/modoboa/static/js/creation_wizard.js
index a04e4bb82..e10985d64 100644
--- a/modoboa/static/js/creation_wizard.js
+++ b/modoboa/static/js/creation_wizard.js
@@ -38,41 +38,41 @@
             var $form = (this.options.formid) ? $('#' + this.options.formid) : $('form');
             var data = $form.serialize() + "&stepid=" + this.get_current_step_id();
 
-            $.ajax({type: 'POST', url: $form.attr("action"), data: data})
-                .done($.proxy(function(resp) {
-                    if (!last) {
-                        var stepid = resp.stepid + 1;
-                        $('input:text:visible:first').focus();
-                        this.set_current_title(resp.title);
-                        if (this.options.transition_callbacks[stepid] != undefined) {
-                            this.options.transition_callbacks[stepid]();
-                        }
-                        this.$element.carousel('next');
+            $.ajax({
+                type: 'POST', url: $form.attr("action"), data: data, global: false
+            }).done($.proxy(function(resp) {
+                if (!last) {
+                    var stepid = resp.stepid + 1;
+                    $('input:text:visible:first').focus();
+                    this.set_current_title(resp.title);
+                    if (this.options.transition_callbacks[stepid] != undefined) {
+                        this.options.transition_callbacks[stepid]();
+                    }
+                    this.$element.carousel('next');
+                } else {
+                    $("#modalbox").modal('hide').remove();
+                    if (this.options.success_callback != undefined) {
+                        this.options.success_callback(resp);
                     } else {
-                        $("#modalbox").modal('hide').remove();
-                        if (this.options.success_callback != undefined) {
-                            this.options.success_callback(resp);
-                        } else {
-                            window.location.reload();
-                        }
+                        window.location.reload();
                     }
-                }, this))
-                .fail($.proxy(function(jqxhr) {
-                    var resp = $.parseJSON(jqxhr.responseText);
-                    if (resp.stepid != undefined) {
-                        var stepid = resp.stepid;
-                        display_form_errors("step" + stepid, resp);
-                        if (this.options.error_callbacks[stepid] != undefined) {
-                            this.options.error_callbacks[stepid]();
-                        }
-                        $('input:text:visible:first').focus();
-                        if (resp.respmsg) {
-                            $(".modal-body").prepend(build_error_alert(resp.respmsg));
-                        }
-                        return;
+                }
+            }, this)).fail($.proxy(function(jqxhr) {
+                var resp = $.parseJSON(jqxhr.responseText);
+                if (resp.stepid != undefined) {
+                    var stepid = resp.stepid;
+                    display_form_errors("step" + stepid, resp);
+                    if (this.options.error_callbacks[stepid] != undefined) {
+                        this.options.error_callbacks[stepid]();
                     }
-                    $(".modal-body").prepend(build_error_alert(resp));
-                }, this));
+                    $('input:text:visible:first').focus();
+                    if (resp.respmsg) {
+                        $(".modal-body").prepend(build_error_alert(resp.respmsg));
+                    }
+                    return;
+                }
+                $(".modal-body").prepend(build_error_alert(resp));
+            }, this));
         },
 
         update_buttons: function() {
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index 5b28f076b..b899731c0 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -31,7 +31,10 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         $(href).modal('open');
         return;
     }
-    $.ajax({type: "GET", url: href}).done(function(data) {
+    $.ajax({
+        type: "GET",
+        url: href
+    }).done(function(data) {
         if (typeof data === "object") {
             /*
              * Compatibility with the old way...
@@ -70,9 +73,6 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         if (css != undefined) {
             $div.css(css);
         }
-    }).fail(function(jqxhr) {
-        var data = $.parseJSON(jqxhr.responseText);
-        $("body").notify("error", data);
     });
 }
 
@@ -168,6 +168,7 @@ function simple_ajax_form_post(e, options) {
     }
     $.ajax({
         type: "POST",
+        global: false,
         url: $form.attr("action"),
         data: args
     }).done(function(data) {
@@ -264,16 +265,11 @@ function simple_ajax_request(e, uoptions) {
     if (e != undefined) e.preventDefault();
     $.ajax({
         url: $this.attr("href"),
-        dataType: 'json',
-        success: function(data) {
-            if (data.status == "ok") {
-                if (options.ok_cb) options.ok_cb(data);
-                if (data.respmsg) {
-                    $("body").notify("success", data.respmsg, 2000);
-                }
-            } else {
-                $("body").notify("error", data.respmsg);
-            }
+        dataType: 'json'
+    }).done(function(data) {
+        if (options.ok_cb) options.ok_cb(data);
+        if (data) {
+            $("body").notify("success", data, 2000);
         }
     });
 }
@@ -304,8 +300,21 @@ function activate_widget(e) {
     }
 }
 
+/*
+ * Default error handler for AJAX requests.
+ */
+function default_ajax_error_handler(event, jqxhr, settings) {
+    try {
+        var data = $.parseJSON(jqxhr.responseText);
+    } catch (x) {
+        var data = gettext("Internal error");
+    }
+    $('body').notify('error', data);
+}
+
 $(document).ready(function() {
     $(document).ajaxSuccess(function(e, xhr, settings) { ajax_login_redirect(xhr); });
+    $(document).ajaxError(default_ajax_error_handler);
     $(document).on('click', 'a[data-toggle="ajaxmodal"]', modalbox);
     $(document).on('click', 'a[data-toggle="ajaxmodal-autowidth"]', modalbox_autowidth);
     $(document).on('click', '.activator', activate_widget);
diff --git a/modoboa/static/js/history.js b/modoboa/static/js/history.js
index d582219a1..2d21dca4f 100644
--- a/modoboa/static/js/history.js
+++ b/modoboa/static/js/history.js
@@ -227,20 +227,14 @@ History.prototype = {
         $.ajax({
             url: this.serialized,
             cache: false,
-            complete: $.proxy(function(XMLHttpRequest, textStatus) {
-                var resp;
-                try {
-                    resp = $.parseJSON(XMLHttpRequest.responseText);
-                } catch (e) {
-                    resp = { status: 'ko', respmsg: gettext('Internal Error') };
-                }
-                if (resp.status == "ko") {
-                    $("body").notify("error", resp.respmsg);
-                    return;
-                }
-                var callback = (resp.callback != undefined) ? resp.callback : "default";
-                this.callbacks[callback](resp);
-            }, this)
-        });
+            dataType: 'json'
+        }).done($.proxy(function(resp) {
+            var callback = (resp.callback != undefined) ? resp.callback : "default";
+
+            this.callbacks[callback](resp);
+            if (resp.respmsg) {
+                $("body").notify("success", resp.respmsg, 2000);
+            }
+        }, this));
     }
 };
\ No newline at end of file
diff --git a/modoboa/static/js/poller.js b/modoboa/static/js/poller.js
index 7beba47ea..acca1c4e5 100644
--- a/modoboa/static/js/poller.js
+++ b/modoboa/static/js/poller.js
@@ -62,19 +62,18 @@ Poller.prototype = {
         $.ajax({
             url: this.url + args,
             dataType: 'json',
-            success: function(data) {
-                poller.running_request = false;
-                if (data.status == "ok") {
-                    if (poller.options.success_cb) {
-                        poller.options.success_cb(data);
-                    }
-                    poller.reset();
-                } else {
-                    $("body").notify("error", data.respmsg);
-                    if (poller.options.error_cb) {
-                        poller.options.error_cb(data);
-                    }
-                }
+            global: false
+        }).done(function(data) {
+            poller.running_request = false;
+            if (poller.options.success_cb) {
+                poller.options.success_cb(data);
+            }
+            poller.reset();
+        }).fail(function(jqxhr) {
+            var data = $.parseJSON(jqxhr.responseText);
+            $("body").notify("error", data);
+            if (poller.options.error_cb) {
+                poller.options.error_cb(data);
             }
         });
     }

From 4512016547b74810efb21d5af4ea69b0dc0c5269 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 29 Oct 2013 21:51:56 +0100
Subject: [PATCH 07/32] Cleaning exceptions.

see #491
---
 modoboa/extensions/webmail/exceptions.py | 18 ++++++++++---
 modoboa/extensions/webmail/imaputils.py  | 11 ++++----
 modoboa/extensions/webmail/lib.py        | 15 ++++++-----
 modoboa/extensions/webmail/views.py      | 33 ++++++++++++------------
 4 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/modoboa/extensions/webmail/exceptions.py b/modoboa/extensions/webmail/exceptions.py
index f5e56cf41..51a42634a 100644
--- a/modoboa/extensions/webmail/exceptions.py
+++ b/modoboa/extensions/webmail/exceptions.py
@@ -6,14 +6,14 @@
 """
 import re
 from django.utils.translation import ugettext as _
-from modoboa.lib.exceptions import ModoboaException
+from modoboa.lib.exceptions import ModoboaException, InternalError
 
 
-class WebmailError(ModoboaException):
-    errorexpr = re.compile("\[([^\]]+)\]\s*([^\.]+)")
+class WebmailInternalError(InternalError):
+    errorexpr = re.compile(r'\[([^\]]+)\]\s*([^\.]+)')
 
     def __init__(self, reason, ajax=False):
-        match = WebmailError.errorexpr.match(reason)
+        match = WebmailInternalError.errorexpr.match(reason)
         if not match:
             self.reason = reason
         else:
@@ -24,6 +24,16 @@ class WebmailError(ModoboaException):
         return self.reason
 
 
+class UnknownAction(ModoboaException):
+    """
+    Use this exception when the webmail encounter an unknown action.
+    """
+    http_code = 404
+
+    def __init__(self):
+        super(UnknownAction, self).__init__(_("Unknown action"))
+
+
 class ImapError(ModoboaException):
     def __init__(self, reason):
         self.reason = reason
diff --git a/modoboa/extensions/webmail/imaputils.py b/modoboa/extensions/webmail/imaputils.py
index 3afa1f70a..46cdd73f2 100644
--- a/modoboa/extensions/webmail/imaputils.py
+++ b/modoboa/extensions/webmail/imaputils.py
@@ -11,9 +11,10 @@ import time
 from functools import wraps
 from django.utils.translation import ugettext as _
 from modoboa.lib import parameters, imap_utf7
+from modoboa.lib.exceptions import InternalError
 from modoboa.lib.connections import ConnectionsManager
 from modoboa.lib.webutils import static_url
-from exceptions import ImapError, WebmailError
+from exceptions import ImapError, WebmailInternalError
 from fetch_parser import parse_fetch_response
 
 #imaplib.Debug = 4
@@ -238,7 +239,7 @@ class IMAPconnector(object):
             data = self._cmd("LIST", "", "")
             m = self.list_response_pattern.match(data[0])
             if m is None:
-                raise WebmailError(_("Failed to retrieve hierarchy delimiter"))
+                raise InternalError(_("Failed to retrieve hierarchy delimiter"))
             self.__hdelimiter = m.group('delimiter')
         return self.__hdelimiter
 
@@ -564,20 +565,20 @@ class IMAPconnector(object):
             name = "%s%s%s" % (parent, self.hdelimiter, name)
         typ, data = self.m.create(self._encode_mbox_name(name))
         if typ == "NO":
-            raise WebmailError(data[0])
+            raise WebmailInternalError(data[0])
         return True
 
     def rename_folder(self, oldname, newname):
         typ, data = self.m.rename(self._encode_mbox_name(oldname),
                                   self._encode_mbox_name(newname))
         if typ == "NO":
-            raise WebmailError(data[0], ajax=True)
+            raise WebmailInternalError(data[0], ajax=True)
         return True
 
     def delete_folder(self, name):
         typ, data = self.m.delete(self._encode_mbox_name(name))
         if typ == "NO":
-            raise WebmailError(data[0])
+            raise WebmailInternalError(data[0])
         return True
 
     def getquota(self, mailbox):
diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py
index 427a917d1..c31eba136 100644
--- a/modoboa/extensions/webmail/lib.py
+++ b/modoboa/extensions/webmail/lib.py
@@ -10,12 +10,13 @@ from django.core.files.uploadhandler import FileUploadHandler, SkipFile
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.conf import settings
 from modoboa.lib import u2u_decode, tables, parameters
+from modoboa.lib.exceptions import InternalError
 from modoboa.lib.webutils import size2integer
 from modoboa.lib.email_listing import EmailListing
 from modoboa.lib.emailutils import (
     EmailAddress, Email, prepare_addresses, set_email_headers
 )
-from modoboa.extensions.webmail.exceptions import WebmailError
+from modoboa.extensions.webmail.exceptions import WebmailInternalError
 from modoboa.extensions.webmail.imaputils import (
     IMAPconnector, get_imapconnector, BodyStructure
 )
@@ -562,8 +563,8 @@ def save_attachment(f):
     dstdir = os.path.join(settings.MEDIA_ROOT, "webmail")
     try:
         fp = NamedTemporaryFile(dir=dstdir, delete=False)
-    except Exception, e:
-        raise WebmailError(str(e))
+    except Exception as e:
+        raise InternalError(str(e))
     for chunk in f.chunks():
         fp.write(chunk)
     fp.close()
@@ -706,19 +707,19 @@ def send_mail(request, posturl=None):
                                  int(parameters.get_admin("SMTP_PORT")))
                 if secmode == "starttls":
                     s.starttls()
-        except Exception, text:
-            raise WebmailError(str(text))
+        except Exception as text:
+            raise WebmailInternalError(str(text))
 
         if parameters.get_admin("SMTP_AUTHENTICATION") == "yes":
             try:
                 s.login(request.user.username, get_password(request))
             except smtplib.SMTPException, e:
-                raise WebmailError(str(e))
+                raise WebmailInternalError(str(e))
         try:
             s.sendmail(request.user.email, rcpts, msg.as_string())
             s.quit()
         except smtplib.SMTPException, e:
-            raise WebmailError(str(e))
+            raise WebmailInternalError(str(e))
 
         sentfolder = parameters.get_user(request.user, "SENT_FOLDER")
         IMAPconnector(user=request.user.username,
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 58e4c949b..a58ce7432 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -11,11 +11,12 @@ from django.contrib.auth.decorators import login_required
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.gzip import gzip_page
 from modoboa.lib import parameters
+from modoboa.lib.exceptions import ModoboaException, BadRequest
 from modoboa.lib.webutils import (
     _render_to_string, ajax_response, render_to_json_response
 )
 from modoboa.extensions.admin.lib import needs_mailbox
-from .exceptions import WebmailError
+from .exceptions import UnknownAction
 from .forms import FolderForm, AttachmentForm, ComposeMailForm
 from .imaputils import get_imapconnector, IMAPconnector, separate_mailbox
 from .lib import (
@@ -43,7 +44,7 @@ def getattachment(request):
     pnum = request.GET.get("partnumber", None)
     fname = request.GET.get("fname", None)
     if not mbox or not mailid or not pnum or not fname:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
 
     imapc = get_imapconnector(request)
     partdef, payload = imapc.fetchpart(mailid, mbox, pnum)
@@ -61,7 +62,7 @@ def getattachment(request):
 def move(request):
     for arg in ["msgset", "to"]:
         if not arg in request.GET:
-            raise WebmailError(_("Invalid request"))
+            raise BadRequest(_("Invalid request"))
     mbc = get_imapconnector(request)
     mbc.move(request.GET["msgset"], request.session["mbox"], request.GET["to"])
     resp = listmailbox(request, request.session["mbox"], update_session=False)
@@ -74,7 +75,7 @@ def delete(request):
     mbox = request.GET.get("mbox", None)
     selection = request.GET.getlist("selection[]", None)
     if mbox is None or selection is None:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     selection = [item for item in selection if item.isdigit()]
     mbc = get_imapconnector(request)
     mbc.move(",".join(selection), mbox,
@@ -92,12 +93,12 @@ def mark(request, name):
     status = request.GET.get("status", None)
     ids = request.GET.get("ids", None)
     if status is None or ids is None:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     imapc = get_imapconnector(request)
     try:
         getattr(imapc, "mark_messages_%s" % status)(name, ids)
     except AttributeError:
-        raise WebmailError(_("Unknown action"))
+        raise UnknownAction
 
     return render_to_json_response({
         'action': status, 'mbox': name,
@@ -109,7 +110,7 @@ def mark(request, name):
 @needs_mailbox()
 def empty(request, name):
     if name != parameters.get_user(request.user, "TRASH_FOLDER"):
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     get_imapconnector(request).empty(name)
     content = "<div class='alert alert-info'>%s</div>" % _("Empty mailbox")
     return render_to_json_response({
@@ -196,7 +197,7 @@ def editfolder(request, tplname="webmail/folder.html"):
 
     name = request.GET.get("name", None)
     if name is None:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     shortname, parent = separate_mailbox(name, sep=mbc.hdelimiter)
     ctx = {"title": _("Edit mailbox"),
            "formid": "mboxform",
@@ -219,7 +220,7 @@ def editfolder(request, tplname="webmail/folder.html"):
 def delfolder(request):
     name = request.GET.get("name", None)
     if name is None:
-        raise WebmailError(_("Bad request"))
+        raise BadRequest(_("Invalid request"))
     mbc = IMAPconnector(user=request.user.username,
                         password=request.session["password"])
     mbc.delete_folder(name)
@@ -251,7 +252,7 @@ def attachments(request, tplname="webmail/attachments.html"):
                     "status": "ok", "fname": request.FILES["attachment"],
                     "tmpname": os.path.basename(tmpname)
                 })
-            except WebmailError, inst:
+            except ModoboaException as inst:
                 error = _("Failed to save attachment: ") + str(inst)
 
         if csuploader.toobig:
@@ -413,7 +414,7 @@ def compose_and_send(request, action, callback=None):
     mbox = request.GET.get("mbox", None)
     mailid = request.GET.get("mailid", None)
     if mbox is None or mailid is None:
-        raise WebmailError(_("Bad request"))
+        raise BadRequest(_("Invalid request"))
     url = "?action=%s&mbox=%s&mailid=%s" % (action, mbox, mailid)
     if request.method == "POST":
         status, resp = send_mail(request, url)
@@ -447,7 +448,7 @@ def getmailcontent(request):
     mbox = request.GET.get("mbox", None)
     mailid = request.GET.get("mailid", None)
     if mbox is None or mailid is None:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     email = ImapEmail(mbox, mailid, request, links=int(request.GET["links"]))
     return render(request, "common/viewmail.html", {
         "headers": email.render_headers(folder=mbox, mail_id=mailid),
@@ -460,7 +461,7 @@ def viewmail(request):
     mbox = request.GET.get("mbox", None)
     mailid = request.GET.get("mailid", None)
     if mbox is None or mailid is None:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     links = request.GET.get("links", None)
     if links is None:
         links = 1 if parameters.get_user(request.user, "ENABLE_LINKS") == "yes" else 0
@@ -489,7 +490,7 @@ def submailboxes(request):
 def check_unseen_messages(request):
     mboxes = request.GET.get("mboxes", None)
     if not mboxes:
-        raise WebmailError(_("Invalid request"))
+        raise BadRequest(_("Invalid request"))
     mboxes = mboxes.split(",")
     counters = dict()
     imapc = get_imapconnector(request)
@@ -526,11 +527,11 @@ def index(request):
 
     if action is not None:
         if not action in globals():
-            raise WebmailError(_("Undefined action"))
+            raise UnknownAction
         response = globals()[action](request)
     else:
         if request.is_ajax():
-            raise WebmailError(_("Bad request"))
+            raise BadRequest(_("Invalid request"))
         response = dict(selection="webmail")
 
     curmbox = request.session.get("mbox", "INBOX")

From 0a27cf725ba5e9b759ba5e8967bcb7d712c3662e Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 29 Oct 2013 21:57:35 +0100
Subject: [PATCH 08/32] Don't raise ModoboaException directly.

see #491
---
 modoboa/extensions/admin/lib.py          | 4 ++--
 modoboa/extensions/admin/views/import.py | 4 ++--
 modoboa/extensions/amavis/lib.py         | 4 ++--
 modoboa/extensions/limits/lib.py         | 4 ++--
 modoboa/extensions/stats/views.py        | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modoboa/extensions/admin/lib.py b/modoboa/extensions/admin/lib.py
index 7f8ad30bc..896956c35 100644
--- a/modoboa/extensions/admin/lib.py
+++ b/modoboa/extensions/admin/lib.py
@@ -6,7 +6,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.contenttypes.models import ContentType
 from modoboa.core.models import User
 from modoboa.lib import parameters, events
-from modoboa.lib.exceptions import ModoboaException
+from modoboa.lib.exceptions import PermDeniedException
 from modoboa.lib.emailutils import split_mailbox
 from modoboa.extensions.admin.models import (
     Domain, Alias
@@ -24,7 +24,7 @@ def needs_mailbox():
         def wrapped_f(request, *args, **kwargs):
             if request.user.mailbox_set.count():
                 return f(request, *args, **kwargs)
-            raise ModoboaException()
+            raise PermDeniedException(_("A mailbox is required"))
         return wrapped_f
     return decorator
 
diff --git a/modoboa/extensions/admin/views/import.py b/modoboa/extensions/admin/views/import.py
index 5384d682a..ea1cb857f 100644
--- a/modoboa/extensions/admin/views/import.py
+++ b/modoboa/extensions/admin/views/import.py
@@ -6,7 +6,7 @@ from django.db import transaction, IntegrityError
 from django.contrib.auth.decorators import (
     login_required, permission_required, user_passes_test
 )
-from modoboa.lib.exceptions import ModoboaException
+from modoboa.lib.exceptions import ModoboaException, Conflict
 from modoboa.core.models import User
 from modoboa.extensions.admin.models import (
     Domain, DomainAlias, Alias
@@ -118,7 +118,7 @@ def importdata(request, formclass=ImportDataForm):
                     except IntegrityError, e:
                         if form.cleaned_data["continue_if_exists"]:
                             continue
-                        raise ModoboaException(_("Object already exists: %s" % row))
+                        raise Conflict(_("Object already exists: %s" % row))
                     cpt += 1
                 msg = _("%d objects imported successfully" % cpt)
                 return render(request, "admin/import_done.html", {
diff --git a/modoboa/extensions/amavis/lib.py b/modoboa/extensions/amavis/lib.py
index 2a98f4ccf..56d8312df 100644
--- a/modoboa/extensions/amavis/lib.py
+++ b/modoboa/extensions/amavis/lib.py
@@ -7,7 +7,7 @@ from functools import wraps
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from modoboa.lib import parameters
-from modoboa.lib.exceptions import ModoboaException
+from modoboa.lib.exceptions import InternalError
 
 
 def selfservice(ssfunc=None):
@@ -50,7 +50,7 @@ class AMrelease(object):
                 self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                 self.sock.connect(path)
         except socket.error, err:
-            raise ModoboaException(
+            raise InternalError(
                 _("Connection to amavis failed: %s" % str(err))
             )
 
diff --git a/modoboa/extensions/limits/lib.py b/modoboa/extensions/limits/lib.py
index a4f7b2f1d..c190b26d7 100644
--- a/modoboa/extensions/limits/lib.py
+++ b/modoboa/extensions/limits/lib.py
@@ -6,7 +6,7 @@
 """
 from django.utils.translation import ugettext as _
 from modoboa.lib.exceptions import ModoboaException
-from .models import LimitsPool
+from modoboa.extensions.limits.models import LimitsPool
 
 
 class LimitReached(ModoboaException):
@@ -30,7 +30,7 @@ class UnsufficientResource(ModoboaException):
 
 
 class BadLimitValue(ModoboaException):
-    pass
+    http_code = 400
 
 
 def inc_limit_usage(user, lname):
diff --git a/modoboa/extensions/stats/views.py b/modoboa/extensions/stats/views.py
index accd7608f..26b38218d 100644
--- a/modoboa/extensions/stats/views.py
+++ b/modoboa/extensions/stats/views.py
@@ -5,7 +5,7 @@ from django.contrib.auth.decorators import (
     login_required, user_passes_test, permission_required
 )
 from modoboa.lib import events
-from modoboa.lib.exceptions import ModoboaException, PermDeniedException
+from modoboa.lib.exceptions import BadRequest, PermDeniedException, NotFound
 from modoboa.lib.webutils import (
     _render_to_string, render_to_json_response
 )
@@ -24,7 +24,7 @@ def index(request):
     deflocation = "graphs/?gset=mailtraffic"
     if not request.user.is_superuser:
         if not Domain.objects.get_for_admin(request.user).count():
-            raise ModoboaException(_("No statistics available"))
+            raise NotFound(_("No statistics available"))
 
     period = request.GET.get("period", "day")
     graph_sets = events.raiseDictEvent('GetGraphSets')
@@ -43,7 +43,7 @@ def graphs(request):
     gset = request.GET.get("gset", None)
     gsets = events.raiseDictEvent("GetGraphSets")
     if not gset in gsets:
-        raise ModoboaException(_("Unknown graphic set"))
+        raise NotFound(_("Unknown graphic set"))
     searchq = request.GET.get("searchquery", None)
     period = request.GET.get("period", "day")
     tplvars = dict(graphs=[], period=period)
@@ -66,7 +66,7 @@ def graphs(request):
 
     if period == "custom":
         if not "start" in request.GET or not "end" in request.GET:
-            raise ModoboaException(_("Bad custom period"))
+            raise BadRequest(_("Bad custom period"))
         start = request.GET["start"]
         end = request.GET["end"]
         G = Grapher()

From 971c535f18a72482b991c98891afe39e25ada778 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 30 Oct 2013 16:21:12 +0100
Subject: [PATCH 09/32] Adding support for import/export of objects.

see #491
---
 modoboa/core/views/admin.py                   |  1 -
 modoboa/extensions/admin/__init__.py          |  3 +
 modoboa/extensions/admin/lib.py               |  1 +
 modoboa/extensions/admin/models/domain.py     |  2 +
 .../extensions/admin/static/admin/js/admin.js |  2 +-
 modoboa/extensions/admin/tests/account.py     |  2 +-
 modoboa/extensions/admin/views/domain.py      |  1 +
 modoboa/extensions/admin/views/export.py      |  8 +--
 modoboa/extensions/admin/views/import.py      | 20 +++++--
 .../postfix_relay_domains/__init__.py         | 19 ++++++
 .../extensions/postfix_relay_domains/lib.py   | 14 +++++
 .../postfix_relay_domains/models.py           | 58 ++++++++++++++++++-
 12 files changed, 116 insertions(+), 15 deletions(-)
 create mode 100644 modoboa/extensions/postfix_relay_domains/lib.py

diff --git a/modoboa/core/views/admin.py b/modoboa/core/views/admin.py
index 678c41caf..071e1091a 100644
--- a/modoboa/core/views/admin.py
+++ b/modoboa/core/views/admin.py
@@ -25,7 +25,6 @@ def viewsettings(request, tplname='core/settings_header.html'):
 @user_passes_test(lambda u: u.is_superuser)
 def viewparameters(request, tplname='core/parameters.html'):
     return render_to_json_response({
-        "status": "ok",
         "left_selection": "parameters",
         "content": _render_to_string(request, tplname, {
             "forms": parameters.get_admin_forms
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index 7cfd3d63a..281fac420 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -37,6 +37,9 @@ admin_events = [
     "ExtraAccountForm",
     "CheckExtraAccountForm",
     "FillAccountInstances",
+
+    "ExtraDomainImportHelp",
+    "ImportObject"
 ]
 
 
diff --git a/modoboa/extensions/admin/lib.py b/modoboa/extensions/admin/lib.py
index 896956c35..d84a998d4 100644
--- a/modoboa/extensions/admin/lib.py
+++ b/modoboa/extensions/admin/lib.py
@@ -4,6 +4,7 @@ from itertools import chain
 from django.db.models import Q
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import ugettext as _
 from modoboa.core.models import User
 from modoboa.lib import parameters, events
 from modoboa.lib.exceptions import PermDeniedException
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index 7a0b909df..b0a2c474e 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -134,5 +134,7 @@ class Domain(AdminObject):
 
     def to_csv(self, csvwriter):
         csvwriter.writerow(["domain", self.name, self.quota, self.enabled])
+        for dalias in self.domainalias_set.all():
+            dalias.to_csv(csvwriter)
 
 reversion.register(Domain)
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index 313bc332e..57f27f9be 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -125,7 +125,7 @@ Admin.prototype = {
         $("#import_status").css("display", "none");
         if (status == "ok") {
             $("#modalbox").modal('hide');
-            this.reload_listing({respmsg: msg});
+            this.reload_listing(msg);
         } else {
             $("#import_result").addClass("alert alert-error");
             $("#import_result").html(msg);
diff --git a/modoboa/extensions/admin/tests/account.py b/modoboa/extensions/admin/tests/account.py
index 6f316eb17..547e170ab 100644
--- a/modoboa/extensions/admin/tests/account.py
+++ b/modoboa/extensions/admin/tests/account.py
@@ -70,7 +70,7 @@ class AccountTestCase(ModoTestCase):
     def test_set_nul_quota_as_domainadmin(self):
         self.clt.logout()
         self.assertTrue(self.clt.login(username="admin@test.com", password="toto"))
-        self._set_quota("user@test.com", 0, 424)
+        self._set_quota("user@test.com", 0, 400)
         self.clt.logout()
         self.assertTrue(self.clt.login(username="admin@test2.com", password="toto"))
         self._set_quota("user@test2.com", 0)
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index 38cd61f10..2dd635c65 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -40,6 +40,7 @@ def _domains(request):
         for flt in ['domfilter', 'searchquery']
         + events.raiseQueryEvent('ExtraDomainFilters')
     )
+    request.session['domains_filters'] = filters
     domainlist = get_domains(
         request.user, **filters
     )
diff --git a/modoboa/extensions/admin/views/export.py b/modoboa/extensions/admin/views/export.py
index 681a54bda..2c38e778f 100644
--- a/modoboa/extensions/admin/views/export.py
+++ b/modoboa/extensions/admin/views/export.py
@@ -8,8 +8,7 @@ from django.utils.translation import ugettext as _
 from django.contrib.auth.decorators import (
     login_required, permission_required, user_passes_test
 )
-from modoboa.extensions.admin.lib import get_identities
-from modoboa.extensions.admin.models import Domain
+from modoboa.extensions.admin.lib import get_domains, get_identities
 from modoboa.extensions.admin.forms import (
     ExportIdentitiesForm, ExportDomainsForm
 )
@@ -73,10 +72,9 @@ def export_domains(request):
         form.is_valid()
         fp = cStringIO.StringIO()
         csvwriter = csv.writer(fp, delimiter=form.cleaned_data["sepchar"])
-        for dom in Domain.objects.get_for_admin(request.user):
+        for dom in get_domains(request.user,
+                               **request.session['domains_filters']):
             dom.to_csv(csvwriter)
-            for da in dom.domainalias_set.all():
-                da.to_csv(csvwriter)
         content = fp.getvalue()
         fp.close()
         return _export(content, form.cleaned_data["filename"])
diff --git a/modoboa/extensions/admin/views/import.py b/modoboa/extensions/admin/views/import.py
index ea1cb857f..52497d051 100644
--- a/modoboa/extensions/admin/views/import.py
+++ b/modoboa/extensions/admin/views/import.py
@@ -6,6 +6,7 @@ from django.db import transaction, IntegrityError
 from django.contrib.auth.decorators import (
     login_required, permission_required, user_passes_test
 )
+from modoboa.lib import events
 from modoboa.lib.exceptions import ModoboaException, Conflict
 from modoboa.core.models import User
 from modoboa.extensions.admin.models import (
@@ -39,10 +40,11 @@ def import_domains(request):
 <ul>
   <li><em>domain; name; quota; enabled</em></li>
   <li><em>domainalias; name; targeted domain; enabled</em></li>
+  %s
 </ul>
 <p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
 <p>You can use a different character as separator.</p>
-""")
+""" % ''.join([unicode(hlp) for hlp in events.raiseQueryEvent('ExtraDomainImportHelp')]))
 
     ctx = dict(
         title=_("Import domains"),
@@ -100,8 +102,8 @@ def importdata(request, formclass=ImportDataForm):
         try:
             reader = csv.reader(request.FILES['sourcefile'],
                                 delimiter=form.cleaned_data['sepchar'])
-        except csv.Error, e:
-            error = str(e)
+        except csv.Error as inst:
+            error = str(inst)
 
         if error is None:
             try:
@@ -112,13 +114,21 @@ def importdata(request, formclass=ImportDataForm):
                     try:
                         fct = globals()["import_%s" % row[0].strip()]
                     except KeyError:
-                        continue
+                        fct = events.raiseQueryEvent(
+                            'ImportObject', row[0].strip()
+                        )
+                        if not fct:
+                            continue
+                        fct = fct[0]
                     try:
                         fct(request.user, row, form.cleaned_data)
                     except IntegrityError, e:
                         if form.cleaned_data["continue_if_exists"]:
                             continue
-                        raise Conflict(_("Object already exists: %s" % row))
+                        raise Conflict(
+                            _("Object already exists: %s"
+                              % form.cleaned_data['sepchar'].join(row[:2]))
+                        )
                     cpt += 1
                 msg = _("%d objects imported successfully" % cpt)
                 return render(request, "admin/import_done.html", {
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index 151462236..647615e24 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -201,3 +201,22 @@ def extra_parameters(app, level):
             widget=forms.widgets.TextInput(attrs={"class": "span1"})
         )
     }
+
+
+@events.observe('ExtraDomainImportHelp')
+def extra_domain_import_help():
+    return [ugettext_lazy("""
+<li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
+<li><em>relaydomainalias; name; target; enabled</em></li>
+""")]
+
+
+@events.observe('ImportObject')
+def get_import_func(objtype):
+    from .lib import import_relaydomain, import_relaydomainalias
+
+    if objtype == 'relaydomain':
+        return [import_relaydomain]
+    if objtype == 'relaydomainalias':
+        return [import_relaydomainalias]
+    return []
diff --git a/modoboa/extensions/postfix_relay_domains/lib.py b/modoboa/extensions/postfix_relay_domains/lib.py
new file mode 100644
index 000000000..a5c4764ec
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/lib.py
@@ -0,0 +1,14 @@
+from django.db import transaction
+from .models import RelayDomain, RelayDomainAlias
+
+
+@transaction.commit_on_success
+def import_relaydomain(user, row, formopts):
+    """Specific code for relay domains import"""
+    RelayDomain().from_csv(user, row)
+
+
+@transaction.commit_on_success
+def import_relaydomainalias(user, row, formopts):
+    """Specific code for relay domain aliases import"""
+    RelayDomainAlias().from_csv(user, row)
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 2900b5c35..560dfb0c5 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -4,8 +4,8 @@ from django.db.models.manager import Manager
 from django.contrib.contenttypes import generic
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.core.models import ObjectAccess
-from modoboa.lib import events, parameters
-from modoboa.lib.permissions import ungrant_access_to_object
+from modoboa.lib import parameters
+from modoboa.lib.exceptions import BadRequest, NotFound
 from modoboa.extensions.admin.models import AdminObject
 
 
@@ -52,6 +52,8 @@ class ServiceManager(Manager):
 
 
 class Service(models.Model):
+    """Postfix service.
+    """
     name = models.CharField(
         ugettext_lazy('name'), max_length=100, unique=True,
         help_text=ugettext_lazy('The service name')
@@ -106,6 +108,33 @@ class RelayDomain(AdminObject):
     def __str__(self):
         return self.name
 
+    def to_csv(self, csvwriter):
+        """Export this relay domain to CSV.
+
+        :param csvwriter:
+        """
+        csvwriter.writerow(
+            ["relaydomain", self.name, self.target_host, 
+             self.service.name, self.enabled, self.verify_recipients]
+        )
+        for rdalias in self.relaydomainalias_set.all():
+            rdalias.to_csv(csvwriter)
+
+    def from_csv(self, user, row):
+        """Import a relay domain from CSV.
+
+        :param user: user importing the relay domain
+        :param str row: relay domain definition
+        """
+        if len(row) != 6:
+            raise BadRequest(_("Invalid line"))
+        self.name = row[1].strip()
+        self.target_host = row[2].strip()
+        self.service, created = Service.objects.get_or_create(name=row[3].strip())
+        self.enabled = (row[4].strip() == 'True')
+        self.verify_recipients = (row[5].strip() == 'True')
+        self.save(creator=user)
+
 reversion.register(RelayDomain)
 
 
@@ -126,4 +155,29 @@ class RelayDomainAlias(AdminObject):
     def __str__(self):
         return self.name
 
+    def to_csv(self, csvwriter):
+        """Export this relay domain alias to CSV.
+
+        :param csvwriter:
+        """
+        csvwriter.writerow(
+            ['relaydomainalias', self.name, self.target.name, self.enabled]
+        )
+
+    def from_csv(self, user, row):
+        """Import a relay domain alias from CSV.
+
+        :param user: user importing the relay domain alias
+        :param str row: relay domain alias definition
+        """
+        if len(row) != 4:
+            raise BadRequest(_("Invalid line"))
+        self.name = row[1].strip()
+        try:
+            self.target = RelayDomain.objects.get(name=row[2].strip())
+        except RelayDomain.DoesNotExist:
+            raise NotFound(_("Relay domain %s does not exist" % row[2].strip()))
+        self.enabled = (row[3].strip() == 'True')
+        self.save(creator=user)
+
 reversion.register(RelayDomainAlias)

From a11e69074ddf950d0ae3c9a130ed59654b4324b5 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 31 Oct 2013 20:35:59 +0100
Subject: [PATCH 10/32] wip: relay domains.

Fixed various issues about:
* Permissions
* Limits

Unit tests were also added.

see #491
---
 modoboa/core/__init__.py                      |   9 +-
 modoboa/core/extensions.py                    |  29 ++-
 modoboa/extensions/admin/__init__.py          |   6 +
 modoboa/extensions/admin/forms/account.py     |  16 +-
 modoboa/extensions/admin/models/domain.py     |  29 ++-
 modoboa/extensions/admin/models/mailbox.py    |   2 +-
 .../extensions/admin/static/admin/js/admin.js |   7 +-
 modoboa/extensions/limits/__init__.py         |   3 +-
 modoboa/extensions/limits/controls.py         |  45 +++-
 modoboa/extensions/limits/tests.py            |  52 ++++-
 .../postfix_relay_domains/__init__.py         |   1 +
 .../postfix_relay_domains/factories.py        |  23 ++
 .../extensions/postfix_relay_domains/tests.py | 196 +++++++++++++++++-
 modoboa/lib/permissions.py                    |  41 +++-
 modoboa/lib/tests.py                          |   8 +-
 modoboa/static/js/creation_wizard.js          |   5 +-
 modoboa/static/js/global.js                   |  12 +-
 modoboa/urls.py                               |   4 +-
 18 files changed, 400 insertions(+), 88 deletions(-)
 create mode 100644 modoboa/extensions/postfix_relay_domains/factories.py

diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py
index 8e81e7145..751e84e47 100644
--- a/modoboa/core/__init__.py
+++ b/modoboa/core/__init__.py
@@ -39,8 +39,13 @@ base_events = [
 ]
 
 
-def load_settings():
-    from .app_settings import GeneralParametersForm, UserSettings
+def load_core_settings():
+    """Load core settings.
+
+    This function must be manually called (see :file:`urls.py`) in
+    order to load base settings.
+    """
+    from modoboa.core.app_settings import GeneralParametersForm, UserSettings
 
     parameters.register(GeneralParametersForm, ugettext_lazy("General"))
     parameters.register(UserSettings, ugettext_lazy("General"))
diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py
index ecd65de4a..b1f81e9d8 100644
--- a/modoboa/core/extensions.py
+++ b/modoboa/core/extensions.py
@@ -37,7 +37,7 @@ class ExtensionsPool(object):
     """The extensions manager"""
 
     def __init__(self):
-        self.extensions = dict()
+        self.extensions = {}
 
     def register_extension(self, ext, show=True):
         self.extensions[ext.name] = dict(cls=ext, show=show)
@@ -63,6 +63,16 @@ class ExtensionsPool(object):
         return instance.infos()
 
     def load_all(self):
+        """Load all enabled extensions.
+
+        Each extension must be loaded in order to integrate with
+        Modoboa. Only enabled and special extensions are loaded but
+        urls are always returned. The reason is urls are imported only
+        once so must know all of them when the python process
+        starts. Otherwise, it would lead to unexpected 404 errors :p
+
+        :return: a list of url maps
+        """
         from modoboa.core.models import Extension
 
         for ext in settings.MODOBOA_APPS:
@@ -70,6 +80,14 @@ class ExtensionsPool(object):
         result = []
         for extname in self.extensions.keys():
             extinstance = self.get_extension(extname)
+            try:
+                baseurl = extinstance.url \
+                    if extinstance.url is not None else extname
+                result += [(r'^%s/' % (baseurl),
+                            include("%s.urls" % extinstance.__module__))]
+            except ImportError:
+                # No urls for this extension
+                pass
             if not extinstance.always_active:
                 try:
                     ext = Extension.objects.get(name=extname)
@@ -78,16 +96,11 @@ class ExtensionsPool(object):
                 except Extension.DoesNotExist:
                     continue
             extinstance.load()
-            try:
-                baseurl = extinstance.url if extinstance.url is not None else extname
-                result += [(r'^%s/' % (baseurl),
-                            include("%s.urls" % extinstance.__module__))]
-            except ImportError:
-                # No urls for this extension
-                pass
         return result
 
     def list_all(self):
+        """List all defined extensions.
+        """
         result = []
         for extname, extdef in self.extensions.iteritems():
             if not extdef["show"]:
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index 281fac420..0589b630b 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -13,6 +13,7 @@ admin_events = [
     "DomainCreated",
     "DomainModified",
     "DomainDeleted",
+    "DomainOwnershipRemoved",
     "ExtraDomainEntries",
     "ExtraDomainMenuEntries",
     "ExtraDomainFilters",
@@ -201,6 +202,11 @@ def user_logged_in(request, username, password):
 
 @events.observe("AccountDeleted")
 def account_deleted(account, byuser, **kwargs):
+    """'AccountDeleted' listener.
+
+    When an account is deleted, we also need to remove its mailbox (if
+    any).
+    """
     if not account.mailbox_set.count():
         return
     mb = account.mailbox_set.all()[0]
diff --git a/modoboa/extensions/admin/forms/account.py b/modoboa/extensions/admin/forms/account.py
index c8afb5fae..a44ba884c 100644
--- a/modoboa/extensions/admin/forms/account.py
+++ b/modoboa/extensions/admin/forms/account.py
@@ -46,20 +46,20 @@ class AccountFormGeneral(forms.ModelForm):
                 widget=forms.HiddenInput, required=False
             )
         else:
-            self.fields["role"].choices = \
-                [('', ugettext_lazy("Choose"))] + get_account_roles(user)
+            self.fields["role"].choices = [('', ugettext_lazy("Choose"))]
+            self.fields["role"].choices += \
+                get_account_roles(user, kwargs['instance']) \
+                if 'instance' in kwargs else get_account_roles(user)
 
         if "instance" in kwargs:
-            if len(args) \
+            if args \
                and (args[0].get("password1", "") == ""
                and args[0].get("password2", "") == ""):
                 self.fields["password1"].required = False
                 self.fields["password2"].required = False
-
-            u = kwargs["instance"]
-            self.fields["role"].initial = u.group
-
-            if not u.is_local \
+            account = kwargs["instance"]
+            self.fields["role"].initial = account.group
+            if not account.is_local \
                and parameters.get_admin("LDAP_AUTH_METHOD") == "directbind":
                 del self.fields["password1"]
                 del self.fields["password2"]
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index b0a2c474e..70166b9b4 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -23,6 +23,8 @@ class DomainManager(Manager):
 
 
 class Domain(AdminObject):
+    """Mail domain.
+    """
     name = models.CharField(ugettext_lazy('name'), max_length=100, unique=True,
                             help_text=ugettext_lazy("The domain name"))
     quota = models.IntegerField(
@@ -84,11 +86,15 @@ class Domain(AdminObject):
             grant_access_to_object(account, al)
 
     def remove_admin(self, account):
-        """Remove an administrator for this domain
+        """Remove an administrator of this domain.
 
-        :param User account: the administrotor to remove
+        :param User account: administrator to remove
         """
-        from modoboa.lib.permissions import ungrant_access_to_object
+        from modoboa.lib.permissions import \
+            ungrant_access_to_object, get_object_owner
+
+        if get_object_owner(self) == account:
+            events.raiseEvent('DomainOwnershipRemoved', account, self)
         ungrant_access_to_object(self, account)
         for mb in self.mailbox_set.all():
             if mb.user.has_perm("admin.add_domain"):
@@ -96,26 +102,27 @@ class Domain(AdminObject):
             ungrant_access_to_object(mb, account)
             ungrant_access_to_object(mb.user, account)
         for al in self.alias_set.all():
-            ungrant_access_to_object(al, account)
+             ungrant_access_to_object(al, account)
 
     def delete(self, fromuser, keepdir=False):
-        from modoboa.lib.permissions import \
-            ungrant_access_to_object, ungrant_access_to_objects
+        """Custom delete method.
+        """
+        from modoboa.lib.permissions import ungrant_access_to_objects
         from .mailbox import Quota
 
         if self.domainalias_set.count():
             events.raiseEvent("DomainAliasDeleted", self.domainalias_set.all())
             ungrant_access_to_objects(self.domainalias_set.all())
-        if self.mailbox_set.count():
-            Quota.objects.filter(username__contains='@%s' % self.name).delete()
-            events.raiseEvent("DeleteMailbox", self.mailbox_set.all())
-            ungrant_access_to_objects(self.mailbox_set.all())
         if self.alias_set.count():
-            events.raiseEvent("MailboxAliasDelete", self.alias_set.all())
+            events.raiseEvent("MailboxAliasDeleted", self.alias_set.all())
             ungrant_access_to_objects(self.alias_set.all())
         if parameters.get_admin("AUTO_ACCOUNT_REMOVAL") == "yes":
             for account in User.objects.filter(mailbox__domain__name=self.name):
                 account.delete(fromuser, keepdir)
+        elif self.mailbox_set.count():
+            Quota.objects.filter(username__contains='@%s' % self.name).delete()
+            events.raiseEvent("MailboxDeleted", self.mailbox_set.all())
+            ungrant_access_to_objects(self.mailbox_set.all())
         super(Domain, self).delete()
 
     def __str__(self):
diff --git a/modoboa/extensions/admin/models/mailbox.py b/modoboa/extensions/admin/models/mailbox.py
index a16e478a0..ed61adcbe 100644
--- a/modoboa/extensions/admin/models/mailbox.py
+++ b/modoboa/extensions/admin/models/mailbox.py
@@ -238,7 +238,7 @@ def mailbox_deleted_handler(sender, **kwargs):
     from modoboa.lib.permissions import ungrant_access_to_object
 
     mb = kwargs['instance']
-    events.raiseEvent("DeleteMailbox", mb)
+    events.raiseEvent("MailboxDeleted", mb)
     ungrant_access_to_object(mb)
     for alias in mb.alias_set.all():
         alias.mboxes.remove(mb)
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index 57f27f9be..d0a5ef387 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -213,11 +213,11 @@ Domains.prototype = {
 
     domadminsform_init: function() {
         $("a[name=removeperm]").click(function(e) {
-            var $tr = $(this).parent().parent();
+            var $tr = $(this).parents('tr');
             simple_ajax_request.apply(this, [e, {
                 ok_cb: function(resp) {
                     $tr.remove();
-                    if (!$("#domadmins").children("tr").length) {
+                    if (!$("#domadmins").find("tr").length) {
                         $("#admins").html('<div class="alert alert-info">'
                             + gettext("No domain administrator defined") + "</div>");
                     }
@@ -235,7 +235,6 @@ Domains.prototype = {
                 1: this.optionsform_prefill
             },
             error_callbacks: {
-                //1: this.generalform_init,
                 2: $.proxy(this.optionsform_init, this)
             },
             success_callback: $.proxy(this.reload_listing, this)
@@ -254,7 +253,7 @@ Domains.prototype = {
             });
         }, this));
         $(document).trigger('domform_init');
-    },
+    }
 };
 
 Domains.prototype = $.extend({}, Admin.prototype, Domains.prototype);
diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py
index 7f49c549f..61a6961fe 100644
--- a/modoboa/extensions/limits/__init__.py
+++ b/modoboa/extensions/limits/__init__.py
@@ -12,7 +12,6 @@ from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
 from .models import LimitTemplates
 from .forms import ResourcePoolForm
-import controls
 
 levents = [
     'GetExtraLimitTemplates'
@@ -53,6 +52,8 @@ class Limits(ModoExtension):
 
     def load(self):
         from modoboa.extensions.limits.app_settings import ParametersForm
+        from modoboa.extensions.limits import controls
+
         parameters.register(ParametersForm, ugettext_lazy("Limits"))
         events.declare(levents)
 
diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py
index 7ddd2f212..34ff09159 100644
--- a/modoboa/extensions/limits/controls.py
+++ b/modoboa/extensions/limits/controls.py
@@ -56,8 +56,9 @@ def inc_nb_domains(user, domain):
 
 
 @events.observe('DomainDeleted')
-def dec_nb_domains(domain):
-    owner = get_object_owner(domain)
+def dec_nb_domains(domain, owner=None):
+    if owner is None:
+        owner = get_object_owner(domain)
     dec_limit_usage(owner, 'domains_limit')
     for domalias in domain.domainalias_set.all():
         dec_nb_domaliases(domalias)
@@ -105,9 +106,14 @@ def inc_nb_mbaliases(user, mailboxalias):
 
 
 @events.observe('MailboxAliasDeleted')
-def dec_nb_mbaliases(mailboxalias):
-    owner = get_object_owner(mailboxalias)
-    dec_limit_usage(owner, 'mailbox_aliases_limit')
+def dec_nb_mbaliases(mailboxaliases):
+    from modoboa.extensions.admin.models import Alias
+
+    if isinstance(mailboxaliases, Alias):
+        mailboxaliases = [mailboxaliases]
+    for alias in mailboxaliases:
+        owner = get_object_owner(alias)
+        dec_limit_usage(owner, 'mailbox_aliases_limit')
 
 
 @events.observe('CanCreate')
@@ -118,21 +124,20 @@ def can_create_new_object(user, objtype, count=1):
 @events.observe("AccountCreated")
 def create_pool(user):
     owner = get_object_owner(user)
-    if not owner.is_superuser and \
-       not owner.belongs_to_group("Resellers"):
+    if not owner.group in ['SuperAdmins', 'Resellers']:
         return
 
-    if user.belongs_to_group("DomainAdmins"):
+    if user.group == 'DomainAdmins':
         check_limit(owner, 'domain_admins_limit')
         inc_limit_usage(owner, 'domain_admins_limit')
 
-    if user.group in ["DomainAdmins", "Resellers"]:
+    if user.group in ['DomainAdmins', 'Resellers']:
         p, created = LimitsPool.objects.get_or_create(user=user)
         p.create_limits(owner)
 
 
 @events.observe("UserCanSetRole")
-def user_can_set_role(user, role):
+def user_can_set_role(user, role, account=None):
     """Check if the user can still set this role.
 
     The only interesting case concerns resellers defining new domain
@@ -140,6 +145,7 @@ def user_can_set_role(user, role):
     operation before any modification is made to :keyword:`account`.
 
     :param ``User`` user: connected user
+    :param ``User`` account: account modified (None on creation)
     :param str newrole: role to check
     """
     if role == 'DomainAdmins':
@@ -148,6 +154,8 @@ def user_can_set_role(user, role):
         return [True]
     if user.is_superuser or not user.limitspool.will_be_reached(lname):
         return [True]
+    if account is not None and account.group == role:
+        return [True]
     return [False]
 
 
@@ -192,3 +200,20 @@ def on_account_deleted(account, byuser, **kwargs):
 
     if account.group == "DomainAdmins":
         dec_limit_usage(owner, 'domain_admins_limit')
+
+
+@events.observe('DomainOwnershipRemoved')
+def domain_ownership_removed(reseller, domain):
+    """DomainOwnershipRemoved listener.
+
+    The access :keyword:`reseller` had to :keyword:`domain` has been
+    removed by a super adminstrator. We must decrement all limit
+    usages.
+
+    :param ``User`` reseller: reseller that created :keyword:`domain`
+    :param ``Domain`` domain: domain
+    """
+    dec_nb_domains(domain, reseller)
+    for dadmin in domain.admins:
+        if reseller.is_owner(dadmin):
+            dec_limit_usage(reseller, 'domain_admins_limit')
diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py
index 0bae19785..ccef3e3b6 100644
--- a/modoboa/extensions/limits/tests.py
+++ b/modoboa/extensions/limits/tests.py
@@ -12,16 +12,11 @@ from modoboa.extensions.limits.models import LimitTemplates
 
 class PermissionsTestCase(ExtTestCase):
     fixtures = ["initial_users.json"]
-    name = "limits"
+    names = ["limits"]
 
     def setUp(self):
         super(PermissionsTestCase, self).setUp()
-        dom = DomainFactory(name='test.com')
-        self.admin = UserFactory(
-            username='admin@test.com', groups=('DomainAdmins',)
-        )
-        MailboxFactory(address='admin', domain=dom, user=self.admin)
-        dom.add_admin(self.admin)
+        populate_database()
 
     def test_domainadmin_deletes_reseller(self):
         """Check if a domain admin can delete a reseller.
@@ -46,13 +41,21 @@ class PermissionsTestCase(ExtTestCase):
 
 class ResourceTestCase(ExtTestCase):
     fixtures = ["initial_users.json"]
-    name = "limits"
+    names = ["limits"]
 
     def setUp(self):
+        """Custom setUp method.
+
+        The 'limits' is manually loaded to ensure extra parameters
+        provided by 'postfix_relay_domains' are properly received.
+        """
+        from modoboa.core.extensions import exts_pool
+
         super(ResourceTestCase, self).setUp()
-        populate_database()
+        exts_pool.get_extension('limits').load()
         for tpl in LimitTemplates().templates:
             parameters.save_admin('DEFLT_%s' % tpl[0].upper(), 2, app='limits')
+        populate_database()
 
     def _create_account(self, username, role='SimpleUsers', status=200):
         values = dict(
@@ -255,6 +258,37 @@ class ResellerTestCase(ResourceTestCase):
         self._check_limit('domain_admins', 2, 2)
         self._check_limit('domains', 3, 3)
 
+    def test_reseller_deletes_domain(self):
+        """Check if all resources are restored after the deletion.
+        """
+        self._create_domain('domain.tld', withtpl=True)
+        dom = Domain.objects.get(name="domain.tld")
+        self.ajax_post(
+            reverse("modoboa.extensions.admin.views.domain.deldomain",
+                    args=[dom.id]),
+            {}
+        )
+        self._check_limit('domains', 0, 2)
+        self._check_limit('domain_admins', 1, 2)
+        self._check_limit('mailboxes', 0, 2)
+        self._check_limit('mailbox_aliases', 0, 2)
+
+    def test_sadmin_removes_ownership(self):
+        self._create_domain('domain.tld', withtpl=True)
+        dom = Domain.objects.get(name="domain.tld")
+        self.clt.logout()
+        self.clt.login(username='admin', password='password')
+        self.ajax_get(
+            reverse(
+                'modoboa.extensions.admin.views.identity.remove_permission'
+            ) + '?domid=%d&daid=%d' % (dom.id, self.user.id)
+            , {}
+        )
+        self._check_limit('domains', 0, 2)
+        self._check_limit('domain_admins', 0, 2)
+        self._check_limit('mailboxes', 0, 2)
+        self._check_limit('mailbox_aliases', 0, 2)
+
     def test_allocate_from_pool(self):
         self._create_domain('domain.tld')
         self._create_account('admin1@domain.tld', role='DomainAdmins')
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index 647615e24..da9bf2ea9 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -23,6 +23,7 @@ class PostfixRelayDomains(ModoExtension):
     label = "Postfix relay domains"
     version = "1.0"
     description = ugettext_lazy("Relay domains support for Postfix")
+    depends_on = ['limits']
 
     def init(self):
         """Initialisation method.
diff --git a/modoboa/extensions/postfix_relay_domains/factories.py b/modoboa/extensions/postfix_relay_domains/factories.py
new file mode 100644
index 000000000..c8bc6e1c5
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/factories.py
@@ -0,0 +1,23 @@
+import factory
+from modoboa.core.factories import PermissionFactory
+from . import models
+
+
+class ServiceFactory(factory.DjangoModelFactory):
+    FACTORY_FOR = models.Service
+    FACTORY_DJANGO_GET_OR_CREATE = ('name', )
+
+    name = 'dummy'
+
+
+class RelayDomainFactory(PermissionFactory):
+    FACTORY_FOR = models.RelayDomain
+
+    target_host = 'external.host.tld'
+    service = factory.SubFactory(ServiceFactory)
+
+
+class RelayDomainAliasFactory(PermissionFactory):
+    FACTORY_FOR = models.RelayDomainAlias
+
+    enabled = True
diff --git a/modoboa/extensions/postfix_relay_domains/tests.py b/modoboa/extensions/postfix_relay_domains/tests.py
index dab97161c..1361a757a 100644
--- a/modoboa/extensions/postfix_relay_domains/tests.py
+++ b/modoboa/extensions/postfix_relay_domains/tests.py
@@ -1,13 +1,201 @@
+from django.core.urlresolvers import reverse
+from modoboa.core.factories import UserFactory
 from modoboa.lib.tests import ExtTestCase
 from modoboa.extensions.admin import factories
+from modoboa.extensions.limits.tests import ResourceTestCase
+from .models import RelayDomain, RelayDomainAlias, Service
+from .factories import RelayDomainFactory, RelayDomainAliasFactory
 
 
-class RelayDomainsTestCase(ExtTestCase):
-    fixtures = ["initial_users.json"]
-    name = "postfix_relay_domains"
+class Operations(object):
+
+    def _create_relay_domain(self, name, status=200):
+        srv, created = Service.objects.get_or_create(name='dummy')
+        values = {
+            'name': name, 'target_host': 'external.host.tld',
+            'service': srv.id, 'enabled': True
+        }
+        return self.ajax_post(
+            reverse("modoboa.extensions.postfix_relay_domains.views.create"),
+            values, status
+        )
+
+    def _relay_domain_alias_operation(self, optype, rdomain, name, status=200):
+        rdom = RelayDomain.objects.get(name=rdomain)
+        values = {
+            'name': rdom.name, 'target_host': rdom.target_host,
+            'service': rdom.service.id
+        }
+        aliases = [alias.name for alias in rdom.relaydomainalias_set.all()]
+        if optype == 'add':
+            aliases.append(name)
+        else:
+            aliases.remove(name)
+        for cpt, alias in enumerate(aliases):
+            fname = 'aliases' if not cpt else 'aliases_%d' % cpt
+            values[fname] = alias
+        return self.ajax_post(
+            reverse("modoboa.extensions.postfix_relay_domains.views.edit",
+                    args=[rdom.id]),
+            values, status
+        )
+
+
+class RelayDomainsTestCase(ExtTestCase, Operations):
+    fixtures = ['initial_users.json']
+    names = ['postfix_relay_domains']
 
     def setUp(self):
         super(RelayDomainsTestCase, self).setUp()
         factories.populate_database()
+        self.rdom = RelayDomainFactory(name='relaydomain.tld')
+        RelayDomainAliasFactory(name='relaydomainalias.tld', target=self.rdom)
 
-    
+    def test_create_relaydomain(self):
+        """Test the creation of a relay domain.
+
+        We also check that unique constraints are respected: domain,
+        relay domain alias.
+
+        FIXME: add a check for domain alias.
+        """
+        self._create_relay_domain('relaydomain1.tld')
+        rdom = RelayDomain.objects.get(name='relaydomain1.tld')
+        self.assertEqual(rdom.target_host, 'external.host.tld')
+        self.assertEqual(rdom.service.name, 'dummy')
+        self.assertEqual(rdom.enabled, True)
+        self.assertEqual(rdom.verify_recipients, False)
+
+        resp = self._create_relay_domain('test.com', 400)
+        self.assertEqual(resp['form_errors']['name'][0],
+                         'A domain with this name already exists')
+        resp = self._create_relay_domain('relaydomainalias.tld', 400)
+        self.assertEqual(
+            resp['form_errors']['name'][0],
+            'A relay domain alias with this name already exists'
+        )
+
+    def test_create_relaydomainalias(self):
+        """Test the creation of a relay domain alias.
+
+        We also check that unique constraints are respected: domain,
+        relay domain.
+
+        FIXME: add a check for domain alias.
+        """
+        self._relay_domain_alias_operation(
+            'add', self.rdom.name, 'relaydomainalias1.tld'
+        )
+        resp = self._relay_domain_alias_operation(
+            'add', self.rdom.name, 'test.com', 400
+        )
+        self.assertEqual(
+            resp['form_errors']['aliases_2'][0],
+            'A domain with this name already exists'
+        )
+        resp = self._relay_domain_alias_operation(
+            'add', self.rdom.name, self.rdom.name, 400
+        )
+        self.assertEqual(
+            resp['form_errors']['aliases_2'][0],
+            'A relay domain with this name already exists'
+        )
+
+    def test_edit_relaydomain(self):
+        """Test the modification of a relay domain.
+
+        Rename 'relaydomain.tld' domain to 'relaydomain.org'
+        """
+        values = {
+            'name': 'relaydomain.org', 'target_host': self.rdom.target_host,
+            'service': self.rdom.service.id
+        }
+        self.ajax_post(
+            reverse('modoboa.extensions.postfix_relay_domains.views.edit',
+                    args=[self.rdom.id]),
+            values
+        )
+        RelayDomain.objects.get(name='relaydomain.org')
+
+    def test_edit_relaydomainalias(self):
+        """Test the modification of a relay domain alias.
+
+        Rename 'relaydomainalias.tld' domain to 'relaydomainalias.net'
+        """
+        values = {
+            'name': 'relaydomain.org', 'target_host': self.rdom.target_host,
+            'service': self.rdom.service.id, 'aliases': 'relaydomainalias.net'
+        }
+        self.ajax_post(
+            reverse('modoboa.extensions.postfix_relay_domains.views.edit',
+                    args=[self.rdom.id]),
+            values
+        )
+        RelayDomainAlias.objects.get(name='relaydomainalias.net')
+        with self.assertRaises(RelayDomainAlias.DoesNotExist):
+            RelayDomainAlias.objects.get(name='relaydomainalias.tld')
+
+    def test_delete_relaydomain(self):
+        """Test the removal of a relay domain
+        """
+        self.ajax_post(
+            reverse("modoboa.extensions.postfix_relay_domains.views.delete",
+                    args=[self.rdom.id]),
+            {}
+        )
+        with self.assertRaises(RelayDomain.DoesNotExist):
+            RelayDomain.objects.get(name='relaydomain.tld')
+
+    def test_delete_relaydomainalias(self):
+        """Test the remove of a relay domain alias
+        """
+        self._relay_domain_alias_operation(
+            'del', self.rdom.name, 'relaydomainalias.tld'
+        )
+        with self.assertRaises(RelayDomain.DoesNotExist):
+            RelayDomain.objects.get(name='relaydomainalias.tld')
+
+
+class LimitsTestCase(ResourceTestCase, Operations):
+    names = ['limits', 'postfix_relay_domains']
+
+    def setUp(self):
+        super(LimitsTestCase, self).setUp()
+        self.user = UserFactory(
+            username='reseller', groups=('Resellers',)
+        )
+        self.clt.logout()
+        self.clt.login(username='reseller', password='toto')
+
+    def test_relay_domains_limit(self):
+        self._create_relay_domain('relaydomain1.tld')
+        self._check_limit('relay_domains', 1, 2)
+        self._create_relay_domain('relaydomain2.tld')
+        self._check_limit('relay_domains', 2, 2)
+        resp = self._create_relay_domain('relaydomain3.tld', 403)
+        self._check_limit('relay_domains', 2, 2)
+        self.ajax_post(
+            reverse('modoboa.extensions.postfix_relay_domains.views.delete',
+                    args=[RelayDomain.objects.get(name='relaydomain2.tld').id]),
+            {}
+        )
+        self._check_limit('relay_domains', 1, 2)
+
+    def test_relay_domain_aliases_limit(self):
+        self._create_relay_domain('relaydomain1.tld')
+        self._relay_domain_alias_operation(
+            'add', 'relaydomain1.tld', 'relay_domain_alias1.tld'
+        )
+        self._check_limit('relay_domain_aliases', 1, 2)
+        self._relay_domain_alias_operation(
+            'add', 'relaydomain1.tld', 'relay_domain_alias2.tld'
+        )
+        self._check_limit('relay_domain_aliases', 2, 2)
+        self._relay_domain_alias_operation(
+            'add', 'relaydomain1.tld', 'relay_domain_alias3.tld', 403
+        )
+        self._check_limit('relay_domain_aliases', 2, 2)
+        self._relay_domain_alias_operation(
+            'delete', 'relaydomain1.tld', 'relay_domain_alias2.tld'
+        )
+        self._check_limit('relay_domain_aliases', 1, 2)
diff --git a/modoboa/lib/permissions.py b/modoboa/lib/permissions.py
index 8b93a2d8c..5cf677aaf 100644
--- a/modoboa/lib/permissions.py
+++ b/modoboa/lib/permissions.py
@@ -2,23 +2,27 @@
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
 from django.db import IntegrityError
-from modoboa.core.models import ObjectAccess
-import events
-from exceptions import ModoboaException
+from modoboa.core.models import ObjectAccess, User
+from modoboa.lib import events
+from modoboa.lib.exceptions import ModoboaException
 
 
-def get_account_roles(user):
-    """Return the list of supported account roles
+def get_account_roles(user, account=None):
+    """Return the list of available account roles.
 
-    This list can be extended by extensions which listen to the
-    ``GetExtraRoles`` event.
+    This function is used to create or modify an account. The returned
+    list can be extended by listening to the ``GetExtraRoles`` event.
 
+    :param ``User`` user: connected user
+    :param ``User`` account: account beeing modified (None on creation)
     :return: list of strings
     """
     std_roles = [("SimpleUsers", _("Simple user"))]
     if user.is_superuser:
         std_roles += [("SuperAdmins",  _("Super administrator"))]
-    filters = events.raiseQueryEvent('UserCanSetRole', user, 'DomainAdmins')
+    filters = events.raiseQueryEvent(
+        'UserCanSetRole', user, 'DomainAdmins', account
+    )
     if user.has_perm("admin.add_domain") and \
             (not filters or True in filters):
         std_roles += [("DomainAdmins", _("Domain administrator"))]
@@ -92,17 +96,32 @@ def ungrant_access_to_object(obj, user=None):
     If no user is provided, all entries referencing this object are
     deleted from the database.
 
+    If a user is provided, we only remove his access. If it was the
+    owner, we give the ownership to the first super admin we find.
+
     :param obj: an object inheriting from ``models.Model``
     :param user: a ``User`` object
     """
     ct = ContentType.objects.get_for_model(obj)
-    if user:
+    if user is not None:
         try:
-            ObjectAccess.objects.get(user=user, content_type=ct, object_id=obj.id).delete()
+            ObjectAccess.objects.get(
+                user=user, content_type=ct, object_id=obj.id
+            ).delete()
         except ObjectAccess.DoesNotExist:
             pass
+        try:
+            ObjectAccess.objects.get(
+                content_type=ct, object_id=obj.id, is_owner=True
+            )
+        except ObjectAccess.DoesNotExist:
+            grant_access_to_object(
+                User.objects.filter(is_superuser=True)[0], obj, True
+            )
     else:
-        ObjectAccess.objects.filter(content_type=ct, object_id=obj.id).delete()
+        ObjectAccess.objects.filter(
+            content_type=ct, object_id=obj.id
+        ).delete()
 
 
 def ungrant_access_to_objects(objects):
diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py
index 8601f8682..3ad5f2007 100644
--- a/modoboa/lib/tests.py
+++ b/modoboa/lib/tests.py
@@ -27,13 +27,15 @@ class ModoTestCase(TestCase):
 
 
 class ExtTestCase(ModoTestCase):
-    name = None
+    names = []
 
     def setUp(self, *args, **kwargs):
         super(ExtTestCase, self).setUp(*args, **kwargs)
         self.clt.get(reverse("modoboa.core.views.admin.viewextensions"))
-        self.clt.post(reverse("modoboa.core.views.admin.saveextensions"),
-                      {"select_%s" % self.name : "1"})
+        self.clt.post(
+            reverse("modoboa.core.views.admin.saveextensions"),
+            dict(("select_%s" % name, "1") for name in self.names)
+        )
 
 
 class TestParams(parameters.AdminParametersForm):
diff --git a/modoboa/static/js/creation_wizard.js b/modoboa/static/js/creation_wizard.js
index e10985d64..2f1f5eabf 100644
--- a/modoboa/static/js/creation_wizard.js
+++ b/modoboa/static/js/creation_wizard.js
@@ -42,11 +42,10 @@
                 type: 'POST', url: $form.attr("action"), data: data, global: false
             }).done($.proxy(function(resp) {
                 if (!last) {
-                    var stepid = resp.stepid + 1;
                     $('input:text:visible:first').focus();
                     this.set_current_title(resp.title);
-                    if (this.options.transition_callbacks[stepid] != undefined) {
-                        this.options.transition_callbacks[stepid]();
+                    if (this.options.transition_callbacks[resp.stepid] != undefined) {
+                        this.options.transition_callbacks[resp.stepid]();
                     }
                     this.$element.carousel('next');
                 } else {
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index b899731c0..6aaa76e11 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -35,15 +35,6 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         type: "GET",
         url: href
     }).done(function(data) {
-        if (typeof data === "object") {
-            /*
-             * Compatibility with the old way...
-             */
-            if (data.status == "ko" && data.respmsg) {
-                $("body").notify("error", data.respmsg);
-            }
-            return;
-        }
         var $div = $('<div />', {
             id: "modalbox", 'class': "modal", html: data
         });
@@ -56,8 +47,7 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
             if (modalcb != undefined) {
                 if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
             }
-        })
-        .on('hidden', function(e) {
+        }).on('hidden', function(e) {
             var $target = $(e.target);
 
             if (!$target.is($(this))) {
diff --git a/modoboa/urls.py b/modoboa/urls.py
index f100d17e1..28a89b86b 100644
--- a/modoboa/urls.py
+++ b/modoboa/urls.py
@@ -2,9 +2,9 @@ from django.conf.urls import patterns, include
 from django.conf import settings
 from modoboa.core.extensions import exts_pool
 from modoboa.lib import parameters, events
-from modoboa.core import load_settings
+from modoboa.core import load_core_settings
 
-load_settings()
+load_core_settings()
 
 urlpatterns = patterns(
     '',

From 22c811f3da1de8a56f949785b359b41824e845a5 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 1 Nov 2013 16:48:04 +0100
Subject: [PATCH 11/32] wip: relay domains support.

* Integration with the amavis frontend
* Per relay domain policies
* One policy shared between a relay domain and its aliases
* One 'users' record per object
* Extra: better event handlers management

see #491
---
 modoboa/extensions/amavis/__init__.py         | 133 +---------
 modoboa/extensions/amavis/forms.py            |  23 +-
 .../extensions/amavis/general_callbacks.py    | 133 ++++++++++
 modoboa/extensions/amavis/lib.py              |  69 +++++
 .../postfix_relay_domains/__init__.py         | 241 +++++-------------
 .../postfix_relay_domains/amavis_callbacks.py |  30 +++
 .../extensions/postfix_relay_domains/forms.py |  42 ++-
 .../general_callbacks.py                      | 176 +++++++++++++
 ...limits_controls.py => limits_callbacks.py} |   0
 .../postfix_relay_domains/models.py           |   3 +
 .../postfix_relay_domains/js/relay_domains.js |   1 +
 .../new_relaydomain_form.html                 |   3 +
 .../relaydomain_form.html                     |   3 +-
 .../extensions/postfix_relay_domains/views.py |  17 +-
 modoboa/lib/events.py                         |  15 ++
 modoboa/lib/parameters.py                     |  31 +--
 modoboa/lib/sysutils.py                       |  14 +
 17 files changed, 576 insertions(+), 358 deletions(-)
 create mode 100644 modoboa/extensions/amavis/general_callbacks.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/amavis_callbacks.py
 create mode 100644 modoboa/extensions/postfix_relay_domains/general_callbacks.py
 rename modoboa/extensions/postfix_relay_domains/{limits_controls.py => limits_callbacks.py} (100%)
 create mode 100644 modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/new_relaydomain_form.html

diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index 69e63e056..5e47ac577 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -8,9 +8,7 @@ Provides:
 * Per-domain settings
 
 """
-from django.utils.translation import ugettext as _, ugettext_lazy
-from django.core.urlresolvers import reverse
-from django.template import Template, Context
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
 
@@ -41,136 +39,13 @@ class Amavis(ModoExtension):
 
     def load(self):
         from .app_settings import ParametersForm, UserSettings
+
         parameters.register(ParametersForm, "Amavis")
         parameters.register(UserSettings, ugettext_lazy("Quarantine"))
+        from modoboa.extensions.amavis import general_callbacks
 
     def destroy(self):
-        events.unregister("UserMenuDisplay", menu)
+        events.unregister_extension()
         parameters.unregister()
 
 exts_pool.register_extension(Amavis)
-
-
-@events.observe("UserMenuDisplay")
-def menu(target, user):
-    if target == "top_menu":
-        return [
-            {"name": "quarantine",
-             "label": _("Quarantine"),
-             "url": reverse('modoboa.extensions.amavis.views.index')}
-        ]
-    return []
-
-
-@events.observe("DomainCreated")
-def on_domain_created(user, domain):
-    from .models import Users, Policy
-    p = Policy.objects.create(policy_name=domain.name)
-    Users.objects.create(email="@%s" % domain.name, fullname=domain.name,
-                         priority=7, policy=p)
-
-
-@events.observe("DomainModified")
-def on_domain_modified(domain):
-    if domain.oldname != domain.name:
-        from .models import Users
-        u = Users.objects.get(email="@%s" % domain.oldname)
-        u.email = "@%s" % domain.name
-        u.fullname = domain.name
-        u.policy.policy_name = domain.name
-        u.policy.save()
-        u.save()
-
-
-@events.observe("DomainDeleted")
-def on_domain_deleted(domain):
-    from .models import Users
-
-    try:
-        u = Users.objects.get(email="@%s" % domain.name)
-    except Users.DoesNotExist:
-        return
-    u.policy.delete()
-    u.delete()
-
-
-@events.observe("GetStaticContent")
-def extra_static_content(caller, user):
-    if user.group == "SimpleUsers":
-        return []
-
-    if caller == 'top' and parameters.get_admin("USER_CAN_RELEASE") == 'no':
-        tpl = Template("""<script type="text/javascript">
-$(document).ready(function() {
-    var poller = new Poller("{{ url }}", {
-        interval: {{ interval }},
-        success_cb: function(data) {
-            var $link = $("#nbrequests");
-            if (data.requests > 0) {
-                $link.html(data.requests + " " + "{{ text }}");
-                $link.parent().removeClass('hidden');
-            } else {
-                $link.parent().addClass('hidden');
-            }
-        }
-    });
-});
-</script>
-""")
-        return [tpl.render(
-            Context({
-                'url': reverse("modoboa.extensions.amavis.views.nbrequests"),
-                'interval': int(parameters.get_admin("CHECK_REQUESTS_INTERVAL")) * 1000,
-                'text': _("pending requests"),
-            })
-        )]
-
-    if caller == 'domains':
-        tpl = Template("""<script type="text/javascript">
-$(document).bind('domform_init', function() {
-    activate_widget.call($('#id_spam_subject_tag2_act'));
-});
-</script>
-""")
-
-        return [tpl.render(Context({}))]
-    return []
-
-
-@events.observe("TopNotifications")
-def display_requests(user):
-    from .sql_listing import get_wrapper
-
-    if parameters.get_admin("USER_CAN_RELEASE") == "yes" \
-            or user.group == "SimpleUsers":
-        return []
-    nbrequests = get_wrapper().get_pending_requests(user)
-
-    url = reverse("modoboa.extensions.amavis.views.index")
-    url += "#listing/?viewrequests=1"
-    tpl = Template('<div class="btn-group {{ css }}"><a id="nbrequests" href="{{ url }}" class="btn btn-danger">{{ label }}</a></div>')
-    css = "hidden" if nbrequests == 0 else ""
-    return [tpl.render(Context(dict(
-        label=_("%d pending requests" % nbrequests), url=url, css=css
-    )))]
-
-
-@events.observe("ExtraDomainForm")
-def extra_domain_form(user, domain):
-    from .forms import DomainPolicyForm
-
-    if not user.has_perm("admin.view_domains"):
-        return []
-    return [
-        dict(
-            id="amavis", title=_("Content filter"), cls=DomainPolicyForm,
-            formtpl="amavis/domain_content_filter.html"
-        )
-    ]
-
-
-@events.observe("FillDomainInstances")
-def fill_domain_instances(user, domain, instances):
-    if not user.has_perm("admin.view_domains"):
-        return
-    instances["amavis"] = domain
diff --git a/modoboa/extensions/amavis/forms.py b/modoboa/extensions/amavis/forms.py
index 721b3c5a1..1f9a270ad 100644
--- a/modoboa/extensions/amavis/forms.py
+++ b/modoboa/extensions/amavis/forms.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from django import forms
-from models import Policy, Users
 from modoboa.lib.formutils import InlineRadioSelect
+from modoboa.extensions.amavis.models import Policy, Users
 
 
 class DomainPolicyForm(forms.ModelForm):
@@ -34,20 +34,21 @@ class DomainPolicyForm(forms.ModelForm):
             self.fields[f].required = False
 
     def save(self, user, commit=True):
-        p = super(DomainPolicyForm, self).save(commit=False)
-        for f in ['bypass_spam_checks', 'bypass_virus_checks', 'bypass_banned_checks']:
-            if getattr(p, f) == '':
-                setattr(p, f, None)
+        policy = super(DomainPolicyForm, self).save(commit=False)
+        for field in ['bypass_spam_checks', 'bypass_virus_checks',
+                  'bypass_banned_checks']:
+            if getattr(policy, field) == '':
+                setattr(policy, field, None)
 
         if self.cleaned_data['spam_subject_tag2_act']:
-            p.spam_subject_tag2 = None
+            policy.spam_subject_tag2 = None
 
         if commit:
-            p.save()
+            policy.save()
             try:
-                u = Users.objects.get(policy=p)
+                u = Users.objects.get(fullname=policy.policy_name)
             except Users.DoesNotExist:
                 u = Users.objects.get(email="@%s" % self.domain.name)
-                u.policy = p
-                p.save()
-        return p
+                u.policy = policy
+                policy.save()
+        return policy
diff --git a/modoboa/extensions/amavis/general_callbacks.py b/modoboa/extensions/amavis/general_callbacks.py
new file mode 100644
index 000000000..29366aa3a
--- /dev/null
+++ b/modoboa/extensions/amavis/general_callbacks.py
@@ -0,0 +1,133 @@
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.template import Template, Context
+
+from modoboa.lib import events, parameters
+from modoboa.extensions.amavis.lib import (
+    create_user_and_policy, update_user_and_policy, delete_user_and_policy
+)
+
+
+@events.observe("UserMenuDisplay")
+def menu(target, user):
+    if target == "top_menu":
+        return [
+            {"name": "quarantine",
+             "label": _("Quarantine"),
+             "url": reverse('modoboa.extensions.amavis.views.index')}
+        ]
+    return []
+
+
+@events.observe("DomainCreated")
+def on_domain_created(user, domain):
+    create_user_and_policy(domain.name)
+
+
+@events.observe("DomainModified")
+def on_domain_modified(domain):
+    update_user_and_policy(domain.oldname, domain.name)
+
+
+@events.observe("DomainDeleted")
+def on_domain_deleted(domain):
+    delete_user_and_policy(domain.name)
+
+
+@events.observe("GetStaticContent")
+def extra_static_content(caller, user):
+    if user.group == "SimpleUsers":
+        return []
+
+    if caller == 'top' and parameters.get_admin("USER_CAN_RELEASE") == 'no':
+        tpl = Template("""<script type="text/javascript">
+$(document).ready(function() {
+    var poller = new Poller("{{ url }}", {
+        interval: {{ interval }},
+        success_cb: function(data) {
+            var $link = $("#nbrequests");
+            if (data.requests > 0) {
+                $link.html(data.requests + " " + "{{ text }}");
+                $link.parent().removeClass('hidden');
+            } else {
+                $link.parent().addClass('hidden');
+            }
+        }
+    });
+});
+</script>
+""")
+        return [tpl.render(
+            Context({
+                'url': reverse("modoboa.extensions.amavis.views.nbrequests"),
+                'interval': int(parameters.get_admin("CHECK_REQUESTS_INTERVAL")) * 1000,
+                'text': _("pending requests"),
+            })
+        )]
+
+    if caller == 'domains':
+        tpl = Template("""<script type="text/javascript">
+$(document).bind('domform_init', function() {
+    activate_widget.call($('#id_spam_subject_tag2_act'));
+});
+</script>
+""")
+
+        return [tpl.render(Context({}))]
+    return []
+
+
+@events.observe("TopNotifications")
+def display_requests(user):
+    from .sql_listing import get_wrapper
+
+    if parameters.get_admin("USER_CAN_RELEASE") == "yes" \
+            or user.group == "SimpleUsers":
+        return []
+    nbrequests = get_wrapper().get_pending_requests(user)
+
+    url = reverse("modoboa.extensions.amavis.views.index")
+    url += "#listing/?viewrequests=1"
+    tpl = Template('<div class="btn-group {{ css }}"><a id="nbrequests" href="{{ url }}" class="btn btn-danger">{{ label }}</a></div>')
+    css = "hidden" if nbrequests == 0 else ""
+    return [tpl.render(Context(dict(
+        label=_("%d pending requests" % nbrequests), url=url, css=css
+    )))]
+
+
+def send_amavis_form():
+    """
+    """
+    from .forms import DomainPolicyForm
+    return [{
+        'id': 'amavis', 'title': _("Content filter"), 'cls': DomainPolicyForm,
+        'formtpl': 'amavis/domain_content_filter.html'
+    }]
+
+
+@events.observe("ExtraDomainForm")
+def extra_domain_form(user, domain):
+    if not user.has_perm("admin.view_domains"):
+        return []
+    return send_amavis_form()
+
+
+@events.observe('ExtraRelayDomainForm')
+def extra_relaydomain_form(user, rdomain):
+    if not user.has_perm("postfix_relay_domains.add_relaydomain"):
+        return []
+    return send_amavis_form()
+
+
+@events.observe("FillDomainInstances")
+def fill_domain_instances(user, domain, instances):
+    if not user.has_perm("admin.view_domains"):
+        return
+    instances["amavis"] = domain
+
+
+@events.observe("FillRelayDomainInstances")
+def fill_relaydomain_instances(user, rdomain, instances):
+    if not user.has_perm("postfix_relay_domains.add_relaydomain"):
+        return
+    instances["amavis"] = rdomain
diff --git a/modoboa/extensions/amavis/lib.py b/modoboa/extensions/amavis/lib.py
index 56d8312df..f33e77249 100644
--- a/modoboa/extensions/amavis/lib.py
+++ b/modoboa/extensions/amavis/lib.py
@@ -8,6 +8,7 @@ from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import InternalError
+from modoboa.extensions.amavis.models import Users, Policy
 
 
 def selfservice(ssfunc=None):
@@ -76,3 +77,71 @@ recipient=%s
         if re.search("250 [\d\.]+ Ok", answer):
             return True
         return False
+
+
+def create_user_and_policy(name):
+    """Create records.
+
+    Create two records (a user and a policy) using :keyword:`name` as
+    an identifier.
+
+    :param str name: name
+    """
+    policy = Policy.objects.create(policy_name=name)
+    Users.objects.create(
+        email="@%s" % name, fullname=name,
+        priority=7, policy=policy
+    )
+
+
+def create_user_and_use_policy(name, policy_name):
+    """Create a *users* record and use an existing policy.
+
+    :param str name: user record name
+    :param str policy_name: policy name
+    """
+    policy = Policy.objects.get(policy_name=policy_name)
+    Users.objects.create(
+        email="@%s" % name, fullname=name,
+        priority=7, policy=policy
+    )
+
+
+def update_user_and_policy(oldname, newname):
+    """Update records.
+
+    :param str oldname: old name
+    :param str newname: new name
+    """
+    if oldname == newname:
+        return
+    u = Users.objects.get(email="@%s" % oldname)
+    u.email = "@%s" % newname
+    u.fullname = newname
+    u.policy.policy_name = newname
+    u.policy.save()
+    u.save()
+
+
+def delete_user_and_policy(name):
+    """Delete records.
+
+    :param str name: identifier
+    """
+    try:
+        u = Users.objects.get(email="@%s" % name)
+    except Users.DoesNotExist:
+        return
+    u.policy.delete()
+    u.delete()
+
+
+def delete_user(name):
+    """Delete a *users* record.
+
+    :param str name: user record name
+    """
+    try:
+        Users.objects.get(email="@%s" % name).delete()
+    except Users.DoesNotExist:
+        pass
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index da9bf2ea9..10aba023a 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -1,11 +1,7 @@
 # coding: utf-8
-from django.core.urlresolvers import reverse
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
-from django.template import Template, Context
-from django.conf import settings
 from django.utils.translation import ugettext_lazy
-from django.db.models import Q
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
 from .models import RelayDomain, RelayDomainAlias, Service
@@ -14,16 +10,64 @@ extension_events = [
     "RelayDomainCreated",
     "RelayDomainDeleted",
     "RelayDomainAliasCreated",
-    "RelayDomainAliasDeleted"
+    "RelayDomainAliasDeleted",
+    "ExtraRelayDomainForm",
+    "FillRelayDomainInstances"
 ]
 
 
+def init_limits_dependant_features():
+    """Populate limits tables.
+
+    Update the pool of every defined user (to add new limits) and
+    update the *Resellers* group with new permissions.
+    """
+    from modoboa.core.models import User
+    from modoboa.extensions.limits import controls
+
+    for u in User.objects.all():
+        controls.create_pool(u)
+    grp = Group.objects.get(name='Resellers')
+    for model in [RelayDomain, RelayDomainAlias, Service]:
+        ct = ContentType.objects.get_for_model(model)
+        name = model.__name__.lower()
+        for action in ['add', 'change', 'delete']:
+            grp.permissions.add(
+                Permission.objects.get(
+                    content_type=ct, codename='%s_%s' % (action, name)
+                )
+            )
+    grp.save()
+
+
+def init_amavis_dependant_features():
+    """Populate amavis database.
+
+    We create records for *users* and *policy* tables for each defined
+    relay domain or relay domain alias.
+    """
+    from modoboa.extensions.amavis.models import Users
+    from modoboa.extensions.amavis.lib import (
+        create_user_and_policy, create_user_and_use_policy
+    )
+
+    for rdom in RelayDomain.objects.all():
+        try:
+            Users.objects.get(email="@%s" % rdom.name)
+        except Users.DoesNotExist:
+            create_user_and_policy(rdom.name)
+        for rdomalias in rdom.relaydomainalias_set.all():
+            try:
+                Users.objects.get(email='@%s' % rdomalias.name)
+            except Users.DoesNotExist:
+                create_user_and_use_policy(rdomalias.name, rdom.name)
+
+
 class PostfixRelayDomains(ModoExtension):
     name = "postfix_relay_domains"
     label = "Postfix relay domains"
     version = "1.0"
     description = ugettext_lazy("Relay domains support for Postfix")
-    depends_on = ['limits']
 
     def init(self):
         """Initialisation method.
@@ -33,26 +77,8 @@ class PostfixRelayDomains(ModoExtension):
         """
         for service_name in ['relay', 'smtp']:
             Service.objects.get_or_create(name=service_name)
-        if not exts_pool.is_extension_enabled('limits'):
-            return
-
-        from modoboa.core.models import User
-        from modoboa.extensions.limits import controls
-
-        for u in User.objects.all():
-            controls.create_pool(u)
-
-        grp = Group.objects.get(name='Resellers')
-        for model in [RelayDomain, RelayDomainAlias, Service]:
-            ct = ContentType.objects.get_for_model(model)
-            name = model.__name__.lower()
-            for action in ['add', 'change', 'delete']:
-                grp.permissions.add(
-                    Permission.objects.get(
-                        content_type=ct, codename='%s_%s' % (action, name)
-                    )
-                )
-        grp.save()
+        if exts_pool.is_extension_enabled('limits'):
+            init_limits_dependant_features()
 
     def load(self):
         from .app_settings import AdminParametersForm
@@ -61,163 +87,14 @@ class PostfixRelayDomains(ModoExtension):
             AdminParametersForm, ugettext_lazy("Relay domains")
         )
         events.declare(extension_events)
-        if not exts_pool.is_extension_enabled('limits'):
-            return
-        import limits_controls
+        from modoboa.extensions.postfix_relay_domains import general_callbacks
+        if exts_pool.is_extension_enabled('limits'):
+            import limits_callbacks
+        if exts_pool.is_extension_enabled('amavis'):
+            import amavis_callbacks
 
     def destroy(self):
-        events.unregister('GetExtraDomainEntries', extra_domain_entries)
-        events.unregister('GetExtraParameters', extra_parameters)
+        events.unregister_extension()
+        parameters.unregister()
 
 exts_pool.register_extension(PostfixRelayDomains)
-
-
-@events.observe('GetStaticContent')
-def static_content(caller, user):
-    if caller != 'domains':
-        return []
-
-    t = Template("""<script src="{{ STATIC_URL }}postfix_relay_domains/js/relay_domains.js" type="text/javascript"></script>
-<script type="text/javascript">
-  var rdomain;
-  $(document).ready(function() {
-    rdomain = new RelayDomains({});
-  });
-</script>
-""")
-    return [t.render(Context({'STATIC_URL': settings.STATIC_URL}))]
-
-
-@events.observe('ExtraDomainFilters')
-def extra_domain_filters():
-    return ['srvfilter']
-
-
-@events.observe('ExtraDomainMenuEntries')
-def extra_domain_menu_entries(user):
-    return [
-        {"name": "newrelaydomain",
-         "label": ugettext_lazy("Add relay domain"),
-         "img": "icon-plus",
-         "modal": True,
-         "modalcb": "rdomain.domainform_cb",
-         "url": reverse(
-             "modoboa.extensions.postfix_relay_domains.views.create"
-         )},
-    ]
-
-
-@events.observe('ExtraDomainEntries')
-def extra_domain_entries(user, domfilter, searchquery, **extrafilters):
-    if domfilter is not None and domfilter and domfilter != 'relaydomain':
-        return []
-    relay_domains = RelayDomain.objects.get_for_admin(user)
-    if searchquery is not None:
-        q = Q(name__contains=searchquery)
-        q |= Q(relaydomainalias__name__contains=searchquery)
-        relay_domains = relay_domains.filter(q).distinct()
-    if 'srvfilter' in extrafilters and extrafilters['srvfilter']:
-        relay_domains = relay_domains.filter(
-            Q(service__name=extrafilters['srvfilter'])
-        )
-    return relay_domains
-
-
-@events.observe('GetDomainModifyLink')
-def rdomain_modify_link(domain):
-    if not isinstance(domain, RelayDomain):
-        return {}
-    return {
-        'url': reverse(
-            'modoboa.extensions.postfix_relay_domains.views.edit',
-            args=[domain.id]
-        ),
-        'modalcb': 'rdomain.domainform_cb'
-    }
-
-
-@events.observe('GetDomainAliasQuerySet')
-def get_da_query_set(domain):
-    if domain.__class__.__name__ != 'RelayDomain':
-        return []
-    return [domain.relaydomainalias_set]
-
-
-@events.observe('GetDomainActions')
-def rdomain_actions(user, domain):
-    if not isinstance(domain, RelayDomain):
-        return []
-    if not user.has_perm("postfix_relay_domains.delete_relaydomain"):
-        return []
-    return [{
-        "name": "delrelaydomain",
-        "url": reverse("modoboa.extensions.postfix_relay_domains.views.delete",
-                       args=[domain.id]),
-        "title": ugettext_lazy("Delete %s?" % domain.name),
-        "img": "icon-trash"
-    }]
-
-
-@events.observe('CheckDomainName')
-def check_domain_name():
-    return [
-        (RelayDomain, ugettext_lazy('relay domain')),
-        (RelayDomainAlias, ugettext_lazy('relay domain alias'))
-    ]
-
-
-@events.observe('GetExtraLimitTemplates')
-def extra_limit_templates():
-    return [
-        ('relay_domains_limit', ugettext_lazy('Relay domains'),
-         ugettext_lazy('Maximum number of relay domains this user can create'),
-         'Resellers'),
-        ("relay_domain_aliases_limit", ugettext_lazy("Relay domain aliases"),
-         ugettext_lazy('Maximum number of relay domain aliases this user can create'),
-         'Resellers'),
-    ]
-
-
-@events.observe('GetExtraParameters')
-def extra_parameters(app, level):
-    from django import forms
-
-    if app != 'limits' or level != 'A':
-        return {}
-    return {
-        'deflt_relay_domains_limit': forms.IntegerField(
-            label=ugettext_lazy("Relay domains"),
-            initial=0,
-            help_text=ugettext_lazy(
-                "Maximum number of allowed relay domains for a new administrator"
-            ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
-        ),
-        'deflt_relay_domain_aliases_limit': forms.IntegerField(
-            label=ugettext_lazy("Relay domain aliases"),
-            initial=0,
-            help_text=ugettext_lazy(
-                "Maximum number of allowed relay domain aliases for a new administrator"
-            ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
-        )
-    }
-
-
-@events.observe('ExtraDomainImportHelp')
-def extra_domain_import_help():
-    return [ugettext_lazy("""
-<li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
-<li><em>relaydomainalias; name; target; enabled</em></li>
-""")]
-
-
-@events.observe('ImportObject')
-def get_import_func(objtype):
-    from .lib import import_relaydomain, import_relaydomainalias
-
-    if objtype == 'relaydomain':
-        return [import_relaydomain]
-    if objtype == 'relaydomainalias':
-        return [import_relaydomainalias]
-    return []
diff --git a/modoboa/extensions/postfix_relay_domains/amavis_callbacks.py b/modoboa/extensions/postfix_relay_domains/amavis_callbacks.py
new file mode 100644
index 000000000..c43052af3
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/amavis_callbacks.py
@@ -0,0 +1,30 @@
+from modoboa.lib import events
+from modoboa.extensions.amavis.lib import (
+    create_user_and_policy, update_user_and_policy, delete_user_and_policy,
+    create_user_and_use_policy, delete_user
+)
+
+
+@events.observe("RelayDomainCreated")
+def on_relay_domain_created(user, rdomain):
+    create_user_and_policy(rdomain.name)
+
+
+@events.observe("RelayDomainModified")
+def on_relay_domain_modified(rdomain):
+    update_user_and_policy(rdomain.oldname, rdomain.name)
+
+
+@events.observe("RelayDomainDeleted")
+def on_relay_domain_deleted(rdomain):
+    delete_user_and_policy(rdomain.name)
+
+
+@events.observe("RelayDomainAliasCreated")
+def on_relay_domain_alias_created(user, rdomainalias):
+    create_user_and_use_policy(rdomainalias.name, rdomainalias.target.name)
+
+
+@events.observe("RelayDomainAliasDeleted")
+def on_relay_domain_alias_deleted(rdomainalias):
+    delete_user(rdomainalias.name)
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index 767caeb3a..37a49d646 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -2,12 +2,12 @@ from django import forms
 from django.http import QueryDict
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib import events
-from modoboa.lib.formutils import DynamicForm, DomainNameField
+from modoboa.lib.formutils import DynamicForm, DomainNameField, TabForms
 from modoboa.extensions.admin.models import Domain, DomainAlias
 from .models import RelayDomain, RelayDomainAlias
 
 
-class RelayDomainForm(forms.ModelForm, DynamicForm):
+class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
     aliases = DomainNameField(
         label=ugettext_lazy("Alias(es)"),
         required=False,
@@ -25,7 +25,7 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
         }
 
     def __init__(self, *args, **kwargs):
-        super(RelayDomainForm, self).__init__(*args, **kwargs)
+        super(RelayDomainFormGeneral, self).__init__(*args, **kwargs)
         if args and isinstance(args[0], QueryDict):
             self._load_from_qdict(args[0], "aliases", DomainNameField)
         elif 'instance' in kwargs:
@@ -42,7 +42,7 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
 
         The validation way is not very smart...
         """
-        super(RelayDomainForm, self).clean()
+        super(RelayDomainFormGeneral, self).clean()
         if self._errors:
             raise forms.ValidationError(self._errors)
         cleaned_data = self.cleaned_data
@@ -90,7 +90,7 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
 
         :param ``User`` user: connected user
         """
-        rd = super(RelayDomainForm, self).save(commit=False)
+        rd = super(RelayDomainFormGeneral, self).save(commit=False)
         if commit:
             rd.save()
             aliases = []
@@ -121,3 +121,35 @@ class RelayDomainForm(forms.ModelForm, DynamicForm):
                     )
                     al.save(creator=user)
         return rd
+
+
+class RelayDomainForm(TabForms):
+    """Specific edition form for relay domains.
+
+    We use a *tabs* compatible form because extensions can add their
+    own tab. (ex: amavis)
+    """
+    def __init__(self, user, *args, **kwargs):
+        self.user = user
+        self.forms = []
+        if user.has_perm("postfix_relay_domains.change_relaydomain"):
+            self.forms.append({
+                'id': 'general', 'title': _("General"), 
+                'formtpl': 'postfix_relay_domains/relaydomain_form.html',
+                'cls': RelayDomainFormGeneral, 'mandatory': True
+            })
+
+        cbargs = [user]
+        if "instances" in kwargs:
+            cbargs += [kwargs["instances"]["general"]]
+        self.forms += events.raiseQueryEvent("ExtraRelayDomainForm", *cbargs)
+        super(RelayDomainForm, self).__init__(*args, **kwargs)
+
+    def save(self, user):
+        """Custom save method
+
+        As forms interact with each other, it is easier to make custom
+        code to save them.
+        """
+        for f in self.forms:
+            f["instance"].save(user)
diff --git a/modoboa/extensions/postfix_relay_domains/general_callbacks.py b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
new file mode 100644
index 000000000..d7fa11bc6
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
@@ -0,0 +1,176 @@
+from django.core.urlresolvers import reverse
+from django.template import Template, Context
+from django.conf import settings
+from django.utils.translation import ugettext_lazy
+from django.db.models import Q
+from modoboa.lib import events
+from .models import RelayDomain, RelayDomainAlias
+
+
+@events.observe('GetStaticContent')
+def static_content(caller, user):
+    if caller != 'domains':
+        return []
+
+    t = Template("""<script src="{{ STATIC_URL }}postfix_relay_domains/js/relay_domains.js" type="text/javascript"></script>
+<script type="text/javascript">
+  var rdomain;
+  $(document).ready(function() {
+    rdomain = new RelayDomains({});
+  });
+</script>
+""")
+    return [t.render(Context({'STATIC_URL': settings.STATIC_URL}))]
+
+
+@events.observe('ExtraDomainFilters')
+def extra_domain_filters():
+    return ['srvfilter']
+
+
+@events.observe('ExtraDomainMenuEntries')
+def extra_domain_menu_entries(user):
+    return [
+        {"name": "newrelaydomain",
+         "label": ugettext_lazy("Add relay domain"),
+         "img": "icon-plus",
+         "modal": True,
+         "modalcb": "rdomain.domainform_cb",
+         "url": reverse(
+             "modoboa.extensions.postfix_relay_domains.views.create"
+         )},
+    ]
+
+
+@events.observe('ExtraDomainEntries')
+def extra_domain_entries(user, domfilter, searchquery, **extrafilters):
+    if domfilter is not None and domfilter and domfilter != 'relaydomain':
+        return []
+    relay_domains = RelayDomain.objects.get_for_admin(user)
+    if searchquery is not None:
+        q = Q(name__contains=searchquery)
+        q |= Q(relaydomainalias__name__contains=searchquery)
+        relay_domains = relay_domains.filter(q).distinct()
+    if 'srvfilter' in extrafilters and extrafilters['srvfilter']:
+        relay_domains = relay_domains.filter(
+            Q(service__name=extrafilters['srvfilter'])
+        )
+    return relay_domains
+
+
+@events.observe('GetDomainModifyLink')
+def rdomain_modify_link(domain):
+    if not isinstance(domain, RelayDomain):
+        return {}
+    return {
+        'url': reverse(
+            'modoboa.extensions.postfix_relay_domains.views.edit',
+            args=[domain.id]
+        ),
+        'modalcb': 'rdomain.domainform_cb'
+    }
+
+
+@events.observe('GetDomainAliasQuerySet')
+def get_da_query_set(domain):
+    if domain.__class__.__name__ != 'RelayDomain':
+        return []
+    return [domain.relaydomainalias_set]
+
+
+@events.observe('GetDomainActions')
+def rdomain_actions(user, domain):
+    if not isinstance(domain, RelayDomain):
+        return []
+    if not user.has_perm("postfix_relay_domains.delete_relaydomain"):
+        return []
+    return [{
+        "name": "delrelaydomain",
+        "url": reverse("modoboa.extensions.postfix_relay_domains.views.delete",
+                       args=[domain.id]),
+        "title": ugettext_lazy("Delete %s?" % domain.name),
+        "img": "icon-trash"
+    }]
+
+
+@events.observe('CheckDomainName')
+def check_domain_name():
+    return [
+        (RelayDomain, ugettext_lazy('relay domain')),
+        (RelayDomainAlias, ugettext_lazy('relay domain alias'))
+    ]
+
+
+@events.observe('GetExtraLimitTemplates')
+def extra_limit_templates():
+    return [
+        ('relay_domains_limit', ugettext_lazy('Relay domains'),
+         ugettext_lazy('Maximum number of relay domains this user can create'),
+         'Resellers'),
+        ("relay_domain_aliases_limit", ugettext_lazy("Relay domain aliases"),
+         ugettext_lazy('Maximum number of relay domain aliases this user can create'),
+         'Resellers'),
+    ]
+
+
+@events.observe('GetExtraParameters')
+def extra_parameters(app, level):
+    from django import forms
+
+    if app != 'limits' or level != 'A':
+        return {}
+    return {
+        'deflt_relay_domains_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domains"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domains for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        ),
+        'deflt_relay_domain_aliases_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domain aliases"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domain aliases for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        )
+    }
+
+
+@events.observe('ExtraDomainImportHelp')
+def extra_domain_import_help():
+    return [ugettext_lazy("""
+<li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
+<li><em>relaydomainalias; name; target; enabled</em></li>
+""")]
+
+
+@events.observe('ImportObject')
+def get_import_func(objtype):
+    from .lib import import_relaydomain, import_relaydomainalias
+
+    if objtype == 'relaydomain':
+        return [import_relaydomain]
+    if objtype == 'relaydomainalias':
+        return [import_relaydomainalias]
+    return []
+
+
+@events.observe('ExtEnabled')
+def extension_enabled(extension):
+    """ExtEnabled event listener.
+
+    Usefull when *limits* or *amavis* extensions are activated after
+    *postfix_relay_domains*.
+
+    :param extension: enabled extension
+    """
+    from modoboa.extensions.postfix_relay_domains import (
+        init_limits_dependant_features, init_amavis_dependant_features
+    )
+    if extension.name == 'limits':
+        init_limits_dependant_features()
+    if extension.name == 'amavis':
+        init_amavis_dependant_features()
diff --git a/modoboa/extensions/postfix_relay_domains/limits_controls.py b/modoboa/extensions/postfix_relay_domains/limits_callbacks.py
similarity index 100%
rename from modoboa/extensions/postfix_relay_domains/limits_controls.py
rename to modoboa/extensions/postfix_relay_domains/limits_callbacks.py
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 560dfb0c5..1c45cbffb 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -139,6 +139,9 @@ reversion.register(RelayDomain)
 
 
 class RelayDomainAlias(AdminObject):
+    """Relay domain alias.
+
+    """
     name = models.CharField(
         ugettext_lazy("name"), max_length=100, unique=True,
         help_text=ugettext_lazy("The alias name")
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
index fc454ab39..d30e10f4b 100644
--- a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -67,6 +67,7 @@ RelayDomains.prototype = {
                 success_cb: $.proxy(admin.reload_listing, admin)
             });
         }, this));
+        $(document).trigger('domform_init');
     },
 
     srv_tag_handler: function(tag, $link) {
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/new_relaydomain_form.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/new_relaydomain_form.html
new file mode 100644
index 000000000..8a349d160
--- /dev/null
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/new_relaydomain_form.html
@@ -0,0 +1,3 @@
+{% extends "common/generic_modal_form.html" %}{% block formbody %}
+{% include "postfix_relay_domains/relaydomain_form.html" %}
+{% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
index 99edce36b..2c0e8d150 100644
--- a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
@@ -1,8 +1,7 @@
-{% extends "common/generic_modal_form.html" %}{% load lib_tags %}{% block formbody %}
+{% load lib_tags %}
 {% render_field form.name %}
 {% render_field form.target_host %}
 {% include "postfix_relay_domains/service_field.html" with field=form.service %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
 {% render_field form.verify_recipients %}
-{% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/views.py b/modoboa/extensions/postfix_relay_domains/views.py
index 5eded6ca3..e59657891 100644
--- a/modoboa/extensions/postfix_relay_domains/views.py
+++ b/modoboa/extensions/postfix_relay_domains/views.py
@@ -10,16 +10,16 @@ from modoboa.lib import events
 from modoboa.lib.exceptions import PermDeniedException
 from modoboa.lib.webutils import render_to_json_response
 from .models import RelayDomain, Service
-from .forms import RelayDomainForm
+from .forms import RelayDomainForm, RelayDomainFormGeneral
 
 
 @login_required
 @permission_required("postfix_relay_domains.add_relaydomain")
 @transaction.commit_on_success
-def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
+def create(request, tplname="postfix_relay_domains/new_relaydomain_form.html"):
     events.raiseEvent("CanCreate", request.user, "relay_domains")
     if request.method == 'POST':
-        form = RelayDomainForm(request.POST)
+        form = RelayDomainFormGeneral(request.POST)
         if form.is_valid():
             rdom = form.save(request.user)
             rdom.post_create(request.user)
@@ -35,18 +35,21 @@ def create(request, tplname="postfix_relay_domains/relaydomain_form.html"):
            "action_classes": "submit",
            "action": reverse(create),
            "formid": "rdomform",
-           "form": RelayDomainForm()}
+           "form": RelayDomainFormGeneral()}
     return render(request, tplname, ctx)
 
 
 @login_required
 @permission_required("postfix_relay_domains.change_relaydomain")
-def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'):
+def edit(request, rdom_id, tplname='common/tabforms.html'):
     rdom = RelayDomain.objects.get(pk=rdom_id)
     if not request.user.can_access(rdom):
         raise PermDeniedException
+    instances = {'general': rdom}
+    events.raiseEvent("FillRelayDomainInstances", request.user, rdom, instances)
     if request.method == 'POST':
-        form = RelayDomainForm(request.POST, instance=rdom)
+        rdom.oldname = rdom.name
+        form = RelayDomainForm(request.user, request.POST, instances=instances)
         if form.is_valid():
             form.save(request.user)
             events.raiseEvent('RelayDomainModified', rdom)
@@ -61,7 +64,7 @@ def edit(request, rdom_id, tplname='postfix_relay_domains/relaydomain_form.html'
         'title': rdom.name,
         'action_label': _("Update"),
         'action_classes': "submit",
-        'form': RelayDomainForm(instance=rdom)
+        'tabs': RelayDomainForm(request.user, instances=instances)
     }
     return render(request, tplname, ctx)
 
diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py
index b2e778bbb..cf565e370 100644
--- a/modoboa/lib/events.py
+++ b/modoboa/lib/events.py
@@ -12,6 +12,7 @@ from functools import wraps
 import inspect
 import re
 from django.conf import settings
+from modoboa.lib.sysutils import guess_extension_name
 
 events = []
 callbacks = {}
@@ -117,6 +118,20 @@ def unregister(event, callback):
         pass
 
 
+def unregister_extension(extension=None):
+    """Unregister all callbacks declared by an extension.
+
+    :param str extension: extension full name (ie. module name)
+    """
+    if extension is None:
+        extension = guess_extension_name()
+    print extension
+    for evt, values in callbacks.items():
+        for name in values.keys():
+            if extension in name:
+                del callbacks[evt][name]
+
+
 def raiseEvent(event, *args, **kwargs):
     """Raise a specific event
 
diff --git a/modoboa/lib/parameters.py b/modoboa/lib/parameters.py
index 61d3372d7..a5c7dfa89 100644
--- a/modoboa/lib/parameters.py
+++ b/modoboa/lib/parameters.py
@@ -8,11 +8,10 @@ will be available and modifiable directly from the web interface.
 
 Only super users will be able to access this part of the web interface.
 """
-import inspect
-import re
 from django import forms
-from . import events
-from exceptions import ModoboaException
+from modoboa.lib import events
+from modoboa.lib.sysutils import guess_extension_name
+from modoboa.lib.exceptions import ModoboaException
 
 _params = {'A': {}, 'U': {}}
 
@@ -185,7 +184,7 @@ def unregister(app=None):
     :param app: the application's name (string)
     """
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     for lvlparams in _params.values():
         if app in lvlparams:
             del lvlparams[app]
@@ -198,23 +197,11 @@ def __is_defined(app, level, name):
         raise NotDefined(app, name)
 
 
-def __guess_extension():
-    """Tries to guess the application's name by inspecting the stack
-
-    :return: a string or None
-    """
-    modname = inspect.getmodule(inspect.stack()[2][0]).__name__
-    m = re.match("(?:modoboa\.)?(?:extensions\.)?([^\.$]+)", modname)
-    if m:
-        return m.group(1)
-    return None
-
-
 def save_admin(name, value, app=None):
     from .models import Parameter
 
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     __is_defined(app, 'A', name)
     fullname = "%s.%s" % (app, name)
     try:
@@ -231,7 +218,7 @@ def save_user(user, name, value, app=None):
     from .models import UserParameter
 
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     __is_defined(app, 'U', name)
     fullname = "%s.%s" % (app, name)
     try:
@@ -256,7 +243,7 @@ def get_admin(name, app=None, raise_error=True):
     from .models import Parameter
 
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     try:
         __is_defined(app, "A", name)
     except NotDefined:
@@ -283,7 +270,7 @@ def get_user(user, name, app=None, raise_error=True):
     from .models import UserParameter
 
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     try:
         __is_defined(app, "U", name)
     except NotDefined:
@@ -349,7 +336,7 @@ def get_parameter_form(level, name, app=None):
     :return: a form class
     """
     if app is None:
-        app = __guess_extension()
+        app = guess_extension_name()
     __is_defined(app, level, name)
     return _params[level][app]["form"]
 
diff --git a/modoboa/lib/sysutils.py b/modoboa/lib/sysutils.py
index 237f9ea64..02af77148 100644
--- a/modoboa/lib/sysutils.py
+++ b/modoboa/lib/sysutils.py
@@ -5,6 +5,8 @@ This module extra functions/shortcuts to communicate with the system
 (executing commands, etc.)
 """
 import subprocess
+import inspect
+import re
 
 
 def exec_cmd(cmd, sudo_user=None, **kwargs):
@@ -24,3 +26,15 @@ def exec_cmd(cmd, sudo_user=None, **kwargs):
                          stderr=subprocess.STDOUT, **kwargs)
     output = p.communicate()[0]
     return p.returncode, output
+
+
+def guess_extension_name():
+    """Tries to guess the application's name by inspecting the stack.
+
+    :return: a string or None
+    """
+    modname = inspect.getmodule(inspect.stack()[2][0]).__name__
+    match = re.match(r"(?:modoboa\.)?(?:extensions\.)?([^\.$]+)", modname)
+    if match is not None:
+        return match.group(1)
+    return None

From 4058b4d9e7eeaa826eda82b696854929c9e65ee0 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 1 Nov 2013 17:36:02 +0100
Subject: [PATCH 12/32] Properly reload callbacks when an extension is enabled.

---
 modoboa/extensions/amavis/__init__.py         |   3 +
 modoboa/extensions/limits/__init__.py         | 102 +----------------
 .../extensions/limits/general_callbacks.py    |  97 +++++++++++++++++
 .../extensions/postfix_autoreply/__init__.py  | 103 ++----------------
 .../postfix_autoreply/general_callbacks.py    |  87 +++++++++++++++
 .../postfix_relay_domains/__init__.py         |   7 ++
 modoboa/extensions/sievefilters/__init__.py   |  38 +------
 .../sievefilters/general_callbacks.py         |  32 ++++++
 modoboa/extensions/stats/__init__.py          |  33 ++----
 modoboa/extensions/stats/general_callbacks.py |  22 ++++
 modoboa/extensions/webmail/__init__.py        |  40 +------
 .../extensions/webmail/general_callbacks.py   |  37 +++++++
 12 files changed, 324 insertions(+), 277 deletions(-)
 create mode 100644 modoboa/extensions/limits/general_callbacks.py
 create mode 100644 modoboa/extensions/postfix_autoreply/general_callbacks.py
 create mode 100644 modoboa/extensions/sievefilters/general_callbacks.py
 create mode 100644 modoboa/extensions/stats/general_callbacks.py
 create mode 100644 modoboa/extensions/webmail/general_callbacks.py

diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index 5e47ac577..1327288ae 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -8,6 +8,7 @@ Provides:
 * Per-domain settings
 
 """
+import sys
 from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
@@ -43,6 +44,8 @@ class Amavis(ModoExtension):
         parameters.register(ParametersForm, "Amavis")
         parameters.register(UserSettings, ugettext_lazy("Quarantine"))
         from modoboa.extensions.amavis import general_callbacks
+        if 'modoboa.extensions.amavis.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
         events.unregister_extension()
diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py
index 61a6961fe..2601c97e1 100644
--- a/modoboa/extensions/limits/__init__.py
+++ b/modoboa/extensions/limits/__init__.py
@@ -4,14 +4,13 @@
 The *limits* extension
 ----------------------
 """
+import sys
 from django.contrib.auth.models import Permission, Group
 from django.db import IntegrityError
 from django.contrib.contenttypes.models import ContentType
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
-from .models import LimitTemplates
-from .forms import ResourcePoolForm
 
 levents = [
     'GetExtraLimitTemplates'
@@ -56,102 +55,13 @@ class Limits(ModoExtension):
 
         parameters.register(ParametersForm, ugettext_lazy("Limits"))
         events.declare(levents)
+        from modoboa.extensions.limits import general_callbacks
+        if 'modoboa.extensions.limits.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
+        events.unregister_extension()
         parameters.unregister()
         Group.objects.get(name="Resellers").delete()
 
 exts_pool.register_extension(Limits)
-
-
-@events.observe("GetExtraRoles")
-def get_extra_roles(user):
-    if user.is_superuser:
-        return [("Resellers", _("Reseller")), ]
-    return []
-
-
-@events.observe("ExtraAdminContent")
-def display_pool_usage(user, target, currentpage):
-    from django.template.loader import render_to_string
-
-    if target != "leftcol" or user.is_superuser:
-        return []
-    if currentpage == "identities":
-        names = ["mailboxes_limit", "mailbox_aliases_limit"]
-        if user.has_perm("admin.add_domain"):
-            names += ["domain_admins_limit"]
-    else:
-        names = [
-            tpl[0] for tpl in LimitTemplates().templates
-            if tpl[0] not in ["domain_admins_limit", "mailboxes_limit",
-                              "mailbox_aliases_limit"]
-            and (len(tpl) == 3 or tpl[3] == user.group)
-        ]
-
-    limits = user.limitspool.limit_set.filter(name__in=names, maxvalue__gt=0)
-    if len(limits) == 0:
-        return []
-    return [render_to_string("limits/poolusage.html", dict(limits=limits))]
-
-
-@events.observe("ExtraAccountForm")
-def extra_account_form(user, account=None):
-    if not user.group in ["SuperAdmins", "Resellers"]:
-        return []
-    if account is not None and \
-            not account.group in ["Resellers", "DomainAdmins"]:
-        return []
-
-    return [
-        dict(
-            id="resources", title=_("Resources"), cls=ResourcePoolForm
-        )
-    ]
-
-
-@events.observe("CheckExtraAccountForm")
-def check_form_access(account, form):
-    if form["id"] != "resources":
-        return [True]
-    if not account.belongs_to_group("Resellers") and \
-       not account.belongs_to_group("DomainAdmins"):
-        return [False]
-    return [True]
-
-
-@events.observe("FillAccountInstances")
-def fill_account_instances(user, account, instances):
-    if not user.is_superuser and not user.belongs_to_group("Resellers"):
-        return
-    if not account.belongs_to_group("Resellers") and \
-       not account.belongs_to_group("DomainAdmins"):
-        return
-    instances["resources"] = account
-
-
-@events.observe("GetStaticContent")
-def get_static_content(caller, user):
-    if caller not in ['domains', 'identities']:
-        return []
-    if user.group == "SimpleUsers":
-        return []
-    return ["""<style>
-.resource {
-    margin: 5px 0;
-}
-
-.resource .progress {
-    margin-bottom: 0px;
-}
-
-.resource .progress .bar {
-    color: #000000;
-}
-</style>
-<script type="text/javascript">
-$(document).ready(function() {
-    $(".progress").tooltip();
-});
-</script>
-"""]
diff --git a/modoboa/extensions/limits/general_callbacks.py b/modoboa/extensions/limits/general_callbacks.py
new file mode 100644
index 000000000..0d41c2449
--- /dev/null
+++ b/modoboa/extensions/limits/general_callbacks.py
@@ -0,0 +1,97 @@
+from django.utils.translation import ugettext as _
+from modoboa.lib import events
+from modoboa.extensions.limits.models import LimitTemplates
+from modoboa.extensions.limits.forms import ResourcePoolForm
+
+
+@events.observe("GetExtraRoles")
+def get_extra_roles(user):
+    if user.is_superuser:
+        return [("Resellers", _("Reseller")), ]
+    return []
+
+
+@events.observe("ExtraAdminContent")
+def display_pool_usage(user, target, currentpage):
+    from django.template.loader import render_to_string
+
+    if target != "leftcol" or user.is_superuser:
+        return []
+    if currentpage == "identities":
+        names = ["mailboxes_limit", "mailbox_aliases_limit"]
+        if user.has_perm("admin.add_domain"):
+            names += ["domain_admins_limit"]
+    else:
+        names = [
+            tpl[0] for tpl in LimitTemplates().templates
+            if tpl[0] not in ["domain_admins_limit", "mailboxes_limit",
+                              "mailbox_aliases_limit"]
+            and (len(tpl) == 3 or tpl[3] == user.group)
+        ]
+
+    limits = user.limitspool.limit_set.filter(name__in=names, maxvalue__gt=0)
+    if len(limits) == 0:
+        return []
+    return [render_to_string("limits/poolusage.html", dict(limits=limits))]
+
+
+@events.observe("ExtraAccountForm")
+def extra_account_form(user, account=None):
+    if not user.group in ["SuperAdmins", "Resellers"]:
+        return []
+    if account is not None and \
+            not account.group in ["Resellers", "DomainAdmins"]:
+        return []
+
+    return [
+        dict(
+            id="resources", title=_("Resources"), cls=ResourcePoolForm
+        )
+    ]
+
+
+@events.observe("CheckExtraAccountForm")
+def check_form_access(account, form):
+    if form["id"] != "resources":
+        return [True]
+    if not account.belongs_to_group("Resellers") and \
+       not account.belongs_to_group("DomainAdmins"):
+        return [False]
+    return [True]
+
+
+@events.observe("FillAccountInstances")
+def fill_account_instances(user, account, instances):
+    if not user.is_superuser and not user.belongs_to_group("Resellers"):
+        return
+    if not account.belongs_to_group("Resellers") and \
+       not account.belongs_to_group("DomainAdmins"):
+        return
+    instances["resources"] = account
+
+
+@events.observe("GetStaticContent")
+def get_static_content(caller, user):
+    if caller not in ['domains', 'identities']:
+        return []
+    if user.group == "SimpleUsers":
+        return []
+    return ["""<style>
+.resource {
+    margin: 5px 0;
+}
+
+.resource .progress {
+    margin-bottom: 0px;
+}
+
+.resource .progress .bar {
+    color: #000000;
+}
+</style>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".progress").tooltip();
+});
+</script>
+"""]
diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py
index fdbebf511..c28dd67e0 100644
--- a/modoboa/extensions/postfix_autoreply/__init__.py
+++ b/modoboa/extensions/postfix_autoreply/__init__.py
@@ -6,13 +6,20 @@ This module provides a way to integrate Modoboa auto-reply
 functionality into Postfix.
 
 """
+import sys
 from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
-from .models import Transport, Alias
+from modoboa.extensions.postfix_autoreply.models import (
+    Transport, Alias
+)
 
 
 class PostfixAutoreply(ModoExtension):
+    """
+    Auto-reply (vacation) functionality using Postfix.
+    
+    """
     name = "postfix_autoreply"
     label = "Postfix autoreply"
     version = "1.0"
@@ -38,14 +45,12 @@ class PostfixAutoreply(ModoExtension):
     def load(self):
         from modoboa.extensions.postfix_autoreply.app_settings import ParametersForm
         parameters.register(ParametersForm, ugettext_lazy("Automatic replies"))
+        from modoboa.extensions.postfix_autoreply import general_callbacks
+        if 'modoboa.extensions.postfix_autoreply.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
-        events.unregister("DomainCreated", onDomainCreated)
-        events.unregister("DomainDeleted", onDomainDeleted)
-        events.unregister("MailboxCreated", onMailboxCreated)
-        events.unregister("MailboxDeleted", onMailboxDeleted)
-        events.unregister("MailboxModified", onModifyMailbox)
-        events.unregister("UserMenuDisplay", menu)
+        events.unregister_extension()
         parameters.unregister()
 
 exts_pool.register_extension(PostfixAutoreply)
@@ -55,87 +60,3 @@ exts_pool.register_extension(PostfixAutoreply)
 def extra_routes():
     return [(r'^user/autoreply/$',
              'modoboa.extensions.postfix_autoreply.views.autoreply'), ]
-
-
-@events.observe("ExtraUprefsJS")
-def extra_js(user):
-    return ["""function autoreply_cb() {
-    $('#id_untildate').datepicker({format: 'yyyy-mm-dd', language: '%s'});
-}
-""" % parameters.get_user(user, "LANG", app="core")
-    ]
-
-
-@events.observe("UserMenuDisplay")
-def menu(target, user):
-    if target != "uprefs_menu":
-        return []
-    if not user.mailbox_set.count():
-        return []
-    return [
-        {"name": "autoreply",
-         "class": "ajaxlink",
-         "url": "autoreply/",
-         "label": ugettext_lazy("Auto-reply message")}
-    ]
-
-
-@events.observe("DomainCreated")
-def onDomainCreated(user, domain):
-    transport = Transport()
-    transport.domain = "autoreply.%s" % domain.name
-    transport.method = "autoreply:"
-    transport.save()
-
-
-@events.observe("DomainModified")
-def onDomainModified(domain):
-    if domain.oldname == domain.name:
-        return
-    Transport.objects.filter(domain="autoreply.%s" % domain.oldname) \
-        .update(domain="autoreply.%s" % domain.name)
-    for al in Alias.objects.filter(full_address__contains="@%s" % domain.oldname):
-        new_address = al.full_address.replace("@%s" % domain.oldname, "@%s" % domain.name)
-        al.full_address = new_address
-        al.autoreply_address = "%s@autoreply.%s" % (new_address, domain.name)
-        al.save()
-
-
-@events.observe("DomainDeleted")
-def onDomainDeleted(domain):
-    Transport.objects.filter(domain="autoreply.%s" % domain.name).delete()
-
-
-@events.observe("MailboxCreated")
-def onMailboxCreated(user, mailbox):
-    alias = Alias()
-    alias.full_address = mailbox.full_address
-    alias.autoreply_address = \
-        "%s@autoreply.%s" % (mailbox.full_address, mailbox.domain.name)
-    alias.save()
-
-
-@events.observe("MailboxDeleted")
-def onMailboxDeleted(mailboxes):
-    from modoboa.extensions.admin.models import Mailbox
-
-    if isinstance(mailboxes, Mailbox):
-        mailboxes = [mailboxes]
-    for mailbox in mailboxes:
-        try:
-            alias = Alias.objects.get(full_address=mailbox.full_address)
-        except Alias.DoesNotExist:
-            pass
-        else:
-            alias.delete()
-
-
-@events.observe("MailboxModified")
-def onModifyMailbox(mailbox, oldmailbox):
-    if oldmailbox.full_address == mailbox.full_address:
-        return
-    alias = Alias.objects.get(full_address=oldmailbox.full_address)
-    alias.full_address = mailbox.full_address
-    alias.autoreply_address =  \
-        "%s@autoreply.%s" % (mailbox.full_address, mailbox.domain.name)
-    alias.save()
diff --git a/modoboa/extensions/postfix_autoreply/general_callbacks.py b/modoboa/extensions/postfix_autoreply/general_callbacks.py
new file mode 100644
index 000000000..c28de5e9c
--- /dev/null
+++ b/modoboa/extensions/postfix_autoreply/general_callbacks.py
@@ -0,0 +1,87 @@
+from django.utils.translation import ugettext_lazy
+from modoboa.lib import events, parameters
+from modoboa.extensions.postfix_autoreply.models import Transport, Alias
+
+
+@events.observe("ExtraUprefsJS")
+def extra_js(user):
+    return ["""function autoreply_cb() {
+    $('#id_untildate').datepicker({format: 'yyyy-mm-dd', language: '%s'});
+}
+""" % parameters.get_user(user, "LANG", app="core")
+    ]
+
+
+@events.observe("UserMenuDisplay")
+def menu(target, user):
+    if target != "uprefs_menu":
+        return []
+    if not user.mailbox_set.count():
+        return []
+    return [
+        {"name": "autoreply",
+         "class": "ajaxlink",
+         "url": "autoreply/",
+         "label": ugettext_lazy("Auto-reply message")}
+    ]
+
+
+@events.observe("DomainCreated")
+def onDomainCreated(user, domain):
+    transport = Transport()
+    transport.domain = "autoreply.%s" % domain.name
+    transport.method = "autoreply:"
+    transport.save()
+
+
+@events.observe("DomainModified")
+def onDomainModified(domain):
+    if domain.oldname == domain.name:
+        return
+    Transport.objects.filter(domain="autoreply.%s" % domain.oldname) \
+        .update(domain="autoreply.%s" % domain.name)
+    for al in Alias.objects.filter(full_address__contains="@%s" % domain.oldname):
+        new_address = al.full_address.replace("@%s" % domain.oldname, "@%s" % domain.name)
+        al.full_address = new_address
+        al.autoreply_address = "%s@autoreply.%s" % (new_address, domain.name)
+        al.save()
+
+
+@events.observe("DomainDeleted")
+def onDomainDeleted(domain):
+    Transport.objects.filter(domain="autoreply.%s" % domain.name).delete()
+
+
+@events.observe("MailboxCreated")
+def onMailboxCreated(user, mailbox):
+    alias = Alias()
+    alias.full_address = mailbox.full_address
+    alias.autoreply_address = \
+        "%s@autoreply.%s" % (mailbox.full_address, mailbox.domain.name)
+    alias.save()
+
+
+@events.observe("MailboxDeleted")
+def onMailboxDeleted(mailboxes):
+    from modoboa.extensions.admin.models import Mailbox
+
+    if isinstance(mailboxes, Mailbox):
+        mailboxes = [mailboxes]
+    for mailbox in mailboxes:
+        try:
+            alias = Alias.objects.get(full_address=mailbox.full_address)
+        except Alias.DoesNotExist:
+            pass
+        else:
+            alias.delete()
+
+
+@events.observe("MailboxModified")
+def onModifyMailbox(mailbox, oldmailbox):
+    if oldmailbox.full_address == mailbox.full_address:
+        return
+    alias = Alias.objects.get(full_address=oldmailbox.full_address)
+    alias.full_address = mailbox.full_address
+    alias.autoreply_address =  \
+        "%s@autoreply.%s" % (mailbox.full_address, mailbox.domain.name)
+    alias.save()
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index 10aba023a..dfe3fff0d 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -1,4 +1,5 @@
 # coding: utf-8
+import sys
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext_lazy
@@ -88,10 +89,16 @@ class PostfixRelayDomains(ModoExtension):
         )
         events.declare(extension_events)
         from modoboa.extensions.postfix_relay_domains import general_callbacks
+        if 'modoboa.extensions.postfix_relay_domains.general_callbacks' in sys.modules:
+            reload(general_callbacks)
         if exts_pool.is_extension_enabled('limits'):
             import limits_callbacks
+            if 'modoboa.extensions.postfix_relay_domains.limits_callbacks' in sys.modules:
+                reload(limits_callbacks)
         if exts_pool.is_extension_enabled('amavis'):
             import amavis_callbacks
+            if 'modoboa.extensions.postfix_relay_domains.amavis_callbacks' in sys.modules:
+                reload(amavis_callbacks)
 
     def destroy(self):
         events.unregister_extension()
diff --git a/modoboa/extensions/sievefilters/__init__.py b/modoboa/extensions/sievefilters/__init__.py
index c5b88c95f..76cade1f7 100644
--- a/modoboa/extensions/sievefilters/__init__.py
+++ b/modoboa/extensions/sievefilters/__init__.py
@@ -1,6 +1,6 @@
 # coding: utf-8
-from django.utils.translation import ugettext as _, ugettext_lazy
-from django.core.urlresolvers import reverse
+import sys
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
 
@@ -16,38 +16,12 @@ class SieveFilters(ModoExtension):
         from .app_settings import ParametersForm, UserSettings
         parameters.register(ParametersForm, ugettext_lazy("Sieve filters"))
         parameters.register(UserSettings, ugettext_lazy("Message filters"))
+        from modoboa.extensions.sievefilters import general_callbacks
+        if 'modoboa.extensions.sievefilters.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
-        events.unregister("UserMenuDisplay", menu)
+        events.unregister_extension()
         parameters.unregister()
 
 exts_pool.register_extension(SieveFilters)
-
-
-@events.observe("UserMenuDisplay")
-def menu(target, user):
-    if target != "options_menu":
-        return []
-    if not user.mailbox_set.count():
-        return []
-    return [
-        {"name": "sievefilters",
-         "label": _("Message filters"),
-         "url": reverse("modoboa.extensions.sievefilters.views.index"),
-         "img": "icon-check"}
-    ]
-
-
-@events.observe("UserLogout")
-def userlogout(request):
-    from .lib import SieveClient
-
-    if not request.user.mailbox_set.count():
-        return
-    try:
-        sc = SieveClient(user=request.user.username,
-                         password=request.session["password"])
-    except Exception:
-        pass
-    else:
-        sc.logout()
diff --git a/modoboa/extensions/sievefilters/general_callbacks.py b/modoboa/extensions/sievefilters/general_callbacks.py
new file mode 100644
index 000000000..0ce7a381b
--- /dev/null
+++ b/modoboa/extensions/sievefilters/general_callbacks.py
@@ -0,0 +1,32 @@
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from modoboa.lib import events
+
+
+@events.observe("UserMenuDisplay")
+def menu(target, user):
+    if target != "options_menu":
+        return []
+    if not user.mailbox_set.count():
+        return []
+    return [
+        {"name": "sievefilters",
+         "label": _("Message filters"),
+         "url": reverse("modoboa.extensions.sievefilters.views.index"),
+         "img": "icon-check"}
+    ]
+
+
+@events.observe("UserLogout")
+def userlogout(request):
+    from .lib import SieveClient
+
+    if not request.user.mailbox_set.count():
+        return
+    try:
+        sc = SieveClient(user=request.user.username,
+                         password=request.session["password"])
+    except Exception:
+        pass
+    else:
+        sc.logout()
diff --git a/modoboa/extensions/stats/__init__.py b/modoboa/extensions/stats/__init__.py
index 7197cc01c..e08b12b55 100644
--- a/modoboa/extensions/stats/__init__.py
+++ b/modoboa/extensions/stats/__init__.py
@@ -7,8 +7,8 @@ This module provides support to retrieve statistics from postfix log :
 sent, received, bounced, rejected
 
 """
-from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext as _, ugettext_lazy
+import sys
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import events, parameters
 from modoboa.core.extensions import ModoExtension, exts_pool
 
@@ -17,7 +17,9 @@ class Stats(ModoExtension):
     name = "stats"
     label = "Statistics"
     version = "1.0"
-    description = ugettext_lazy("Graphical statistics about emails traffic using RRDtool")
+    description = ugettext_lazy(
+        "Graphical statistics about emails traffic using RRDtool"
+    )
     needs_media = True
 
     def load(self):
@@ -26,27 +28,12 @@ class Stats(ModoExtension):
         parameters.register(
             ParametersForm, ugettext_lazy("Graphical statistics")
         )
+        from modoboa.extensions.stats import general_callbacks
+        if 'modoboa.extensions.stats.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
-        events.unregister("AdminMenuDisplay", menu)
+        events.unregister_extension()
+        parameters.unregister()
 
 exts_pool.register_extension(Stats)
-
-
-@events.observe("UserMenuDisplay")
-def menu(target, user):
-    if target != "top_menu" or user.group == "SimpleUsers":
-        return []
-    return [
-        {"name": "stats",
-         "label": _("Statistics"),
-         "url": reverse('fullindex')}
-    ]
-
-
-@events.observe("GetGraphSets")
-def get_default_graph_sets():
-    from modoboa.extensions.stats.graph_templates import MailTraffic
-
-    gset = MailTraffic()
-    return {gset.html_id: gset}
diff --git a/modoboa/extensions/stats/general_callbacks.py b/modoboa/extensions/stats/general_callbacks.py
new file mode 100644
index 000000000..ced60145c
--- /dev/null
+++ b/modoboa/extensions/stats/general_callbacks.py
@@ -0,0 +1,22 @@
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from modoboa.lib import events
+
+
+@events.observe("UserMenuDisplay")
+def menu(target, user):
+    if target != "top_menu" or user.group == "SimpleUsers":
+        return []
+    return [
+        {"name": "stats",
+         "label": _("Statistics"),
+         "url": reverse('fullindex')}
+    ]
+
+
+@events.observe("GetGraphSets")
+def get_default_graph_sets():
+    from modoboa.extensions.stats.graph_templates import MailTraffic
+
+    gset = MailTraffic()
+    return {gset.html_id: gset}
diff --git a/modoboa/extensions/webmail/__init__.py b/modoboa/extensions/webmail/__init__.py
index 8b336b8b1..597f85375 100644
--- a/modoboa/extensions/webmail/__init__.py
+++ b/modoboa/extensions/webmail/__init__.py
@@ -1,4 +1,5 @@
 # coding: utf-8
+import sys
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.core.urlresolvers import reverse
 from modoboa.lib import events, parameters
@@ -17,43 +18,12 @@ class Webmail(ModoExtension):
 
         parameters.register(ParametersForm, "Webmail")
         parameters.register(UserSettings, "Webmail")
+        from modoboa.extensions.webmail import general_callbacks
+        if 'modoboa.extensions.webmail.general_callbacks' in sys.modules:
+            reload(general_callbacks)
 
     def destroy(self):
-        events.unregister("UserMenuDisplay", menu)
+        events.unregister_extension()
         parameters.unregister()
 
 exts_pool.register_extension(Webmail)
-
-
-@events.observe("UserMenuDisplay")
-def menu(target, user):
-    if target != "top_menu":
-        return []
-    if not user.mailbox_set.count():
-        return []
-    return [
-        {"name": "webmail",
-         "label": _("Webmail"),
-         "url": reverse("modoboa.extensions.webmail.views.index")},
-    ]
-
-
-@events.observe("UserLogout")
-def userlogout(request):
-    from .lib import IMAPconnector
-    from .exceptions import ImapError
-
-    if not request.user.mailbox_set.count():
-        return
-    try:
-        m = IMAPconnector(user=request.user.username,
-                          password=request.session["password"])
-    except Exception:
-        # TODO silent exception are bad : we should at least log it
-        return
-
-    # The following statement may fail under Python 2.6...
-    try:
-        m.logout()
-    except ImapError:
-        pass
diff --git a/modoboa/extensions/webmail/general_callbacks.py b/modoboa/extensions/webmail/general_callbacks.py
new file mode 100644
index 000000000..affbcf2bf
--- /dev/null
+++ b/modoboa/extensions/webmail/general_callbacks.py
@@ -0,0 +1,37 @@
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from modoboa.lib import events
+
+
+@events.observe("UserMenuDisplay")
+def menu(target, user):
+    if target != "top_menu":
+        return []
+    if not user.mailbox_set.count():
+        return []
+    return [
+        {"name": "webmail",
+         "label": _("Webmail"),
+         "url": reverse("modoboa.extensions.webmail.views.index")},
+    ]
+
+
+@events.observe("UserLogout")
+def userlogout(request):
+    from .lib import IMAPconnector
+    from .exceptions import ImapError
+
+    if not request.user.mailbox_set.count():
+        return
+    try:
+        m = IMAPconnector(user=request.user.username,
+                          password=request.session["password"])
+    except Exception:
+        # TODO silent exception are bad : we should at least log it
+        return
+
+    # The following statement may fail under Python 2.6...
+    try:
+        m.logout()
+    except ImapError:
+        pass

From c526a7c90bd6cfab043e1fd5e71b738a511dc28e Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 2 Nov 2013 15:36:18 +0100
Subject: [PATCH 13/32] wip: relay domains.

* Documentation update
* Few fixes

see #491
---
 doc/extending/events.rst                      | 455 ++++++++++++++++--
 modoboa/extensions/admin/__init__.py          |   1 -
 modoboa/extensions/admin/models/domain.py     |   4 +
 .../admin/templatetags/admin_tags.py          |  12 +-
 .../postfix_relay_domains/__init__.py         |   1 +
 .../general_callbacks.py                      |   7 -
 .../postfix_relay_domains/models.py           |   4 +
 modoboa/lib/events.py                         |   1 -
 8 files changed, 414 insertions(+), 71 deletions(-)

diff --git a/doc/extending/events.rst b/doc/extending/events.rst
index 083ed7750..69987bd59 100644
--- a/doc/extending/events.rst
+++ b/doc/extending/events.rst
@@ -11,10 +11,10 @@ Introduction
 Modoboa provides a simple API to interact with events. It understands
 two kinds of events: 
  
-* Those that return a value
-* Those that return nothing
+* Those returning a value
+* Those returning nothing
 
-Listening to a specific event is achieved as follow::
+Listening to a specific event is achieved as follows::
 
     from modoboa.lib import events
     
@@ -41,12 +41,32 @@ To stop listening to as specific event, you must use the
 
 The parameters are the same than those used with ``register``.
 
+To unregister all events declared by a specific extension, use the
+``unregister_extension`` function::
+
+  events.unregister_extension([name])
+
+``name`` is the extension's name but it is optional. Leave it empty to
+let the function guess the name.
+
 Read further to get a complete list and description of all available events.
 
 ****************
 Supported events
 ****************
 
+AccountAutoCreated
+==================
+
+Raised when a new account is automatically created (example: LDAP
+synchronization).
+
+*Callback prototype*::
+
+  def callback(account): pass
+
+* ``account`` is the newly created account (``User`` instance)
+
 AccountCreated
 ==============
 
@@ -69,6 +89,32 @@ Raised when an existing account is deleted.
 
 * ``account`` is the account that is going to be deleted
 * ``byuser`` is the adminstrator deleting ``account``
+
+AccountExported
+===============
+
+Raised when an account is exported to CSV.
+
+*Callback prototype*::
+
+  def callback(account): pass
+
+* ``account`` is the account being exported
+
+Must return a list of values to include in the export.
+
+AccountImported
+===============
+
+Raised when an account is imported from CSV.
+
+*Callback prototype*::
+
+  def callback(user, account, row): pass
+
+* ``user`` is the user importing the account
+* ``account`` is the account being imported
+* ``row`` is a list containing what remains from the CSV definition
   
 AccountModified
 ===============
@@ -127,6 +173,21 @@ Raised just before a user tries to create a new object.
 Return ``True`` or ``False`` to indicate if this user can respectively
 create or not create a new ``Domain`` object.
 
+CheckDomainName
+===============
+
+Raised before the unicity of a domain name is checked. By default,
+modoboa prevents duplicate names between domains and domain aliases
+but extensions have the possibility to extend this rule using this
+event.
+
+*Callback prototype*::
+
+  def callback(): pass
+
+Must return a list of 2uple, each one containing a model class and an
+associated label.
+
 CheckExtraAccountForm
 =====================
 
@@ -144,52 +205,6 @@ this account is concerned by a specific form.
 Callbacks listening to this event must return a list containing one
 Boolean.
 
-DomainCreated
-=============
-
-Raised when a new domain is created. 
-
-*Callback prototype*::
-
-  def callback(user, domain): pass
-
-* ``user`` corresponds to the ``User`` object creating the domain (its owner)
-* ``domain`` is a ``Domain`` instance
-
-MailboxCreated
-==============
-
-Raised when a new mailbox is created.
-
-*Callback prototype*::
-
-  def callback(user, mailbox): pass
-
-* ``user`` is the new mailbox's owner (``User`` instance)
-* ``mailbox`` is the new mailbox (``Mailbox`` instance)
-
-DomainDeleted
-=============
-
-Raised when an existing domain is about to be deleted.
-
-*Callback prototype*::
-
-  def callback(domain): pass
-
-* ``domain`` is a ``Domain`` instance
-
-MailboxDeleted
-==============
-
-Raised when an existing mailbox is about to be deleted. 
-
-*Callback prototype*::
-
-  def callback(mailbox): pass
-
-* ``mailbox`` is a ``Mailbox`` instance
-
 DomainAliasCreated
 ==================
 
@@ -213,6 +228,29 @@ Raised when an existing domain alias is about to be deleted.
 
 * ``domain_alias`` is a ``DomainAlias`` instance
 
+DomainCreated
+=============
+
+Raised when a new domain is created. 
+
+*Callback prototype*::
+
+  def callback(user, domain): pass
+
+* ``user`` corresponds to the ``User`` object creating the domain (its owner)
+* ``domain`` is a ``Domain`` instance
+
+DomainDeleted
+=============
+
+Raised when an existing domain is about to be deleted.
+
+*Callback prototype*::
+
+  def callback(domain): pass
+
+* ``domain`` is a ``Domain`` instance
+
 DomainModified
 ==============
 
@@ -223,7 +261,20 @@ Raised when a domain has been modified.
   def callback(domain): pass
 
 * ``domain`` is the modified ``Domain`` instance, it contains an extra
-  ``oldname`` field which contains the old domain name
+  ``oldname`` field which contains the old name
+
+DomainOwnershipRemoved
+======================
+
+Raised before the ownership of a domain is removed from its original
+creator.
+
+*Callback prototype*::
+
+  def callback(owner, domain): pass
+
+* ``owner`` is the original creator
+* ``domain`` is the ``Domain`` instance being modified
 
 ExtDisabled
 ===========
@@ -289,6 +340,37 @@ Let extensions add extra content into the admin panel.
 
 Callbacks listening to this event must return a list of string.
 
+ExtraDomainEntries
+==================
+
+Raised to request extra entries to display inside the *domains*
+listing.
+
+*Callback prototype*::
+
+  def callback(user, domfilter, searchquery, **extrafilters): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+* ``domfilter`` is a string indicating which domain type the user needs
+* ``searchquery`` is a string containing a search query
+* ``extrafilters`` is a set of keyword arguments that may contain additional filters
+
+Must return a valid ``QuerySet``.
+
+ExtraDomainFilters
+==================
+
+Raised to request extra filters for the *domains* listing page. For
+example, the *postfix_relay_domains* extension let users filter
+entries based on service types.
+
+*Callback prototype*::
+
+  def callback(): pass
+
+Must return a list of valid filter names (string).
+
 ExtraDomainForm
 ===============
 
@@ -304,6 +386,59 @@ tabs).
 
 * ``domain`` is the domain beeing modified (``Domain`` instance)
 
+Callbacks listening to the event must return a list of dictionnaries,
+each one must contain at least three keys::
+
+  {"id" : "<the form's id>",
+   "title" : "<the title used to present the form>",
+   "cls" : TheFormClassName}
+
+ExtraDomainImportHelp
+=====================
+
+Raised to request extra help text to display inside the domain import
+form.
+
+*Callback prototype*::
+
+  def callback(): pass
+
+Must return a list a string.
+
+ExtraDomainMenuEntries
+======================
+
+Raised to request extra entries to include in the left menu of the
+*domains* listing page.
+
+*Callback prototype*::
+
+  def callback(user): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+
+Must return a list of dictionaries. Each dictionary must contain at
+least three keys::
+
+  {"name": "<menu name>",
+   "label": "<menu label>",
+   "url": "<menu url>"}
+
+ExtraRelayDomainForm
+====================
+
+Let extensions add new forms to the relay domain edition form (the one
+with tabs).
+
+*Callback prototype*::
+
+  def callback(user, rdomain): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+* ``rdomain`` is the relay domain being modified (``RelayDomain`` instance)
+
 Callbacks listening to the event must return a list of dictionnaries,
 each one must contain at least three keys::
 
@@ -344,6 +479,24 @@ forms.
 
 * ``domain`` is the ``Domain`` instance beeing modified
 
+* ``instances`` is a dictionnary where the callback will add
+  information needed to fill a specific form
+
+FillRelayDomainInstances
+========================
+
+When a relay domain is being modified, this event is raised to fill extra
+forms.
+
+*Callback prototype*::
+
+  def callback(user, rdomain, instances): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+
+* ``rdomain`` is the ``RelayDomain`` instance being modified
+
 * ``instances`` is a dictionnary where the callback will add
   information needed to fill a specific form
 
@@ -364,6 +517,73 @@ Some places in the interface let plugins add their own announcement
 
 Callbacks listening to this event must return a list of string.
 
+GetDomainActions
+================
+
+Raised to request the list of actions available for the *domains*
+listing entry being displayed.
+
+*Callback prototype*::
+
+  def callback(user, rdomain): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+* ``rdomain`` is the ``RelayDomain`` instance being displayed
+
+Must return a list of dictionaries, each dictionary containing at
+least the following entries::
+
+  {"name": "<action name>",
+   "url": "<action url>",
+   "title": "<action title>",
+   "img": "<action icon>"}
+
+GetDomainModifyLink
+===================
+
+Raised to request the modification url of the *domains* listing entry
+being displayed.
+
+*Callback prototype*::
+
+  def callback(domain): pass
+
+* ``domain`` is a model instance (``RelayDomain`` for example)
+
+Must return a dictionary containing at least the following entry::
+
+  {'url': '<modification url>'}
+
+GetExtraLimitTemplates
+======================
+
+Raised to request extra limit templates. For example, the
+*postfix_relay_domains* extension define a template to limit the
+number of relay domains an administrator can create.
+
+*Callback prototype*::
+
+  def callback(): pass
+
+Must return a list of set. Each set must contain at least three entries::
+
+  [('<limit_name>', '<limit label>', '<limit help text>')]
+
+GetExtraParameters
+==================
+
+Raised to request extra parameters for a given parameters form.
+
+*Callback prototype*::
+
+  def callback(application, level): pass
+
+* ``application`` is the name of the form's application (ie. admin, amavis, etc.)
+* ``level`` is the form's level: ``A`` for admin or ``U`` for user
+
+Must return a dictionary. Each entry must be a valid Django form field.
+
 .. _getextraroles:
 
 GetExtraRoles
@@ -397,6 +617,27 @@ template but need javascript stuff.
 
 Callbacks listening to this event must return a list of string.
 
+ImportObject
+============
+
+Raised to request the function handling an object being imported from CSV.
+
+*Callback prototype*::
+
+  def callback(objtype): pass
+
+``objtype`` is the type of object being imported
+
+Must return a list of function. A valid import function must respect
+the following prototype::
+
+  def import_function(user, row, formopts): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+* ``row`` is a string containing the object's definition (CSV format)
+* ``formopts`` is a dictionary that may contain options
+
 MailboxAliasCreated
 ===================
 
@@ -420,8 +661,31 @@ Raised when an existing mailbox alias is about to be deleted.
 
 * ``mailbox_alias`` is an ``Alias`` instance
 
-ModifyMailbox
-=============
+MailboxCreated
+==============
+
+Raised when a new mailbox is created.
+
+*Callback prototype*::
+
+  def callback(user, mailbox): pass
+
+* ``user`` is the new mailbox's owner (``User`` instance)
+* ``mailbox`` is the new mailbox (``Mailbox`` instance)
+
+MailboxDeleted
+==============
+
+Raised when an existing mailbox is about to be deleted. 
+
+*Callback prototype*::
+
+  def callback(mailbox): pass
+
+* ``mailbox`` is a ``Mailbox`` instance
+
+MailboxModified
+===============
 
 Raised when an existing mailbox is modified. 
 
@@ -506,3 +770,90 @@ contain at least the following keys::
   {"name" : "a_name_without_spaces",
    "label" : _("The menu label"),
    "url" : reverse("your_view")}
+
+RelayDomainAliasCreated
+=======================
+
+Raised when a new relay domain alias is created.
+
+*Callback prototype*::
+
+  def callback(user, rdomain_alias): pass
+
+* ``user`` is the new relay domain alias owner (``User`` instance)
+* ``rdomain_alias`` is the new relay domain alias (``DomainAlias`` instance)
+
+RelayDomainAliasDeleted
+=======================
+
+Raised when an existing relay domain alias is about to be deleted. 
+
+*Callback prototype*::
+
+  def callback(rdomain_alias): pass
+
+* ``rdomain_alias`` is a ``RelayDomainAlias`` instance
+
+RelayDomainCreated
+==================
+
+Raised when a new relay domain is created.
+
+*Callback prototype*::
+
+  def callback(user, rdomain): pass
+
+* ``user`` corresponds to the ``User`` object creating the relay domain (its owner)
+* ``rdomain`` is a ``RelayDomain`` instance
+
+RelayDomainDeleted
+==================
+
+Raised when an existing relay domain is about to be deleted.
+
+*Callback prototype*::
+
+  def callback(rdomain): pass
+
+* ``rdomain`` is a ``RelayDomain`` instance
+
+RelayDomainModified
+===================
+
+Raised when a relay domain has been modified.
+
+*Callback prototype*::
+
+  def callback(rdomain): pass
+
+* ``rdomain`` is the modified ``RelayDomain`` instance, it contains an
+   extra ``oldname`` field which contains the old name
+
+RoleChanged
+===========
+
+Raised when the role of an account is about to be changed.
+
+*Callback prototype*::
+
+  def callback(account, role): pass
+
+* ``account`` is the account being modified
+* ``role`` is the new role (string)
+
+UserCanSetRole
+==============
+
+Raised to check if a user is allowed to set a given role to an
+account.
+
+*Callback prototype*::
+
+  def callback(account, role): pass
+
+* ``user`` is the ``User`` instance corresponding to the currently
+  logged in user
+* ``role`` is the role ``user`` tries to set
+
+Must return a list containing ``True`` or ``False`` to indicate if
+this user can is allowed to set ``role``.
diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py
index 0589b630b..8a7629a80 100644
--- a/modoboa/extensions/admin/__init__.py
+++ b/modoboa/extensions/admin/__init__.py
@@ -19,7 +19,6 @@ admin_events = [
     "ExtraDomainFilters",
     "GetDomainActions",
     "GetDomainModifyLink",
-    "GetDomainAliasQuerySet",
     "CheckDomainName",
 
     "DomainAliasCreated",
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index 70166b9b4..95940dda6 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -70,6 +70,10 @@ class Domain(AdminObject):
         """
         return [oa.user for oa in self.owners.filter(user__is_superuser=False)]
 
+    @property
+    def aliases(self):
+        return self.domainalias_set
+
     def add_admin(self, account):
         """Add a new administrator for this domain
 
diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py
index 7b9a7c5f7..3f934ddce 100644
--- a/modoboa/extensions/admin/templatetags/admin_tags.py
+++ b/modoboa/extensions/admin/templatetags/admin_tags.py
@@ -194,18 +194,10 @@ def domain_aliases(domain):
     :param domain:
     :rtype: str
     """
-    if domain.__class__.__name__ == "Domain":
-        qset = domain.domainalias_set
-    else:
-        qset = events.raiseQueryEvent('GetDomainAliasQuerySet', domain)
-        if not qset:
-            return '---'
-        qset = qset[0]
-
-    if not qset.count():
+    if not domain.aliases.count():
         return '---'
     res = ''
-    for alias in qset.all():
+    for alias in domain.aliases.all():
         res += '%s<br/>' % alias.name
     return res
 
diff --git a/modoboa/extensions/postfix_relay_domains/__init__.py b/modoboa/extensions/postfix_relay_domains/__init__.py
index dfe3fff0d..d3451781e 100644
--- a/modoboa/extensions/postfix_relay_domains/__init__.py
+++ b/modoboa/extensions/postfix_relay_domains/__init__.py
@@ -10,6 +10,7 @@ from .models import RelayDomain, RelayDomainAlias, Service
 extension_events = [
     "RelayDomainCreated",
     "RelayDomainDeleted",
+    "RelayDomainModified",
     "RelayDomainAliasCreated",
     "RelayDomainAliasDeleted",
     "ExtraRelayDomainForm",
diff --git a/modoboa/extensions/postfix_relay_domains/general_callbacks.py b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
index d7fa11bc6..6c9861d36 100644
--- a/modoboa/extensions/postfix_relay_domains/general_callbacks.py
+++ b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
@@ -71,13 +71,6 @@ def rdomain_modify_link(domain):
     }
 
 
-@events.observe('GetDomainAliasQuerySet')
-def get_da_query_set(domain):
-    if domain.__class__.__name__ != 'RelayDomain':
-        return []
-    return [domain.relaydomainalias_set]
-
-
 @events.observe('GetDomainActions')
 def rdomain_actions(user, domain):
     if not isinstance(domain, RelayDomain):
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 1c45cbffb..360810cb3 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -105,6 +105,10 @@ class RelayDomain(AdminObject):
              "type": "srv", "color": "info"}
         ]
 
+    @property
+    def aliases(self):
+        return self.relaydomainalias_set
+
     def __str__(self):
         return self.name
 
diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py
index cf565e370..e5baac544 100644
--- a/modoboa/lib/events.py
+++ b/modoboa/lib/events.py
@@ -125,7 +125,6 @@ def unregister_extension(extension=None):
     """
     if extension is None:
         extension = guess_extension_name()
-    print extension
     for evt, values in callbacks.items():
         for name in values.keys():
             if extension in name:

From e8f59ecf7b51c81177ef874c5bb09ae70fae6d19 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 2 Nov 2013 15:50:12 +0100
Subject: [PATCH 14/32] wip: relay domains.

Documentation update.

see #491
---
 doc/getting_started/plugins.rst | 14 ++++++++++++++
 doc/getting_started/upgrade.rst |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/doc/getting_started/plugins.rst b/doc/getting_started/plugins.rst
index cb47c879f..1bc6c2def 100644
--- a/doc/getting_started/plugins.rst
+++ b/doc/getting_started/plugins.rst
@@ -32,6 +32,20 @@ associated value to -1.
 Default limits applied to new administrators can be changed through
 the *Modoboa > Parameters > Limits* page.
 
+*****************************
+Postfix relay domains support
+*****************************
+
+This plugin adds the support for relay domains using postfix. This
+feature is useful when the MTA managed by Modoboa is not the final
+destination of one or many domains.
+
+If activated, two new objects will be available from the *domains*
+listing page: *relay domain* and *relay domain alias*.
+
+This extension is compatible with the *amavis* and *limits*
+ones. Resellers will be able to create both new objects.
+
 .. _amavis_frontend:
 
 ********************
diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst
index dfde23e49..d5c6e1583 100644
--- a/doc/getting_started/upgrade.rst
+++ b/doc/getting_started/upgrade.rst
@@ -53,6 +53,9 @@ Finally, follow the common procedure::
 1.1.0: FIXME
 ============
 
+#. Add ``'modoboa.extensions.postfix_relay_domains'`` to
+ ``MODOBOA_APPS``
+
 Due to code refactoring, some modifications need to be done into
 :file:`settings.py`:
 

From c9103bd0e03e936e74b22293bfc129e76e068e90 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 4 Nov 2013 09:29:59 +0100
Subject: [PATCH 15/32] I forgot those modifications from 1.0.1 :p

---
 modoboa/core/__init__.py       |  2 +-
 modoboa/core/app_settings.py   | 13 ++++++++++---
 modoboa/core/views/auth.py     |  2 +-
 modoboa/lib/fixtures/demo.json |  2 +-
 modoboa/lib/webutils.py        | 16 +++++-----------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py
index 824c49add..544b3a1b3 100644
--- a/modoboa/core/__init__.py
+++ b/modoboa/core/__init__.py
@@ -52,4 +52,4 @@ def unset_default_topredirection(extension):
     """
     topredirection = parameters.get_admin("DEFAULT_TOP_REDIRECTION")
     if topredirection == extension.name:
-        parameters.save_admin("DEFAULT_TOP_REDIRECTION", "userprefs")
+        parameters.save_admin("DEFAULT_TOP_REDIRECTION", "core")
diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py
index 9acfafae5..543672102 100644
--- a/modoboa/core/app_settings.py
+++ b/modoboa/core/app_settings.py
@@ -19,7 +19,7 @@ def enabled_applications():
     from modoboa.core.models import Extension
     from modoboa.lib.dbutils import db_table_exists
 
-    result = [("core", "core")]
+    result = [("user", "user")]
     if db_table_exists("core_extension"):
         exts = Extension.objects.filter(enabled=True)
         result += [(ext.name, ext.name) for ext in exts]
@@ -98,7 +98,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         label=ugettext_lazy("Bind password"),
         initial='',
         help_text=ugettext_lazy("The password to use when binding to the LDAP server (with 'Bind DN')"),
-        widget=forms.PasswordInput,
+        widget=forms.PasswordInput(render_value=True),
         required=False
     )
 
@@ -152,7 +152,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
     default_top_redirection = forms.ChoiceField(
         label=ugettext_lazy("Default top redirection"),
         choices=[],
-        initial="core",
+        initial="user",
         help_text=ugettext_lazy("The default redirection used when no application is specified")
     )
 
@@ -176,6 +176,13 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         super(GeneralParametersForm, self).__init__(*args, **kwargs)
         self.fields["default_top_redirection"].choices = enabled_applications()
 
+    def clean_secret_key(self):
+        if len(self.cleaned_data["secret_key"]) not in [16, 24, 32]:
+            raise forms.ValidationError(
+                _("Key must be either 16, 24, or 32 bytes long")
+            )
+        return self.cleaned_data["secret_key"]
+
     def clean_ldap_user_dn_template(self):
         tpl = self.cleaned_data["ldap_user_dn_template"]
         try:
diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py
index f4d132d9e..67eb3f973 100644
--- a/modoboa/core/views/auth.py
+++ b/modoboa/core/views/auth.py
@@ -35,7 +35,7 @@ def dologin(request):
 
                 nextlocation = request.POST.get("next", None)
                 if nextlocation is None or nextlocation == "None":
-                    if user.group != "SimpleUsers":
+                    if user.group == "SimpleUsers":
                         nextlocation = reverse("modoboa.lib.webutils.topredirection")
                     else:
                         nextlocation = reverse("domains")
diff --git a/modoboa/lib/fixtures/demo.json b/modoboa/lib/fixtures/demo.json
index d155e29d7..046dd26f0 100644
--- a/modoboa/lib/fixtures/demo.json
+++ b/modoboa/lib/fixtures/demo.json
@@ -20,7 +20,7 @@
         "model": "lib.parameter",
         "fields": {
             "name": "general.DEFAULT_TOP_REDIRECTION",
-            "value": "userprefs"
+            "value": "user"
         }
     },
     {
diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py
index aa47ea23e..f85c90ecb 100644
--- a/modoboa/lib/webutils.py
+++ b/modoboa/lib/webutils.py
@@ -138,27 +138,21 @@ def size2integer(value):
 
 @login_required
 def topredirection(request):
-    """Simple view to redirect the request when no application is specified
+    """Simple view to redirect the request when no application is specified.
 
     The default "top redirection" can be specified in the *Admin >
     Settings* panel. It is the application that will be launched by
     default. Users that are not allowed to access this application
     will be redirected to the "User preferences" application.
 
+    This feature only applies to simple users.
+
     :param request: a Request object
     """
     from modoboa.lib import parameters
     from modoboa.core.extensions import exts_pool
 
     topredir = parameters.get_admin("DEFAULT_TOP_REDIRECTION", app="core")
-    if not topredir in ["core"]:
-        infos = exts_pool.get_extension_infos(topredir)
-        path = infos["url"] if infos["url"] else infos["name"]
-    else:
-        path = "admin"  # topredir
-
-    if topredir in ["core", "stats"] and \
-            request.user.belongs_to_group('SimpleUsers'):
-        path = "userprefs"
-
+    infos = exts_pool.get_extension_infos(topredir)
+    path = infos["url"] if infos["url"] else infos["name"]
     return HttpResponseRedirect(path)

From 91ce9c5f5cd96b8919817b6d65196005aedb41a3 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 4 Nov 2013 10:27:28 +0100
Subject: [PATCH 16/32] Don't propose all extensions for top redirection.

---
 modoboa/core/app_settings.py                | 6 +++++-
 modoboa/core/extensions.py                  | 1 +
 modoboa/extensions/amavis/__init__.py       | 1 +
 modoboa/extensions/sievefilters/__init__.py | 1 +
 modoboa/extensions/webmail/__init__.py      | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py
index 543672102..edb9bfe48 100644
--- a/modoboa/core/app_settings.py
+++ b/modoboa/core/app_settings.py
@@ -17,12 +17,16 @@ def enabled_applications():
     :return: a list
     """
     from modoboa.core.models import Extension
+    from modoboa.core.extensions import exts_pool
     from modoboa.lib.dbutils import db_table_exists
 
     result = [("user", "user")]
     if db_table_exists("core_extension"):
         exts = Extension.objects.filter(enabled=True)
-        result += [(ext.name, ext.name) for ext in exts]
+        for ext in exts:
+            extclass = exts_pool.get_extension(ext.name)
+            if extclass.available_for_topredirection:
+                result.append((ext.name, ext.name))
     return sorted(result, key=lambda e: e[0])
 
 
diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py
index 4b399bd24..1eedc56a8 100644
--- a/modoboa/core/extensions.py
+++ b/modoboa/core/extensions.py
@@ -15,6 +15,7 @@ class ModoExtension(object):
     url = None
     needs_media = False
     always_active = False
+    available_for_topredirection = False
 
     def infos(self):
         return dict(
diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index 9abc912ed..8a85d646c 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -21,6 +21,7 @@ class Amavis(ModoExtension):
     version = "1.0"
     description = ugettext_lazy("Simple amavis management frontend")
     url = "quarantine"
+    available_for_topredirection = True
 
     def init(self):
         """Init function
diff --git a/modoboa/extensions/sievefilters/__init__.py b/modoboa/extensions/sievefilters/__init__.py
index c5b88c95f..a6e437c6c 100644
--- a/modoboa/extensions/sievefilters/__init__.py
+++ b/modoboa/extensions/sievefilters/__init__.py
@@ -11,6 +11,7 @@ class SieveFilters(ModoExtension):
     version = "1.0"
     description = ugettext_lazy("Plugin to easily create server-side filters")
     url = "sfilters"
+    available_for_topredirection = True
 
     def load(self):
         from .app_settings import ParametersForm, UserSettings
diff --git a/modoboa/extensions/webmail/__init__.py b/modoboa/extensions/webmail/__init__.py
index 8b336b8b1..d673156f0 100644
--- a/modoboa/extensions/webmail/__init__.py
+++ b/modoboa/extensions/webmail/__init__.py
@@ -11,6 +11,7 @@ class Webmail(ModoExtension):
     version = "1.0"
     description = ugettext_lazy("Simple IMAP webmail")
     needs_media = True
+    available_for_topredirection = True
 
     def load(self):
         from .app_settings import ParametersForm, UserSettings

From 77e5d754fbf7beb49357a23aa383ce30136234cd Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 4 Nov 2013 10:35:43 +0100
Subject: [PATCH 17/32] Display help messages on 'hover' event.

fixes #492
---
 modoboa/static/js/global.js      | 5 +++--
 modoboa/static/js/twocols_nav.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index d58a2a1d4..0e7d05a52 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -45,7 +45,8 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         $div.modal({show: false});
         $div.one('shown', function() {
             $(".help").popover({
-                container: "#modalbox"
+                container: "#modalbox",
+                trigger: "hover"
             }).click(function(e) {e.preventDefault();});
             if (modalcb != undefined) {
                 if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
@@ -253,5 +254,5 @@ $(document).ready(function() {
     $(document).on('click', 'a[data-toggle="ajaxmodal"]', modalbox);
     $(document).on('click', 'a[data-toggle="ajaxmodal-autowidth"]', modalbox_autowidth);
     $(document).on('click', '.activator', activate_widget);
-    $(".help").popover().click(function(e) {e.preventDefault();});
+    $(".help").popover({trigger: 'hover'}).click(function(e) {e.preventDefault();});
 });
\ No newline at end of file
diff --git a/modoboa/static/js/twocols_nav.js b/modoboa/static/js/twocols_nav.js
index d8d3ed337..ba1d994c4 100644
--- a/modoboa/static/js/twocols_nav.js
+++ b/modoboa/static/js/twocols_nav.js
@@ -75,7 +75,7 @@ TwocolsNav.prototype = {
         $('#' + this.options.divid + ' input[type=radio]').click($.proxy(this.radio_clicked, this));
         $(".help").popover({
             placement: 'bottom',
-            trigger: 'click'
+            trigger: 'hover'
         }).click(function(e) {e.preventDefault();});
         $('#' + this.options.divid + ' select').change();
         $('#' + this.options.divid + ' input[type=radio]:checked').click();

From 14a026e2bf0b4b14189acb767949883eaf953482 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 10:55:22 +0100
Subject: [PATCH 18/32] Properly display sieve filter errors.

---
 .../templates/sievefilters/index.html         | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index 817d6fd51..a8442ffab 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -14,6 +14,27 @@ var history = new History({
 var cond_templates = null;
 var action_templates = null;
 
+function display_form_errors(data) {
+    $.each(data.form_errors, function(id, value) {
+        var fullid = "id_" + (data.prefix ? data.prefix + "-" : "") + id;
+        var $widget = $("#" + formid + " #" + fullid);
+        var ulid = fullid + "-error";
+        var $ul = $("#" + ulid);
+
+        if (!$ul.length) {
+            $ul = $("<span />", {
+                "class": "errors",
+                "id": ulid
+            }).append($("<li />", {
+                html: value[0]
+            });
+            $widget.after($ul);
+        } else {
+            $ul.find('li').html(value[0]);
+        }
+    });
+}
+
 function filterform_cb() {
     cond_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'condition' %}", cond_templates);
     action_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'action' %}", action_templates);
@@ -40,7 +61,8 @@ function filterform_cb() {
         simple_ajax_form_post(e, {
             formid: 'filterform',
             reload_mode: 'history',
-            extradata: counters
+            extradata: counters,
+            error_cb: display_filter_errors
         });
     });
 }

From d9650a3dca7373aa9a719f3e8357588a02a905f3 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 10:58:29 +0100
Subject: [PATCH 19/32] It seems I pushed the wrong version :p

---
 .../templates/sievefilters/index.html         | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index a8442ffab..63ac35146 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -14,24 +14,22 @@ var history = new History({
 var cond_templates = null;
 var action_templates = null;
 
-function display_form_errors(data) {
+function display_filter_errors(data) {
+    $("ul.errors").remove();
     $.each(data.form_errors, function(id, value) {
-        var fullid = "id_" + (data.prefix ? data.prefix + "-" : "") + id;
-        var $widget = $("#" + formid + " #" + fullid);
-        var ulid = fullid + "-error";
-        var $ul = $("#" + ulid);
-
-        if (!$ul.length) {
-            $ul = $("<span />", {
-                "class": "errors",
-                "id": ulid
-            }).append($("<li />", {
-                html: value[0]
-            });
-            $widget.after($ul);
-        } else {
-            $ul.find('li').html(value[0]);
+        if (id.indexOf('cond') && id.indexOf('action')) {
+            return;                     
         }
+        var fullid = "id_" + (data.prefix ? data.prefix + "-" : "") + id;
+        var $widget = $("#" + fullid);
+        var ulid = fullid + "-error";
+        var $ul = $("<ul />", {
+            "class": "errors",
+            "id": ulid
+        }).append($("<li />", {
+            html: value[0]
+        }));
+        $widget.after($ul);
     });
 }
 

From e62a4c426dedf562b763864772e0398d5044a4e3 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 11:01:05 +0100
Subject: [PATCH 20/32] Replace old occurences of 'admin_user' by 'core_user'.

---
 doc/integration/imap_and_smtp.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst
index a8df706ba..2c90a9fe5 100644
--- a/doc/integration/imap_and_smtp.rst
+++ b/doc/integration/imap_and_smtp.rst
@@ -136,11 +136,11 @@ MySQL users
 
   default_pass_scheme = CRYPT
 
-  password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active=1
+  password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active=1
 
   user_query = SELECT '<mailboxes storage directory>/%d/%n' AS home, <uid> as uid, <gid> as gid, concat('*:bytes=', mb.quota, 'M') AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d'
 
-  iterate_query = SELECT email AS username FROM admin_user
+  iterate_query = SELECT email AS username FROM core_user
 
 .. _dovecot_pg_queries:
 
@@ -155,11 +155,11 @@ PostgreSQL users
 
   default_pass_scheme = CRYPT
 
-  password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active
+  password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active
 
   user_query = SELECT '<mailboxes storage directory>/%d/%n' AS home, <uid> as uid, <gid> as gid, '*:bytes=' || mb.quota || 'M' AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d'
 
-  iterate_query = SELECT email AS username FROM admin_user
+  iterate_query = SELECT email AS username FROM core_user
 
 SQLite users
 ------------
@@ -172,11 +172,11 @@ SQLite users
 
   default_pass_scheme = CRYPT
 
-  password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active=1
+  password_query = SELECT email AS user, password FROM core_user WHERE email='%u' and is_active=1
 
   user_query = SELECT '<mailboxes storage directory>/%d/%n' AS home, <uid> as uid, <gid> as gid, ('*:bytes=' || mb.quota || 'M') AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d'
 
-  iterate_query = SELECT email AS username FROM admin_user
+  iterate_query = SELECT email AS username FROM core_user
 
 .. note::
 
@@ -323,7 +323,7 @@ work for Modoboa. You should use the following one instead:
   DECLARE
     mboxid INTEGER;
   BEGIN
-    SELECT admin_mailbox.id INTO STRICT mboxid FROM admin_mailbox INNER JOIN admin_user ON admin_mailbox.user_id=admin_user.id WHERE admin_user.username=NEW.username;
+    SELECT admin_mailbox.id INTO STRICT mboxid FROM admin_mailbox INNER JOIN core_user ON admin_mailbox.user_id=core_user.id WHERE core_user.username=NEW.username;
     UPDATE admin_quota SET mbox_id = mboxid
       WHERE username = NEW.username;
     RETURN NULL;

From e5fba5541d4b509a9969cf2b68d8ce7ea8ebfabe Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 11:09:25 +0100
Subject: [PATCH 21/32] Execute all unit tests.

---
 tests/install_from_scratch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index 50e03947c..63dec55cd 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -23,7 +23,7 @@ class DeployTest(unittest.TestCase):
 
     def tearDown(self):
         path = os.path.join(self.workdir, self.projname)
-        code, output = exec_cmd("python manage.py test admin", cwd=path)
+        code, output = exec_cmd("python manage.py test lib admin limits", cwd=path)
         self.assertEqual(code, 0)
 
         if hasattr(self, "workdir"):

From 1fc330c28a65ec171008719f04f87f8c4684ed11 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 13:50:45 +0100
Subject: [PATCH 22/32] Adding Travis support.

---
 .travis.yml                   | 15 +++++++++++++++
 tests/install_from_scratch.py | 16 +++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..df07ef804
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+
+services: mysql
+
+install: 
+  - python setup.py -q install
+
+before_script:
+  - mysql -e 'create database modoboa_test;'
+
+script: 
+  - PYTHONPATH=tests python -m unittest install_from_scratch
diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index 63dec55cd..c166fdb09 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -12,27 +12,17 @@ class DeployTest(unittest.TestCase):
     dbtype = "mysql"
     dbhost = "localhost"
     projname = "modoboa_test"
-    dbuser = "root"
-    dbpassword = "toto"
+    dbuser = "travis"
+    dbpassword = ""
 
     def setUp(self):
-        cmd = "mysqladmin -u %s -p%s create %s" % (self.dbuser, self.dbpassword, self.projname)
-        code, out = exec_cmd(cmd)
-        self.assertEqual(code, 0)
         self.workdir = tempfile.mkdtemp()
 
     def tearDown(self):
         path = os.path.join(self.workdir, self.projname)
-        code, output = exec_cmd("python manage.py test lib admin limits", cwd=path)
+        code, output = exec_cmd("python manage.py test lib admin limits postfix_relay_domains", cwd=path)
         self.assertEqual(code, 0)
 
-        if hasattr(self, "workdir"):
-           shutil.rmtree(self.workdir)
-        child = pexpect.spawn("mysqladmin -u root -p%s drop %s" % (self.dbpassword, self.projname))
-        child.expect("\[y/N\]")
-        child.sendline("y")
-        child.expect('Database "%s" dropped' % self.projname)
-
     def test_standard(self):
         timeout = 2
         cmd = "modoboa-admin.py deploy --syncdb --collectstatic %s" % self.projname

From bf3fe869f6d915ff90ba7d3ebc0d78776c75351d Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 16:29:15 +0100
Subject: [PATCH 23/32] Fixing unit tests.

---
 .travis.yml                                   |  1 +
 .../core/commands/templates/settings.py.tpl   |  1 +
 modoboa/core/views/admin.py                   |  2 +-
 modoboa/extensions/limits/models.py           |  7 +++++--
 modoboa/extensions/limits/tests.py            |  7 ++-----
 .../extensions/postfix_relay_domains/tests.py | 19 +++++++++++++++----
 modoboa/lib/tests.py                          | 11 ++++++++---
 7 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df07ef804..2aba856e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ services: mysql
 
 install: 
   - python setup.py -q install
+  - pip install -q pexpect
 
 before_script:
   - mysql -e 'create database modoboa_test;'
diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index f86ad1e39..710c6c96a 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -155,6 +155,7 @@ MODOBOA_APPS = (
     # Modoboa extensions here.
     'modoboa.extensions.admin',
     'modoboa.extensions.limits',
+    'modoboa.extensions.postfix_relay_domains',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
     'modoboa.extensions.stats',
diff --git a/modoboa/core/views/admin.py b/modoboa/core/views/admin.py
index 071e1091a..26f97e0a9 100644
--- a/modoboa/core/views/admin.py
+++ b/modoboa/core/views/admin.py
@@ -78,7 +78,7 @@ def saveextensions(request):
     for k in request.POST.keys():
         if k.startswith("select_"):
             parts = k.split("_", 1)
-            dbext = Extension.objects.get(name=parts[1])            
+            dbext = Extension.objects.get(name=parts[1])
             if not dbext in actived_exts:
                 dbext.on()
             else:
diff --git a/modoboa/extensions/limits/models.py b/modoboa/extensions/limits/models.py
index c249aa27b..21f4e7b32 100644
--- a/modoboa/extensions/limits/models.py
+++ b/modoboa/extensions/limits/models.py
@@ -10,7 +10,7 @@ from modoboa.lib import events
 class LimitTemplates(Singleton):
 
     def __init__(self):
-        self.templates = [
+        self.__templates = [
             ("domain_admins_limit", ugettext_lazy("Domain admins"),
              ugettext_lazy("Maximum number of domain administrators this user can create"),
              'Resellers'),
@@ -25,7 +25,10 @@ class LimitTemplates(Singleton):
             ("mailbox_aliases_limit", ugettext_lazy("Mailbox aliases"),
              ugettext_lazy("Maximum number of mailbox aliases this user can create"))
         ]
-        self.templates += events.raiseQueryEvent('GetExtraLimitTemplates')
+    
+    @property
+    def templates(self):
+        return self.__templates + events.raiseQueryEvent('GetExtraLimitTemplates')
 
 
 class LimitsPool(models.Model):
diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py
index ccef3e3b6..cf529f8ae 100644
--- a/modoboa/extensions/limits/tests.py
+++ b/modoboa/extensions/limits/tests.py
@@ -12,10 +12,10 @@ from modoboa.extensions.limits.models import LimitTemplates
 
 class PermissionsTestCase(ExtTestCase):
     fixtures = ["initial_users.json"]
-    names = ["limits"]
 
     def setUp(self):
         super(PermissionsTestCase, self).setUp()
+        self.activate_extensions('limits')
         populate_database()
 
     def test_domainadmin_deletes_reseller(self):
@@ -41,7 +41,6 @@ class PermissionsTestCase(ExtTestCase):
 
 class ResourceTestCase(ExtTestCase):
     fixtures = ["initial_users.json"]
-    names = ["limits"]
 
     def setUp(self):
         """Custom setUp method.
@@ -49,10 +48,8 @@ class ResourceTestCase(ExtTestCase):
         The 'limits' is manually loaded to ensure extra parameters
         provided by 'postfix_relay_domains' are properly received.
         """
-        from modoboa.core.extensions import exts_pool
-
         super(ResourceTestCase, self).setUp()
-        exts_pool.get_extension('limits').load()
+        self.activate_extensions('limits')
         for tpl in LimitTemplates().templates:
             parameters.save_admin('DEFLT_%s' % tpl[0].upper(), 2, app='limits')
         populate_database()
diff --git a/modoboa/extensions/postfix_relay_domains/tests.py b/modoboa/extensions/postfix_relay_domains/tests.py
index 1361a757a..9598f5a1f 100644
--- a/modoboa/extensions/postfix_relay_domains/tests.py
+++ b/modoboa/extensions/postfix_relay_domains/tests.py
@@ -1,5 +1,6 @@
 from django.core.urlresolvers import reverse
 from modoboa.core.factories import UserFactory
+from modoboa.lib import parameters
 from modoboa.lib.tests import ExtTestCase
 from modoboa.extensions.admin import factories
 from modoboa.extensions.limits.tests import ResourceTestCase
@@ -40,13 +41,18 @@ class Operations(object):
             values, status
         )
 
+    def _check_limit(self, name, curvalue, maxvalue):
+        l = self.user.limitspool.get_limit('%s_limit' % name)
+        self.assertEqual(l.curvalue, curvalue)
+        self.assertEqual(l.maxvalue, maxvalue)
+
 
 class RelayDomainsTestCase(ExtTestCase, Operations):
     fixtures = ['initial_users.json']
-    names = ['postfix_relay_domains']
 
     def setUp(self):
         super(RelayDomainsTestCase, self).setUp()
+        self.activate_extensions('postfix_relay_domains')
         factories.populate_database()
         self.rdom = RelayDomainFactory(name='relaydomain.tld')
         RelayDomainAliasFactory(name='relaydomainalias.tld', target=self.rdom)
@@ -156,12 +162,17 @@ class RelayDomainsTestCase(ExtTestCase, Operations):
             RelayDomain.objects.get(name='relaydomainalias.tld')
 
 
-class LimitsTestCase(ResourceTestCase, Operations):
-    names = ['limits', 'postfix_relay_domains']
+class LimitsTestCase(ExtTestCase, Operations):
+    fixtures = ['initial_users.json']
 
     def setUp(self):
         super(LimitsTestCase, self).setUp()
-        self.user = UserFactory(
+        from modoboa.extensions.limits.models import LimitTemplates
+
+        self.activate_extensions('limits', 'postfix_relay_domains')
+        for tpl in LimitTemplates().templates:
+            parameters.save_admin('DEFLT_%s' % tpl[0].upper(), 2, app='limits')
+        self.user = UserFactory.create(
             username='reseller', groups=('Resellers',)
         )
         self.clt.logout()
diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py
index 3ad5f2007..50fef9bc0 100644
--- a/modoboa/lib/tests.py
+++ b/modoboa/lib/tests.py
@@ -27,15 +27,20 @@ class ModoTestCase(TestCase):
 
 
 class ExtTestCase(ModoTestCase):
-    names = []
 
     def setUp(self, *args, **kwargs):
         super(ExtTestCase, self).setUp(*args, **kwargs)
         self.clt.get(reverse("modoboa.core.views.admin.viewextensions"))
-        self.clt.post(
+
+    def activate_extensions(self, *names):
+        from modoboa.core.extensions import exts_pool
+
+        self.ajax_post(
             reverse("modoboa.core.views.admin.saveextensions"),
-            dict(("select_%s" % name, "1") for name in self.names)
+            dict(("select_%s" % name, "1") for name in names)
         )
+        for name in names:
+            exts_pool.get_extension(name).load()
 
 
 class TestParams(parameters.AdminParametersForm):

From 7b636cb95b13e2f3ae50029e444b408fdd537493 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 17:02:46 +0100
Subject: [PATCH 24/32] Try with only one silent test.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2aba856e1..d96e78284 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ before_script:
   - mysql -e 'create database modoboa_test;'
 
 script: 
-  - PYTHONPATH=tests python -m unittest install_from_scratch
+  - PYTHONPATH=tests python -m unittest install_from_scratch.DeployTest.test_silent

From 2c2e4fc95b97d4f1fb95551d0133fad698cb5f80 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 18:38:21 +0100
Subject: [PATCH 25/32] Adding debug.

---
 .travis.yml                   | 2 --
 tests/install_from_scratch.py | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d96e78284..0e31043e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ python:
   - "2.6"
   - "2.7"
 
-services: mysql
-
 install: 
   - python setup.py -q install
   - pip install -q pexpect
diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index c166fdb09..bf1ea336d 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -21,6 +21,7 @@ class DeployTest(unittest.TestCase):
     def tearDown(self):
         path = os.path.join(self.workdir, self.projname)
         code, output = exec_cmd("python manage.py test lib admin limits postfix_relay_domains", cwd=path)
+        print output
         self.assertEqual(code, 0)
 
     def test_standard(self):

From d295613ae68278691f2bdffd07b381b55bf1386d Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 19:18:18 +0100
Subject: [PATCH 26/32] Fix Django version.

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e31043e9..b5e95c1cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,13 @@ python:
   - "2.6"
   - "2.7"
 
-install: 
+env:
+  - DJANGO=1.5
+
+install:
+  - pip install -q Django==$DJANGO --use-mirrors
   - python setup.py -q install
-  - pip install -q pexpect
+  - pip install -q pexpect --use-mirrors
 
 before_script:
   - mysql -e 'create database modoboa_test;'

From 623b9fec03aa6f54791dec6d916dc876b05c2fee Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 19:22:46 +0100
Subject: [PATCH 27/32] Domain aliases support for amavis.

fixes #494
---
 modoboa/extensions/amavis/__init__.py         |  14 +-
 .../extensions/amavis/general_callbacks.py    |  13 +-
 .../amavis/migrations/0002_create_records.py  |   9 +-
 .../0003_create_domalias_records.py           | 269 ++++++++++++++++++
 4 files changed, 297 insertions(+), 8 deletions(-)
 create mode 100644 modoboa/extensions/amavis/migrations/0003_create_domalias_records.py

diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index 4378ae222..552e006dd 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -29,15 +29,21 @@ class Amavis(ModoExtension):
         for existing domains to let Amavis consider them local.
         """
         from modoboa.extensions.admin.models import Domain
-        from .models import Users, Policy
+        from modoboa.extensions.amavis.models import Users
+        from modoboa.extensions.amavis.lib import (
+            create_user_and_policy, create_user_and_use_policy
+        )
 
         for dom in Domain.objects.all():
             try:
                 Users.objects.get(email="@%s" % dom.name)
             except Users.DoesNotExist:
-                p = Policy.objects.create(policy_name=dom.name)
-                Users.objects.create(email="@%s" % dom.name, fullname=dom.name,
-                                     priority=7, policy=p)
+                create_user_and_policy(dom.name)
+            for domalias in dom.domainalias_set.all():
+                try:
+                    Users.objects.get(email='@%s' % domalias.name)
+                except Users.DoesNotExist:
+                    create_user_and_use_policy(domalias.name, dom.name)
 
     def load(self):
         from .app_settings import ParametersForm, UserSettings
diff --git a/modoboa/extensions/amavis/general_callbacks.py b/modoboa/extensions/amavis/general_callbacks.py
index 29366aa3a..558b2355b 100644
--- a/modoboa/extensions/amavis/general_callbacks.py
+++ b/modoboa/extensions/amavis/general_callbacks.py
@@ -4,7 +4,8 @@ from django.template import Template, Context
 
 from modoboa.lib import events, parameters
 from modoboa.extensions.amavis.lib import (
-    create_user_and_policy, update_user_and_policy, delete_user_and_policy
+    create_user_and_policy, update_user_and_policy, delete_user_and_policy,
+    create_user_and_use_policy, delete_user
 )
 
 
@@ -34,6 +35,16 @@ def on_domain_deleted(domain):
     delete_user_and_policy(domain.name)
 
 
+@events.observe("DomainAliasCreated")
+def on_relay_domain_alias_created(user, domainalias):
+    create_user_and_use_policy(domainalias.name, domainalias.target.name)
+
+
+@events.observe("DomainAliasDeleted")
+def on_relay_domain_alias_deleted(domainalias):
+    delete_user(domainalias.name)
+
+
 @events.observe("GetStaticContent")
 def extra_static_content(caller, user):
     if user.group == "SimpleUsers":
diff --git a/modoboa/extensions/amavis/migrations/0002_create_records.py b/modoboa/extensions/amavis/migrations/0002_create_records.py
index a9447f2e3..ba2c3ccf2 100644
--- a/modoboa/extensions/amavis/migrations/0002_create_records.py
+++ b/modoboa/extensions/amavis/migrations/0002_create_records.py
@@ -10,9 +10,12 @@ class Migration(DataMigration):
     def forwards(self, orm):
         "Write your forwards methods here."
         orm["amavis.Users"].objects.all().delete()
-        orm["amavis.Policy"].objects.create(id=1, policy_name='default', bypass_virus_checks=None,
-                                            bypass_spam_checks=None, bypass_banned_checks=None,
-                                            spam_subject_tag2=None)
+        if not orm['amavis.Policy'].objects.all():
+            orm["amavis.Policy"].objects.create(
+                id=1, policy_name='default', bypass_virus_checks=None,
+                bypass_spam_checks=None, bypass_banned_checks=None,
+                spam_subject_tag2=None
+            )
         for dom in orm["admin.Domain"].objects.all():
             orm["amavis.Users"].objects.create(email="@%s" % dom.name, fullname=dom.name,
                                                priority=7, policy_id=1)
diff --git a/modoboa/extensions/amavis/migrations/0003_create_domalias_records.py b/modoboa/extensions/amavis/migrations/0003_create_domalias_records.py
new file mode 100644
index 000000000..f5fd72418
--- /dev/null
+++ b/modoboa/extensions/amavis/migrations/0003_create_domalias_records.py
@@ -0,0 +1,269 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from django.core.exceptions import ObjectDoesNotExist
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Write your forwards methods here."
+        try:
+            ext = orm["core.Extension"].objects.get(name="amavis")
+        except ObjectDoesNotExist:
+            return
+        if not ext.enabled:
+            return
+        for domalias in orm["admin.DomainAlias"].objects.all():
+            u = orm["amavis.Users"](
+                email="@%s" % domalias.name, fullname=domalias.name, priority=7
+            )
+            u.policy = orm["amavis.Policy"].objects.get(policy_name=domalias.target.name)
+            u.save()
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+        raise RuntimeError("Cannot revert this migration")
+
+    models = {
+        'admin.alias': {
+            'Meta': {'ordering': "['domain__name', 'address']", 'unique_together': "(('address', 'domain'),)", 'object_name': 'Alias'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '254'}),
+            'aliases': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['admin.Alias']", 'symmetrical': 'False'}),
+            'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'extmboxes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mboxes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['admin.Mailbox']", 'symmetrical': 'False'})
+        },
+        'admin.domain': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Domain'},
+            'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'quota': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'admin.domainalias': {
+            'Meta': {'object_name': 'DomainAlias'},
+            'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"})
+        },
+        'admin.mailbox': {
+            'Meta': {'object_name': 'Mailbox'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '252'}),
+            'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'quota': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"})
+        },
+        'admin.mailboxoperation': {
+            'Meta': {'object_name': 'MailboxOperation'},
+            'argument': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Mailbox']", 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'admin.objectdates': {
+            'Meta': {'object_name': 'ObjectDates'},
+            'creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_modification': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'admin.quota': {
+            'Meta': {'object_name': 'Quota'},
+            'bytes': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}),
+            'mbox': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'quota_value'", 'unique': 'True', 'null': 'True', 'to': "orm['admin.Mailbox']"}),
+            'messages': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'username': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'primary_key': 'True'})
+        },
+        u'amavis.maddr': {
+            'Meta': {'object_name': 'Maddr', 'db_table': "u'maddr'", 'managed': 'False'},
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '765'}),
+            'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}),
+            'partition_tag': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'amavis.mailaddr': {
+            'Meta': {'object_name': 'Mailaddr', 'db_table': "u'mailaddr'", 'managed': 'False'},
+            'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'amavis.msgrcpt': {
+            'Meta': {'unique_together': "(('partition_tag', 'mail', 'rseqnum'),)", 'object_name': 'Msgrcpt', 'db_table': "u'msgrcpt'", 'managed': 'False'},
+            'bl': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'bspam_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'content': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'ds': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'is_local': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'mail': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['amavis.Msgs']", 'primary_key': 'True'}),
+            'partition_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'rid': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['amavis.Maddr']", 'primary_key': 'True', 'db_column': "'rid'"}),
+            'rs': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'rseqnum': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smtp_resp': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'wl': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'})
+        },
+        u'amavis.msgs': {
+            'Meta': {'unique_together': "(('partition_tag', 'mail_id'),)", 'object_name': 'Msgs', 'db_table': "u'msgs'", 'managed': 'False'},
+            'am_id': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+            'client_addr': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'content': ('django.db.models.fields.CharField', [], {'max_length': '1', 'blank': 'True'}),
+            'dsn_sent': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'from_addr': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'host': ('django.db.models.fields.CharField', [], {'max_length': '765'}),
+            'mail_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'originating': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'partition_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'policy': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'quar_loc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'quar_type': ('django.db.models.fields.CharField', [], {'max_length': '1', 'blank': 'True'}),
+            'secret_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'blank': 'True'}),
+            'sid': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['amavis.Maddr']", 'db_column': "'sid'"}),
+            'size': ('django.db.models.fields.IntegerField', [], {}),
+            'spam_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'time_iso': ('django.db.models.fields.CharField', [], {'max_length': '48'}),
+            'time_num': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'amavis.policy': {
+            'Meta': {'object_name': 'Policy', 'db_table': "u'policy'", 'managed': 'False'},
+            'addr_extension_bad_header': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'addr_extension_banned': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'addr_extension_spam': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'addr_extension_virus': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'archive_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'bad_header_admin': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'bad_header_lover': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'bad_header_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'banned_admin': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'banned_files_lover': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'banned_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'banned_rulenames': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'bypass_banned_checks': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'null': 'True'}),
+            'bypass_header_checks': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'bypass_spam_checks': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'null': 'True'}),
+            'bypass_virus_checks': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '3', 'null': 'True'}),
+            'clean_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'disclaimer_options': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'forward_method': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_size_limit': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'newvirus_admin': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'policy_name': ('django.db.models.fields.CharField', [], {'max_length': '96', 'blank': 'True'}),
+            'sa_userconf': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'sa_username': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_admin': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_dsn_cutoff_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'spam_kill_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'spam_lover': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'spam_quarantine_cutoff_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'spam_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_subject_tag': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_subject_tag2': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_subject_tag3': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'spam_tag2_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'spam_tag3_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'spam_tag_level': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'unchecked_lover': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'unchecked_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'virus_admin': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'virus_lover': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'virus_quarantine_to': ('django.db.models.fields.CharField', [], {'max_length': '192', 'null': 'True', 'blank': 'True'}),
+            'warnbadhrecip': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'warnbannedrecip': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
+            'warnvirusrecip': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'})
+        },
+        u'amavis.quarantine': {
+            'Meta': {'ordering': "['-mail__time_num']", 'unique_together': "(('partition_tag', 'mail', 'chunk_ind'),)", 'object_name': 'Quarantine', 'db_table': "u'quarantine'", 'managed': 'False'},
+            'chunk_ind': ('django.db.models.fields.IntegerField', [], {}),
+            'mail': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['amavis.Msgs']", 'primary_key': 'True'}),
+            'mail_text': ('django.db.models.fields.TextField', [], {}),
+            'partition_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'amavis.users': {
+            'Meta': {'object_name': 'Users', 'db_table': "u'users'", 'managed': 'False'},
+            'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'fullname': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'policy': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['amavis.Policy']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'amavis.wblist': {
+            'Meta': {'object_name': 'Wblist', 'db_table': "u'wblist'", 'managed': 'False'},
+            'rid': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'sid': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'wb': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'core.extension': {
+            'Meta': {'object_name': 'Extension'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        u'core.log': {
+            'Meta': {'object_name': 'Log'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'level': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'logger': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'message': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'core.objectaccess': {
+            'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"})
+        },
+        u'core.user': {
+            'Meta': {'ordering': "['username']", 'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'})
+        }
+    }
+
+    complete_apps = ['core', 'admin', 'amavis']
+    symmetrical = True

From 8826cd6cac5e3b1f6270a538622498facbd897b8 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 19:29:18 +0100
Subject: [PATCH 28/32] Travis build status added.

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 956639ad1..fef637441 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
 Modoboa
 #######
 
-|latest-version| |downloads|
+|travis| |latest-version| |downloads|
 
 Modoboa is a mail hosting and management platform including a modern
 and simplified Web User Interface. It provides useful components such
@@ -65,9 +65,9 @@ The following external libraries are provided with Modoboa:
 .. |downloads| image:: https://pypip.in/d/modoboa/badge.png
    :alt: Downloads from Pypi
    :target: https://crate.io/packages/modoboa/
-
+.. |travis| image:: https://travis-ci.org/tonioo/modoboa.png?branch=master
+   :target: https://travis-ci.org/tonioo/modoboa
 
 .. image:: https://d2weczhvl823v0.cloudfront.net/tonioo/modoboa/trend.png
    :alt: Bitdeli badge
    :target: https://bitdeli.com/free
-

From 9ef83f9db93a314f1883f6c3a4a007e5ccec27a6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 8 Nov 2013 20:43:03 +0100
Subject: [PATCH 29/32] Adding mysql-python as requirement.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b5e95c1cf..5c692ad59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
 install:
   - pip install -q Django==$DJANGO --use-mirrors
   - python setup.py -q install
+  - pip install -q MySQL-python --use-mirrors
   - pip install -q pexpect --use-mirrors
 
 before_script:

From 1c6d9935504524fa82d74984c9bf8b03882ff8f3 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 9 Nov 2013 22:24:57 +0100
Subject: [PATCH 30/32] Modoboa is not compatible with django-reversion 1.8.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d7ba96b5f..ff9ceadfb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 django
-django-reversion
+django-reversion==1.7.1
 dj-database-url
 south
 lxml

From 4e72d70917b43971cd9d42b1a1fe13cb7a2dbbfb Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 12 Nov 2013 21:48:48 +0100
Subject: [PATCH 31/32] Compatibility with reversion >= 1.8.

fixes #497
---
 .../core/commands/templates/settings.py.tpl   |  3 +-
 modoboa/core/extensions.py                    |  8 +++--
 modoboa/core/models.py                        | 36 +++++++++++++++----
 modoboa/core/templatetags/core_tags.py        |  2 +-
 modoboa/extensions/admin/forms/domain.py      |  7 ++--
 modoboa/extensions/admin/models/domain.py     |  9 +++++
 .../extensions/admin/static/admin/js/admin.js |  2 +-
 modoboa/extensions/admin/views/identity.py    | 21 +++++------
 .../extensions/amavis/general_callbacks.py    | 11 +++---
 .../extensions/postfix_relay_domains/forms.py |  8 +++--
 .../general_callbacks.py                      | 26 --------------
 .../postfix_relay_domains/limits_callbacks.py | 27 ++++++++++++++
 .../postfix_relay_domains/models.py           |  9 +++++
 .../extensions/postfix_relay_domains/views.py |  4 +--
 modoboa/lib/parameters.py                     |  2 ++
 requirements.txt                              |  2 +-
 16 files changed, 114 insertions(+), 63 deletions(-)

diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 710c6c96a..b7f36115f 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -106,6 +106,7 @@ TEMPLATE_LOADERS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.transaction.TransactionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -154,8 +155,8 @@ MODOBOA_APPS = (
     'modoboa.lib',
     # Modoboa extensions here.
     'modoboa.extensions.admin',
-    'modoboa.extensions.limits',
     'modoboa.extensions.postfix_relay_domains',
+    'modoboa.extensions.limits',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
     'modoboa.extensions.stats',
diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py
index fe11435c7..07073a9d2 100644
--- a/modoboa/core/extensions.py
+++ b/modoboa/core/extensions.py
@@ -76,11 +76,13 @@ class ExtensionsPool(object):
         """
         from modoboa.core.models import Extension
 
+        result = []
         for ext in settings.MODOBOA_APPS:
             __import__(ext)
-        result = []
-        for extname in self.extensions.keys():
+            extname = ext.split('.')[-1]
             extinstance = self.get_extension(extname)
+            if extinstance is None:
+                continue
             try:
                 baseurl = extinstance.url \
                     if extinstance.url is not None else extname
@@ -106,7 +108,7 @@ class ExtensionsPool(object):
         for extname, extdef in self.extensions.iteritems():
             if not extdef["show"]:
                 continue
-            infos = extdef["instance"].infos()
+            infos = self.get_extension_infos(extname)
             infos["id"] = extname
             result += [infos]
         return sorted(result, key=lambda i: i["name"])
diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index db0050044..68ac4bead 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -4,9 +4,11 @@ import re
 import hashlib
 import crypt
 import base64
+import logging
 from random import Random
 import reversion
 from django.db import models
+from django.db.models.signals import post_delete
 from django.dispatch import receiver
 from django.utils import timezone
 from django.utils.translation import ugettext as _, ugettext_lazy
@@ -463,24 +465,44 @@ class Log(models.Model):
 
 @receiver(reversion.post_revision_commit)
 def post_revision_commit(sender, **kwargs):
-    import logging
-
     if kwargs["revision"].user is None:
         return
     logger = logging.getLogger("modoboa.admin")
     for version in kwargs["versions"]:
-        if version.type == reversion.models.VERSION_ADD:
+        prev_revisions = reversion.get_for_object(version.object)
+        if prev_revisions.count() == 1:
             action = _("added")
             level = "info"
-        elif version.type == reversion.models.VERSION_CHANGE:
+        else:
             action = _("modified")
             level = "warning"
-        else:
-            action = _("deleted")
-            level = "critical"
         message = _("%(object)s '%(name)s' %(action)s by user %(user)s") % {
             "object": unicode(version.content_type).capitalize(),
             "name": version.object_repr, "action": action,
             "user": kwargs["revision"].user.username
         }
         getattr(logger, level)(message)
+
+
+@receiver(post_delete)
+def post_delete_hook(sender, instance, **kwargs):
+    """Custom post-delete hook.
+
+    We want to know who was responsible for an object deletion.
+    """
+    from reversion.models import Version
+
+    if not reversion.is_registered(sender):
+        return
+    del_list = reversion.get_deleted(sender)
+    try:
+        version = del_list.get(object_id=instance.id)
+    except Version.DoesNotExist:
+        return
+    logger = logging.getLogger("modoboa.admin")
+    msg = _("%(object)s '%(name)s' %(action)s by user %(user)s") % {
+        "object": unicode(version.content_type).capitalize(),
+        "name": version.object_repr, "action": _("deleted"),
+        "user": version.revision.user.username
+    }
+    logger.critical(msg)
diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py
index b424c1f9f..7b9a08930 100644
--- a/modoboa/core/templatetags/core_tags.py
+++ b/modoboa/core/templatetags/core_tags.py
@@ -45,7 +45,7 @@ def settings_menu(selection, user):
          "label": _("Information")},
         {"name": "logs",
          "class": "ajaxlink",
-         "url": "logs/",
+         "url": "logs/&sort_order=-date_created",
          "label": _("Logs")},
         {"name": "parameters",
          "class": "ajaxlink",
diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index c3686fdc9..c19b60d68 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -107,7 +107,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
             username = q['username'].replace('@%s' % self.oldname, '@%s' % domain.name)
             Quota.objects.filter(username=q['username']).update(username=username)
 
-    def save(self, user, commit=True):
+    def save(self, user, commit=True, domalias_post_create=False):
         """Custom save method
 
         Updating a domain may have consequences on other objects
@@ -148,7 +148,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
                     else:
                         continue
                     al = DomainAlias(name=alias, target=d, enabled=d.enabled)
-                    al.save(creator=user)
+                    al.save(creator=user) if domalias_post_create else al.save()
 
             if old_mail_homes is not None:
                 self.update_mailbox_quotas(d)
@@ -253,5 +253,6 @@ class DomainForm(TabForms):
         As forms interact with each other, it is easier to make custom
         code to save them.
         """
-        for f in self.forms:
+        self.forms[0]['instance'].save(user, domalias_post_create=True)
+        for f in self.forms[1:]:
             f["instance"].save(user)
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index 95940dda6..e7467d592 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -148,4 +148,13 @@ class Domain(AdminObject):
         for dalias in self.domainalias_set.all():
             dalias.to_csv(csvwriter)
 
+    def post_create(self, creator):
+        """Post creation actions.
+
+        :param ``User`` creator: user whos created this domain
+        """
+        super(Domain, self).post_create(creator)
+        for domalias in self.domainalias_set.all():
+            domalias.post_create(creator)
+
 reversion.register(Domain)
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index d0a5ef387..0ed43c300 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -392,7 +392,7 @@ Identities.prototype = {
         $("#wizard").cwizard({
             formid: "newaccount_form",
             transition_callbacks: {
-                2: this.mailform_prefill
+                1: this.mailform_prefill
             },
             success_callback: $.proxy(this.reload_listing, this)
         });
diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py
index e44ac9d87..8e8fea69a 100644
--- a/modoboa/extensions/admin/views/identity.py
+++ b/modoboa/extensions/admin/views/identity.py
@@ -115,6 +115,14 @@ def list_quotas(request, tplname="admin/quotas.html"):
 @permission_required("core.add_user")
 @transaction.commit_on_success
 def newaccount(request, tplname='common/wizard_forms.html'):
+    """Create a new account.
+
+    .. note:: An issue still remains int this code: if all validation
+       steps are successful but an error occurs after we call 'save',
+       the account will be created. It happens transaction management
+       doesn't work very well with nested functions. Need to wait for
+       django 1.6 and atomicity.
+    """
     cwizard = CreationWizard()
     cwizard.add_step(AccountFormGeneral, _("General"),
                      [dict(classes="btn-inverse next", label=_("Next"))],
@@ -135,16 +143,9 @@ def newaccount(request, tplname='common/wizard_forms.html'):
         if retcode == 2:
             genform = cwizard.steps[0]["form"]
             account = genform.save()
-            try:
-                account.post_create(request.user)
-                mailform = cwizard.steps[1]["form"]
-                mailform.save(request.user, account)
-            except ModoboaException:
-                # A bit uggly: transaction management doesn't work very
-                # well with nested functions. Need to wait for django 1.6
-                # and atomicity.
-                account.delete(request.user, False)
-                raise
+            account.post_create(request.user)
+            mailform = cwizard.steps[1]["form"]
+            mailform.save(request.user, account)
             return render_to_json_response(_("Account created"))
         return render_to_json_response({
             'stepid': data, 'form_errors': cwizard.errors
diff --git a/modoboa/extensions/amavis/general_callbacks.py b/modoboa/extensions/amavis/general_callbacks.py
index 558b2355b..8d9ad4ec6 100644
--- a/modoboa/extensions/amavis/general_callbacks.py
+++ b/modoboa/extensions/amavis/general_callbacks.py
@@ -1,8 +1,8 @@
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.template import Template, Context
-
 from modoboa.lib import events, parameters
+from modoboa.extensions.admin.models import DomainAlias
 from modoboa.extensions.amavis.lib import (
     create_user_and_policy, update_user_and_policy, delete_user_and_policy,
     create_user_and_use_policy, delete_user
@@ -36,13 +36,16 @@ def on_domain_deleted(domain):
 
 
 @events.observe("DomainAliasCreated")
-def on_relay_domain_alias_created(user, domainalias):
+def on_domain_alias_created(user, domainalias):
     create_user_and_use_policy(domainalias.name, domainalias.target.name)
 
 
 @events.observe("DomainAliasDeleted")
-def on_relay_domain_alias_deleted(domainalias):
-    delete_user(domainalias.name)
+def on_domain_alias_deleted(domainaliases):
+    if isinstance(domainaliases, DomainAlias):
+        domainaliases = [domainaliases]
+    for domainalias in domainaliases:
+        delete_user(domainalias.name)
 
 
 @events.observe("GetStaticContent")
diff --git a/modoboa/extensions/postfix_relay_domains/forms.py b/modoboa/extensions/postfix_relay_domains/forms.py
index 37a49d646..08cff2059 100644
--- a/modoboa/extensions/postfix_relay_domains/forms.py
+++ b/modoboa/extensions/postfix_relay_domains/forms.py
@@ -82,7 +82,7 @@ class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
 
         return cleaned_data
 
-    def save(self, user, commit=True):
+    def save(self, user, commit=True, rdomalias_post_create=False):
         """Custom save method.
 
         As relay domain aliases are defined using the same form as
@@ -119,7 +119,8 @@ class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
                     al = RelayDomainAlias(
                         name=alias, target=rd, enabled=rd.enabled
                     )
-                    al.save(creator=user)
+                    al.save(creator=user) \
+                        if rdomalias_post_create else al.save()
         return rd
 
 
@@ -151,5 +152,6 @@ class RelayDomainForm(TabForms):
         As forms interact with each other, it is easier to make custom
         code to save them.
         """
-        for f in self.forms:
+        self.forms[0]['instance'].save(user, rdomalias_post_create=True)
+        for f in self.forms[1:]:
             f["instance"].save(user)
diff --git a/modoboa/extensions/postfix_relay_domains/general_callbacks.py b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
index 6c9861d36..c51c54be4 100644
--- a/modoboa/extensions/postfix_relay_domains/general_callbacks.py
+++ b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
@@ -106,32 +106,6 @@ def extra_limit_templates():
     ]
 
 
-@events.observe('GetExtraParameters')
-def extra_parameters(app, level):
-    from django import forms
-
-    if app != 'limits' or level != 'A':
-        return {}
-    return {
-        'deflt_relay_domains_limit': forms.IntegerField(
-            label=ugettext_lazy("Relay domains"),
-            initial=0,
-            help_text=ugettext_lazy(
-                "Maximum number of allowed relay domains for a new administrator"
-            ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
-        ),
-        'deflt_relay_domain_aliases_limit': forms.IntegerField(
-            label=ugettext_lazy("Relay domain aliases"),
-            initial=0,
-            help_text=ugettext_lazy(
-                "Maximum number of allowed relay domain aliases for a new administrator"
-            ),
-            widget=forms.widgets.TextInput(attrs={"class": "span1"})
-        )
-    }
-
-
 @events.observe('ExtraDomainImportHelp')
 def extra_domain_import_help():
     return [ugettext_lazy("""
diff --git a/modoboa/extensions/postfix_relay_domains/limits_callbacks.py b/modoboa/extensions/postfix_relay_domains/limits_callbacks.py
index 9966945e7..5d50ea28a 100644
--- a/modoboa/extensions/postfix_relay_domains/limits_callbacks.py
+++ b/modoboa/extensions/postfix_relay_domains/limits_callbacks.py
@@ -1,9 +1,36 @@
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import events
 from modoboa.lib.permissions import get_object_owner
 from modoboa.extensions.limits.lib import inc_limit_usage, dec_limit_usage
 from .models import RelayDomainAlias
 
 
+@events.observe('GetExtraParameters')
+def extra_parameters(app, level):
+    from django import forms
+
+    if app != 'limits' or level != 'A':
+        return {}
+    return {
+        'deflt_relay_domains_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domains"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domains for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        ),
+        'deflt_relay_domain_aliases_limit': forms.IntegerField(
+            label=ugettext_lazy("Relay domain aliases"),
+            initial=0,
+            help_text=ugettext_lazy(
+                "Maximum number of allowed relay domain aliases for a new administrator"
+            ),
+            widget=forms.widgets.TextInput(attrs={"class": "span1"})
+        )
+    }
+
+
 @events.observe('RelayDomainCreated')
 def inc_relaydomains_count(user, rdomain):
     inc_limit_usage(user, 'relay_domains_limit')
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 360810cb3..088874c2e 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -139,6 +139,15 @@ class RelayDomain(AdminObject):
         self.verify_recipients = (row[5].strip() == 'True')
         self.save(creator=user)
 
+    def post_create(self, creator):
+        """Post creation actions.
+
+        :param ``User`` creator: user whos created this relay domain
+        """
+        super(RelayDomain, self).post_create(creator)
+        for rdomalias in self.relaydomainalias_set.all():
+            rdomalias.post_create(creator)
+
 reversion.register(RelayDomain)
 
 
diff --git a/modoboa/extensions/postfix_relay_domains/views.py b/modoboa/extensions/postfix_relay_domains/views.py
index e59657891..e6df53621 100644
--- a/modoboa/extensions/postfix_relay_domains/views.py
+++ b/modoboa/extensions/postfix_relay_domains/views.py
@@ -23,9 +23,7 @@ def create(request, tplname="postfix_relay_domains/new_relaydomain_form.html"):
         if form.is_valid():
             rdom = form.save(request.user)
             rdom.post_create(request.user)
-            return render_to_json_response(
-                {"respmsg": _("Relay domain created")}
-            )
+            return render_to_json_response(_("Relay domain created"))
         return render_to_json_response(
             {'form_errors': form.errors}, status=400
         )
diff --git a/modoboa/lib/parameters.py b/modoboa/lib/parameters.py
index a5c7dfa89..42b8294db 100644
--- a/modoboa/lib/parameters.py
+++ b/modoboa/lib/parameters.py
@@ -17,6 +17,8 @@ _params = {'A': {}, 'U': {}}
 
 
 class NotDefined(ModoboaException):
+    http_code = 404
+
     def __init__(self, app, name):
         self.app = app
         self.name = name
diff --git a/requirements.txt b/requirements.txt
index ff9ceadfb..94613aa78 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 django
-django-reversion==1.7.1
+django-reversion>=1.8.0
 dj-database-url
 south
 lxml

From 8d2a26b97f220a82cb3844b1c2d7297f52c638b6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 12 Nov 2013 22:19:16 +0100
Subject: [PATCH 32/32] Cleanup.

---
 modoboa/core/models.py   | 12 +++++-------
 modoboa/lib/ldaputils.py | 10 ++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index 68ac4bead..e817906fd 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -26,7 +26,7 @@ from modoboa.lib.sysutils import exec_cmd
 from modoboa.core.extensions import exts_pool
 
 try:
-    from modoboa.lib.ldaputils import *
+    from modoboa.lib.ldaputils import LDAPAuthBackend
     ldap_available = True
 except ImportError:
     ldap_available = False
@@ -110,6 +110,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         elif scheme == "md5crypt":
             # The salt may vary from 12 to 48 bits. (Using all six bytes here
             # with a subset of characters means we get only 35 random bits.)
+            import string
             salt = "".join(Random().sample(string.letters + string.digits, 6))
             result = md5crypt(raw_value, salt)
             prefix = ""  # the result already has $1$ prepended to it
@@ -141,12 +142,9 @@ class User(AbstractBaseUser, PermissionsMixin):
                 raise InternalError(
                     _("Failed to update password: LDAP module not installed")
                 )
-
-            ab = LDAPAuthBackend()
-            try:
-                ab.update_user_password(self.username, curvalue, raw_value)
-            except LDAPException as e:
-                raise InternalError(_("Failed to update password: %s" % str(e)))
+            LDAPAuthBackend().update_user_password(
+                self.username, curvalue, raw_value
+            )
         events.raiseEvent(
             "PasswordUpdated", self, raw_value, self.pk is None
         )
diff --git a/modoboa/lib/ldaputils.py b/modoboa/lib/ldaputils.py
index 28e5e178a..ea4723af1 100644
--- a/modoboa/lib/ldaputils.py
+++ b/modoboa/lib/ldaputils.py
@@ -40,11 +40,9 @@ import string
 import crypt
 from random import Random
 from django.conf import settings
+from django.utils.translation import ugettext as _
 from modoboa.lib import parameters
-
-
-class LDAPException(Exception):
-    pass
+from modoboa.lib.exceptions import InternalError
 
 
 class LDAPAuthBackend(object):
@@ -126,5 +124,5 @@ class LDAPAuthBackend(object):
                      self.pwd_attr,
                      self._crypt_password(newpassword))]
             self.conn.modify_s(self.user_dn, ldif)
-        except ldap.LDAPError, e:
-            raise LDAPException(str(e))
+        except ldap.LDAPError as e:
+            raise InternalError(_("Failed to update password: %s" % str(e)))