From 390bc172097f59cfa5881723f5340bdb78e3252c Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 17 Mar 2010 11:51:35 +1300 Subject: [PATCH] Switching to AwlQuery. --- inc/drivers_ldap.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php index 4f6f0e60..937351b3 100644 --- a/inc/drivers_ldap.php +++ b/inc/drivers_ldap.php @@ -341,7 +341,7 @@ function sync_LDAP(){ $ldap_users_info[$ldap_user[$mapping["username"]]] = $ldap_user; unset($ldap_users_tmp[$key]); } - $qry = new PgQuery( "SELECT username, user_no, updated FROM usr "); + $qry = new AwlQuery( "SELECT username, user_no, updated FROM usr "); $qry->Exec('sync_LDAP',__LINE__,__FILE__); while($db_user = $qry->Fetch(true)){ $db_users[] = $db_user['username']; @@ -378,15 +378,18 @@ function sync_LDAP(){ } // deactivating all users + $params = array(); $usr_in = ''; + $i = 0; foreach( $users_to_deactivate AS $v ) { if ( isset($c->do_not_sync_from_ldap) && isset($c->do_not_sync_from_ldap[$v]) ) continue; - $usr_in .= ($usr_in == '' ? '' : ', ') . qpg($v); + $usr_in .= ($usr_in == '' ? '' : ', :u') . $i; + $params[':u'.$i] = strtolower($v); + $i++; } if ( $usr_in != '' ) { - $usr_in = substr($usr_in,1); $c->messages[] = sprintf(i18n('- deactivating users : %s'),join(', ',$users_to_deactivate)); - $qry = new PgQuery( "UPDATE usr SET active = FALSE WHERE lower(username) IN ($usr_in)"); + $qry = new AwlQuery( 'UPDATE usr SET active = FALSE WHERE lower(username) IN ($usr_in)', $params); $qry->Exec('sync_LDAP',__LINE__,__FILE__); }