[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] infolog/inc/class.bolink.inc.php, 1.20.2.8
From: |
nomail |
Subject: |
[Phpgroupware-cvs] infolog/inc/class.bolink.inc.php, 1.20.2.8 |
Date: |
Mon, 28 Jun 2004 19:50:06 +0200 |
Update of /infolog/inc
Modified Files:
Branch: Version-0_9_16-branch
class.bolink.inc.php
date: 2004/06/28 17:50:06; author: jarg; state: Exp; lines: +17 -13
Log Message:
bugfix #9259, search addressbook works again
=====================================================================
Index: infolog/inc/class.bolink.inc.php
diff -u infolog/inc/class.bolink.inc.php:1.20.2.7
infolog/inc/class.bolink.inc.php:1.20.2.8
--- infolog/inc/class.bolink.inc.php:1.20.2.7 Tue Mar 2 17:13:21 2004
+++ infolog/inc/class.bolink.inc.php Mon Jun 28 17:50:06 2004
@@ -881,15 +881,15 @@
*/
function addressbook_title( $addr )
{
- if (!is_object($this->contacts))
- {
- $this->contacts =
createobject('phpgwapi.contacts');
- }
- if (!is_array($addr))
- {
- //list( $addr ) =
$this->contacts->read_single_entry( $addr );
- list( $addr ) =
$this->contacts->get_principal_persons_data( $addr );
- }
+// if (!is_object($this->contacts))
+// {
+// $this->contacts =
createobject('phpgwapi.contacts');
+// }
+// if (!is_array($addr))
+// {
+// //list( $addr ) =
$this->contacts->read_single_entry( $addr );
+// list( $addr ) =
$this->contacts->get_principal_persons_data( $addr );
+// }
if (!is_array($addr))
{
@@ -926,11 +926,15 @@
{
$this->contacts =
createobject('phpgwapi.contacts');
}
- $columns_to_display = array('per_first_name',
'per_last_name', 'per_prefix');
+ $columns_to_display = array('contact_id',
'per_first_name', 'per_last_name', 'per_prefix', 'org_name');
$me = $GLOBALS['phpgw_info']['user']['account_id'];
- $addrs = $this->contacts->get_people_by_owner($me,
$columns_to_display);
-
+ //$addrs = $this->contacts->get_people_by_owner($me,
$columns_to_display);
+ $criteria = $this->contacts->criteria_for_index(
+ $me, PHPGW_CONTACTS_ALL,
+ PHPGW_CONTACTS_CATEGORIES_ALL,
+ $columns_to_display, $pattern,
$columns_to_display);
+ $addrs =
$this->contacts->get_persons($columns_to_display, '','','','','',$criteria);
$content = array( );
while ($addrs && list( $key,$addr ) = each( $addrs ))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] infolog/inc/class.bolink.inc.php, 1.20.2.8,
nomail <=