diff --git a/modoboa/admin/templates/admin/extensions.html b/modoboa/admin/templates/admin/extensions.html index 141ec8108..a419d20ad 100644 --- a/modoboa/admin/templates/admin/extensions.html +++ b/modoboa/admin/templates/admin/extensions.html @@ -1,6 +1,6 @@ {% load i18n %}{% load url from future %}

{% trans "Extensions" %} {% trans "Choose the extension(s) to use" %}


-
+{% csrf_token %} {{ extensions|safe }}
{% trans 'Save' %} diff --git a/modoboa/admin/templates/admin/parameters.html b/modoboa/admin/templates/admin/parameters.html index f26edcec5..0ae46dfc2 100644 --- a/modoboa/admin/templates/admin/parameters.html +++ b/modoboa/admin/templates/admin/parameters.html @@ -1,7 +1,7 @@ {% load i18n libextras %}{% load url from future %} {% url "modoboa.admin.views.saveparameters" as action %}

{% trans "Parameters" %} {% trans "Configure Modoboa" %}


-
+{% csrf_token %} {% include "common/parameters.html" %}

diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index 33bbc266a..8772cf4a4 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -561,7 +561,7 @@ def viewparameters(request, tplname='admin/parameters.html'): return ajax_simple_response({ "status": "ok", "left_selection": "parameters", - "content": render_to_string(tplname, { + "content": _render_to_string(request, tplname, { "forms": parameters.get_admin_forms }) }) diff --git a/modoboa/core/templates/settings.py b/modoboa/core/templates/settings.py index 7adf2fdb8..d75b9cc43 100644 --- a/modoboa/core/templates/settings.py +++ b/modoboa/core/templates/settings.py @@ -101,7 +101,7 @@ TEMPLATE_LOADERS = ( MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - # 'django.middleware.csrf.CsrfViewMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.locale.LocaleMiddleware', diff --git a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html index b1c032f5a..96a96b5af 100644 --- a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html +++ b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html @@ -3,7 +3,7 @@
+ id="uprefs_form">{% csrf_token %} {% render_form form %}
diff --git a/modoboa/extensions/postfix_autoreply/views.py b/modoboa/extensions/postfix_autoreply/views.py index 07676d9f4..8fa347d4b 100644 --- a/modoboa/extensions/postfix_autoreply/views.py +++ b/modoboa/extensions/postfix_autoreply/views.py @@ -1,17 +1,19 @@ # coding: utf-8 from datetime import date from django.http import HttpResponse -from django.template.loader import render_to_string from django.contrib.auth.decorators \ import login_required from django.contrib import messages from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ -from modoboa.lib.webutils import _render, ajax_simple_response, ajax_response +from modoboa.lib.webutils import ( + ajax_simple_response, ajax_response, _render_to_string +) from modoboa.lib.decorators import needs_mailbox from forms import * from models import * + @login_required @needs_mailbox() def autoreply(request, tplname="postfix_autoreply/autoreply.html"): @@ -26,18 +28,17 @@ def autoreply(request, tplname="postfix_autoreply/autoreply.html"): else: form = ARmessageForm(request.POST) if form.is_valid(): - from modoboa import userprefs - arm = form.save(commit=False) arm.untildate = form.cleaned_data["untildate"] arm.mbox = mb arm.save() return ajax_simple_response(dict( - status="ok", respmsg=_("Auto reply message updated successfully.") + status="ok", + respmsg=_("Auto reply message updated successfully.") )) return ajax_simple_response({ - "status": "ko", + "status": "ko", "errors": form.errors, "onload_cb": "autoreply_cb" }) @@ -48,7 +49,7 @@ def autoreply(request, tplname="postfix_autoreply/autoreply.html"): else: form.fields['untildate'].initial = date.today() return ajax_simple_response({ - "status" : "ok", - "content" : render_to_string(tplname, {"form" : form}), - "onload_cb" : "autoreply_cb" - }) + "status": "ok", + "content": _render_to_string(request, tplname, {"form": form}), + "onload_cb": "autoreply_cb" + }) diff --git a/modoboa/extensions/sievefilters/app_settings.py b/modoboa/extensions/sievefilters/app_settings.py index a36c46ca7..443af6285 100644 --- a/modoboa/extensions/sievefilters/app_settings.py +++ b/modoboa/extensions/sievefilters/app_settings.py @@ -26,7 +26,7 @@ class ParametersForm(AdminParametersForm): port = forms.IntegerField( label=_("Server port"), - initial=2000, + initial=4190, help_text=_("Listening port of your MANAGESIEVE server") ) diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html index 5df72b670..035f04feb 100644 --- a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html +++ b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html @@ -1,6 +1,6 @@ {% load url from future %} + method="POST" id="feditor" name="feditor">{% csrf_token %} diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html index 7a413bf1a..39e473603 100644 --- a/modoboa/extensions/webmail/templates/webmail/compose.html +++ b/modoboa/extensions/webmail/templates/webmail/compose.html @@ -1,5 +1,5 @@ {% load i18n libextras %}{% load url from future %} -
+{% csrf_token %}
{% render_field form.to %} diff --git a/modoboa/templates/common/generic_modal_form.html b/modoboa/templates/common/generic_modal_form.html index 21cfca04a..817a6177e 100644 --- a/modoboa/templates/common/generic_modal_form.html +++ b/modoboa/templates/common/generic_modal_form.html @@ -4,7 +4,7 @@ {% if error %}
{{ error }}
{% endif %} + target="{{ target }}">{% csrf_token %} {% block formbody %} {% render_form form %} {% block extrafields %}{% endblock %} diff --git a/modoboa/templates/common/tabforms.html b/modoboa/templates/common/tabforms.html index bf8ba37e7..d331ea417 100644 --- a/modoboa/templates/common/tabforms.html +++ b/modoboa/templates/common/tabforms.html @@ -1,7 +1,7 @@ {% extends "common/generic_modal.html" %} {% load i18n libextras %} {% block modalbody %} - + {% csrf_token %}