|
| From: | Dave Hall <address@hidden> |
| Subject: | [Phpgroupware-cvs] phpgwapi/inc class.contact_accounts.inc.php, 1.1.2.2, 1.1.2.3 class.contact_addr.inc.php, 1.1.2.3, 1.1.2.4 class.contact_addr_type.inc.php, 1.1.2.2, 1.1.2.3 class.contact_categories.inc.php, 1.1.2.2, 1.1.2.3 class.contact_central.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm_descr.inc.php, 1.1.2.2, 1.1.2.3 class.contact_comm_type.inc.php, 1.1.2.2, 1.1.2.3 class.contact_note.inc.php, 1.1.2.2, 1.1.2.3 class.contact_note_type.inc.php, 1.1.2.2, 1.1.2.3 class.contact_org.inc.php, 1.1.2.2, 1.1.2.3 class.contact_org_person.inc.php, 1.1.2.2, 1.1.2.3 class.contact_others.inc.php, 1.1.2.2, 1.1.2.3 class.contact_person.inc.php, 1.1.2.3, 1.1.2.4 class.contact_types.inc.php, 1.1.2.2, 1.1.2.3 class.contacts_sql.inc.php, 1.17.2.2.2.13, 1.17.2.2.2.14 class.sql.inc.php, 1.1.2.7, 1.1.2.8 |
| Date: | Fri, 03 Oct 2003 00:24:43 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5862
Modified Files:
Tag: Version-0_9_16-branch
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
class.contacts_sql.inc.php class.sql.inc.php
Log Message:
various fixes from Step One Crew
Index: class.contact_note.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_note.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_note.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_note.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_note_id'),
'note_contact_id' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_note_id',
! 'type'
=> 'integer'),
'note_contact_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id'),
'note_type' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id',
! 'type'
=> 'integer'),
'note_type' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'note_type_id'),
'note_text' => array('select'
=> '',
'criteria'
=> '',
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'note_type_id',
! 'type'
=> 'integer'),
'note_text' => array('select'
=> '',
'criteria'
=> '',
***************
*** 32,36 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'note_creaton' => array('select'
=> '',
'criteria'
=> '',
--- 35,40 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'),
'note_creaton' => array('select'
=> '',
'criteria'
=> '',
***************
*** 39,43 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on'),
'note_creatby' => array('select'
=> '',
'criteria'
=> '',
--- 43,48 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on',
! 'type'
=> 'integer'),
'note_creatby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 46,50 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by'),
'note_modon' => array('select'
=> '',
'criteria'
=> '',
--- 51,56 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by',
! 'type'
=> 'integer'),
'note_modon' => array('select'
=> '',
'criteria'
=> '',
***************
*** 53,57 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on'),
'note_modby' => array('select'
=> '',
'criteria'
=> '',
--- 59,64 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on',
! 'type'
=> 'integer'),
'note_modby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 60,64 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by'),
'note' => array('select'
=> '',
'criteria'
=> '',
--- 67,72 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by',
! 'type'
=> 'integer'),
'note' => array('select'
=> '',
'criteria'
=> '',
***************
*** 67,71 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''));
--- 75,80 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'));
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.13
retrieving revision 1.17.2.2.2.14
diff -C2 -d -r1.17.2.2.2.13 -r1.17.2.2.2.14
*** class.contacts_sql.inc.php 2 Oct 2003 22:23:53 -0000 1.17.2.2.2.13
--- class.contacts_sql.inc.php 3 Oct 2003 00:24:37 -0000 1.17.2.2.2.14
***************
*** 2031,2035 ****
* Retrieve all the locations of $contacts_id
*
! * @param integer $contacts_id The contact id that will be used
for search his data.
* @param Array $data This is the information that want to
retrieve, according whith phpGroupware Address Specification.
* @param integer $action PHPGW_SQL_RETURN_SQL |
PHPGW_SQL_RUN_SQL depending what we want
--- 2031,2035 ----
* Retrieve all the locations of $contacts_id
*
! * @param integer|array $contact_id The contact id that will be
used for search his data.
* @param Array $data This is the information that want to
retrieve, according whith phpGroupware Address Specification.
* @param integer $action PHPGW_SQL_RETURN_SQL |
PHPGW_SQL_RUN_SQL depending what we want
Index: class.contact_central.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_central.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_central.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.3
--- class.contact_central.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
***************
*** 11,15 ****
'delete' => '',
'sort' => '',
! 'field' => ''),
'owner' => array('select' => '',
'criteria' => '',
--- 11,16 ----
'delete' => '',
'sort' => '',
! 'field' => '',
! 'type' =>
'integer'),
'owner' => array('select' => '',
'criteria' => '',
***************
*** 18,22 ****
'delete' => '',
'sort' => '',
! 'field' => ''),
'access' => array('select' => '',
'criteria' => '',
--- 19,24 ----
'delete' => '',
'sort' => '',
! 'field' => '',
! 'type' =>
'integer'),
'access' => array('select' => '',
'criteria' => '',
***************
*** 33,37 ****
'delete' => '',
'sort' => '',
! 'field' => ''),
'contact_type' => array('select' => '',
'criteria' => '',
--- 35,40 ----
'delete' => '',
'sort' => '',
! 'field' => '',
! 'type' =>
'string'),
'contact_type' => array('select' => '',
'criteria' => '',
***************
*** 40,44 ****
'delete' => '',
'sort' => '',
! 'field' =>
'contact_type_id'),
'sel_cat_id' => array('select' => '',
'criteria' => '',
--- 43,48 ----
'delete' => '',
'sort' => '',
! 'field' =>
'contact_type_id',
! 'type' =>
'integer'),
'sel_cat_id' => array('select' => '',
'criteria' => '',
Index: class.sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql.inc.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** class.sql.inc.php 2 Oct 2003 22:23:53 -0000 1.1.2.7
--- class.sql.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.8
***************
*** 421,425 ****
foreach($value as $data)
{
! $return_value[] = '(CASE '.$data.' WHEN NULL
THEN \'\' ELSE '.$data.' END)';
}
return $return_value;
--- 421,425 ----
foreach($value as $data)
{
! $return_value[] = '(CASE WHEN '.$data.' IS NULL
THEN \'\' ELSE '.$data.' END)';
}
return $return_value;
Index: class.contact_person.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_person.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_person.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.3
--- class.contact_person.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'per_first_name' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'per_first_name' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'first_name'),
'per_last_name' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'first_name',
! 'type'
=> 'string'),
'per_last_name' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'last_name'),
'per_middle_name' => array('select'
=> '',
'criteria'
=> '',
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'last_name',
! 'type'
=> 'string'),
'per_middle_name' => array('select'
=> '',
'criteria'
=> '',
***************
*** 32,36 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'middle_name'),
'per_prefix' => array('select'
=> '',
'criteria'
=> '',
--- 35,40 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'middle_name',
! 'type'
=> 'string'),
'per_prefix' => array('select'
=> '',
'criteria'
=> '',
***************
*** 39,43 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'prefix'),
'per_suffix' => array('select'
=> '',
'criteria'
=> '',
--- 43,48 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'prefix',
! 'type'
=> 'string'),
'per_suffix' => array('select'
=> '',
'criteria'
=> '',
***************
*** 46,50 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'suffix'),
'per_birthday' => array('select'
=> '',
'criteria'
=> '',
--- 51,56 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'suffix',
! 'type'
=> 'string'),
'per_birthday' => array('select'
=> '',
'criteria'
=> '',
***************
*** 53,57 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'birthday'),
'per_pubkey' => array('select'
=> '',
'criteria'
=> '',
--- 59,64 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'birthday',
! 'type'
=> 'string'),
'per_pubkey' => array('select'
=> '',
'criteria'
=> '',
***************
*** 60,64 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'pubkey'),
'per_title' => array('select'
=> '',
'criteria'
=> '',
--- 67,72 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'pubkey',
! 'type'
=> 'string'),
'per_title' => array('select'
=> '',
'criteria'
=> '',
***************
*** 67,71 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'title'),
'per_department' => array('select'
=> '',
'criteria'
=> '',
--- 75,80 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'title',
! 'type'
=> 'string'),
'per_department' => array('select'
=> '',
'criteria'
=> '',
***************
*** 74,78 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'department'),
'per_initials' => array('select'
=> '',
'criteria'
=> '',
--- 83,88 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'department',
! 'type'
=> 'string'),
'per_initials' => array('select'
=> '',
'criteria'
=> '',
***************
*** 81,85 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'initials'),
'per_sound' => array('select'
=> '',
'criteria'
=> '',
--- 91,96 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'initials',
! 'type'
=> 'string'),
'per_sound' => array('select'
=> '',
'criteria'
=> '',
***************
*** 88,92 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'sound'),
'per_active' => array('select'
=> '',
'criteria'
=> '',
--- 99,104 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'sound',
! 'type'
=> 'string'),
'per_active' => array('select'
=> '',
'criteria'
=> '',
***************
*** 95,99 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'active'),
'per_creaton' => array('select'
=> '',
'criteria'
=> '',
--- 107,112 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'active',
! 'type'
=> 'string'),
'per_creaton' => array('select'
=> '',
'criteria'
=> '',
***************
*** 102,106 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on'),
'per_creatby' => array('select'
=> '',
'criteria'
=> '',
--- 115,120 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on',
! 'type'
=> 'integer'),
'per_creatby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 109,113 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by'),
'per_modon' => array('select'
=> '',
'criteria'
=> '',
--- 123,128 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by',
! 'type'
=> 'integer'),
'per_modon' => array('select'
=> '',
'criteria'
=> '',
***************
*** 116,120 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on'),
'per_modby' => array('select'
=> '',
'criteria'
=> '',
--- 131,136 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on',
! 'type'
=> 'integer'),
'per_modby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 123,127 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by'),
'per_name' => array('select'
=> '',
'criteria'
=> '',
--- 139,144 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by',
! 'type'
=> 'integer'),
'per_name' => array('select'
=> '',
'criteria'
=> '',
***************
*** 144,148 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'first_name'),
'n_family' => array('select'
=> '',
'criteria'
=> '',
--- 161,166 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'first_name',
! 'type'
=> 'string'),
'n_family' => array('select'
=> '',
'criteria'
=> '',
***************
*** 151,155 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'last_name'),
'n_middle' => array('select'
=> '',
'criteria'
=> '',
--- 169,174 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'last_name',
! 'type'
=> 'string'),
'n_middle' => array('select'
=> '',
'criteria'
=> '',
***************
*** 158,162 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'middle_name'),
'n_prefix' => array('select'
=> '',
'criteria'
=> '',
--- 177,182 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'middle_name',
! 'type'
=> 'string'),
'n_prefix' => array('select'
=> '',
'criteria'
=> '',
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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_org_person.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_org_person.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete' => '',
'sort' => '',
! 'field' =>
'org_id'),
'my_person_id' => array('select' => '',
'criteria' => '',
--- 11,16 ----
'delete' => '',
'sort' => '',
! 'field' =>
'org_id',
! 'type' =>
'integer'),
'my_person_id' => array('select' => '',
'criteria' => '',
***************
*** 18,22 ****
'delete' => '',
'sort' => '',
! 'field' =>
'person_id'),
'my_addr_id' => array('select' => '',
'criteria' => '',
--- 19,24 ----
'delete' => '',
'sort' => '',
! 'field' =>
'person_id',
! 'type' =>
'integer'),
'my_addr_id' => array('select' => '',
'criteria' => '',
***************
*** 25,29 ****
'delete' => '',
'sort' => '',
! 'field' =>
'addr_id'),
'my_preferred'=> array('select' => '',
'criteria' => '',
--- 27,32 ----
'delete' => '',
'sort' => '',
! 'field' =>
'addr_id',
! 'type' =>
'integer'),
'my_preferred'=> array('select' => '',
'criteria' => '',
***************
*** 32,36 ****
'delete' => '',
'sort' => '',
! 'field' =>
'preferred'),
'my_creaton' => array('select' => '',
'criteria' => '',
--- 35,40 ----
'delete' => '',
'sort' => '',
! 'field' =>
'preferred',
! 'type' =>
'string'),
'my_creaton' => array('select' => '',
'criteria' => '',
***************
*** 39,43 ****
'delete' => '',
'sort' => '',
! 'field' =>
'created_on'),
'my_creatby' => array('select' => '',
'criteria' => '',
--- 43,48 ----
'delete' => '',
'sort' => '',
! 'field' =>
'created_on',
! 'type' =>
'integer'),
'my_creatby' => array('select' => '',
'criteria' => '',
***************
*** 46,50 ****
'delete' => '',
'sort' => '',
! 'field' =>
'created_by'));
function contact_org_person ($ali = '', $field = '', $criteria
= '')
--- 51,56 ----
'delete' => '',
'sort' => '',
! 'field' =>
'created_by',
! 'type' =>
'integer'));
function contact_org_person ($ali = '', $field = '', $criteria
= '')
Index: class.contact_org.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_org.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_org.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_org.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete' => '',
'sort' => '',
! 'field' =>
'org_id') ,
'org_name' => array('select' => '',
'criteria' => '',
--- 11,16 ----
'delete' => '',
'sort' => '',
! 'field' =>
'org_id',
! 'type' =>
'integer'),
'org_name' => array('select' => '',
'criteria' => '',
***************
*** 18,22 ****
'delete' => '',
'sort' => '',
! 'field' =>
'name'),
'org_active' => array('select' => '',
'criteria' => '',
--- 19,24 ----
'delete' => '',
'sort' => '',
! 'field' =>
'name',
! 'type' =>
'string'),
'org_active' => array('select' => '',
'criteria' => '',
***************
*** 25,29 ****
'delete' => '',
'sort' => '',
! 'field' =>
'active'),
'org_parent' => array('select' => '',
'criteria' => '',
--- 27,32 ----
'delete' => '',
'sort' => '',
! 'field' =>
'active',
! 'type' =>
'string'),
'org_parent' => array('select' => '',
'criteria' => '',
***************
*** 32,36 ****
'delete' => '',
'sort' => '',
! 'field' =>
'parent'),
'org_creaton' => array('select' => '',
'criteria' => '',
--- 35,40 ----
'delete' => '',
'sort' => '',
! 'field' =>
'parent',
! 'type' =>
'integer'),
'org_creaton' => array('select' => '',
'criteria' => '',
***************
*** 39,43 ****
'delete' => '',
'sort' => '',
! 'field' =>
'created_on'),
'org_creatby' => array('select' => '',
'criteria' => '',
--- 43,48 ----
'delete' => '',
'sort' => '',
! 'field' =>
'created_on',
! 'type' =>
'integer'),
'org_creatby' => array('select' => '',
'criteria' => '',
***************
*** 46,50 ****
'delete' => '',
'sort' => '',
! 'field' =>
'created_by'),
'org_modon' => array('select' => '',
'criteria' => '',
--- 51,56 ----
'delete' => '',
'sort' => '',
! 'field' =>
'created_by',
! 'type' =>
'integer'),
'org_modon' => array('select' => '',
'criteria' => '',
***************
*** 53,57 ****
'delete' => '',
'sort' => '',
! 'field' =>
'modified_on'),
'org_modby' => array('select' => '',
'criteria' => '',
--- 59,64 ----
'delete' => '',
'sort' => '',
! 'field' =>
'modified_on',
! 'type' =>
'integer'),
'org_modby' => array('select' => '',
'criteria' => '',
***************
*** 60,64 ****
'delete' => '',
'sort' => '',
! 'field' =>
'modified_by'),
'name' => array('select' => '',
'criteria' => '',
--- 67,72 ----
'delete' => '',
'sort' => '',
! 'field' =>
'modified_by',
! 'type' =>
'integer'),
'name' => array('select' => '',
'criteria' => '',
***************
*** 88,92 ****
}
$this->set_elinks('org_id',
'phpgwapi.contact_org_person', 'my_org_id');
! $this->set_ilinks('org_id',
'phpgwapi.contact_central','contact_id', REQUIRED_KEY);
}
--- 96,100 ----
}
$this->set_elinks('org_id',
'phpgwapi.contact_org_person', 'my_org_id');
! $this->set_ilinks('org_id',
'phpgwapi.contact_central','contact_id', PHPGW_SQL_REQUIRED_KEY);
}
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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_comm_descr.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_comm_descr.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'comm_type' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'comm_type' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'comm_type_id'),
'comm_description' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'comm_type_id',
! 'type'
=> 'integer'),
'comm_description' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'descr'),
'comm_find_descr' => array('select'
=> '',
'criteria'
=> '',
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'descr',
! 'type'
=> 'string'),
'comm_find_descr' => array('select'
=> '',
'criteria'
=> '',
***************
*** 64,68 ****
$criteria = sql_criteria::append_or($data);
-
$this->_add_criteria($criteria);
}
--- 67,70 ----
Index: class.contact_addr.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_addr.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_addr.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.3
--- class.contact_addr.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
***************
*** 40,43 ****
--- 40,50 ----
'sort'
=> '',
'field'
=> 'add2'),
+ 'addr_add3' => array('select'
=> '',
+ 'criteria'
=> '',
+ 'insert'
=> '',
+ 'update'
=> '',
+ 'delete'
=> '',
+ 'sort'
=> '',
+ 'field'
=> 'add3'),
'addr_city' => array('select'
=> '',
'criteria'
=> '',
***************
*** 220,224 ****
function select_addr_address($element)
{
!
$this->field_list['addr_address']=$this->put_alias('.add1').' ||
'.$this->put_alias('add2');
}
/*
--- 227,231 ----
function select_addr_address($element)
{
! $this->field_list['addr_address'] =
sql::concat_null(array($this->put_alias('add1'), $this->put_alias('add2'),
$this->put_alias('add3')));
}
/*
***************
*** 230,234 ****
{
$this->set_primary_address($element);
!
$this->field_list['adr_one_street']=$this->put_alias('.add1').' ||
'.$this->put_alias('add2');
}
--- 237,241 ----
{
$this->set_primary_address($element);
!
$this->field_list['adr_one_street']=sql::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
***************
*** 250,255 ****
{
$this->set_secondary_address($element);
!
$this->field_list['adr_one_street']=$this->put_alias('.add1').' ||
'.$this->put_alias('add2');
!
}
/*
--- 257,261 ----
{
$this->set_secondary_address($element);
!
$this->field_list['adr_one_street']=sql_criteria::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
/*
Index: class.contact_comm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_comm.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.3
--- class.contact_comm.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
***************
*** 12,16 ****
'sort'
=> '',
'type'
=> 'integer',
! 'field'
=> 'comm_id'),
'comm_contact_id' => array('select'
=> '',
'criteria'
=> '',
--- 12,17 ----
'sort'
=> '',
'type'
=> 'integer',
! 'field'
=> 'comm_id',
! 'type'
=> 'integer'),
'comm_contact_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 20,24 ****
'sort'
=> '',
'type'
=> 'integer',
! 'field'
=> 'contact_id'),
'comm_descr' => array('select'
=> '',
'criteria'
=> '',
--- 21,26 ----
'sort'
=> '',
'type'
=> 'integer',
! 'field'
=> 'contact_id',
! 'type'
=> 'integer'),
'comm_descr' => array('select'
=> '',
'criteria'
=> '',
***************
*** 27,31 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'comm_descr_id'),
'comm_preferred' => array('select'
=> '',
'criteria'
=> '',
--- 29,34 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'comm_descr_id',
! 'type'
=> 'integer'),
'comm_preferred' => array('select'
=> '',
'criteria'
=> '',
***************
*** 34,38 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'preferred'),
'comm_data' => array('select'
=> '',
'criteria'
=> '',
--- 37,42 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'preferred',
! 'type'
=> 'string'),
'comm_data' => array('select'
=> '',
'criteria'
=> '',
***************
*** 41,45 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'comm_creaton' => array('select'
=> '',
'criteria'
=> '',
--- 45,50 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'),
'comm_creaton' => array('select'
=> '',
'criteria'
=> '',
***************
*** 48,52 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on'),
'comm_creatby' => array('select'
=> '',
'criteria'
=> '',
--- 53,58 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on',
! 'type'
=> 'integer'),
'comm_creatby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 55,59 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by'),
'comm_modon' => array('select'
=> '',
'criteria'
=> '',
--- 61,66 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by',
! 'type'
=> 'integer'),
'comm_modon' => array('select'
=> '',
'criteria'
=> '',
***************
*** 62,66 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on'),
'comm_modby' => array('select'
=> '',
'criteria'
=> '',
--- 69,74 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on',
! 'type'
=> 'integer'),
'comm_modby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 69,73 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by'),
'phone' => array('select'
=> '',
'criteria'
=> '',
--- 77,82 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by',
! 'type'
=> 'integer'),
'phone' => array('select'
=> '',
'criteria'
=> '',
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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_note_type.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_note_type.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'note_description' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'note_description' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'description'));
function contact_note_type ($ali = '', $field = '', $criteria =
'')
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'description',
! 'type'
=> 'string'));
function contact_note_type ($ali = '', $field = '', $criteria =
'')
Index: class.contact_types.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_types.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_types.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_types.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'contact_type_descr' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'contact_type_descr' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'contact_type_table' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'),
'contact_type_table' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''));
function contact_types ($ali = '', $field = '', $criteria =
'')
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'));
function contact_types ($ali = '', $field = '', $criteria =
'')
Index: class.contact_categories.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_categories.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_categories.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_categories.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'cat_id'),
'parent_id' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'cat_id',
! 'type'
=> 'integer'),
'parent_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'cat_id'));
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'cat_id',
! 'type'
=> 'integer'));
Index: class.contact_others.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_others.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_others.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_others.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'other_id'),
'other_contact_id' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'other_id',
! 'type'
=> 'integer'),
'other_contact_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id'),
'other_name' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id',
! 'type'
=> 'integer'),
'other_name' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'other_value' => array('select'
=> '',
'criteria'
=> '',
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'),
'other_value' => array('select'
=> '',
'criteria'
=> '',
***************
*** 32,36 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'other_owner' => array('select'
=> '',
'criteria'
=> '',
--- 35,40 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'string'),
'other_owner' => array('select'
=> '',
'criteria'
=> '',
***************
*** 39,43 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_owner'),
'other_count_row' => array('select'
=> '',
'criteria'
=> '',
--- 43,48 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_owner',
! 'type'
=> 'integer'),
'other_count_row' => array('select'
=> '',
'criteria'
=> '',
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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_comm_type.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_comm_type.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 6,22 ****
{
var $map = array('comm_type_id'=> array('select' => '',
! 'criteria' => '',
! 'insert' => '',
! 'update' => '',
! 'delete' => '',
! 'sort' => '',
! 'field' => ''),
'comm_type_description'=> array('select'
=> '',
! 'criteria' => '',
! 'insert' => '',
! 'update' => '',
! 'delete' => '',
! 'sort' => '',
! 'field' =>
'type'),
'comm_active' => array('select' => '',
'criteria' => '',
--- 6,24 ----
{
var $map = array('comm_type_id'=> array('select' => '',
! 'criteria' => '',
! 'insert' => '',
! 'update' => '',
! 'delete' => '',
! 'sort' => '',
! 'field' => '',
! 'type' =>
'integer'),
'comm_type_description'=> array('select'
=> '',
! 'criteria' => '',
! 'insert' => '',
! 'update' => '',
! 'delete' => '',
! 'sort' => '',
! 'field' =>
'type',
! 'type' =>
'string'),
'comm_active' => array('select' => '',
'criteria' => '',
***************
*** 25,29 ****
'delete' => '',
'sort' => '',
! 'field' =>
'active'),
'comm_class' => array('select' => '',
'criteria' => '',
--- 27,32 ----
'delete' => '',
'sort' => '',
! 'field' =>
'active',
! 'type' =>
'string'),
'comm_class' => array('select' => '',
'criteria' => '',
***************
*** 32,36 ****
'delete' => '',
'sort' => '',
! 'field' =>
'class'));
--- 35,40 ----
'delete' => '',
'sort' => '',
! 'field' =>
'class',
! 'type' =>
'string'));
Index: class.contact_accounts.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_accounts.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_accounts.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_accounts.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'account_person_id' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'account_person_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'person_id'),
'person_only' => array('criteria'
=> ''),
'is_user' => array('select'
=> ''));
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'person_id',
! 'type'
=> 'integer'),
'person_only' => array('criteria'
=> ''),
'is_user' => array('select'
=> ''));
***************
*** 34,38 ****
}
$this->set_elinks('account_id',
'phpgwapi.contact_central','owner');
! $this->set_ilinks('account_person_id',
'phpgwapi.contact_person','person_id', LAZY_KEY);
}
--- 36,40 ----
}
$this->set_elinks('account_id',
'phpgwapi.contact_central','owner');
! $this->set_ilinks('account_person_id',
'phpgwapi.contact_person','person_id', PHPGW_SQL_LAZY_KEY);
}
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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.contact_addr_type.inc.php 30 Sep 2003 05:20:01 -0000 1.1.2.2
--- class.contact_addr_type.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> ''),
'addr_description' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> '',
! 'type'
=> 'integer'),
'addr_description' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'description'));
function contact_addr_type ($ali = '', $field = '', $criteria
= '')
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'description',
! 'type'
=> 'string'));
function contact_addr_type ($ali = '', $field = '', $criteria
= '')
| [Prev in Thread] | Current Thread | [Next in Thread] |