[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.8, 1.17.2.2.2.9 class.sql_builder.inc.php, 1.1.2.4, 1.1.2.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php class.sql_builder.inc.php 
Log Message:
Fixes for bugs 5188, 5237 - from jarg


Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_builder.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.sql_builder.inc.php   26 Sep 2003 05:28:37 -0000      1.1.2.4
--- class.sql_builder.inc.php   26 Sep 2003 05:32:45 -0000      1.1.2.5
***************
*** 551,555 ****
                        else
                        {
-                               print 'algo malo esta sucediendole a esto';
                                return ;
                        }
--- 551,554 ----

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.8
retrieving revision 1.17.2.2.2.9
diff -C2 -d -r1.17.2.2.2.8 -r1.17.2.2.2.9
*** class.contacts_sql.inc.php  26 Sep 2003 05:28:37 -0000      1.17.2.2.2.8
--- class.contacts_sql.inc.php  26 Sep 2003 05:32:44 -0000      1.17.2.2.2.9
***************
*** 500,504 ****
                                $this->comm_descr = $data['comm_descr'];
                        }
! 
                        {
                                $this->comm_descr = 
$this->get_contact_comm_descr();
--- 500,504 ----
                                $this->comm_descr = $data['comm_descr'];
                        }
!                       else
                        {
                                $this->comm_descr = 
$this->get_contact_comm_descr();
***************
*** 790,799 ****
                                $this->criteria($criteria);
                                $this->criteria(array('contact_type' => 
$this->search_contact_type($this->_contact_person)));
- 
                        }
                        else
                        {
!                               $criteria_token = 
sql_criteria::token_and(sql_criteria::_equal('contact_type', 
$this->search_contact_type($this->_contact_person)), $criteria_token);
!                               $this->criteria_token($criteria_token);
                        }
  
--- 790,805 ----
                                $this->criteria($criteria);
                                $this->criteria(array('contact_type' => 
$this->search_contact_type($this->_contact_person)));
                        }
                        else
                        {
!                               if($criteria_token=='')
!                               {
!                                       $this->criteria(array('contact_type' => 
$this->search_contact_type($this->_contact_person)));
!                               }
!                               else
!                               {
!                                       $criteria_token = 
sql_criteria::token_and(sql_criteria::_equal('contact_type', 
$this->search_contact_type($this->_contact_person)), $criteria_token);
!                                       $this->criteria_token($criteria_token);
!                               }
                        }
  
***************
*** 843,848 ****
                                      'per_department',
                                      'per_initials',
!                                     'per_sound',
!                                     'per_active');
                        $this->request($data);
                        $this->criteria(array('contact_id' => $contact_id));
--- 849,853 ----
                                      'per_department',
                                      'per_initials',
!                                     'per_sound');
                        $this->request($data);
                        $this->criteria(array('contact_id' => $contact_id));
***************
*** 891,896 ****
                        else
                        {
!                               $criteria_token = 
sql_criteria::token_and(sql_criteria::_equal('contact_type', 
$this->search_contact_type($this->_contact_org)), $criteria_token);
!                               $this->criteria_token($criteria_token);
                        }
                        
--- 896,908 ----
                        else
                        {
!                               if($criteria_token=='')
!                               {
!                                       $this->criteria(array('contact_type' => 
$this->search_contact_type($this->_contact_org)));
!                               }
!                               else
!                               {
!                                       $criteria_token = 
sql_criteria::token_and(sql_criteria::_equal('contact_type', 
$this->search_contact_type($this->_contact_org)), $criteria_token);
!                                       $this->criteria_token($criteria_token);
!                               }
                        }
                        
***************
*** 1760,1764 ****
                {
                        $type = ($type)? $type : $this->get_type_contact($cid);
- 
                        $type = ($type == $this->_contact_person)? 'person' : 
'org';
  
--- 1772,1775 ----
***************
*** 2496,2500 ****
                        
                        $principal = $this->$get_data_type($contact_id);
!                       $categories = explode(",", $principal[0]['cat_id']);
                        $comms = $this->get_comm_contact_data($contact_id);
                        $locations = $this->get_addr_contact_data($contact_id);
--- 2507,2519 ----
                        
                        $principal = $this->$get_data_type($contact_id);
!                       $cats = explode(",", $principal[0]['cat_id']);
!                       foreach($cats as $cat)
!                       {
!                               if($cat)
!                               {
!                                       $categories[] = $cat;
!                               }
!                       }
!       
                        $comms = $this->get_comm_contact_data($contact_id);
                        $locations = $this->get_addr_contact_data($contact_id);