[Phpgroupware-cvs] addressbook/inc class.soaddressbook.inc.php, 1.14.2.3.2.5, 1.14.2.3.2.6

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.soaddressbook.inc.php 
Log Message:
Fixes for bugs 5144, 5148, 5518 - from eald


Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.5
retrieving revision 1.14.2.3.2.6
diff -C2 -d -r1.14.2.3.2.5 -r1.14.2.3.2.6
*** class.soaddressbook.inc.php 16 Sep 2003 18:44:15 -0000      1.14.2.3.2.5
--- class.soaddressbook.inc.php 25 Sep 2003 23:52:31 -0000      1.14.2.3.2.6
***************
*** 22,26 ****
        class soaddressbook
        {
- 
                function soaddressbook($useacl=True)
                {
--- 22,25 ----
***************
*** 63,68 ****
                        $this->comm_type = $this->contacts->comm_type;
                        $this->addr_type = $this->contacts->addr_type;
!                       $this->tab_main_persons = 
$this->contacts->tab_main_persons;
!                       $this->tab_main_organizations = 
$this->contacts->tab_main_organizations;
                }
  
--- 62,67 ----
                        $this->comm_type = $this->contacts->comm_type;
                        $this->addr_type = $this->contacts->addr_type;
!                       $this->tab_main_persons = 
$this->contacts->get_person_name();
!                       $this->tab_main_organizations = 
$this->contacts->get_org_name();
                }
  
***************
*** 198,207 ****
                function get_persons($fields, $start='', $limit='', 
$orderby='', $sort='', $criteria='')
                {
!                       return $this->contacts->get_persons($fields, $start, 
$limit, $orderby, $sort, $criteria);
                }
  
                function get_orgs($fields, $start='', $limit='', $orderby='', 
$sort='', $criteria='')
                {
!                       return $this->contacts->get_orgs($fields, $start, 
$limit, $orderby, $sort, $criteria);
                }
  
--- 197,206 ----
                function get_persons($fields, $start='', $limit='', 
$orderby='', $sort='', $criteria='')
                {
!                       return $this->contacts->get_persons($fields, $start, 
$limit, $orderby, $sort, '', $criteria);
                }
  
                function get_orgs($fields, $start='', $limit='', $orderby='', 
$sort='', $criteria='')
                {
!                       return $this->contacts->get_orgs($fields, $start, 
$limit, $orderby, $sort, '', $criteria);
                }
  
***************
*** 250,254 ****
                        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);
  
--- 249,253 ----
                        unset($fields['old_tab']);
  
!                       $type = 
$this->contacts->search_contact_type($this->contacts->get_person_name());
                        $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others, $orgs);
  
***************
*** 285,289 ****
                        unset($fields['old_tab']);
  
!                       $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;
--- 284,288 ----
                        unset($fields['old_tab']);
  
!                       $type = 
$this->contacts->search_contact_type($this->contacts->get_org_name());
                        $c_id = $this->contacts->add_contact($type, $fields, 
$comms, $addr, $cats, $others, $persons);
                        return $c_id;
***************
*** 404,407 ****
--- 403,417 ----
                {
                        return $this->contacts->search_contact_type_id($id);
+               }
+ 
+ 
+               /**
+               * Criteria for index primordially
+               *
+               * return string criteria for search.
+               */
+               function criteria_contacts($user, $access, $category, $fields, 
$pattern)
+               {
+                       return $this->contacts->criteria_for_index($user, 
$access, $category, $fields, $pattern);
                }