Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/di' into local-rs/feature/di
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralph Schindler committed Jul 13, 2011
20 parents 0b4eeb2 + 14733fb + 9522bf5 + 13eba34 + 80e576a + edc16b1 + 9113d7c + 2510b05 + 1f7f769 + 37761a1 + 6e8b2c3 + e4ea566 + 0b2466c + 46af398 + 34ac43f + 5fb91dd + 7b1f77f + 26b2f38 + 0aa1278 + 3579086 commit 77122ab
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 38 deletions.
74 changes: 37 additions & 37 deletions src/Ldap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static function filterEscape($str)
*/
public static function explodeDn($dn, array &$keys = null, array &$vals = null)
{
return DN::checkDn($dn, $keys, $vals);
return Dn::checkDn($dn, $keys, $vals);
}

/**
Expand Down Expand Up @@ -516,7 +516,7 @@ protected function _splitName($name, &$dname, &$aname)
*/
protected function _getAccountDn($acctname)
{
if (DN::checkDn($acctname)) {
if (Dn::checkDn($acctname)) {
return $acctname;
}
$acctname = $this->getCanonicalAccountName($acctname, self::ACCTNAME_FORM_USERNAME);
Expand Down Expand Up @@ -761,7 +761,7 @@ public function bind($username = null, $password = null)
} else {
/* Check to make sure the username is in DN form.
*/
if (!DN::checkDn($username)) {
if (!Dn::checkDn($username)) {
if ($this->_getBindRequiresDn()) {
/* moreCreds stops an infinite loop if _getUsername does not
* return a DN and the bind requires it
Expand Down Expand Up @@ -868,7 +868,7 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
if ($basedn === null) {
$basedn = $this->getBaseDn();
}
else if ($basedn instanceof DN) {
else if ($basedn instanceof Dn) {
$basedn = $basedn->toString();
}

Expand Down Expand Up @@ -903,11 +903,11 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
return $this->_createCollection($iterator, $collectionClass);
}

/**
/**
* Extension point for collection creation
*
* @param \Zend\Ldap\Collection\DefaultIterator $iterator
* @param string|null $collectionClass
* @param \Zend\Ldap\Collection\DefaultIterator $iterator
* @param string|null $collectionClass
* @return \Zend\Ldap\Collection
* @throws \Zend\Ldap\Exception
*/
Expand Down Expand Up @@ -1091,8 +1091,8 @@ public static function prepareLdapEntryArray(array &$entry)
*/
public function add($dn, array $entry)
{
if (!($dn instanceof DN)) {
$dn = DN::factory($dn, null);
if (!($dn instanceof Dn)) {
$dn = Dn::factory($dn, null);
}
self::prepareLdapEntryArray($entry);
foreach ($entry as $key => $value) {
Expand All @@ -1101,9 +1101,9 @@ public function add($dn, array $entry)
}
}

$rdnParts = $dn->getRdn(DN::ATTR_CASEFOLD_LOWER);
$rdnParts = $dn->getRdn(Dn::ATTR_CASEFOLD_LOWER);
foreach ($rdnParts as $key => $value) {
$value = DN::unescapeValue($value);
$value = Dn::unescapeValue($value);
if (!array_key_exists($key, $entry)) {
$entry[$key] = array($value);
} else if (!in_array($value, $entry[$key])) {
Expand Down Expand Up @@ -1135,12 +1135,12 @@ public function add($dn, array $entry)
*/
public function update($dn, array $entry)
{
if (!($dn instanceof DN)) {
$dn = DN::factory($dn, null);
if (!($dn instanceof Dn)) {
$dn = Dn::factory($dn, null);
}
self::prepareLdapEntryArray($entry);

$rdnParts = $dn->getRdn(DN::ATTR_CASEFOLD_LOWER);
$rdnParts = $dn->getRdn(Dn::ATTR_CASEFOLD_LOWER);
foreach ($rdnParts as $key => $value) {
$value = Dn::unescapeValue($value);
if (array_key_exists($key, $entry) && !in_array($value, $entry[$key])) {
Expand Down Expand Up @@ -1177,7 +1177,7 @@ public function update($dn, array $entry)
*/
public function save($dn, array $entry)
{
if ($dn instanceof DN) {
if ($dn instanceof Dn) {
$dn = $dn->toString();
}
if ($this->exists($dn)) $this->update($dn, $entry);
Expand All @@ -1195,7 +1195,7 @@ public function save($dn, array $entry)
*/
public function delete($dn, $recursively = false)
{
if ($dn instanceof DN) {
if ($dn instanceof Dn) {
$dn = $dn->toString();
}
if ($recursively === true) {
Expand Down Expand Up @@ -1224,7 +1224,7 @@ public function delete($dn, $recursively = false)
*/
protected function _getChildrenDns($parentDn)
{
if ($parentDn instanceof DN) {
if ($parentDn instanceof Dn) {
$parentDn = $parentDn->toString();
}
$children = array();
Expand Down Expand Up @@ -1254,20 +1254,20 @@ protected function _getChildrenDns($parentDn)
*/
public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate = false)
{
if ($from instanceof DN) {
if ($from instanceof Dn) {
$orgDnParts = $from->toArray();
} else {
$orgDnParts = DN::explodeDn($from);
$orgDnParts = Dn::explodeDn($from);
}

if ($to instanceof DN) {
if ($to instanceof Dn) {
$newParentDnParts = $to->toArray();
} else {
$newParentDnParts = DN::explodeDn($to);
$newParentDnParts = Dn::explodeDn($to);
}

$newDnParts = array_merge(array(array_shift($orgDnParts)), $newParentDnParts);
$newDn = DN::fromArray($newDnParts);
$newDn = Dn::fromArray($newDnParts);
return $this->rename($from, $newDn, $recursively, $alwaysEmulate);
}

Expand Down Expand Up @@ -1307,18 +1307,18 @@ public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
else if ($recursively) $emulate = true;

if ($emulate === false) {
if ($from instanceof DN) {
if ($from instanceof Dn) {
$from = $from->toString();
}

if ($to instanceof DN) {
if ($to instanceof Dn) {
$newDnParts = $to->toArray();
} else {
$newDnParts = DN::explodeDn($to);
$newDnParts = Dn::explodeDn($to);
}

$newRdn = DN::implodeRdn(array_shift($newDnParts));
$newParent = DN::implodeDn($newDnParts);
$newRdn = Dn::implodeRdn(array_shift($newDnParts));
$newParent = Dn::implodeDn($newDnParts);
$isOK = @ldap_rename($this->getResource(), $from, $newRdn, $newParent, true);
if($isOK === false) {
throw new Exception($this, 'renaming ' . $from . ' to ' . $to);
Expand All @@ -1343,20 +1343,20 @@ public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
*/
public function copyToSubtree($from, $to, $recursively = false)
{
if ($from instanceof DN) {
if ($from instanceof Dn) {
$orgDnParts = $from->toArray();
} else {
$orgDnParts = DN::explodeDn($from);
$orgDnParts = Dn::explodeDn($from);
}

if ($to instanceof DN) {
if ($to instanceof Dn) {
$newParentDnParts = $to->toArray();
} else {
$newParentDnParts = DN::explodeDn($to);
$newParentDnParts = Dn::explodeDn($to);
}

$newDnParts = array_merge(array(array_shift($orgDnParts)), $newParentDnParts);
$newDn = DN::fromArray($newDnParts);
$newDn = Dn::fromArray($newDnParts);
return $this->copy($from, $newDn, $recursively);
}

Expand All @@ -1373,19 +1373,19 @@ public function copy($from, $to, $recursively = false)
{
$entry = $this->getEntry($from, array(), true);

if ($to instanceof DN) {
if ($to instanceof Dn) {
$toDnParts = $to->toArray();
} else {
$toDnParts = DN::explodeDn($to);
$toDnParts = Dn::explodeDn($to);
}
$this->add($to, $entry);

if ($recursively === true && $this->countChildren($from)>0) {
$children = $this->_getChildrenDns($from);
foreach ($children as $c) {
$cDnParts = DN::explodeDn($c);
$cDnParts = Dn::explodeDn($c);
$newChildParts = array_merge(array(array_shift($cDnParts)), $toDnParts);
$newChild = DN::implodeDn($newChildParts);
$newChild = Dn::implodeDn($newChildParts);
$this->copy($c, $newChild, true);
}
}
Expand All @@ -1395,7 +1395,7 @@ public function copy($from, $to, $recursively = false)
/**
* Returns the specified DN as a Zend_Ldap_Node
*
* @param string|\Zend\Ldap\dN $dn
* @param string|\Zend\Ldap\Dn $dn
* @return \Zend\Ldap\Node|null
* @throws \Zend\Ldap\Exception
*/
Expand Down
1 change: 0 additions & 1 deletion tools/phptools
Submodule phptools deleted from d232cb

0 comments on commit 77122ab

Please sign in to comment.