[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.11, 1.17.2.2.2.12 class.contact_accounts.inc.php, 1.1.2.1, 1.1.2.2 class.contact_addr.inc.php, 1.1.2.2, 1.1.2.3 class.contact_addr_type.inc.php, 1.1.2.1, 1.1.2.2 class.contact_categories.inc.php, 1.1.2.1, 1.1.2.2 class.contact_central.inc.php, 1.1.2.2, 1.1.2.3 class.contact_comm.inc.php, 1.1.2.2, 1.1.2.3 class.contact_comm_descr.inc.php, 1.1.2.1, 1.1.2.2 class.contact_comm_type.inc.php, 1.1.2.1, 1.1.2.2 class.contact_note.inc.php, 1.1.2.1, 1.1.2.2 class.contact_note_type.inc.php, 1.1.2.1, 1.1.2.2 class.contact_org.inc.php, 1.1.2.1, 1.1.2.2 class.contact_org_person.inc.php, 1.1.2.1, 1.1.2.2 class.contact_others.inc.php, 1.1.2.1, 1.1.2.2 class.contact_person.inc.php, 1.1.2.2, 1.1.2.3 class.contact_types.inc.php, 1.1.2.1, 1.1.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv22874

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php class.contact_accounts.inc.php 
        class.contact_addr.inc.php class.contact_addr_type.inc.php 
        class.contact_categories.inc.php class.contact_central.inc.php 
        class.contact_comm.inc.php class.contact_comm_descr.inc.php 
        class.contact_comm_type.inc.php class.contact_note.inc.php 
        class.contact_note_type.inc.php class.contact_org.inc.php 
        class.contact_org_person.inc.php class.contact_others.inc.php 
        class.contact_person.inc.php class.contact_types.inc.php 
Log Message:
fix for 5165 and others unreported from jarg


Index: class.contact_note.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_note.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_note.inc.php  8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_note.inc.php  30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_note extends sql_entity
        {

Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.11
retrieving revision 1.17.2.2.2.12
diff -C2 -d -r1.17.2.2.2.11 -r1.17.2.2.2.12
*** class.contacts_sql.inc.php  29 Sep 2003 23:04:37 -0000      1.17.2.2.2.11
--- class.contacts_sql.inc.php  30 Sep 2003 05:20:00 -0000      1.17.2.2.2.12
***************
*** 20,25 ****
  /* $Id$ */
        include(PHPGW_API_INC . '/class.sql_builder.inc.php');
!       include(PHPGW_API_INC . '/class.sql_criteria.inc.php');
!       include(PHPGW_API_INC . '/class.sql_entity.inc.php');
  
        define(PHPGW_CONTACTS_CATEGORIES_ALL, -3);
--- 20,25 ----
  /* $Id$ */
        include(PHPGW_API_INC . '/class.sql_builder.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
  
        define(PHPGW_CONTACTS_CATEGORIES_ALL, -3);
***************
*** 2453,2464 ****
                                }
                        }
-                       $location = CreateObject('phpgwapi.contact_addr');
-                       $search_fields = (empty($search_fields) || 
!is_array($search_fields)) ? array() : $search_fields;
-                       if(count(array_intersect($location->get_false_fields(), 
$search_fields)) > 0)
-                       {
-                               $addr_preferred_criteria = 
sql_criteria::token_or(sql_criteria::_equal('addr_pref_val', 'Y'),
-                                                                               
sql_criteria::_is_null('key_addr_id'));
-                               $criteria = sql_criteria::token_and($criteria, 
$addr_preferred_criteria);
-                       }
                        if(count($search_fields) > 0 && $pattern)
                        {
--- 2453,2456 ----
***************
*** 2467,2471 ****
                                        $search_array[] = 
sql_criteria::token_has($field, $pattern);
                                }
!                               $criteria = sql_criteria::token_and($criteria, 
sql_criteria::_append_or($search_array));
                        }
                        return $criteria;
--- 2459,2471 ----
                                        $search_array[] = 
sql_criteria::token_has($field, $pattern);
                                }
