MDL-14543 fixed broken deleting from auth sync - credit goes to Juris Treibahs ;...

diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index d849227770c8a255baf229336e6758064062c263..edeecb102d8b270cb6b5527d06284bcf852777f9 100644 (file)
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -695,7 +695,7 @@ if ( !is_object($PHPCAS_CLIENT) ) {
         // find users in DB that aren't in ldap -- to be removed!
         // this is still not as scalable (but how often do we mass delete?)
         if (!empty($this->config->removeuser)) {
-            $sql = "SELECT u.id, u.username, u.email
+            $sql = "SELECT u.id, u.username, u.email, u.auth
                     FROM {$CFG->prefix}user u
                         LEFT JOIN $temptable e ON u.username = e.username
                     WHERE u.auth='cas'

diff --git a/auth/db/auth.php b/auth/db/auth.php
index 334437fe7c3edc2417243a771352a2733938306d..c4e0d8d564bca5c9d5e532e7050983b3b8ffe7f8 100644 (file)
--- a/auth/db/auth.php
+++ b/auth/db/auth.php
@@ -238,11 +238,11 @@ class auth_plugin_db extends auth_plugin_base {
 
             // find obsolete users
             if (count($userlist)) {
-                $sql = "SELECT u.id, u.username, u.email
+                $sql = "SELECT u.id, u.username, u.email, u.auth
                         FROM {$CFG->prefix}user u
                         WHERE u.auth='db' AND u.deleted=0 AND u.username NOT IN ($quoteduserlist)";
             } else {
-                $sql = "SELECT u.id, u.username, u.email
+                $sql = "SELECT u.id, u.username, u.email, u.auth
                         FROM {$CFG->prefix}user u
                         WHERE u.auth='db' AND u.deleted=0";
             }

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index cd9aab84c1f57d78cfc648bf0fc1bc262fe5a732..e6b106d934d163d9a85bb8b793b07563577fd75f 100644 (file)
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -643,7 +643,7 @@ class auth_plugin_ldap extends auth_plugin_base {
         // find users in DB that aren't in ldap -- to be removed!
         // this is still not as scalable (but how often do we mass delete?)
         if (!empty($this->config->removeuser)) {
-            $sql = "SELECT u.id, u.username, u.email
+            $sql = "SELECT u.id, u.username, u.email, u.auth 
                     FROM {$CFG->prefix}user u
                         LEFT JOIN $temptable e ON u.username = e.username
                     WHERE u.auth='ldap'