[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.42.2.5.2.35, 1.42.2.5.2.36

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv16507/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojects.inc.php 
Log Message:
fixes contacts popup

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.35
retrieving revision 1.42.2.5.2.36
diff -C2 -d -r1.42.2.5.2.35 -r1.42.2.5.2.36
*** class.boprojects.inc.php    5 Oct 2003 06:13:52 -0000       1.42.2.5.2.35
--- class.boprojects.inc.php    21 Oct 2003 12:06:24 -0000      1.42.2.5.2.36
***************
*** 188,201 ****
                }
  
!               function read_abook($start, $query, $qfilter, $sort, $order)
                {
-                       $account_id = 
$GLOBALS['phpgw_info']['user']['account_id'];
- 
                        $cols = array('contact_id', 
'per_first_name','per_last_name','org_name','people');
!                       $criteria = array('my_preferred' => 'Y');
!                       
!                       $entries = $this->contacts->get_persons($cols, 
$limit='',$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'], 
$order, $sort, $criteria);
!                       
!                       //$entries = 
$this->contacts->read($start,$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
 $cols, $query, $qfilter, $sort, $order, $account_id);
                        $this->total_records = $this->contacts->total_records;
                        return $entries;
--- 188,198 ----
                }
  
!               function read_abook($start, $query, $filter, $sort, $order)
                {
                        $cols = array('contact_id', 
'per_first_name','per_last_name','org_name','people');
!                       //$criteria = array('my_preferred' => 'Y');
! 
!                       $entries = $this->contacts->get_persons($cols, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'], $start, 
$order, $sort);//, $criteria);
! 
                        $this->total_records = $this->contacts->total_records;
                        return $entries;
***************
*** 205,212 ****
                {
                        $cols = array('contact_id', 
'per_first_name','per_last_name','org_name','people');
!                       $criteria = array('contact_id' => intval($abid), 
'my_preferred' => 'Y');
  
!                       return $this->contacts->get_persons($cols, 
$limit='',$maxmatchs='', $order='', $sort='',$criteria);
!                       //return 
$this->contacts->read_single_entry($abid,$cols);
                }
  
--- 202,209 ----
                {
                        $cols = array('contact_id', 
'per_first_name','per_last_name','org_name','people');
!                       $criteria = array('contact_id' => intval($abid));//, 
'my_preferred' => 'Y');
  
!                       return $this->contacts->get_persons($cols, 
$limit='',$start = '',$order='', $sort='',$criteria);
!                       //_debug_array($co);
                }