cvs: pear /Net_LDAP LDAP.php
| From: | Benedikt Hallinger | Date: | Mon, 23 Apr 2007 08:26:28 +0000 |
| Subject: | cvs: pear /Net_LDAP LDAP.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-46112@lists.php.net to get a copy of this message | ||
beni Mon Apr 23 08:26:28 2007 UTC
Modified files:
/pear/Net_LDAP LDAP.php
Log:
* Modified LDAP->modify() a little bit (parametercheck)
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP/LDAP.php?r1=1.46&r2=1.47&diff_format=u
Index: pear/Net_LDAP/LDAP.php
diff -u pear/Net_LDAP/LDAP.php:1.46 pear/Net_LDAP/LDAP.php:1.47
--- pear/Net_LDAP/LDAP.php:1.46 Fri Mar 30 06:01:44 2007
+++ pear/Net_LDAP/LDAP.php Mon Apr 23 08:26:28 2007
@@ -15,7 +15,7 @@
* @author Benedikt Hallinger <beni@php.net>
* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
* @license http://www.gnu.org/copyleft/lesser.html
- * @version CVS: $Id: LDAP.php,v 1.46 2007/03/30 06:01:44 beni Exp $
+ * @version CVS: $Id: LDAP.php,v 1.47 2007/04/23 08:26:28 beni Exp $
* @link http://pear.php.net/package/Net_LDAP/
*/
@@ -44,7 +44,7 @@
* @author Benedikt Hallinger <beni@php.net>
* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
* @license http://www.gnu.org/copyleft/lesser.html
- * @version CVS: $Id: LDAP.php,v 1.46 2007/03/30 06:01:44 beni Exp $
+ * @version CVS: $Id: LDAP.php,v 1.47 2007/04/23 08:26:28 beni Exp $
* @link http://pear.php.net/package/Net_LDAP/
*/
class Net_LDAP extends PEAR
@@ -600,7 +600,7 @@
}
}
- if (isset($parms['changes'])) {
+ if (is_array($_params['changes'])) {
foreach ($parms['changes'] as $action => $value) {
$msg = $this->modify($entry->dn(), array($action => $value));
if (Net_LDAP::isError($msg)) {
@@ -828,15 +828,18 @@
$result = @ldap_list($this->_link, $base, $filter, array(), 1, 1);
if (ldap_errno($this->_link) == 32) {
- return false;
+ $return = false;
+ return $return;
}
if (ldap_errno($this->_link) != 0) {
PEAR::raiseError(ldap_error($this->_link), ldap_errno($this->_link));
}
if (@ldap_count_entries($this->_link, $result)) {
- return true;
+ $return = true;
+ return $return;
}
- return false;
+ $return = false;
+ return $return;
}