!                               $search_criteria = 
sql_criteria::_append_or($search_array);
!                               $location = 
CreateObject('phpgwapi.contact_addr');
!                               
if(count(array_intersect($location->get_false_fields(), $search_fields)) > 0)
!                               {
!                                       $addr_preferred_criteria = 
sql_criteria::token_or(sql_criteria::_equal('addr_pref_val', 'Y'),
!                                                                               
        sql_criteria::_is_null('key_addr_id'));
!                                       $search_criteria = 
sql_criteria::token_and($search_criteria, $addr_preferred_criteria);
!                               }
!                               $criteria = sql_criteria::token_and($criteria, 
$search_criteria);
                        }
                        return $criteria;

Index: class.contact_central.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_central.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_central.inc.php       26 Sep 2003 00:03:08 -0000      1.1.2.2
--- class.contact_central.inc.php       30 Sep 2003 05:20:01 -0000      1.1.2.3
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_central extends sql_entity
        {

Index: class.contact_person.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_person.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_person.inc.php        26 Sep 2003 00:03:08 -0000      1.1.2.2
--- class.contact_person.inc.php        30 Sep 2003 05:20:01 -0000      1.1.2.3
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_person extends sql_entity
        {

Index: class.contact_categories.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_categories.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_categories.inc.php    8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_categories.inc.php    30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_categories extends sql_entity
        {

Index: class.contact_org_person.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_org_person.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_org_person.inc.php    8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_org_person.inc.php    30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_org_person extends sql_entity
        {

Index: class.contact_org.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_org.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_org.inc.php   8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_org.inc.php   30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_org extends sql_entity
        {

Index: class.contact_comm_descr.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm_descr.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_comm_descr.inc.php    8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_comm_descr.inc.php    30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_comm_descr extends sql_entity
        {

Index: class.contact_addr.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_addr.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_addr.inc.php  26 Sep 2003 00:03:08 -0000      1.1.2.2
--- class.contact_addr.inc.php  30 Sep 2003 05:20:01 -0000      1.1.2.3
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_addr extends sql_entity
        {

Index: class.contact_comm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_comm.inc.php  26 Sep 2003 00:03:08 -0000      1.1.2.2
--- class.contact_comm.inc.php  30 Sep 2003 05:20:01 -0000      1.1.2.3
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_comm extends sql_entity
        {

Index: class.contact_types.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_types.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_types.inc.php 8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_types.inc.php 30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_types extends sql_entity
        {

Index: class.contact_note_type.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_note_type.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_note_type.inc.php     8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_note_type.inc.php     30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_note_type extends sql_entity
        {

Index: class.contact_others.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_others.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_others.inc.php        8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_others.inc.php        30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_others extends sql_entity
        {

Index: class.contact_comm_type.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm_type.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_comm_type.inc.php     8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_comm_type.inc.php     30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_comm_type extends sql_entity
        {
***************
*** 32,36 ****
  
  
!               function contact_comm_type ($ali = '', $field = '', $criteria = 
        '')
                {
                        $this->_constructor('phpgw_contact_comm_type', 
'contact_comm_type');
--- 35,39 ----
  
  
!               function contact_comm_type ($ali = '', $field = '', $criteria = 
'')
                {
                        $this->_constructor('phpgw_contact_comm_type', 
'contact_comm_type');
***************
*** 45,50 ****
  
                        $this->set_elinks('comm_type_id', 
'phpgwapi.contact_comm_descr','comm_type');
!               }               
! 
        }
  ?>
--- 48,52 ----
  
                        $this->set_elinks('comm_type_id', 
'phpgwapi.contact_comm_descr','comm_type');
!               }
        }
  ?>

Index: class.contact_accounts.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_accounts.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_accounts.inc.php      8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_accounts.inc.php      30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
        class contact_accounts extends sql_entity
        {

Index: class.contact_addr_type.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_addr_type.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.contact_addr_type.inc.php     8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.contact_addr_type.inc.php     30 Sep 2003 05:20:01 -0000      1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
  <?php
+       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
+       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
+ 
          class contact_addr_type extends sql_entity
          {
***************
*** 17,21 ****
                                                                   'field'      
  => 'description'));
                  
!                 function contact_addr_type ($ali = '', $field = '', $criteria 
=         '')
                  {
                          $this->_constructor('phpgw_contact_addr_type', 
'contact_addr_type');
--- 20,24 ----
                                                                   'field'      
  => 'description'));
                  
!                 function contact_addr_type ($ali = '', $field = '', $criteria 
= '')
                  {
                          $this->_constructor('phpgw_contact_addr_type', 
'contact_addr_type');