|
| From: | Dave Hall <address@hidden> |
| Subject: | [Phpgroupware-cvs] phpgwapi/inc class.contact_addr.inc.php, 1.1.2.4, 1.1.2.5 class.contacts_sql.inc.php, 1.17.2.2.2.14, 1.17.2.2.2.15 |
| Date: | Fri, 03 Oct 2003 03:09:35 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv27748
Modified Files:
Tag: Version-0_9_16-branch
class.contact_addr.inc.php class.contacts_sql.inc.php
Log Message:
various fixes from jarg
Index: class.contact_addr.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_addr.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_addr.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
--- class.contact_addr.inc.php 3 Oct 2003 03:09:32 -0000 1.1.2.5
***************
*** 11,15 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_addr_id'),
'addr_contact_id' => array('select'
=> '',
'criteria'
=> '',
--- 11,16 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_addr_id',
! 'type'
=> 'integer'),
'addr_contact_id' => array('select'
=> '',
'criteria'
=> '',
***************
*** 18,22 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id'),
'addr_type' => array('select'
=> '',
'criteria'
=> '',
--- 19,24 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'contact_id',
! 'type'
=> 'integer'),
'addr_type' => array('select'
=> '',
'criteria'
=> '',
***************
*** 25,29 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'addr_type_id'),
'addr_add1' => array('select'
=> '',
'criteria'
=> '',
--- 27,32 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'addr_type_id',
! 'type'
=> 'integer'),
'addr_add1' => array('select'
=> '',
'criteria'
=> '',
***************
*** 32,36 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add1'),
'addr_add2' => array('select'
=> '',
'criteria'
=> '',
--- 35,40 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add1',
! 'type'
=> 'string'),
'addr_add2' => array('select'
=> '',
'criteria'
=> '',
***************
*** 39,43 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add2'),
'addr_add3' => array('select'
=> '',
'criteria'
=> '',
--- 43,48 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add2',
! 'type'
=> 'string'),
'addr_add3' => array('select'
=> '',
'criteria'
=> '',
***************
*** 46,50 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add3'),
'addr_city' => array('select'
=> '',
'criteria'
=> '',
--- 51,56 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'add3',
! 'type'
=> 'string'),
'addr_city' => array('select'
=> '',
'criteria'
=> '',
***************
*** 53,57 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'city'),
'addr_state' => array('select'
=> '',
'criteria'
=> '',
--- 59,64 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'city',
! 'type'
=> 'string'),
'addr_state' => array('select'
=> '',
'criteria'
=> '',
***************
*** 60,64 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'state'),
'addr_postal_code' => array('select'
=> '',
'criteria'
=> '',
--- 67,72 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'state',
! 'type'
=> 'string'),
'addr_postal_code' => array('select'
=> '',
'criteria'
=> '',
***************
*** 67,71 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'postal_code'),
'addr_country' => array('select'
=> '',
'criteria'
=> '',
--- 75,80 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'postal_code',
! 'type'
=> 'string'),
'addr_country' => array('select'
=> '',
'criteria'
=> '',
***************
*** 74,78 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'country'),
'addr_preferred' => array('select'
=> '',
'criteria'
=> '',
--- 83,88 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'country',
! 'type'
=> 'string'),
'addr_preferred' => array('select'
=> '',
'criteria'
=> '',
***************
*** 81,85 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'preferred'),
'addr_creaton' => array('select'
=> '',
'criteria'
=> '',
--- 91,96 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'preferred',
! 'type'
=> 'string'),
'addr_creaton' => array('select'
=> '',
'criteria'
=> '',
***************
*** 88,92 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on'),
'addr_creatby' => array('select'
=> '',
'criteria'
=> '',
--- 99,104 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_on',
! 'type'
=> 'integer'),
'addr_creatby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 95,99 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by'),
'addr_modon' => array('select'
=> '',
'criteria'
=> '',
--- 107,112 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'created_by',
! 'type'
=> 'integer'),
'addr_modon' => array('select'
=> '',
'criteria'
=> '',
***************
*** 102,106 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on'),
'addr_modby' => array('select'
=> '',
'criteria'
=> '',
--- 115,120 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_on',
! 'type'
=> 'integer'),
'addr_modby' => array('select'
=> '',
'criteria'
=> '',
***************
*** 109,113 ****
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by'),
'addr_precedence' => array('select'
=> '',
'criteria'
=> '',
--- 123,128 ----
'delete'
=> '',
'sort'
=> '',
! 'field'
=> 'modified_by',
! 'type'
=> 'integer'),
'addr_precedence' => array('select'
=> '',
'criteria'
=> '',
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.14
retrieving revision 1.17.2.2.2.15
diff -C2 -d -r1.17.2.2.2.14 -r1.17.2.2.2.15
*** class.contacts_sql.inc.php 3 Oct 2003 00:24:37 -0000 1.17.2.2.2.14
--- class.contacts_sql.inc.php 3 Oct 2003 03:09:32 -0000 1.17.2.2.2.15
***************
*** 556,559 ****
--- 556,573 ----
}
+ function delete_sessiondata($var='')
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','phpgwapi');
+ if($var!='')
+ {
+ unset($data[$var]);
+ }
+ else
+ {
+ $data = '';
+ }
+
$GLOBALS['phpgw']->session->appsession('session_data','phpgwapi',$data);
+ }
+
/**
* Get the information about contact of type `person'
***************
*** 1511,1514 ****
--- 1525,1540 ----
}
+ /**
+ * Allow edit communication information of an contact
+ * @param integer $id Contact Id that want to be edited.
+ * @param array $data Information for contact
+ * @param integer $action PHPGW_SQL_RETURN_SQL |
PHPGW_SQL_RUN_SQL depending what we want
+ */
+ function edit_comms_by_contact($id, $data,
$action=PHPGW_SQL_RETURN_SQL)
+ {
+ $comm = CreateObject('phpgwapi.contact_comm');
+ return $comm->update($data,
sql_criteria::_equal('contact_id',sql::integer($id)), $action);
+ }
+
/*************************************************************\
* Add contact section *
***************
*** 2750,2753 ****
--- 2776,2795 ----
return $type[0]['contact_type'];
}
+
+ /**
+ * Get the preferred address of organization.
+ *
+ * @param integer $org_id The organization id which want to
check.
+ * @param integer $action PHPGW_SQL_RETURN_SQL |
PHPGW_SQL_RUN_SQL depending what we want
+ * @return integer The addr_id.
+ */
+ function get_location_pref_org($org_id,
$action=PHPGW_SQL_RUN_SQL)
+ {
+ $this->request(array('key_addr_id'));
+ $this->criteria(array('org_id' => $org_id,
+ 'addr_pref_val'=>'Y'));
+ $addr_id = $this->get_query($action, __LINE__,
__FILE__);
+ return $addr_id[0]['key_addr_id'];
+ }
}
?>
| [Prev in Thread] | Current Thread | [Next in Thread] |