From 83b7a261cf3057e6948e984c84ff320fffe9a176 Mon Sep 17 00:00:00 2001
From: liedekef <liedekef>
Date: Wed, 17 Jan 2007 09:10:13 +0000
Subject: [PATCH] Use unix login if it is entered to sync first, before
 sambalogin

---
 htdocs/user/fiche.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 070caf838ed..8d703c178f1 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -315,6 +315,7 @@ if ($_POST["action"] == 'adduserldap')
 	$justthese = array(
 		$conf->global->LDAP_FIELD_NAME,
 		$conf->global->LDAP_FIELD_FIRSTNAME,
+		$conf->global->LDAP_FIELD_UID,
 		$conf->global->LDAP_FIELD_LOGIN_SAMBA,
 		$conf->global->LDAP_FIELD_MAIL,
 		$conf->global->LDAP_FIELD_PHONE,
@@ -333,7 +334,8 @@ if ($_POST["action"] == 'adduserldap')
 			{
 				$ldap_nom    = $attribute[$conf->global->LDAP_FIELD_NAME];
 				$ldap_prenom = $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
-				$ldap_login  = $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
+				$ldap_login  = $attribute[$conf->global->LDAP_FIELD_LOGIN];
+				$ldap_loginsmb = $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
 				$ldap_phone  = $attribute[$conf->global->LDAP_FIELD_PHONE];
 				$ldap_fax    = $attribute[$conf->global->LDAP_FIELD_FAX];
 				$ldap_mobile = $attribute[$conf->global->LDAP_FIELD_MOBILE];
@@ -394,6 +396,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
 							         $conf->global->LDAP_FIELD_FULLNAME,
 							         $conf->global->LDAP_FIELD_NAME,
 							         $conf->global->LDAP_FIELD_FIRSTNAME,
+							         $conf->global->LDAP_FIELD_LOGIN,
 							         $conf->global->LDAP_FIELD_LOGIN_SAMBA);
 
 			$ldapusers = $ldap->getUsers('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $justthese, 1);
@@ -482,6 +485,11 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print '<input type="hidden" name="login" value="'.$ldap_login.'">';
 		print $ldap_login;
 	}
+	elseif ($ldap_loginsmb)
+	{
+		print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">';
+		print $ldap_loginsmb;
+	}
 	else
 	{
 		print '<input size="20" maxsize="24" type="text" name="login" value="">';