mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
* Django 1.2 compatibility for LDAP authentication
* Fixed bad import statements fixed #159
This commit is contained in:
+2
-2
@@ -2,7 +2,6 @@
|
||||
from django.db import models, IntegrityError
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.dispatch import receiver
|
||||
from django.conf import settings
|
||||
from modoboa.lib import parameters
|
||||
from modoboa.lib.sysutils import exec_cmd, exec_as_vuser
|
||||
@@ -432,7 +431,6 @@ class Extension(models.Model):
|
||||
try:
|
||||
from django_auth_ldap.backend import populate_user
|
||||
|
||||
@receiver(populate_user, dispatch_uid="myuid")
|
||||
def populate_callback(sender, user=None, **kwargs):
|
||||
if user is None:
|
||||
return
|
||||
@@ -451,5 +449,7 @@ try:
|
||||
mb = Mailbox()
|
||||
mb.save_from_user(localpart, domain, user)
|
||||
|
||||
populate_user.connect(populate_callback, dispatch_uid="myuid")
|
||||
|
||||
except ImportError, inst:
|
||||
pass
|
||||
|
||||
@@ -188,7 +188,7 @@ def mailbox_actions(user, mboxid):
|
||||
|
||||
@register.simple_tag
|
||||
def mbalias_actions(user, aliasid):
|
||||
from admin.models import Alias
|
||||
from modoboa.admin.models import Alias
|
||||
|
||||
alias = Alias.objects.get(pk=aliasid)
|
||||
if alias.ui_disabled(user):
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from lib import *
|
||||
from modoboa import admin, userprefs
|
||||
from models import *
|
||||
from admin.permissions import *
|
||||
from admin.tables import *
|
||||
from modoboa.admin.permissions import *
|
||||
from modoboa.admin.tables import *
|
||||
from modoboa.lib import events, parameters
|
||||
from modoboa.auth.lib import crypt_password
|
||||
from modoboa.lib.webutils \
|
||||
|
||||
Reference in New Issue
Block a user