From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Aug 2011 08:03:11 +0000 (+0400)
Subject: ldap auth: support LDAP extra attributes (closes #363)
X-Git-Tag: 1.5.6~47
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8efb5f62e86fd0c11147aec979733a33ade53756;p=tt-rss.git

ldap auth: support LDAP extra attributes (closes #363)
---

diff --git a/functions.php b/functions.php
index 73898f69..694f5bef 100644
--- a/functions.php
+++ b/functions.php
@@ -1951,14 +1951,16 @@
 				// LemonLDAP can send user informations via HTTP HEADER
 				if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER){
 					// update user name
-					if ($_SERVER['HTTP_USER_NAME']){
-						$fullname = db_escape_string($_SERVER['HTTP_USER_NAME']);
+					$fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
+					if ($fullname){
+						$fullname = db_escape_string($fullname);
 						db_query($link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
 							$_SESSION["uid"]);
 					}
 					// update user mail
-					if ($_SERVER['HTTP_USER_MAIL']){
-						$email = db_escape_string($_SERVER['HTTP_USER_MAIL']);
+					$email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
+					if ($email){
+						$email = db_escape_string($email);
 						db_query($link, "UPDATE ttrss_users SET email = '$email' WHERE id = " .
 							$_SESSION["uid"]);
 					}