From a44018e89ebeff5e293ecd7777aeb9c82f30cf6d Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Thu, 16 Aug 2012 14:30:44 +0200
Subject: [PATCH] fix in the ldap user import

---
 webui/model/user/import.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webui/model/user/import.php b/webui/model/user/import.php
index 3b581f5e..1965d99e 100644
--- a/webui/model/user/import.php
+++ b/webui/model/user/import.php
@@ -25,10 +25,10 @@ class ModelUserImport extends Model {
       LOGGER("LDAP type: " . $host['type']);
 
       if($host['type'] == "AD") {
-         $attrs = array("cn", "proxyaddresses", "member");
+         $attrs = array("cn", "proxyaddresses", "member", "mail");
 
          $mailAttr = "proxyaddresses";
-         $mailAttrs = array("proxyaddresses");
+         $mailAttrs = array("mail", "proxyaddresses");
 
          $memberAttrs = array("member");
       }
@@ -238,7 +238,7 @@ class ModelUserImport extends Model {
 
          foreach ($query->rows as $deleted) {
             $deleteduser++;
-            $this->model_user_user->deleteUser($deleted['uid']);
+            $this->model_user_user->delete_user($deleted['uid']);
          }
       }