From 11c2e3c9d4b88099ab8284619d3627ebe655fa43 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 24 Aug 2020 16:54:43 +0200 Subject: [PATCH] LSsearch: remove buggy _hash cache parameter and replace it by an hash accessible key --- src/includes/class/class.LSsearch.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/includes/class/class.LSsearch.php b/src/includes/class/class.LSsearch.php index d47f8d81..37354d9a 100644 --- a/src/includes/class/class.LSsearch.php +++ b/src/includes/class/class.LSsearch.php @@ -70,9 +70,6 @@ class LSsearch extends LSlog_staticLoggerClass { // The cache of search parameters private $_searchParams = NULL; - // The cache of the hash of the search parameters - private $_hash = NULL; - // The result of the search private $result=NULL; @@ -744,9 +741,6 @@ class LSsearch extends LSlog_staticLoggerClass { * @retval void **/ private function generateSearchParams() { - // Purge the cache of the hash - $this -> _hash = NULL; - // Base $retval = array( 'filter' => $this -> params['filter'], @@ -984,10 +978,9 @@ class LSsearch extends LSlog_staticLoggerClass { public function getHash($searchParams=null) { if(is_null($searchParams)) { $searchParams=$this -> _searchParams; - if ($this -> _hash) { - return $this -> _hash; - } } + if (!$searchParams) + return false; if ($searchParams['filter'] instanceof Net_LDAP_Filter) { $searchParams['filter']=$searchParams['filter']->asString(); } @@ -1195,6 +1188,9 @@ class LSsearch extends LSlog_staticLoggerClass { return $ret; } } + elseif ($key == 'hash') { + return $this -> getHash(); + } else { throw new Exception('Incorrect property !'); }