lc_ldap.shortcuts

apps/impressions/printLib.py

@@ -7,8 +7,8 @@ import datetime
 import time
 import re
 import sys
-sys.path.append('/usr/scripts/lc_ldap/')
-import lc_ldap
+sys.path.append('/usr/scripts/')
+import lc_ldap.shortcuts
 import lc_ldap.crans_utils
 
 if settings.LOCATION == "o2":
@@ -24,9 +24,9 @@ else:
     ccups = None
 
 if settings.BASE_LDAP_TEST:
-    cldap = lc_ldap.lc_ldap_test()
+    cldap = lc_ldap.shortcuts.lc_ldap_test()
 else:
-    cldap = lc_ldap.lc_ldap_admin()
+    cldap = lc_ldap.shortcuts.lc_ldap_admin()
 
 
 class Job(object):

apps/voip/management/commands/genasterisk.py

@@ -2,8 +2,6 @@
 # -*- encoding: utf-8 -*-
 
 import sys
-sys.path.append('/usr/scripts/lc_ldap/')
-import lc_ldap
 
 from django.core.management.base import BaseCommand, CommandError
 from intranet.apps.voip.models import Profile
@@ -13,6 +11,5 @@ class Command(BaseCommand):
     help = 'Génère une conf pour asterisk'
 
     def handle(self, *args, **options):
-        conn = lc_ldap.lc_ldap()
         for profile in Profile.objects.order_by('user__username').all():
             self.stdout.write(profile.asterisk_config().encode('utf-8') + '\n')

apps/voip/management/commands/genasteriskalias.py

@@ -2,8 +2,6 @@
 # -*- encoding: utf-8 -*-
 
 import sys
-sys.path.append('/usr/scripts/lc_ldap/')
-import lc_ldap
 
 from django.core.management.base import BaseCommand, CommandError
 from intranet.apps.voip.models import Profile
@@ -13,6 +11,5 @@ class Command(BaseCommand):
     help = 'Génère une conf pour la boîte vocal d\'asterisk'
 
     def handle(self, *args, **options):
-        conn = lc_ldap.lc_ldap()
         for profile in Profile.objects.order_by('user__username').all():
             self.stdout.write(profile.asterisk_alias_config().encode('utf-8') + '\n')

apps/voip/management/commands/genasteriskvoicemail.py

@@ -2,8 +2,6 @@
 # -*- encoding: utf-8 -*-
 
 import sys
-sys.path.append('/usr/scripts/lc_ldap/')
-import lc_ldap
 
 from django.core.management.base import BaseCommand, CommandError
 from intranet.apps.voip.models import Profile
@@ -13,6 +11,5 @@ class Command(BaseCommand):
     help = 'Génère une conf pour la boîte vocal d\'asterisk'
 
     def handle(self, *args, **options):
-        conn = lc_ldap.lc_ldap()
         for profile in Profile.objects.order_by('user__username').all():
             self.stdout.write(profile.asterisk_voicemail_config().encode('utf-8') + '\n')

cas_login.py

@@ -28,8 +28,8 @@ from django_cas.backends import CASBackend
 
 # Pour se connecter à la base ldap
 import sys
-sys.path.append("/usr/scripts/lc_ldap")
-import lc_ldap
+sys.path.append("/usr/scripts/")
+import lc_ldap.shortcuts
 
 conn_pool = import_module('conn_pool', 'intranet')
 
@@ -54,7 +54,7 @@ class CransCASBackend(CASBackend):
         django_username = user.username
 
         try:
-            conn = lc_ldap.lc_ldap_admin()
+            conn = lc_ldap.shortcuts.lc_ldap_admin(user=django_username)
             ldap_user = conn.search('uid=%s' % django_username,\
                 scope = ldap.SCOPE_ONELEVEL)[0]
         except IndexError:

conn_pool.py

@@ -21,8 +21,8 @@
 #
 import time
 import sys
-sys.path.append("/usr/scripts/lc_ldap/")
-import lc_ldap
+sys.path.append("/usr/scripts/")
+import lc_ldap.shortcuts
 
 CONNS = {}
 OBJECTS = {}
@@ -33,7 +33,7 @@ LDAP_USER_TIMEOUT = 600
 
 def get_conn(user):
     if not user.username in CONNS.keys():
-        CONNS[user.username]= lc_ldap.lc_ldap_admin()
+        CONNS[user.username]= lc_ldap.shortcuts.lc_ldap_admin(user=user.username)
     return CONNS[user.username]
 
 def get_user(user, mode='ro', refresh=False):

login.py

@@ -28,8 +28,8 @@ from django.utils.importlib import import_module
 
 # Pour se connecter à la base ldap
 import sys
-sys.path.append("/usr/scripts/lc_ldap")
-import lc_ldap
+sys.path.append("/usr/scripts/")
+import lc_ldap.shortcuts
 
 conn_pool = import_module('conn_pool', 'intranet')
 
@@ -44,9 +44,9 @@ class LDAPUserBackend(ModelBackend):
 
         if not username or not password:
             return None
-        lc_class = lc_ldap.lc_ldap_test if settings.BASE_LDAP_TEST else lc_ldap.lc_ldap
+        shortcut = lc_ldap.shortcuts.lc_ldap_test if settings.BASE_LDAP_TEST else lc_ldap.shortcuts.lc_ldap
         try:
-            conn = lc_class(user = username, cred = password)
+            conn = shortcut(user = username, cred = password)
             myself = conn.search(dn = conn.dn, scope = ldap.SCOPE_BASE)
             ldap_user = myself[0]
         except IndexError: