From: Arthur Schiwon Date: Tue, 8 May 2012 11:56:07 +0000 (+0200) Subject: LDAP: sqlite compatibility X-Git-Tag: v4.0.0RC~111 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5dee914ed2b45c4956fbab1449a6ecc369e959f6;p=nextcloud-server.git LDAP: sqlite compatibility --- diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php index 31a39327ddf..505181ff882 100755 --- a/apps/user_ldap/lib_ldap.php +++ b/apps/user_ldap/lib_ldap.php @@ -360,8 +360,14 @@ class OC_LDAP { static private function mapComponent($dn, $ocname, $isUser = true) { $table = self::getMapTable($isUser); + $sqliteAdjustment = ''; + $dbtype = OCP\Config::getSystemValue('dbtype'); + if(($dbtype == 'sqlite') || ($dbtype == 'sqlite3')) { + $sqliteAdjustment = 'OR'; + } + $insert = OCP\DB::prepare(' - INSERT IGNORE INTO '.$table.' + INSERT '.$sqliteAdjustment.' IGNORE INTO '.$table.' (ldap_dn, owncloud_name) VALUES (?,?) '); @@ -453,7 +459,6 @@ class OC_LDAP { if(!is_null($attr) && !is_array($attr)) { $attr = array(strtolower($attr)); } - $sr = @ldap_search(self::getConnectionResource(), $base, $filter, $attr); $findings = @ldap_get_entries(self::getConnectionResource(), $sr ); // if we're here, probably no connection ressource is returned.