Adjustments to pass array values (one more to go)

addressbook/inc/class.boaddressbook.inc.php

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

addressbook/inc/class.soaddressbook.inc.php

@@ -56,10 +56,17 @@
 			$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($start,$offset,$qcols,$query,$qfilter,$sort,$order,$readrights);
+			return $this->contacts->read(
+				$data['start'],
+				$data['limit'],
+				$data['fields'],
+				$data['query'],
+				$data['filter'],
+				$data['sort'],
+				$data['order']
+			);
 		}
 
 		function read_entry($id,$fields)

addressbook/inc/class.uiaddressbook.inc.php

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