[Phpgroupware-cvs] phpgwapi/inc class.contact_org_person.inc.php, 1.1.2.4, 1.1.2.5 class.contacts_sql.inc.php, 1.17.2.2.2.16, 1.17.2.2.2.17 functions.inc.php, 1.121.2.13.2.15, 1.121.2.13.2.16

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.contact_org_person.inc.php class.contacts_sql.inc.php 
        functions.inc.php 
Log Message:
various fixes from eald

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.16
retrieving revision 1.17.2.2.2.17
diff -C2 -d -r1.17.2.2.2.16 -r1.17.2.2.2.17
*** class.contacts_sql.inc.php  4 Oct 2003 23:42:36 -0000       1.17.2.2.2.16
--- class.contacts_sql.inc.php  5 Oct 2003 07:35:18 -0000       1.17.2.2.2.17
***************
*** 1658,1661 ****
--- 1658,1665 ----
                {
                        $this->org = CreateObject('phpgwapi.contact_org');
+                       if ($action == PHPGW_SQL_RUN_SQL)
+                       {
+                               $this->lock_table($this->org->table);
+                       }
                        $this->lock_table($this->org->table);
                        $principal['org_creaton'] = $this->get_mkdate();
***************
*** 1679,1682 ****
--- 1683,1690 ----
                {
                        $this->person = CreateObject('phpgwapi.contact_person');
+                       if ($action == PHPGW_SQL_RUN_SQL)
+                       {
+                               $this->lock_table($this->person->table);
+                       }
                        $this->lock_table($this->person->table);
                        $principal['per_creaton'] = $this->get_mkdate();

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.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.contact_org_person.inc.php    4 Oct 2003 23:42:36 -0000       1.1.2.4
--- class.contact_org_person.inc.php    5 Oct 2003 07:35:18 -0000       1.1.2.5
***************
*** 66,70 ****
                        }
                        $this->set_ilinks('my_org_id', 
'phpgwapi.contact_org','org_id');
!                       $this->set_ilinks('my_person_id', 
'phpgwapi.contact_person','person_id') ;
                }
                
--- 66,70 ----
                        }
                        $this->set_ilinks('my_org_id', 
'phpgwapi.contact_org','org_id');
!                       $this->set_ilinks('my_person_id', 
'phpgwapi.contact_person','person_id');
                }
                

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.15
retrieving revision 1.121.2.13.2.16
diff -C2 -d -r1.121.2.13.2.15 -r1.121.2.13.2.16
*** functions.inc.php   4 Oct 2003 23:42:36 -0000       1.121.2.13.2.15
--- functions.inc.php   5 Oct 2003 07:35:18 -0000       1.121.2.13.2.16
***************
*** 218,225 ****
        $GLOBALS['phpgw']->preferences  = CreateObject('phpgwapi.preferences');
        $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
-       if($GLOBALS['phpgw_info']['flags']['enable_class_contacts'] == True)
-       {
-                       $GLOBALS['phpgw']->contacts = 
CreateObject('phpgwapi.contacts');
-       }
        print_debug('main class loaded', 'messageonly','api');
        if (! 
isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) ||
--- 218,221 ----