mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-18 05:51:26 +02:00
@@ -14,7 +14,10 @@ class SieveClient(object):
|
||||
__metaclass__ = ConnectionsManager
|
||||
|
||||
def __init__(self, user=None, password=None):
|
||||
ret, msg = self.login(user, password)
|
||||
try:
|
||||
ret, msg = self.login(user, password)
|
||||
except Error, e:
|
||||
raise ConnectionError(str(e))
|
||||
if not ret:
|
||||
raise ConnectionError(msg)
|
||||
|
||||
@@ -29,6 +32,8 @@ class SieveClient(object):
|
||||
try:
|
||||
ret = self.msc.connect(user, password, use_starttls, authmech)
|
||||
except Error, e:
|
||||
ret = False
|
||||
if not ret:
|
||||
return False, _("Connection to MANAGESIEVE server failed, check your configuration")
|
||||
return True, None
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# coding: utf-8
|
||||
|
||||
from sievelib.managesieve import Error
|
||||
from django.http import HttpResponse
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.utils.translation import ugettext as _
|
||||
@@ -18,8 +18,11 @@ def index(request, tplname="sievefilters/index.html"):
|
||||
password=request.session["password"])
|
||||
except ConnectionError, e:
|
||||
return _render_error(request, user_context={"error" : e})
|
||||
|
||||
active_script, scripts = sc.listscripts()
|
||||
|
||||
try:
|
||||
active_script, scripts = sc.listscripts()
|
||||
except Error, e:
|
||||
return _render_error(request, user_context={"error" : e})
|
||||
if active_script is None:
|
||||
active_script = ""
|
||||
default_script = scripts[0] if len(scripts) else ""
|
||||
|
||||
Reference in New Issue
Block a user