2.1.27

PR #1964
nilsteampassnet · Oct 11, 2017 · 38add93 · 38add93
1 parent b9af30e
commit 38add93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -15,6 +15,7 @@
  Improved the possibility to define the access level on Roles when creating new folder
  Added filter in Roles
  New: confirm deletion of attachment
+ #1964 Make email field in new LDAP user insertion null safe
  #1956 Warning appears on Category and API pages in admin mode
  #1947 Dependency & array update in install checks
  #1945 Cannot delete items

diff --git a/sources/identify.php b/sources/identify.php
@@ -621,13 +621,13 @@ function identifyUser($sentData)
             array(
                 'login' => $username,
                 'pw' => $data['pw'],
-                'email' => @$user_info_from_ad[0]['mail'][0],
+                'email' => (isset($user_info_from_ad[0]['mail'][0]) === false) ? '' : $user_info_from_ad[0]['mail'][0],
                 'name' => $user_info_from_ad[0]['givenname'][0],
                 'lastname' => $user_info_from_ad[0]['sn'][0],
                 'admin' => '0',
                 'gestionnaire' => '0',
                 'can_manage_all_users' => '0',
-                'personal_folder' => $SETTINGS['enable_pf_feature'] == "1" ? '1' : '0',
+                'personal_folder' => $SETTINGS['enable_pf_feature'] === "1" ? '1' : '0',
                 'fonction_id' => '',
                 'groupes_interdits' => '',
                 'groupes_visibles' => '',