tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'LDAP-change-email-by-mail-dev' into 'develop' 

Changed email by mail in mysql

See merge request artica/pandorafms!1155
This commit is contained in:
vgilc 2017-12-04 12:24:25 +01:00
parent 4d4cee2251 a024d66fd7
commit 9869433f6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/auth/mysql.php
View File

@ -782,7 +782,7 @@ function get_ldap_login_attr ($login) {
$id_user = $login; $id_user = $login;
switch ($config['ldap_login_user_attr']) { switch ($config['ldap_login_user_attr']) {
case 'email': case 'mail':
$dc = io_safe_output($config["ldap_base_dn"]); $dc = io_safe_output($config["ldap_base_dn"]);
$correct_admin_bind = true; $correct_admin_bind = true;
@ -1010,7 +1010,7 @@ function prepare_permissions_groups_of_user_ldap ($id_user, $password,
if (!is_user ($id_user)) { if (!is_user ($id_user)) {
if (($config['ldap_login_user_attr'] != 'name') && ($config['ldap_login_user_attr'] != null)) { if (($config['ldap_login_user_attr'] != 'name') && ($config['ldap_login_user_attr'] != null)) {
switch ($config['ldap_login_user_attr']) { switch ($config['ldap_login_user_attr']) {
case 'email': case 'mail':
$filter="(" . $config['ldap_login_attr'] . "=" . io_safe_output($id_user) . ")"; $filter="(" . $config['ldap_login_attr'] . "=" . io_safe_output($id_user) . ")";
$justthese = array("mail"); $justthese = array("mail");