MDL-53580 auth_ldap: Set default value for suspended_attribute

It was also necessary to cast some boolean values to ints as a workaround for moodle's broken boolean validation.
emp7eror · May 10, 2016 · 8ffe9ae · 8ffe9ae
1 parent e4b5a06
commit 8ffe9ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
@@ -937,7 +937,9 @@ function sync_users($do_updates=true) {
                 // It isn't possible to just rely on the configured suspension attribute since
                 // things like active directory use bit masks, other things using LDAP might
                 // do different stuff as well.
-                $user->suspended = $this->is_user_suspended($user);
+                //
+                // The cast to int is a workaround for MDL-53959.
+                $user->suspended = (int)$this->is_user_suspended($user);
                 if (empty($user->lang)) {
                     $user->lang = $CFG->lang;
                 }
@@ -1012,7 +1014,8 @@ function update_user_record($username, $updatekeys = false, $triggerevent = fals
             if (!empty($updatekeys)) {
                 $newuser = new stdClass();
                 $newuser->id = $userid;
-                $newuser->suspended = $this->is_user_suspended((object) $newinfo);
+                // The cast to int is a workaround for MDL-53959.
+                $newuser->suspended = (int)$this->is_user_suspended((object) $newinfo);
 
                 foreach ($updatekeys as $key) {
                     if (isset($newinfo[$key])) {

diff --git a/lib/ldaplib.php b/lib/ldaplib.php
@@ -75,6 +75,14 @@ function ldap_getdefaults() {
                         'ad' => 'cn',
                         'default' => 'cn'
                         );
+    $default['suspended_attribute'] = array(
+                        'edir' => '',
+                        'rfc2307' => '',
+                        'rfc2307bis' => '',
+                        'samba' => '',
+                        'ad' => '',
+                        'default' => ''
+                        );
     $default['memberattribute'] = array(
                         'edir' => 'member',
                         'rfc2307' => 'member',