bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-06-29 06:53:43 +02:00
Code Issues Projects Releases Wiki Activity

LSsearchEntry: remove useless $hash private property

Browse source
This commit is contained in:
Benjamin Renard 2020-08-24 16:14:16 +02:00
parent 70370f99f9
commit 7c8fb87c99
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/includes/class/class.LSsearch.php
View file

@ -1064,7 +1064,13 @@ class LSsearch extends LSlog_staticLoggerClass {
); );
foreach ($list as $key => $id) { foreach ($list as $key => $id) {
$retval['list'][]=new LSsearchEntry($this,$this -> LSobject,$this -> params,$this -> _hash,$this -> result['list'],$id); $retval['list'][] = new LSsearchEntry(
$this,
$this -> LSobject,
$this -> params,
$this -> result['list'],
$id
);
} }
} }
return $retval; return $retval;
@ -1085,7 +1091,13 @@ class LSsearch extends LSlog_staticLoggerClass {
$sortTable=$this -> getSortTable(); $sortTable=$this -> getSortTable();
foreach ($sortTable as $key => $id) { foreach ($sortTable as $key => $id) {
$retval[]=new LSsearchEntry($this,$this -> LSobject,$this -> params,$this -> _hash,$this -> result['list'],$id); $retval[] = new LSsearchEntry(
$this,
$this -> LSobject,
$this -> params,
$this -> result['list'],
$id
);
} }
} }
return $retval; return $retval;
@ -1205,9 +1217,9 @@ class LSsearch extends LSlog_staticLoggerClass {
else { else {
$dir = -1; $dir = -1;
} }
$oa = new LSsearchEntry($this,$this -> LSobject,$this -> params,$this -> _hash,$this -> result['list'],$a); $oa = new LSsearchEntry($this, $this -> LSobject, $this -> params, $this -> result['list'], $a);
$va = $oa->$sortBy; $va = $oa->$sortBy;
$ob = new LSsearchEntry($this,$this -> LSobject,$this -> params,$this -> _hash,$this -> result['list'],$b); $ob = new LSsearchEntry($this, $this -> LSobject, $this -> params, $this -> result['list'], $b);
$vb = $ob->$sortBy; $vb = $ob->$sortBy;
if ($va == $vb) return 0; if ($va == $vb) return 0;
@ -1312,11 +1324,17 @@ class LSsearch extends LSlog_staticLoggerClass {
$retval=array(); $retval=array();
if ($this -> total>0) { if ($this -> total>0) {
$sortTable=$this -> getSortTable(); $sortTable = $this -> getSortTable();
foreach ($sortTable as $key => $id) { foreach ($sortTable as $key => $id) {
$entry=new LSsearchEntry($this,$this -> LSobject,$this -> params,$this -> _hash,$this -> result['list'],$id); $entry = new LSsearchEntry(
$retval[$entry->dn]=$entry->displayName; $this,
$this -> LSobject,
$this -> params,
$this -> result['list'],
$id
);
$retval[$entry -> dn] = $entry -> displayName;
} }
} }

6
src/includes/class/class.LSsearchEntry.php
View file

@ -41,9 +41,6 @@ class LSsearchEntry extends LSlog_staticLoggerClass {
// The parameters of the search // The parameters of the search
private $params = array(); private $params = array();
// The hash of the search parameters
private $hash = NULL;
// The attributes list // The attributes list
private $attrs_list=array(); private $attrs_list=array();
@ -61,11 +58,10 @@ class LSsearchEntry extends LSlog_staticLoggerClass {
* *
* @param[in] $LSobject string The LdapObject type of search * @param[in] $LSobject string The LdapObject type of search
* @param[in] $params array Parameters of search * @param[in] $params array Parameters of search
* @param[in] $hash array Parameters of search
* @param[in] $resultEntry array The data of the result entry * @param[in] $resultEntry array The data of the result entry
* *
**/ **/
public function __construct(&$LSsearch, $LSobject, $params, $hash, &$result, $id) { public function __construct(&$LSsearch, $LSobject, $params, &$result, $id) {
if (!LSsession :: loadLSobject($LSobject)) { if (!LSsession :: loadLSobject($LSobject)) {
return; return;
} }