[Phpgroupware-cvs] phpgwapi/inc/class.contacts_sql.inc.php, 1.17.2.2.2.66

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.contacts_sql.inc.php

date: 2004/06/28 21:05:03;  author: alexbsa;  state: Exp;  lines: +10 -7

Log Message:
Fixes delete-account-contact problem with the phpgw_contact_others table.
Also adds 'active' flag for the others table.
=====================================================================
Index: phpgwapi/inc/class.contacts_sql.inc.php
diff -u phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.65 
phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.66
--- phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.65       Mon Jun 28 
07:08:09 2004
+++ phpgwapi/inc/class.contacts_sql.inc.php     Mon Jun 28 21:05:03 2004
@@ -83,10 +83,11 @@
                                                        'per_prefix'            
=> 'prefix',
                                                        'per_suffix'            
=> 'suffix',
                                                        'per_birthday'          
=> 'birthday',
-                                                       'per_pubkey'            
=> 'public key',
-                                                       'per_title'             
=> 'title',
-                                                       'per_department'        
=> 'department',
-                                                       'per_sound'             
=> 'sound',
+                                                       'per_pubkey'            
=> 'public key', 
+                                                       'per_title'             
=> 'title', 
+                                                       'per_department'        
=> 'department', 
+                                                       'per_sound'             
=> 'sound', 
+                                                       'per_active'            
=> 'active',                                    
                                        //              'per_name'              
=> 'full name',
                                        //              'sel_cat_id'            
=> 'categories',
                                                        'org_name'              
=> 'company name',
@@ -1124,6 +1125,7 @@
                                      'per_title',
                                      'per_department',
                                      'per_initials',
+                                     'per_active',
                                      'per_sound');
                        $this->request($data);
                        $this->criteria(array('contact_id' => $contact_id));
@@ -1237,6 +1239,7 @@
                                      'owner',
                                      'access',
                                      'cat_id',
+                                     'org_active',
                                      'org_name');
                        $this->request($data);
                        $this->criteria(array('contact_id' => $contact_id));
@@ -2219,7 +2222,7 @@
                        }
                        $contact = CreateObject('phpgwapi.contact_others');
                        return $contact->update(array('other_owner' => 
$new_owner),
-                                               
sql_criteria::_equal('other_owner',sql::integer($old_owner)),
+                                               
sql_criteria::_equal('contact_owner',sql::integer($old_owner)),
                                                PHPGW_SQL_RUN_SQL);
                }
 
@@ -3008,7 +3011,7 @@
                function get_cats_by_org($org_id)
                {
                        $this->request('cat_id');
-                       $this->criteria(array('org_id' => $person_id));
+                       $this->criteria(array('org_id' => $org_id));
                        $cats = $this->get_records_by_field('cat_id', __LINE__, 
__FILE__);
                        if($cats[0])
                        {