DMC/boka3
13
0
Fork 0
Code Issues13 Pull Requests Projects Releases Wiki Activity

Fixed the last palces where ldap object must be passed

Browse Source
This commit is contained in:
Erik Thuning 2021-09-15 10:53:13 +02:00
parent 3c8a0485de
commit 6cc74873b2
3 changed files with 7 additions and 6 deletions

4
include/Product.php

@ -109,7 +109,9 @@ class Product {
return true;
}
public function matches($terms) {
// Ldap object must be passed to keep the arglist in sync
// with User->matches()
public function matches($terms, $ldap) {
foreach($terms as $field => $values) {
$matchvalues = array();
if(property_exists($this, $field)) {

2
include/SearchPage.php

@ -132,7 +132,7 @@ class SearchPage extends Page {
$items = get_items($type);
$out = array();
foreach($items as $item) {
if($item->matches($terms)) {
if($item->matches($terms, $this->ldap)) {
$out[] = $item;
}
}

7
include/User.php

@ -3,7 +3,6 @@ class User {
private $id = 0;
private $name = '';
private $notes = '';
private $ldap = null;
public static function create_user($name) {
$ins_user = prepare('insert into `user`(`name`) values (?)');
@ -45,17 +44,17 @@ class User {
return true;
}
public function matches($terms) {
public function matches($terms, $ldap) {
foreach($terms as $field => $values) {
$matchvalues = array();
if($field == 'name') {
$matchvalues[] = $this->name;
$matchvalues[] = $this->get_displayname();
$matchvalues[] = $this->get_displayname($ldap);
} else if(property_exists($this, $field)) {
$matchvalues[] = $this->$field;
} else if($field == 'fritext') {
$matchvalues[] = $this->name;
$matchvalues[] = $this->get_displayname();
$matchvalues[] = $this->get_displayname($ldap);
$matchvalues[] = $this->notes;
} else {
return false;