extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments to pass array values (one more to go)

Browse Source
This commit is contained in:
Miles Lott 2001-08-23 06:57:37 +00:00
parent c08ed955e1
commit a18da3100c
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/inc/class.boaddressbook.inc.php
View File

@ -210,15 +210,7 @@
function read_entries($data) function read_entries($data)
{ {
$entries = $this->so->read_entries( $entries = $this->so->read_entries($data);
$data['start'],
$data['limit'],
$data['fields'],
$this->query,
$data['filter'],
$this->sort,
$this->order
);
$this->total = $this->so->contacts->total_records; $this->total = $this->so->contacts->total_records;
if($this->debug) { echo '<br>Total records="' . $this->total . '"'; } if($this->debug) { echo '<br>Total records="' . $this->total . '"'; }
return $this->strip_html($entries); return $this->strip_html($entries);

13
addressbook/inc/class.soaddressbook.inc.php
View File

@ -56,10 +56,17 @@
$this->owner = $owner; $this->owner = $owner;
} }
function read_entries($start,$offset,$qcols,$query,$qfilter,$sort,$order) function read_entries($data)
{ {
$readrights = $this->rights & PHPGW_ACL_READ; return $this->contacts->read(
return $this->contacts->read($start,$offset,$qcols,$query,$qfilter,$sort,$order,$readrights); $data['start'],
$data['limit'],
$data['fields'],
$data['query'],
$data['filter'],
$data['sort'],
$data['order']
);
} }
function read_entry($id,$fields) function read_entry($id,$fields)

9
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -420,7 +420,10 @@
'start' => $this->start, 'start' => $this->start,
'limit' => $this->limit, 'limit' => $this->limit,
'fields' => $columns_to_display, 'fields' => $columns_to_display,
'filter' => $qfilter 'filter' => $qfilter,
'query' => $this->query,
'sort' => $this->sort,
'order' => $this->order
)); ));
$total_records = $this->bo->total; $total_records = $this->bo->total;
} }
@ -430,8 +433,8 @@
$query = $this->query; $query = $this->query;
$search_filter = $phpgw->nextmatchs->show_tpl('/index.php', $search_filter = $phpgw->nextmatchs->show_tpl('/index.php',
$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.get_list',"75%", $this->start, $total_records,'&menuaction=addressbook.uiaddressbook.get_list','75%',
$phpgw_info["theme"]["th_bg"],1,1,1,1,$this->cat_id); $phpgw_info['theme']['th_bg'],1,1,1,1,$this->cat_id);
$query = ''; $query = '';
$lang_showing = $phpgw->nextmatchs->show_hits($total_records,$this->start); $lang_showing = $phpgw->nextmatchs->show_hits($total_records,$this->start);