[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.11, 1.36.2.15.2.12 class.soaddressbook.inc.php, 1.14.2.3.2.1, 1.14.2.3.2.2 class.boaddressbook.inc.php, 1.21.2.2.2.3, 1.21.2.2.2.4

[Jonathan Rivera <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php class.soaddressbook.inc.php 
        class.boaddressbook.inc.php 
Log Message:
This add orgs to persons and persons to orgs in database, eald fix the bug 5143 
and 5145, and this patch fix other part of this same bug


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.11
retrieving revision 1.36.2.15.2.12
diff -C2 -r1.36.2.15.2.11 -r1.36.2.15.2.12
*** class.uiaddressbook.inc.php 10 Sep 2003 03:12:32 -0000      1.36.2.15.2.11
--- class.uiaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.36.2.15.2.12
***************
*** 1866,1870 ****
                                $my_person_name='entry[my_person][]';
                                $all_person_name='entry[all_person][]';
!                               $defaul_person_name='entry[current_person]';
  
                                $fields_to_search=array('person_id', 
'per_first_name');
--- 1866,1870 ----
                                $my_person_name='entry[my_person][]';
                                $all_person_name='entry[all_person][]';
!                               //$defaul_person_name='entry[current_person]';
  
                                $fields_to_search=array('person_id', 
'per_first_name');
***************
*** 1872,1877 ****
  
                                return 
$this->many_actions_form($this->tab_persons, $all_person_name, 
!                                       $my_person_name, $defaul_person_name, 
'all_person_data',
!                                       'my_person_data', 'my_person_array', 
$fields['current_person'],
                                        $section, $fields);
                                break;
--- 1872,1877 ----
  
                                return 
$this->many_actions_form($this->tab_persons, $all_person_name, 
!                                       $my_person_name, '', 'all_person_data',
!                                       'my_person_data', 'my_person_array', '',
                                        $section, $fields);
                                break;
***************
*** 2020,2024 ****
                        {
                                $owner_title = 'Org';
!                               $owner_value = $fields['name'];
                        }
                        
--- 2020,2024 ----
                        {
                                $owner_title = 'Org';
!                               $owner_value = $fields['org_name'];
                        }
                        
***************
*** 2046,2050 ****
                        $this->template->set_var('person', $owner_value);
  
!                       if ($option!='Categories')
                        {
                                $this->template->set_var('lang_defaul', 
lang('Defaul ' . $option . ':'));
--- 2046,2050 ----
                        $this->template->set_var('person', $owner_value);
  
!                       if ($option==$this->tab_orgs)
                        {
                                $this->template->set_var('lang_defaul', 
lang('Defaul ' . $option . ':'));

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.1
retrieving revision 1.14.2.3.2.2
diff -C2 -r1.14.2.3.2.1 -r1.14.2.3.2.2
*** class.soaddressbook.inc.php 8 Sep 2003 13:26:37 -0000       1.14.2.3.2.1
--- class.soaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.14.2.3.2.2
***************
*** 215,223 ****
                function add_person($fields)
                {
- //                    if (is_array($fields['my_cats']))
- //                    {
- //                            $fields['cat_id'] = implode(",", 
$fields['my_cats']);
- //                    }
-                       
                        if (is_array($fields['my_orgs']))
                        {
--- 215,218 ----
***************
*** 234,238 ****
                        $orgs = $fields['orgs'];
                        $cats = $fields['my_cats'];
!                       
                        unset($fields['tmp_data']);
                        unset($fields['all_orgs']);
--- 229,235 ----
                        $orgs = $fields['orgs'];
                        $cats = $fields['my_cats'];
! 
!                       $fields['preferred_address']=1;
! 
                        unset($fields['tmp_data']);
                        unset($fields['all_orgs']);
***************
*** 249,262 ****
                        unset($fields['old_tab']);
  
- //                    unset($fields['comms']['key_comm_id']);
- //                    unset($fields['addr']['key_addr_id']);
- //                    unset($fields['others']['key_other_id']);
-                       
                        $type = 
$this->contacts->search_contact_type($this->tab_main_persons);
!                       $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others);
  
-                       //$this->contacts->add_email();
-                       //$this->contacts->add_phone();
-                       
                        return $c_id;
                }
--- 246,252 ----
                        unset($fields['old_tab']);
  
                        $type = 
$this->contacts->search_contact_type($this->tab_main_persons);
!                       $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others, $orgs);
  
                        return $c_id;
                }
***************
*** 265,270 ****
                function add_org($fields)
                {
-                       //$fields['cat_id'] = implode(",", $fields['my_cats']);
-                       
                        if (is_array($fields['my_person']))
                        {
--- 255,258 ----
***************
*** 272,276 ****
                                foreach($my_persons as $key => $value)
                                {
!                                       $fields['persons'][] = 
array('person_id' => $value);
                                }
                        }
--- 260,264 ----
                                foreach($my_persons as $key => $value)
                                {
!                                       $fields['persons'][] = $value;
                                }
                        }
***************
*** 294,298 ****
  
                        $type = 
$this->contacts->search_contact_type($this->tab_main_organizations);
!                       $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others);
                        return $c_id;
                }
--- 282,286 ----
  
                        $type = 
$this->contacts->search_contact_type($this->tab_main_organizations);
!                       $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others, $persons);
                        return $c_id;
                }

Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2.2.3
retrieving revision 1.21.2.2.2.4
diff -C2 -r1.21.2.2.2.3 -r1.21.2.2.2.4
*** class.boaddressbook.inc.php 8 Sep 2003 13:26:37 -0000       1.21.2.2.2.3
--- class.boaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.21.2.2.2.4
***************
*** 470,474 ****
                        //get orgs for this person
                        $entry = 
$this->so->contacts->get_organizations_by_person($id, 
array('my_org_id','org_name', 'my_preferred'));
-                       
                        if($entry)
                        {
--- 470,473 ----
***************
*** 477,481 ****
                                        if ($v['my_preferred'] == 'Y')
                                        {
!                                               $entry['entry']['current_org'] 
= $v['my_org_id'];
                                        }
                                        $entry['entry']['my_orgs'][$k] = 
$v['my_org_id'];
--- 476,480 ----
                                        if ($v['my_preferred'] == 'Y')
                                        {
!                                               
$entry['entry']['preferred_org'] = $v['my_org_id'];
                                        }
                                        $entry['entry']['my_orgs'][$k] = 
$v['my_org_id'];