sgehrig
2010-08-21 13:22:20 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22866] standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php: [ZF-10266]</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22866</dd>
<dt>Author</dt> <dd>sgehrig</dd>
<dt>Date</dt> <dd>2010-08-21 06:22:19 -0700 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10266]
exposing time- and sizelimit parameters in search</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapphp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesuserzfldapdevlibraryZendLdapphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php (22865 => 22866)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php 2010-08-21 12:28:09 UTC (rev 22865)
+++ standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php 2010-08-21 13:22:19 UTC (rev 22866)
</span><span class="lines">@@ -913,6 +913,8 @@
</span><span class="cx"> * - attributes
</span><span class="cx"> * - sort
</span><span class="cx"> * - collectionClass
</span><ins>+ * - sizelimit
+ * - timelimit
</ins><span class="cx"> *
</span><span class="cx"> * @param string|Zend_Ldap_Filter_Abstract|array $filter
</span><span class="cx"> * @param string|Zend_Ldap_Dn|null $basedn
</span><span class="lines">@@ -920,11 +922,13 @@
</span><span class="cx"> * @param array $attributes
</span><span class="cx"> * @param string|null $sort
</span><span class="cx"> * @param string|null $collectionClass
</span><ins>+ * @param integer $sizelimit
+ * @param integer $timelimit
</ins><span class="cx"> * @return Zend_Ldap_Collection
</span><span class="cx"> * @throws Zend_Ldap_Exception
</span><span class="cx"> */
</span><del>- public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
- array $attributes = array(), $sort = null, $collectionClass = null)
</del><ins>+ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, array $attributes = array(),
+ $sort = null, $collectionClass = null, $sizelimit = 0, $timelimit = 0)
</ins><span class="cx"> {
</span><span class="cx"> if (is_array($filter)) {
</span><span class="cx"> $options = array_change_key_case($filter, CASE_LOWER);
</span><span class="lines">@@ -944,6 +948,9 @@
</span><span class="cx"> case 'collectionclass':
</span><span class="cx"> $collectionClass = $value;
</span><span class="cx"> break;
</span><ins>+ case 'sizelimit':
+ case 'timelimit':
+ $$key = (int)$value; </ins><span class="cx"> } </span><span class="cx"> } </span><span class="cx"> } </span><span class="lines">@@ -961,14 +968,14 @@ </span><span class="cx"> </span><span class="cx"> switch ($scope) { </span><span class="cx"> case self::SEARCH_SCOPE_ONE: </span><del>- $search = @ldap_list($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_list($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit); </ins><span class="cx"> break; </span><span class="cx"> case self::SEARCH_SCOPE_BASE: </span><del>- $search = @ldap_read($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_read($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit); </ins><span class="cx"> break; </span><span class="cx"> case self::SEARCH_SCOPE_SUB: </span><span class="cx"> default: </span><del>- $search = @ldap_search($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_search($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1091,6 +1098,8 @@
</span><span class="cx"> * - attributes
</span><span class="cx"> * - sort
</span><span class="cx"> * - reverseSort
</span><ins>+ * - sizelimit
+ * - timelimit
</ins><span class="cx"> *
</span><span class="cx"> * @param string|Zend_Ldap_Filter_Abstract|array $filter
</span><span class="cx"> * @param string|Zend_Ldap_Dn|null $basedn
</span><span class="lines">@@ -1098,11 +1107,13 @@
</span><span class="cx"> * @param array $attributes
</span><span class="cx"> * @param string|null $sort
</span><span class="cx"> * @param boolean $reverseSort
</span><ins>+ * @param integer $sizelimit
+ * @param integer $timelimit </ins><span class="cx"> * @return array </span><span class="cx"> * @throws Zend_Ldap_Exception </span><span class="cx"> */ </span><span class="cx"> public function searchEntries($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, </span><del>- array $attributes = array(), $sort = null, $reverseSort = false) </del><ins>+ array $attributes = array(), $sort = null, $reverseSort = false, $sizelimit = 0, $timelimit = 0) </ins><span class="cx"> { </span><span class="cx"> if (is_array($filter)) { </span><span class="cx"> $filter = array_change_key_case($filter, CASE_LOWER); </span><span class="lines">@@ -1114,7 +1125,7 @@ </span><span class="cx"> unset($filter['reversesort']); </span><span class="cx"> } </span><span class="cx"> } </span><del>- $result = $this->search($filter, $basedn, $scope, $attributes, $sort); </del><ins>+ $result = $this->search($filter, $basedn, $scope, $attributes, $sort, null, $sizelimit, $timelimit); </ins><span class="cx"> $items = $result->toArray();
</span><span class="cx"> if ((bool)$reverseSort === true) {
</span><span class="cx"> $items = array_reverse($items, false);
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22866] standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php: [ZF-10266]</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22866</dd>
<dt>Author</dt> <dd>sgehrig</dd>
<dt>Date</dt> <dd>2010-08-21 06:22:19 -0700 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10266]
exposing time- and sizelimit parameters in search</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapphp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesuserzfldapdevlibraryZendLdapphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php (22865 => 22866)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php 2010-08-21 12:28:09 UTC (rev 22865)
+++ standard/branches/user/zf-ldap-dev/library/Zend/Ldap.php 2010-08-21 13:22:19 UTC (rev 22866)
</span><span class="lines">@@ -913,6 +913,8 @@
</span><span class="cx"> * - attributes
</span><span class="cx"> * - sort
</span><span class="cx"> * - collectionClass
</span><ins>+ * - sizelimit
+ * - timelimit
</ins><span class="cx"> *
</span><span class="cx"> * @param string|Zend_Ldap_Filter_Abstract|array $filter
</span><span class="cx"> * @param string|Zend_Ldap_Dn|null $basedn
</span><span class="lines">@@ -920,11 +922,13 @@
</span><span class="cx"> * @param array $attributes
</span><span class="cx"> * @param string|null $sort
</span><span class="cx"> * @param string|null $collectionClass
</span><ins>+ * @param integer $sizelimit
+ * @param integer $timelimit
</ins><span class="cx"> * @return Zend_Ldap_Collection
</span><span class="cx"> * @throws Zend_Ldap_Exception
</span><span class="cx"> */
</span><del>- public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
- array $attributes = array(), $sort = null, $collectionClass = null)
</del><ins>+ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, array $attributes = array(),
+ $sort = null, $collectionClass = null, $sizelimit = 0, $timelimit = 0)
</ins><span class="cx"> {
</span><span class="cx"> if (is_array($filter)) {
</span><span class="cx"> $options = array_change_key_case($filter, CASE_LOWER);
</span><span class="lines">@@ -944,6 +948,9 @@
</span><span class="cx"> case 'collectionclass':
</span><span class="cx"> $collectionClass = $value;
</span><span class="cx"> break;
</span><ins>+ case 'sizelimit':
+ case 'timelimit':
+ $$key = (int)$value; </ins><span class="cx"> } </span><span class="cx"> } </span><span class="cx"> } </span><span class="lines">@@ -961,14 +968,14 @@ </span><span class="cx"> </span><span class="cx"> switch ($scope) { </span><span class="cx"> case self::SEARCH_SCOPE_ONE: </span><del>- $search = @ldap_list($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_list($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit); </ins><span class="cx"> break; </span><span class="cx"> case self::SEARCH_SCOPE_BASE: </span><del>- $search = @ldap_read($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_read($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit); </ins><span class="cx"> break; </span><span class="cx"> case self::SEARCH_SCOPE_SUB: </span><span class="cx"> default: </span><del>- $search = @ldap_search($this->getResource(), $basedn, $filter, $attributes); </del><ins>+ $search = @ldap_search($this->getResource(), $basedn, $filter, $attributes, 0, $sizelimit, $timelimit);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1091,6 +1098,8 @@
</span><span class="cx"> * - attributes
</span><span class="cx"> * - sort
</span><span class="cx"> * - reverseSort
</span><ins>+ * - sizelimit
+ * - timelimit
</ins><span class="cx"> *
</span><span class="cx"> * @param string|Zend_Ldap_Filter_Abstract|array $filter
</span><span class="cx"> * @param string|Zend_Ldap_Dn|null $basedn
</span><span class="lines">@@ -1098,11 +1107,13 @@
</span><span class="cx"> * @param array $attributes
</span><span class="cx"> * @param string|null $sort
</span><span class="cx"> * @param boolean $reverseSort
</span><ins>+ * @param integer $sizelimit
+ * @param integer $timelimit </ins><span class="cx"> * @return array </span><span class="cx"> * @throws Zend_Ldap_Exception </span><span class="cx"> */ </span><span class="cx"> public function searchEntries($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, </span><del>- array $attributes = array(), $sort = null, $reverseSort = false) </del><ins>+ array $attributes = array(), $sort = null, $reverseSort = false, $sizelimit = 0, $timelimit = 0) </ins><span class="cx"> { </span><span class="cx"> if (is_array($filter)) { </span><span class="cx"> $filter = array_change_key_case($filter, CASE_LOWER); </span><span class="lines">@@ -1114,7 +1125,7 @@ </span><span class="cx"> unset($filter['reversesort']); </span><span class="cx"> } </span><span class="cx"> } </span><del>- $result = $this->search($filter, $basedn, $scope, $attributes, $sort); </del><ins>+ $result = $this->search($filter, $basedn, $scope, $attributes, $sort, null, $sizelimit, $timelimit); </ins><span class="cx"> $items = $result->toArray();
</span><span class="cx"> if ((bool)$reverseSort === true) {
</span><span class="cx"> $items = array_reverse($items, false);
</span></span></pre>
</div>
</div>
</body>
</html>