From b9d3e607bbc0e7430e99a5b0a5431a78f57d6680 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 06 Aug 2014 05:47:03 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/lib/Net/LDAP3/Result.php | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/program/lib/Net/LDAP3/Result.php b/program/lib/Net/LDAP3/Result.php
index 728b304..0759df0 100644
--- a/program/lib/Net/LDAP3/Result.php
+++ b/program/lib/Net/LDAP3/Result.php
@@ -71,7 +71,7 @@
}
/**
- *
+ * Wrapper for ldap_sort()
*/
public function sort($attr)
{
@@ -79,18 +79,23 @@
}
/**
- *
+ * Get entries count
*/
public function count()
{
- if (!isset($this->count))
+ if (!isset($this->count)) {
$this->count = ldap_count_entries($this->conn, $this->result);
+ }
return $this->count;
}
/**
+ * Wrapper for ldap_get_entries()
*
+ * @param bool $normalize Optionally normalize the entries to a list of hash arrays
+ *
+ * @return array List of LDAP entries
*/
public function entries($normalize = false)
{
@@ -103,6 +108,14 @@
return $entries;
}
+ /**
+ * Wrapper for ldap_get_dn() using the current entry pointer
+ */
+ public function get_dn()
+ {
+ return $this->current ? ldap_get_dn($this->conn, $this->current) : null;
+ }
+
/*** Implement PHP 5 Iterator interface to make foreach work ***/
--
Gitblit v1.9.1