[Phpgroupware-cvs] addressbook/inc/export Multiple_VCard, 1.2.6.2, 1.2.6.3

[Jonathan Rivera <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc/export
In directory subversions:/tmp/cvs-serv31246/addressbook/inc/export

Modified Files:
      Tag: Version-0_9_16-branch
        Multiple_VCard 
Log Message:
Bugfix, problems with acl and addresses, this works fine now


Index: Multiple_VCard
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/export/Multiple_VCard,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -C2 -d -r1.2.6.2 -r1.2.6.3
*** Multiple_VCard      3 Nov 2003 21:08:48 -0000       1.2.6.2
--- Multiple_VCard      3 Dec 2003 18:51:26 -0000       1.2.6.3
***************
*** 45,66 ****
                        $this->id=-1;
  
                        if ($ncat_id)
                        {
!                               $tmp = 
$this->contacts->get_persons_by_cat($ncat_id);
!                               //$filter = 'tid=n,cat_id='.$ncat_id;
                        }
                        else
                        {
!                               $tmp_person = 
$this->contacts->get_persons(array('person_id'));
!                               if(is_array($tmp_person))
                                {
!                                       foreach($tmp_person as $data)
!                                       {
!                                               $tmp[] = $data['person_id'];
!                                       }
                                }
-                               //$filter = 'tid=n';
                        }
  
                        //$tmp = 
$this->contacts->read('','',array('id'=>'id'),'',$filter);
                        for ($i=0;$i<count($tmp);$i++)
--- 45,69 ----
                        $this->id=-1;
  
+                       $fields = array('person_id');
                        if ($ncat_id)
                        {
!                               $criteria = 
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id'],
 PHPGW_CONTACTS_ALL, $ncat_id);
!                               $tmp_person = 
$this->contacts->get_persons($fields, '', '', '', '', '', $criteria);
                        }
                        else
                        {
!                               $criteria = 
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id'],
 PHPGW_CONTACTS_ALL);
!                               $tmp_person = 
$this->contacts->get_persons($fields, '', '', '', '', '', $criteria);
!                       }
! 
!                       if(is_array($tmp_person))
!                       {
!                               foreach($tmp_person as $data)
                                {
!                                       $tmp[] = $data['person_id'];
                                }
                        }
  
+ 
                        //$tmp = 
$this->contacts->read('','',array('id'=>'id'),'',$filter);
                        for ($i=0;$i<count($tmp);$i++)
***************
*** 82,87 ****
                        //$top = 
$this->contacts->read_single_entry($this->ids[$this->id],$this->qfields);
                        $fieldlist = 
$this->contacts->person_complete_data($this->ids[$this->id]);
!                       $type_work = 
$this->contacts->search_location_type('work');
!                       $type_home = 
$this->contacts->search_location_type('home');
                        $fields['full_name']            = 
$fieldlist['full_name'];
                        $fields['first_name']           = 
$fieldlist['first_name'];
--- 85,111 ----
                        //$top = 
$this->contacts->read_single_entry($this->ids[$this->id],$this->qfields);
                        $fieldlist = 
$this->contacts->person_complete_data($this->ids[$this->id]);
! 
!                       if(is_array($fieldlist['locations']))
!                       {
!                               foreach($fieldlist['locations'] as $key => 
$values)
!                               {
!                                       if($values['type']=='work')
!                                       {
!                                               $type_work = $key;
!                                       }
!                                       elseif($values['type']=='home')
!                                       {
!                                               $type_home = $key;
!                                       }
!                               }
!                       }
! 
!                       print 'home'.$type_home;
!                       print 'work'.$type_work;
!                       
!                       echo '<pre>';
!                       print_r($fieldlist);
!                       echo '</pre>';
! 
                        $fields['full_name']            = 
$fieldlist['full_name'];
                        $fields['first_name']           = 
$fieldlist['first_name'];