|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [17463] formatting code |
| Date: | Sun, 24 Dec 2017 06:25:53 -0500 (EST) |
Revision: 17463
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17463
Author: sigurdne
Date: 2017-12-24 06:25:53 -0500 (Sun, 24 Dec 2017)
Log Message:
-----------
formatting code
Modified Paths:
--------------
trunk/phpgwapi/inc/class.contact_addr.inc.php
trunk/phpgwapi/inc/class.contact_addr_type.inc.php
trunk/phpgwapi/inc/class.contact_categories.inc.php
trunk/phpgwapi/inc/class.contact_central.inc.php
trunk/phpgwapi/inc/class.contact_comm.inc.php
trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
trunk/phpgwapi/inc/class.contact_comm_type.inc.php
trunk/phpgwapi/inc/class.contact_note.inc.php
trunk/phpgwapi/inc/class.contact_note_type.inc.php
trunk/phpgwapi/inc/class.contact_org.inc.php
trunk/phpgwapi/inc/class.contact_org_person.inc.php
trunk/phpgwapi/inc/class.contact_others.inc.php
trunk/phpgwapi/inc/class.contact_person.inc.php
trunk/phpgwapi/inc/class.contact_types.inc.php
trunk/phpgwapi/inc/class.contacts_shared.inc.php
trunk/phpgwapi/inc/class.contacts_sql.inc.php
Modified: trunk/phpgwapi/inc/class.contact_addr.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_addr.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_addr.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,294 +1,293 @@
<?php
/**
- * Query statements for "addr" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "addr" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "addr" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "addr" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_addr extends phpgwapi_sql_entity
{
- var $map = array('key_addr_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_addr_id',
- 'type'
=> 'integer'),
- 'addr_contact_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_id',
- 'type'
=> 'integer'),
- 'addr_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'addr_type_id',
- 'type'
=> 'integer'),
- 'addr_add1' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'add1',
- 'type'
=> 'string'),
- 'addr_add2' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'add2',
- 'type'
=> 'string'),
- 'addr_add3' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'add3',
- 'type'
=> 'string'),
- 'addr_city' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'city',
- 'type'
=> 'string'),
- 'addr_state' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'state',
- 'type'
=> 'string'),
- 'addr_postal_code' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'postal_code',
- 'type'
=> 'string'),
- 'addr_country' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'country',
- 'type'
=> 'string'),
- 'addr_preferred' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'preferred',
- 'type'
=> 'string'),
- 'addr_creaton' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_on',
- 'type'
=> 'integer'),
- 'addr_creatby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_by',
- 'type'
=> 'integer'),
- 'addr_modon' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_on',
- 'type'
=> 'integer'),
- 'addr_modby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_by',
- 'type'
=> 'integer'),
- 'addr_precedence' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'precedence'),
- 'addr_address' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'adr_one_street' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'add1'),
- 'adr_one_locality' => array('select'
=> 'select_primary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'city'),
- 'adr_one_region' => array('select'
=> 'select_primary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'state'),
- 'adr_one_postalcode' => array('select'
=> 'select_primary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'postal_code'),
- 'adr_one_countryname' => array('select'
=> 'select_primary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'country'),
- 'adr_two_street' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'adr_two_locality' => array('select'
=> 'select_secondary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'city'),
- 'adr_two_region' => array('select'
=> 'select_secondary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'state'),
- 'adr_two_postalcode' => array('select'
=> 'select_secondary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'postal_code'),
- 'adr_two_countryname' => array('select'
=> 'select_secondary',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'country'),
- 'addr_pref_val' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'preferred'));
+
+ var $map = array('key_addr_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_addr_id',
+ 'type' => 'integer'),
+ 'addr_contact_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_id',
+ 'type' => 'integer'),
+ 'addr_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'addr_type_id',
+ 'type' => 'integer'),
+ 'addr_add1' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'add1',
+ 'type' => 'string'),
+ 'addr_add2' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'add2',
+ 'type' => 'string'),
+ 'addr_add3' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'add3',
+ 'type' => 'string'),
+ 'addr_city' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'city',
+ 'type' => 'string'),
+ 'addr_state' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'state',
+ 'type' => 'string'),
+ 'addr_postal_code' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'postal_code',
+ 'type' => 'string'),
+ 'addr_country' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'country',
+ 'type' => 'string'),
+ 'addr_preferred' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'preferred',
+ 'type' => 'string'),
+ 'addr_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'addr_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'addr_modon' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_on',
+ 'type' => 'integer'),
+ 'addr_modby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_by',
+ 'type' => 'integer'),
+ 'addr_precedence' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'precedence'),
+ 'addr_address' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'adr_one_street' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'add1'),
+ 'adr_one_locality' => array('select' =>
'select_primary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'city'),
+ 'adr_one_region' => array('select' => 'select_primary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'state'),
+ 'adr_one_postalcode' => array('select' =>
'select_primary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'postal_code'),
+ 'adr_one_countryname' => array('select' =>
'select_primary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'country'),
+ 'adr_two_street' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'adr_two_locality' => array('select' =>
'select_secondary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'city'),
+ 'adr_two_region' => array('select' =>
'select_secondary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'state'),
+ 'adr_two_postalcode' => array('select' =>
'select_secondary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'postal_code'),
+ 'adr_two_countryname' => array('select' =>
'select_secondary',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'country'),
+ 'addr_pref_val' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'preferred'));
var $primary_set;
var $secondary_set;
-
- function __construct ($ali = '', $field = '', $criteria = '')
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_addr',
'contact_addr');
- if($field)
+ if ($field)
{
$this->add_select($field);
-
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('addr_contact_id',
'phpgwapi.contact_central','contact_id');
- $this->set_elinks('addr_type',
'phpgwapi.contact_addr_type','addr_type_id');
+ $this->set_ilinks('addr_contact_id',
'phpgwapi.contact_central', 'contact_id');
+ $this->set_elinks('addr_type',
'phpgwapi.contact_addr_type', 'addr_type_id');
}
/**
- * Get address fields 1-3 from database
- *
- * @param mixed $element Unused
- * @internal addr_address false field is a concatenation of add1
and add2 therefore, we use the || standard concatenation operator for select
- */
- function select_addr_address($element)
+ * Get address fields 1-3 from database
+ *
+ * @param mixed $element Unused
+ * @internal addr_address false field is a concatenation of
add1 and add2 therefore, we use the || standard concatenation operator for
select
+ */
+ function select_addr_address( $element )
{
- $this->field_list['addr_address'] =
phpgwapi_sql::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
+ $this->field_list['addr_address'] =
phpgwapi_sql::concat_null(array($this->put_alias('add1'),
+ $this->put_alias('add2'),
$this->put_alias('add3')));
}
/**
- * Get address fields 1-3 for primary address from database
- *
- * @param mixed $element
- * @internal addr_address false field is a concatenation of add1
and add2 therefore, we use the || standard concatenation operator for select
- */
- function select_adr_one_street($element)
+ * Get address fields 1-3 for primary address from database
+ *
+ * @param mixed $element
+ * @internal addr_address false field is a concatenation of
add1 and add2 therefore, we use the || standard concatenation operator for
select
+ */
+ function select_adr_one_street( $element )
{
$this->set_primary_address($element);
- $this->field_list['adr_one_street'] =
phpgwapi_sql::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
-
+ $this->field_list['adr_one_street'] =
phpgwapi_sql::concat_null(array($this->put_alias('add1'),
+ $this->put_alias('add2'),
$this->put_alias('add3')));
}
/**
- * Write primary address to database
- *
- * @param mixed $element Unused
- * @internal Generic select builder for adr_one fields that need
to be limited to criteria precedence=1 but map 1 to 1 to real fields
(city,country,postalcode)
- */
- function select_primary($element)
+ * Write primary address to database
+ *
+ * @param mixed $element Unused
+ * @internal Generic select builder for adr_one fields that
need to be limited to criteria precedence=1 but map 1 to 1 to real fields
(city,country,postalcode)
+ */
+ function select_primary( $element )
{
$this->set_primary_address($element);
$this->field_list[$element['field']] =
$this->put_alias($element['real_field']);
@@ -295,51 +294,51 @@
}
/**
- * Get address fields 1-3 for secondary address from database
- *
- * @param mixed $element
- * @internal Street address as asked for by the adr_*_street
false fields are actually concatenations of add1 and add2, therefore that needs
its own handler
- */
- function select_adr_two_street($element)
+ * Get address fields 1-3 for secondary address from database
+ *
+ * @param mixed $element
+ * @internal Street address as asked for by the adr_*_street
false fields are actually concatenations of add1 and add2, therefore that needs
its own handler
+ */
+ function select_adr_two_street( $element )
{
$this->set_secondary_address($element);
- $this->field_list['adr_one_street'] =
phpgwapi_sql_criteria::concat_null(array($this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
+ $this->field_list['adr_one_street'] =
phpgwapi_sql_criteria::concat_null(array(
+ $this->put_alias('add1'),
$this->put_alias('add2'), $this->put_alias('add3')));
}
/**
- * Write secondary address to database
- *
- * @param mixed $element
- * @internal Generic select builder for adr_two fields that need
to be limited to criteria precedence=2 but map 1 to 1 to real fields
(city,country,postalcode)
- */
- function select_secondary($element)
+ * Write secondary address to database
+ *
+ * @param mixed $element
+ * @internal Generic select builder for adr_two fields that
need to be limited to criteria precedence=2 but map 1 to 1 to real fields
(city,country,postalcode)
+ */
+ function select_secondary( $element )
{
- $this->set_secondary_address($element);
- $this->field_list[$element['field']] =
$this->put_alias(phpgwapi_sql::string($element['real_field']));
+ $this->set_secondary_address($element);
+ $this->field_list[$element['field']] =
$this->put_alias(phpgwapi_sql::string($element['real_field']));
}
/**
- * Get address fields 1-2 for primary address from database
- *
- * @param mixed $element
- * @internal Backwards compatibility for adr_one adr_two when
asked to SEARCH CRITERIA (where clause)
- * @internal In this case, searching in the adr_one_street false
field should look for the value in add1 and add2 since adr_one_street is
defined to be the concatenation of this two fields
- */
- function criteria_adr_one_street($element)
+ * Get address fields 1-2 for primary address from database
+ *
+ * @param mixed $element
+ * @internal Backwards compatibility for adr_one adr_two when
asked to SEARCH CRITERIA (where clause)
+ * @internal In this case, searching in the adr_one_street
false field should look for the value in add1 and add2 since adr_one_street is
defined to be the concatenation of this two fields
+ */
+ function criteria_adr_one_street( $element )
{
$this->set_primary_address($element);
- $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),$element['value']),
-
phpgwapi_sql_criteria::has($this->put_alias('add2'),$element['value']));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),
$element['value']), phpgwapi_sql_criteria::has($this->put_alias('add2'),
$element['value']));
$this->_add_criteria($criteria);
}
/**
- * Get primary address from database
- *
- * @param mixed $element
- * @internal Generic criteria builder for adr_one type fields.
They need an extra precedence and then are a LIKE clause which is given by
phpgwapi_sql_criteria::has(). So, if the user asks for adr_one_country, the
resulting query will be tablename.country = %%value%%
- */
- function criteria_primary($element)
+ * Get primary address from database
+ *
+ * @param mixed $element
+ * @internal Generic criteria builder for adr_one type fields.
They need an extra precedence and then are a LIKE clause which is given by
phpgwapi_sql_criteria::has(). So, if the user asks for adr_one_country, the
resulting query will be tablename.country = %%value%%
+ */
+ function criteria_primary( $element )
{
$this->set_primary_address($element);
$criteria =
phpgwapi_sql_criteria::has($this->put_alias($element['real_field']),
phpgwapi_sql::string($element['value']));
@@ -347,21 +346,19 @@
}
/**
- * Get address fields 1-2 for secondary address from database
- *
- * @param mixed $element
- * @internal Same as criteria_adr_one_street but with precedence
2
- */
- function criteria_adr_two_street($element)
+ * Get address fields 1-2 for secondary address from database
+ *
+ * @param mixed $element
+ * @internal Same as criteria_adr_one_street but with
precedence 2
+ */
+ function criteria_adr_two_street( $element )
{
$this->set_secondary_address($element);
- $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),
phpgwapi_sql::string($element['value'])),
-
phpgwapi_sql_criteria::has($this->put_alias('add2'),
phpgwapi_sql::string($element['value'])));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::has($this->put_alias('add1'),
phpgwapi_sql::string($element['value'])),
phpgwapi_sql_criteria::has($this->put_alias('add2'),
phpgwapi_sql::string($element['value'])));
$this->_add_criteria($criteria);
-
}
- function criteria_secondary($element)
+ function criteria_secondary( $element )
{
$this->set_secondary_address($element);
$criteria =
phpgwapi_sql_criteria::has($this->put_alias($element['real_field']),
phpgwapi_sql::string($element['value']));
@@ -368,41 +365,38 @@
$this->_add_criteria($criteria);
}
- function set_primary_address($element)
+ function set_primary_address( $element )
{
- if($this->primary_set != 'primary')
+ if ($this->primary_set != 'primary')
{
- $criteria =
phpgwapi_sql_criteria::equal($this->put_alias('precedence'),'1');
+ $criteria =
phpgwapi_sql_criteria::equal($this->put_alias('precedence'), '1');
$this->_add_criteria($criteria);
- $this->primary_set='primary';
+ $this->primary_set = 'primary';
}
-
}
- function set_secondary_address($element)
+ function set_secondary_address( $element )
{
- if($this->secondary_set != 'secondary')
+ if ($this->secondary_set != 'secondary')
{
- $criteria =
phpgwapi_sql_criteria::equal($this->put_alias('precedence'),'2');
+ $criteria =
phpgwapi_sql_criteria::equal($this->put_alias('precedence'), '2');
$this->_add_criteria($criteria);
- $this->secondary_set='secondary';
+ $this->secondary_set = 'secondary';
}
-
}
- function criteria_addr_pref_val($element)
+ function criteria_addr_pref_val( $element )
{
$field = $this->put_alias($element['real_field']);
- $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($element['value'])),
-
phpgwapi_sql_criteria::is_null($field));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($element['value'])),
phpgwapi_sql_criteria::is_null($field));
$this->_add_criteria($criteria);
return $criteria;
}
- function criteria_addr_contact_id($element)
+ function criteria_addr_contact_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
@@ -411,4 +405,4 @@
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_addr_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_addr_type.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_addr_type.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,67 +1,67 @@
<?php
/**
- * Query statements for "addr_type" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "addr_type" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "addr_type" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
- class contact_addr_type extends phpgwapi_sql_entity
+ * Query statements for "addr_type" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
+ class contact_addr_type extends phpgwapi_sql_entity
+ {
+
+ var $map = array('addr_type_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'addr_description' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'description',
+ 'type' => 'string'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
- var $map = array('addr_type_id' =>
array('select' => '',
-
'criteria' => '',
-
'insert' => '',
-
'update' => '',
-
'delete' => '',
-
'sort' => '',
-
'field' => '',
- 'type'
=> 'integer'),
-
'addr_description' => array('select' => '',
-
'criteria' => '',
-
'insert' => '',
-
'update' => '',
-
'delete' => '',
-
'sort' => '',
-
'field' =>
'description',
- 'type'
=> 'string'));
-
- function __construct ($ali = '', $field = '',
$criteria = '')
- {
-
$this->_constructor('phpgw_contact_addr_type', 'contact_addr_type');
- if($field)
- {
-
$this->add_select($field);
- }
- if($criteria)
- {
-
$this->add_criteria($criteria);
- }
-
$this->set_ilinks('addr_type_id', 'phpgwapi.contact_addr','addr_type');
- }
+ $this->_constructor('phpgw_contact_addr_type',
'contact_addr_type');
+ if ($field)
+ {
+ $this->add_select($field);
+ }
+ if ($criteria)
+ {
+ $this->add_criteria($criteria);
+ }
+ $this->set_ilinks('addr_type_id',
'phpgwapi.contact_addr', 'addr_type');
+ }
- function criteria_addr_type_id($element)
+ function criteria_addr_type_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
@@ -70,4 +70,4 @@
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_categories.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_categories.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_categories.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,68 +1,67 @@
<?php
/**
- * Query statements for "categories" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "categories" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "categories" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "categories" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_categories extends phpgwapi_sql_entity
{
- var $map = array('key_cat_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'cat_id',
- 'type'
=> 'integer'),
- 'parent_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'cat_id',
- 'type'
=> 'integer'));
-
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+
+ var $map = array('key_cat_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'cat_id',
+ 'type' => 'integer'),
+ 'parent_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'cat_id',
+ 'type' => 'integer'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_categories',
'contact_categories');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
//$this->set_elinks('key_cat_id',
'contact_central','cat_id');
- }
+ }
- function select_parent_id($element)
+ function select_parent_id( $element )
{
$this->set_alias('categorie_parent');
$this->_add_field(array('field' => 'parent_id',
'real_field' => 'cat_id'));
- $this->set_elinks('key_cat_id',
'phpgwapi.contact_categories','parent_id');
+ $this->set_elinks('key_cat_id',
'phpgwapi.contact_categories', 'parent_id');
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_central.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_central.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_central.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,107 +1,105 @@
<?php
/**
- * Query statements for "central" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "central" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "central" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "central" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_central extends phpgwapi_sql_entity
{
- var $map = array('contact_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => '',
- 'type' =>
'integer'),
- 'owner' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => '',
- 'type' =>
'integer'),
- 'access' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => '',
- 'type' =>
'string'),
- 'cat_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => '',
- 'type' =>
'string'),
- 'contact_type' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'contact_type_id',
- 'type' =>
'integer'),
- 'sel_cat_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'cat_id'),
- 'count_contacts'=> array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => ''),
- 'max_contacts' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => ''),
- 'people_contact'=> array('select' =>
'unlink_org'),
- 'organizations_contact' => array('select' =>
'unlink_org'));
-
+ var $map = array('contact_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'owner' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'access' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'cat_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'contact_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_type_id',
+ 'type' => 'integer'),
+ 'sel_cat_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'cat_id'),
+ 'count_contacts' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'max_contacts' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'people_contact' => array('select' => 'unlink_org'),
+ 'organizations_contact' => array('select' =>
'unlink_org'));
- function __construct ($ali = '', $field = '', $criteria =
'')
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact', 'contact_central');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
@@ -112,7 +110,7 @@
$this->set_elinks('contact_id',
'phpgwapi.contact_comm', 'comm_contact_id');
$this->set_elinks('contact_id',
'phpgwapi.contact_others', 'other_contact_id');
- $this->set_ilinks('contact_type',
'phpgwapi.contact_types','contact_type_id');
+ $this->set_ilinks('contact_type',
'phpgwapi.contact_types', 'contact_type_id');
// $this->set_ilinks('owner',
'phpgwapi.contact_accounts','account_id');
//$this->set_ilinks('cat_id',
'contact_categories','key_cat_id');
}
@@ -127,22 +125,22 @@
unset($this->elink['phpgwapi.contact_person']);
}
- function criteria_contact_id($element)
+ function criteria_contact_id( $element )
{
- $this->_add_criteria($this->index_criteria($element));
+ $this->_add_criteria($this->index_criteria($element));
}
- function criteria_access($element)
+ function criteria_access( $element )
{
- $this->_add_criteria($this->index_criteria($element));
+ $this->_add_criteria($this->index_criteria($element));
}
- function criteria_contact_type($element)
+ function criteria_contact_type( $element )
{
- $this->_add_criteria($this->index_criteria($element));
+ $this->_add_criteria($this->index_criteria($element));
}
- function criteria_owner($element)
+ function criteria_owner( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
@@ -157,18 +155,17 @@
$this->add_field('max_contacts', 'max(contact_id)');
}
- function criteria_sel_cat_id($element)
+ function criteria_sel_cat_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
- foreach($element['value'] as $value)
+ foreach ($element['value'] as $value)
{
- $data[] =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
sql::string($value)),
-
phpgwapi_sql_criteria::has($field, ',' . $value . ','));
+ $data[] =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
sql::string($value)), phpgwapi_sql_criteria::has($field, ',' . $value . ','));
}
-
+
$criteria =
phpgwapi_sql_criteria::append_or($data);
$this->_add_criteria($criteria);
}
@@ -177,4 +174,4 @@
$this->_add_criteria(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($element['value'])));
}
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_comm.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_comm.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,268 +1,267 @@
<?php
/**
- * Query statements for "comm" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "comm" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "comm" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "comm" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_comm extends phpgwapi_sql_entity
{
- var $map = array('key_comm_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'type'
=> 'integer',
- 'field'
=> 'comm_id',
- 'type'
=> 'integer'),
- 'comm_contact_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'type'
=> 'integer',
- 'field'
=> 'contact_id',
- 'type'
=> 'integer'),
- 'comm_descr' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_descr_id',
- 'type'
=> 'integer'),
- 'comm_preferred' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'preferred',
- 'type'
=> 'string'),
- 'comm_data' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'),
- 'comm_creaton' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_on',
- 'type'
=> 'integer'),
- 'comm_creatby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_by',
- 'type'
=> 'integer'),
- 'comm_modon' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_on',
- 'type'
=> 'integer'),
- 'comm_modby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_by',
- 'type'
=> 'integer'),
- 'phone' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'phone_home' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'phone_prefer' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'email' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'email_home' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_work' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_home' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_voice' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_fax' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_msg' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_cell' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_pager' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_bbs' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_modem' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_car' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_isdn' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_video' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'tel_prefer' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'),
- 'url' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_data'));
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+
+ var $map = array('key_comm_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'type' => 'integer',
+ 'field' => 'comm_id',
+ 'type' => 'integer'),
+ 'comm_contact_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'type' => 'integer',
+ 'field' => 'contact_id',
+ 'type' => 'integer'),
+ 'comm_descr' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_descr_id',
+ 'type' => 'integer'),
+ 'comm_preferred' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'preferred',
+ 'type' => 'string'),
+ 'comm_data' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'comm_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'comm_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'comm_modon' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_on',
+ 'type' => 'integer'),
+ 'comm_modby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_by',
+ 'type' => 'integer'),
+ 'phone' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'phone_home' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'phone_prefer' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'email' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'email_home' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_work' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_home' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_voice' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_fax' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_msg' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_cell' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_pager' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_bbs' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_modem' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_car' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_isdn' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_video' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'tel_prefer' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'),
+ 'url' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_data'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_comm',
'contact_comm');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('comm_contact_id',
'phpgwapi.contact_central','contact_id');
- $this->set_elinks('comm_descr',
'phpgwapi.contact_comm_descr','comm_descr_id');
+ $this->set_ilinks('comm_contact_id',
'phpgwapi.contact_central', 'contact_id');
+ $this->set_elinks('comm_descr',
'phpgwapi.contact_comm_descr', 'comm_descr_id');
}
- function criteria_key_comm_id($element)
+ function criteria_key_comm_id( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
-
-
- function criteria_comm_contact_id($element)
+
+ function criteria_comm_contact_id( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
-
- function criteria_comm_descr($element)
+
+ function criteria_comm_descr( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_comm_descr.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_comm_descr.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,89 +1,89 @@
<?php
/**
- * Query statements for "comm_descr" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "comm_descr" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "comm_descr" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "comm_descr" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_comm_descr extends phpgwapi_sql_entity
{
- var $map = array('comm_descr_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'integer'),
- 'comm_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'comm_type_id',
- 'type'
=> 'integer'),
- 'comm_description' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'descr',
- 'type'
=> 'string'),
- 'comm_find_descr' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'descr'));
- function __construct ($ali = '', $field = '', $criteria =
'')
+ var $map = array('comm_descr_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'comm_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'comm_type_id',
+ 'type' => 'integer'),
+ 'comm_description' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'descr',
+ 'type' => 'string'),
+ 'comm_find_descr' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'descr'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_comm_descr',
'contact_comm_descr');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('comm_descr_id',
'phpgwapi.contact_comm','comm_descr');
- $this->set_elinks('comm_type',
'phpgwapi.contact_comm_type','comm_type_id');
+ $this->set_ilinks('comm_descr_id',
'phpgwapi.contact_comm', 'comm_descr');
+ $this->set_elinks('comm_type',
'phpgwapi.contact_comm_type', 'comm_type_id');
}
- function criteria_comm_descr_id($element)
+ function criteria_comm_descr_id( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
- function criteria_comm_find_descr($element)
+ function criteria_comm_find_descr( $element )
{
$field = $this->put_alias($element['real_field']);
-
- foreach($element['value'] as $value)
+
+ foreach ($element['value'] as $value)
{
$data[] = phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($value));
}
@@ -91,4 +91,4 @@
$criteria = phpgwapi_sql_criteria::append_or($data);
$this->_add_criteria($criteria);
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_comm_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_comm_type.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,78 +1,77 @@
<?php
/**
- * Query statements for "comm_type" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "comm_type" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "comm_type" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "comm_type" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_comm_type extends phpgwapi_sql_entity
{
- 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' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'active',
- 'type' =>
'string'),
- 'comm_class' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'class',
- 'type' =>
'string'));
+ 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' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'active',
+ 'type' => 'string'),
+ 'comm_class' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'class',
+ 'type' => 'string'));
- function __construct ($ali = '', $field = '', $criteria = '')
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_comm_type',
'contact_comm_type');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('comm_type_id',
'phpgwapi.contact_comm_descr','comm_type');
+ $this->set_ilinks('comm_type_id',
'phpgwapi.contact_comm_descr', 'comm_type');
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_note.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_note.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_note.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,118 +1,117 @@
<?php
/**
- * Query statements for "note" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "note" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "note" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "note" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_note extends phpgwapi_sql_entity
{
- var $map = array('key_note_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_note_id',
- 'type'
=> 'integer'),
- 'note_contact_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_id',
- 'type'
=> 'integer'),
- 'note_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'note_type_id',
- 'type'
=> 'integer'),
- 'note_text' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'),
- 'note_creaton' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_on',
- 'type'
=> 'integer'),
- 'note_creatby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_by',
- 'type'
=> 'integer'),
- 'note_modon' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_on',
- 'type'
=> 'integer'),
- 'note_modby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_by',
- 'type'
=> 'integer'),
- 'note' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'));
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+ var $map = array('key_note_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_note_id',
+ 'type' => 'integer'),
+ 'note_contact_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_id',
+ 'type' => 'integer'),
+ 'note_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'note_type_id',
+ 'type' => 'integer'),
+ 'note_text' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'note_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'note_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'note_modon' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_on',
+ 'type' => 'integer'),
+ 'note_modby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_by',
+ 'type' => 'integer'),
+ 'note' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_note',
'contact_note');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('note_contact_id',
'phpgwapi.contact_central','contact_id');
- $this->set_elinks('note_type',
'phpgwapi.contact_note_type','note_type_id');
+ $this->set_ilinks('note_contact_id',
'phpgwapi.contact_central', 'contact_id');
+ $this->set_elinks('note_type',
'phpgwapi.contact_note_type', 'note_type_id');
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_note_type.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_note_type.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_note_type.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,61 +1,60 @@
<?php
/**
- * Query statements for "note_type" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "note_type" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "note_type" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "note_type" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_note_type extends phpgwapi_sql_entity
{
- var $map = array('note_type_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'integer'),
- 'note_description' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'description',
- 'type'
=> 'string'));
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+
+ var $map = array('note_type_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'note_description' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'description',
+ 'type' => 'string'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_note_type',
'contact_note_type');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('note_type_id',
'phpgwapi.contact_note','note_type');
- }
-
- }
+ $this->set_ilinks('note_type_id',
'phpgwapi.contact_note', 'note_type');
+ }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_org.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_org.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_org.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,127 +1,127 @@
<?php
/**
- * Query statements for "org" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "org" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "org" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "org" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_org extends phpgwapi_sql_entity
{
- var $map = array('org_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'org_id',
- 'type' =>
'integer'),
- 'org_name' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'name',
- 'type' =>
'string'),
- 'org_active' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'active',
- 'type' =>
'string'),
- 'org_parent' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'parent',
- 'type' =>
'integer'),
- 'org_creaton' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'created_on',
- 'type' =>
'integer'),
- 'org_creatby' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'created_by',
- 'type' =>
'integer'),
- 'org_modon' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'modified_on',
- 'type' =>
'integer'),
- 'org_modby' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'modified_by',
- 'type' =>
'integer'),
- 'name' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => ''),
- 'count_orgs' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' => ''),
- 'people_org' => array('select' =>
'unlink_org'),
- 'organizations'=> array('select' =>
'relink_org_person'),
- 'orgs_local' => array('select' =>
'relink_org_person'));
- function __construct ($ali = '', $field = '', $criteria =
'')
+ var $map = array('org_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'org_id',
+ 'type' => 'integer'),
+ 'org_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'name',
+ 'type' => 'string'),
+ 'org_active' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'active',
+ 'type' => 'string'),
+ 'org_parent' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'parent',
+ 'type' => 'integer'),
+ 'org_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'org_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'org_modon' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_on',
+ 'type' => 'integer'),
+ 'org_modby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_by',
+ 'type' => 'integer'),
+ 'name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'count_orgs' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'people_org' => array('select' => 'unlink_org'),
+ 'organizations' => array('select' =>
'relink_org_person'),
+ 'orgs_local' => array('select' => 'relink_org_person'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_org', 'contact_org');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('org_id',
'phpgwapi.contact_central','contact_id', PHPGW_SQL_REQUIRED_KEY);
- $this->set_ilinks('org_id',
'phpgwapi.contact_org_person','my_org_id', PHPGW_SQL_LAZY_KEY);
+ $this->set_ilinks('org_id', 'phpgwapi.contact_central',
'contact_id', PHPGW_SQL_REQUIRED_KEY);
+ $this->set_ilinks('org_id',
'phpgwapi.contact_org_person', 'my_org_id', PHPGW_SQL_LAZY_KEY);
}
function unlink_org()
@@ -135,10 +135,10 @@
$this->set_elinks('org_id',
'phpgwapi.contact_org_person', 'my_org_id');
}
- function criteria_org_id($element)
+ function criteria_org_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
@@ -152,4 +152,4 @@
{
$this->add_field('count_orgs', 'count(org_id)');
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_org_person.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_org_person.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_org_person.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,111 +1,111 @@
<?php
/**
- * Query statements for "org_person" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "org_person" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "org_person" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "org_person" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_org_person extends phpgwapi_sql_entity
{
- var $map = array('my_org_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'org_id',
- 'type' =>
'integer'),
- 'my_person_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'person_id',
- 'type' =>
'integer'),
- 'my_addr_id' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'addr_id',
- 'type' =>
'integer'),
- 'my_preferred'=> array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'preferred',
- 'type' =>
'string'),
- 'my_creaton' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'created_on',
- 'type' =>
'integer'),
- 'my_creatby' => array('select' => '',
- 'criteria' => '',
- 'insert' => '',
- 'update' => '',
- 'delete' => '',
- 'sort' => '',
- 'field' =>
'created_by',
- 'type' =>
'integer'),
- 'people_org_person' => array('select' =>
'relink_person'),
- 'organizations_org_person' => array('select' =>
'relink_org'));
- function __construct ($ali = '', $field = '', $criteria = '')
+ var $map = array('my_org_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'org_id',
+ 'type' => 'integer'),
+ 'my_person_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'person_id',
+ 'type' => 'integer'),
+ 'my_addr_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'addr_id',
+ 'type' => 'integer'),
+ 'my_preferred' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'preferred',
+ 'type' => 'string'),
+ 'my_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'my_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'people_org_person' => array('select' =>
'relink_person'),
+ 'organizations_org_person' => array('select' =>
'relink_org'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_org_person',
'contact_org_person');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_elinks('my_org_id',
'phpgwapi.contact_org','org_id');
- $this->set_elinks('my_person_id',
'phpgwapi.contact_person','person_id');
+ $this->set_elinks('my_org_id', 'phpgwapi.contact_org',
'org_id');
+ $this->set_elinks('my_person_id',
'phpgwapi.contact_person', 'person_id');
}
function relink_person()
{
unset($this->elink['phpgwapi.contact_person']);
- $this->set_ilinks('my_person_id',
'phpgwapi.contact_person','person_id', PHPGW_SQL_LAZY_KEY);
+ $this->set_ilinks('my_person_id',
'phpgwapi.contact_person', 'person_id', PHPGW_SQL_LAZY_KEY);
}
function relink_org()
{
unset($this->elink['phpgwapi.contact_org']);
- $this->set_ilinks('my_org_id',
'phpgwapi.contact_org','org_id', PHPGW_SQL_LAZY_KEY);
+ $this->set_ilinks('my_org_id', 'phpgwapi.contact_org',
'org_id', PHPGW_SQL_LAZY_KEY);
}
- function criteria_my_org_id($element)
+ function criteria_my_org_id( $element )
{
$field = $this->put_alias($element['real_field']);
$new_criteria = phpgwapi_sql_criteria::equal($field,
$element['value']);
@@ -113,7 +113,7 @@
$this->relink_person();
}
- function criteria_my_person_id($element)
+ function criteria_my_person_id( $element )
{
$field = $this->put_alias($element['real_field']);
$new_criteria = phpgwapi_sql_criteria::equal($field,
$element['value']);
@@ -121,22 +121,21 @@
$this->relink_org();
}
- function select_my_org_id($element)
+ function select_my_org_id( $element )
{
$this->_add_field(array('field' => 'my_org_id',
'real_field' => 'org_id'));
}
- function select_my_person_id($element)
+ function select_my_person_id( $element )
{
$this->_add_field(array('field' => 'my_person_id',
'real_field' => 'person_id'));
}
- function criteria_my_preferred($element)
+ function criteria_my_preferred( $element )
{
$field = $this->put_alias($element['real_field']);
- $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($element['value'])),
-
phpgwapi_sql_criteria::is_null($field));
+ $criteria =
phpgwapi_sql_criteria::or_(phpgwapi_sql_criteria::equal($field,
phpgwapi_sql::string($element['value'])),
phpgwapi_sql_criteria::is_null($field));
$this->_add_criteria($criteria);
return $criteria;
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_others.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_others.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_others.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,134 +1,133 @@
<?php
/**
- * Query statements for "others" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "others" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "others" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "others" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_others extends phpgwapi_sql_entity
{
- var $map = array('key_other_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'other_id',
- 'type'
=> 'integer'),
- 'other_contact_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_id',
- 'type'
=> 'integer'),
- 'other_name' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'),
- 'other_value' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'),
- 'other_owner' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'contact_owner',
- 'type'
=> 'integer'),
- 'other_count_row' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'label' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'email_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'email_home_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'adr_one_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'adr_two_type' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''));
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+ var $map = array('key_other_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'other_id',
+ 'type' => 'integer'),
+ 'other_contact_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_id',
+ 'type' => 'integer'),
+ 'other_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'other_value' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'other_owner' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'contact_owner',
+ 'type' => 'integer'),
+ 'other_count_row' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'label' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'email_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'email_home_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'adr_one_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'adr_two_type' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_others',
'contact_others');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('other_contact_id',
'phpgwapi.contact_central','contact_id');
+ $this->set_ilinks('other_contact_id',
'phpgwapi.contact_central', 'contact_id');
}
- function criteria_other_contact_id($element)
+ function criteria_other_contact_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
@@ -137,4 +136,4 @@
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_person.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_person.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_person.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,301 +1,301 @@
<?php
/**
- * Query statements for "person" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "person" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "person" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "person" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_person extends phpgwapi_sql_entity
{
- var $map = array('person_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'integer'),
- 'per_full_name' => array('select'
=> 'full_name',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'per_first_name' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'first_name',
- 'type'
=> 'string'),
- 'per_last_name' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'last_name',
- 'type'
=> 'string'),
- 'per_middle_name' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'middle_name',
- 'type'
=> 'string'),
- 'per_prefix' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'prefix',
- 'type'
=> 'string'),
- 'per_suffix' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'suffix',
- 'type'
=> 'string'),
- 'per_birthday' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'birthday',
- 'type'
=> 'string'),
- 'per_pubkey' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'pubkey',
- 'type'
=> 'string'),
- 'per_title' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'title',
- 'type'
=> 'string'),
- 'per_department' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'department',
- 'type'
=> 'string'),
- 'per_initials' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'initials',
- 'type'
=> 'string'),
- 'per_sound' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'sound',
- 'type'
=> 'string'),
- 'per_active' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'active',
- 'type'
=> 'string'),
- 'per_creaton' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_on',
- 'type'
=> 'integer'),
- 'per_creatby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'created_by',
- 'type'
=> 'integer'),
- 'per_modon' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_on',
- 'type'
=> 'integer'),
- 'per_modby' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'modified_by',
- 'type'
=> 'integer'),
- 'per_name' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'fn' => array('select'
=> 'full_name',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> ''),
- 'n_given' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'first_name',
- 'type'
=> 'string'),
- 'n_family' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'last_name',
- 'type'
=> 'string'),
- 'n_middle' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'middle_name',
- 'type'
=> 'string'),
- 'n_prefix' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_prefix'),
- 'n_suffix' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_suffix'),
- 'sound' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_sound'),
- 'bday' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_birthday'),
- 'tz' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_timezone'),
- 'geo' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_geo'),
- 'pubkey' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_pubkey'),
- 'org_unit' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'per_deparment'),
- 'title' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'title'),
- 'count_persons' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> 'person_id'),
- 'organizations_person' => array('select'
=> 'unlink_person'),
- 'people' => array('select'
=> 'relink_org_person'),
- 'people_local' => array('select'
=> 'relink_org_person'));
- function __construct ($ali = '', $field = '', $criteria =
'')
+ var $map = array('person_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'per_full_name' => array('select' => 'full_name',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'per_first_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'first_name',
+ 'type' => 'string'),
+ 'per_last_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'last_name',
+ 'type' => 'string'),
+ 'per_middle_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'middle_name',
+ 'type' => 'string'),
+ 'per_prefix' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'prefix',
+ 'type' => 'string'),
+ 'per_suffix' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'suffix',
+ 'type' => 'string'),
+ 'per_birthday' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'birthday',
+ 'type' => 'string'),
+ 'per_pubkey' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'pubkey',
+ 'type' => 'string'),
+ 'per_title' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'title',
+ 'type' => 'string'),
+ 'per_department' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'department',
+ 'type' => 'string'),
+ 'per_initials' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'initials',
+ 'type' => 'string'),
+ 'per_sound' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'sound',
+ 'type' => 'string'),
+ 'per_active' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'active',
+ 'type' => 'string'),
+ 'per_creaton' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_on',
+ 'type' => 'integer'),
+ 'per_creatby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'created_by',
+ 'type' => 'integer'),
+ 'per_modon' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_on',
+ 'type' => 'integer'),
+ 'per_modby' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'modified_by',
+ 'type' => 'integer'),
+ 'per_name' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'fn' => array('select' => 'full_name',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => ''),
+ 'n_given' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'first_name',
+ 'type' => 'string'),
+ 'n_family' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'last_name',
+ 'type' => 'string'),
+ 'n_middle' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'middle_name',
+ 'type' => 'string'),
+ 'n_prefix' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_prefix'),
+ 'n_suffix' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_suffix'),
+ 'sound' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_sound'),
+ 'bday' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_birthday'),
+ 'tz' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_timezone'),
+ 'geo' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_geo'),
+ 'pubkey' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_pubkey'),
+ 'org_unit' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'per_deparment'),
+ 'title' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'title'),
+ 'count_persons' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => 'person_id'),
+ 'organizations_person' => array('select' =>
'unlink_person'),
+ 'people' => array('select' => 'relink_org_person'),
+ 'people_local' => array('select' =>
'relink_org_person'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_person',
'contact_person');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_ilinks('person_id',
'phpgwapi.contact_central','contact_id', PHPGW_SQL_REQUIRED_KEY);
+ $this->set_ilinks('person_id',
'phpgwapi.contact_central', 'contact_id', PHPGW_SQL_REQUIRED_KEY);
$this->set_elinks('person_id',
'phpgwapi.contact_accounts', 'account_person_id');
- $this->set_ilinks('person_id',
'phpgwapi.contact_org_person','my_person_id', PHPGW_SQL_LAZY_KEY);
+ $this->set_ilinks('person_id',
'phpgwapi.contact_org_person', 'my_person_id', PHPGW_SQL_LAZY_KEY);
}
function unlink_person()
@@ -306,10 +306,10 @@
function relink_org_person()
{
unset($this->ilink['phpgwapi.contact_org_person']);
- $this->set_elinks('person_id',
'phpgwapi.contact_org_person','my_person_id');
+ $this->set_elinks('person_id',
'phpgwapi.contact_org_person', 'my_person_id');
}
- function criteria_person_id($element)
+ function criteria_person_id( $element )
{
$this->_add_criteria($this->index_criteria($element));
}
@@ -321,10 +321,11 @@
function full_name()
{
- $this->add_field('per_full_name',
phpgwapi_sql::concat_null(array($this->real_field('per_prefix'),
phpgwapi_sql::string(' '),
-
$this->real_field('per_first_name'), phpgwapi_sql::string(' '),
-
$this->real_field('per_middle_name'), phpgwapi_sql::string(' '),
-
$this->real_field('per_last_name'), phpgwapi_sql::string(' '),
-
$this->real_field('per_suffix'))));
+ $this->add_field('per_full_name',
phpgwapi_sql::concat_null(array($this->real_field('per_prefix'),
+ phpgwapi_sql::string(' '),
+ $this->real_field('per_first_name'),
phpgwapi_sql::string(' '),
+ $this->real_field('per_middle_name'),
phpgwapi_sql::string(' '),
+ $this->real_field('per_last_name'),
phpgwapi_sql::string(' '),
+ $this->real_field('per_suffix'))));
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contact_types.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contact_types.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contact_types.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,75 +1,75 @@
<?php
/**
- * Query statements for "contact_type" table
- * @author Edgar Antonio Luna <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
-
+ * Query statements for "contact_type" table
+ * @author Edgar Antonio Luna <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Use SQL criteria
- */
+ * Use SQL criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Use SQL entity
- */
+ * Use SQL entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * Query statements for "contact_type" table
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Query statements for "contact_type" table
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contact_types extends phpgwapi_sql_entity
{
- var $map = array('contact_type_id' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'integer'),
- 'contact_type_descr' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'),
- 'contact_type_table' => array('select'
=> '',
- 'criteria'
=> '',
- 'insert'
=> '',
- 'update'
=> '',
- 'delete'
=> '',
- 'sort'
=> '',
- 'field'
=> '',
- 'type'
=> 'string'));
-
- function __construct ($ali = '', $field = '', $criteria =
'')
+
+ var $map = array('contact_type_id' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'integer'),
+ 'contact_type_descr' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'),
+ 'contact_type_table' => array('select' => '',
+ 'criteria' => '',
+ 'insert' => '',
+ 'update' => '',
+ 'delete' => '',
+ 'sort' => '',
+ 'field' => '',
+ 'type' => 'string'));
+
+ function __construct( $ali = '', $field = '', $criteria = '' )
{
$this->_constructor('phpgw_contact_types',
'contact_types');
- if($field)
+ if ($field)
{
$this->add_select($field);
}
- if($criteria)
+ if ($criteria)
{
$this->add_criteria($criteria);
}
- $this->set_elinks('contact_type_id',
'phpgwapi.contact_central','contact_type');
+ $this->set_elinks('contact_type_id',
'phpgwapi.contact_central', 'contact_type');
}
- function criteria_contact_type_id($element)
+ function criteria_contact_type_id( $element )
{
$field = $this->put_alias($element['real_field']);
- if(is_array($element['value']))
+ if (is_array($element['value']))
{
$this->_add_criteria(phpgwapi_sql_criteria::in($field, $element['value']));
}
@@ -78,4 +78,4 @@
$this->_add_criteria(phpgwapi_sql_criteria::equal($field, $element['value']));
}
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contacts_shared.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contacts_shared.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contacts_shared.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,33 +1,34 @@
<?php
/**
- * Contact Management Shared Routines
- * @author Joseph Engo <address@hidden>
- * @author Miles Lott <address@hidden>
- * @author Bettina Gille <address@hidden>
- * @copyright Copyright (C) Copyright (C) 2001,2002 Joseph Engo, Miles
Lott, Bettina Gille
- * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- */
+ * Contact Management Shared Routines
+ * @author Joseph Engo <address@hidden>
+ * @author Miles Lott <address@hidden>
+ * @author Bettina Gille <address@hidden>
+ * @copyright Copyright (C) Copyright (C) 2001,2002 Joseph Engo, Miles
Lott, Bettina Gille
+ * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ */
/**
- * Contact Management Shared Routines
- *
- * @package phpgwapi
- * @subpackage contacts
- */
+ * Contact Management Shared Routines
+ *
+ * @package phpgwapi
+ * @subpackage contacts
+ */
class contacts extends contacts_
{
- function check_perms($has, $needed)
+
+ function check_perms( $has, $needed )
{
return (!!($has & $needed) == True);
}
- function split_stock_and_extras($fields)
+ function split_stock_and_extras( $fields )
{
- while (list($field,$value) = @each($fields))
+ while (list($field, $value) = @each($fields))
{
/* Depending on how the array was built, this
is needed. */
if (gettype($value) == 'integer')
@@ -36,7 +37,7 @@
}
if ($this->stock_contact_fields[$field])
{
- $stock_fields[$field] = $value;
+ $stock_fields[$field] = $value;
$stock_fieldnames[$field] =
$this->stock_contact_fields[$field];
}
else
@@ -44,10 +45,10 @@
$extra_fields[$field] = $value;
}
}
- return
array($stock_fields,$stock_fieldnames,$extra_fields);
+ return array($stock_fields, $stock_fieldnames,
$extra_fields);
}
- function loop_addslashes($fields)
+ function loop_addslashes( $fields )
{
$absf = $this->stock_contact_fields;
while ($t = each($absf))
@@ -57,8 +58,8 @@
reset($absf);
return $ta;
}
+ /* This will take an array or integer */
- /* This will take an array or integer */
// function delete($id)
// {
// if (gettype($id) == 'array')
@@ -74,46 +75,48 @@
// }
// }
- function asc_sort($a,$b)
+ function asc_sort( $a, $b )
{
- echo "<br>A:'".$a."' B:'".$b;
- if($a[1]==$b[1]) return 0;
- return ($a[1]>$b[1])?1:-1;
+ echo "<br>A:'" . $a . "' B:'" . $b;
+ if ($a[1] == $b[1])
+ return 0;
+ return ($a[1] > $b[1]) ? 1 : -1;
}
- function desc_sort($a,$b)
+ function desc_sort( $a, $b )
{
- echo "<br>A:'".$a."' B:'".$b;
- if($a[1]==$b[1]) return 0;
- return ($a[1]<$b[1])?1:-1;
+ echo "<br>A:'" . $a . "' B:'" . $b;
+ if ($a[1] == $b[1])
+ return 0;
+ return ($a[1] < $b[1]) ? 1 : -1;
}
/**
- * Compare two strings by alphabetical order
- *
- * @param string $s1
- * @param string $s2
- * @return integer 1 if $s1 comes after $s2 alphabetically, 0 if
not.
- */
- function comesafter($s1, $s2)
+ * Compare two strings by alphabetical order
+ *
+ * @param string $s1
+ * @param string $s2
+ * @return integer 1 if $s1 comes after $s2 alphabetically, 0
if not.
+ */
+ function comesafter( $s1, $s2 )
{
/*
- We don't want to overstep the bounds of one of the
strings and segfault,
- so let's see which one is shorter.
- */
+ We don't want to overstep the bounds of one of the
strings and segfault,
+ so let's see which one is shorter.
+ */
$order = 1;
- if ( (strlen($s1) == 0) )
+ if ((strlen($s1) == 0))
{
return 0;
}
- if ( (strlen($s2) == 0) )
+ if ((strlen($s2) == 0))
{
return 1;
}
- if (strlen ($s1) > strlen ($s2))
+ if (strlen($s1) > strlen($s2))
{
$temp = $s1;
$s1 = $s2;
@@ -121,30 +124,36 @@
$order = 0;
}
- for ($index = 0; $index < strlen ($s1); $index++)
+ for ($index = 0; $index < strlen($s1); $index++)
{
/* $s1 comes after $s2 */
- if (strtolower($s1[$index]) >
strtolower($s2[$index])) { return ($order); }
+ if (strtolower($s1[$index]) >
strtolower($s2[$index]))
+ {
+ return ($order);
+ }
/* $s1 comes before $s2 */
- if (strtolower($s1[$index]) <
strtolower($s2[$index])) { return (1 - $order); }
+ if (strtolower($s1[$index]) <
strtolower($s2[$index]))
+ {
+ return (1 - $order);
+ }
}
- /* Special case in which $s1 is a substring of
$s2 */
+ /* Special case in which $s1 is a substring of $s2 */
return ($order);
}
/**
- * Sort a multi-dimensional array by a second-degree index.
- *
- * For instance, the 0th index of the Ith member of both the
group and user arrays
- * is a string identifier. In the case of a user array this is
the username;
- * with the group array it is the group name.
- * @param array $sortarray
- * @param integer|string $index
- * @return array
- */
- function asortbyindex ($sortarray, $index)
+ * Sort a multi-dimensional array by a second-degree index.
+ *
+ * For instance, the 0th index of the Ith member of both the
group and user arrays
+ * is a string identifier. In the case of a user array this is
the username;
+ * with the group array it is the group name.
+ * @param array $sortarray
+ * @param integer|string $index
+ * @return array
+ */
+ function asortbyindex( $sortarray, $index )
{
$lastindex = count($sortarray) - 2;
for ($subindex = 0; $subindex < $lastindex; $subindex++)
@@ -163,7 +172,7 @@
return ($sortarray);
}
- function arsortbyindex ($sortarray, $index)
+ function arsortbyindex( $sortarray, $index )
{
$lastindex = count($sortarray) - 1;
for ($subindex = $lastindex; $subindex > 0; $subindex--)
@@ -183,38 +192,47 @@
}
/**
- * Eliminate fields that are not found within $filterfields from
LDAP fields
- *
- * @param array $ldap_fields Array with LDAP fields to filter
- * @param array $filterfields LDAP fields to filter
- * @param boolean $DEBUG true to switch debug mode on, defaults
to false
- * @return array New LDAP field array incuding only fields from
$filterfields
- * @deprecated
- */
- function filter_ldap($ldap_fields,$filterfields,$DEBUG=0)
+ * Eliminate fields that are not found within $filterfields
from LDAP fields
+ *
+ * @param array $ldap_fields Array with LDAP fields to filter
+ * @param array $filterfields LDAP fields to filter
+ * @param boolean $DEBUG true to switch debug mode on, defaults
to false
+ * @return array New LDAP field array incuding only fields from
$filterfields
+ * @deprecated
+ */
+ function filter_ldap( $ldap_fields, $filterfields, $DEBUG = 0 )
{
$match = 0;
- if($DEBUG) { echo '<br>'; }
- for($i=0;$i<count($ldap_fields);$i++)
+ if ($DEBUG)
{
+ echo '<br>';
+ }
+ for ($i = 0; $i < count($ldap_fields); $i++)
+ {
$yes = True;
if ($ldap_fields[$i]['uidnumber'][0])
{
reset($filterfields);
- while (list($col,$filt) =
each($filterfields))
+ while (list($col, $filt) =
each($filterfields))
{
if ($col == 'phpgwcontactcatid')
{
- $colarray =
explode(',',$ldap_fields[$i][$col][0]);
+ $colarray =
explode(',', $ldap_fields[$i][$col][0]);
if ($colarray[1])
{
-
while(list($key,$val) = each ($colarray))
+ while
(list($key, $val) = each($colarray))
{
-
if($DEBUG) { echo ' Testing "'.$col.'" for "'.$val.'"'; }
+ if
($DEBUG)
+ {
+
echo ' Testing "' . $col . '" for "' . $val . '"';
+ }
if
($val == $filt)
{
-
if($DEBUG) { echo ', and number '.$ldap_fields[$i]['uidnumber'][0].'
matched.'.' '; }
+
if ($DEBUG)
+
{
+
echo ', and number ' . $ldap_fields[$i]['uidnumber'][0] . ' matched.' .
' ';
+
}
$yes &= True;
$match++;
break;
@@ -223,16 +241,25 @@
}
else
{
- if($DEBUG) {
echo ' Testing "'.$col.'" for "'.$filt.'"'; }
+ if ($DEBUG)
+ {
+ echo
' Testing "' . $col . '" for "' . $filt . '"';
+ }
if
($ldap_fields[$i][$col][0] == $filt)
{
-
if($DEBUG) { echo ', and number '.$ldap_fields[$i]['uidnumber'][0].'
matched.'.' '; }
+ if
($DEBUG)
+ {
+
echo ', and number ' . $ldap_fields[$i]['uidnumber'][0] . ' matched.' .
' ';
+ }
$yes &=
True;
$match++;
}
else
{
-
if($DEBUG) { echo ', but number '.$ldap_fields[$i]['uidnumber'][0].' did not
match.'.' '; }
+ if
($DEBUG)
+ {
+
echo ', but number ' . $ldap_fields[$i]['uidnumber'][0] . ' did not match.' .
' ';
+ }
$yes &=
False;
$match--;
}
@@ -240,16 +267,25 @@
}
else
{
- if($DEBUG) { echo
' Testing "'.$col.'" for "'.$filt.'"'; }
+ if ($DEBUG)
+ {
+ echo
' Testing "' . $col . '" for "' . $filt . '"';
+ }
if
($ldap_fields[$i][$col][0] == $filt)
{
- if($DEBUG) {
echo ', and number '.$ldap_fields[$i]['uidnumber'][0].'
matched.'.' '; }
+ if ($DEBUG)
+ {
+ echo ',
and number ' . $ldap_fields[$i]['uidnumber'][0] . ' matched.' . ' ';
+ }
$yes &= True;
$match++;
}
else
{
- if($DEBUG) {
echo ', but number '.$ldap_fields[$i]['uidnumber'][0].' did not
match.'.' '; }
+ if ($DEBUG)
+ {
+ echo ',
but number ' . $ldap_fields[$i]['uidnumber'][0] . ' did not match.' .
' ';
+ }
$yes &= False;
$match--;
}
@@ -258,24 +294,30 @@
if ($yes)
{
- if($DEBUG) { echo
$ldap_fields[$i]['uidnumber'][0].' matched all!'.'<br>'; }
+ if ($DEBUG)
+ {
+ echo
$ldap_fields[$i]['uidnumber'][0] . ' matched all!' . '<br>';
+ }
$new_ldap[] = $ldap_fields[$i];
}
else
{
- if($DEBUG) { echo
$ldap_fields[$i]['uidnumber'][0].' did not match all.'.'<br>'; }
+ if ($DEBUG)
+ {
+ echo
$ldap_fields[$i]['uidnumber'][0] . ' did not match all.' . '<br>';
+ }
}
}
}
- if($DEBUG)
+ if ($DEBUG)
{
- if($match)
+ if ($match)
{
- echo '<br>'.$match.' total
matches.'."\n";
+ echo '<br>' . $match . ' total
matches.' . "\n";
}
else
{
- echo '<br>No matches :('."\n";
+ echo '<br>No matches :(' . "\n";
}
}
$this->total_records = count($new_ldap);
@@ -283,32 +325,32 @@
return $new_ldap;
}
- function formatted_address($id, $business = True, $afont = '',
$asize = '2')
+ function formatted_address( $id, $business = True, $afont = '',
$asize = '2' )
{
- $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $t = createObject('phpgwapi.Template',
$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
$s = createObject('phpgwapi.sbox');
$fields = array
(
- 'n_given' =>
'n_given',
- 'n_family' =>
'n_family',
- 'title' =>
'title',
- 'org_name' =>
'org_name',
- 'org_unit' =>
'org_unit',
- 'adr_one_street' =>
'adr_one_street',
- 'adr_one_locality' =>
'adr_one_locality',
- 'adr_one_postalcode' => 'adr_one_postalcode',
- 'adr_one_region' =>
'adr_one_region',
- 'adr_one_countryname' =>
'adr_one_countryname',
- 'adr_two_street' =>
'adr_two_street',
- 'adr_two_locality' =>
'adr_two_locality',
- 'adr_two_postalcode' => 'adr_two_postalcode',
- 'adr_two_region' =>
'adr_two_region',
- 'adr_two_countryname' => 'adr_two_countryname'
+ 'n_given' => 'n_given',
+ 'n_family' => 'n_family',
+ 'title' => 'title',
+ 'org_name' => 'org_name',
+ 'org_unit' => 'org_unit',
+ 'adr_one_street' => 'adr_one_street',
+ 'adr_one_locality' => 'adr_one_locality',
+ 'adr_one_postalcode' => 'adr_one_postalcode',
+ 'adr_one_region' => 'adr_one_region',
+ 'adr_one_countryname' => 'adr_one_countryname',
+ 'adr_two_street' => 'adr_two_street',
+ 'adr_two_locality' => 'adr_two_locality',
+ 'adr_two_postalcode' => 'adr_two_postalcode',
+ 'adr_two_region' => 'adr_two_region',
+ 'adr_two_countryname' => 'adr_two_countryname'
);
- list($address) = $this->read_single_entry($id,$fields);
- foreach($address as $k => $val)
+ list($address) = $this->read_single_entry($id, $fields);
+ foreach ($address as $k => $val)
{
$address[$k] =
$GLOBALS['phpgw']->strip_html($val);
}
@@ -329,28 +371,28 @@
$company = $title . $address['n_given']
. ' ' . $address['n_family'];
}
- $street = $address['adr_one_street'];
- $city = $address['adr_one_locality'];
- $zip = $address['adr_one_postalcode'];
- $state = $address['adr_one_region'];
+ $street = $address['adr_one_street'];
+ $city = $address['adr_one_locality'];
+ $zip = $address['adr_one_postalcode'];
+ $state = $address['adr_one_region'];
$country = $address['adr_one_countryname'];
}
else
{
$company = $title . $address['n_given'] .
' ' . $address['n_family'];
- $street = $address['adr_two_street'];
- $city = $address['adr_two_locality'];
- $zip = $address['adr_two_postalcode'];
- $state = $address['adr_two_region'];
+ $street = $address['adr_two_street'];
+ $city = $address['adr_two_locality'];
+ $zip = $address['adr_two_postalcode'];
+ $state = $address['adr_two_region'];
$country = $address['adr_two_countryname'];
}
- if (! $country)
+ if (!$country)
{
$country =
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
}
- if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP .'default' . SEP . 'format_' . strtolower($country) .
'.tpl'))
+ if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP . 'default' . SEP . 'format_' . strtolower($country)
. '.tpl'))
{
$a = $t->set_file(array('address_format' =>
'format_' . strtolower($country) . '.tpl'));
}
@@ -364,57 +406,57 @@
$afont =
$GLOBALS['phpgw_info']['theme']['font'];
}
- $a .= $t->set_var('font',$afont);
- $a .= $t->set_var('fontsize',$asize);
- $a .= $t->set_var('company',$company);
- $a .= $t->set_var('department',$address['org_unit']);
- $a .= $t->set_var('street',$street);
- $a .= $t->set_var('city',$city);
- $a .= $t->set_var('zip',$zip);
- $a .= $t->set_var('state',$state);
+ $a .= $t->set_var('font', $afont);
+ $a .= $t->set_var('fontsize', $asize);
+ $a .= $t->set_var('company', $company);
+ $a .= $t->set_var('department', $address['org_unit']);
+ $a .= $t->set_var('street', $street);
+ $a .= $t->set_var('city', $city);
+ $a .= $t->set_var('zip', $zip);
+ $a .= $t->set_var('state', $state);
if ($country !=
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
{
$countryname = $s->get_full_name($country);
- $a .= $t->set_var('country',lang($countryname));
+ $a .= $t->set_var('country',
lang($countryname));
}
- $a .= $t->fp('out','address_format');
+ $a .= $t->fp('out', 'address_format');
return $a;
}
- function formatted_address_full($id, $business = True, $afont =
'', $asize = '2')
+ function formatted_address_full( $id, $business = True, $afont
= '', $asize = '2' )
{
- $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $t = createObject('phpgwapi.Template',
$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
$s = createObject('phpgwapi.sbox');
$fields = array
(
- 'n_given' =>
'n_given',
- 'n_family' =>
'n_family',
- 'title' =>
'title',
- 'org_name' =>
'org_name',
- 'org_unit' =>
'org_unit',
- 'adr_one_street' =>
'adr_one_street',
- 'adr_one_locality' =>
'adr_one_locality',
- 'adr_one_postalcode' => 'adr_one_postalcode',
- 'adr_one_region' =>
'adr_one_region',
- 'tel_work' =>
'tel_work',
- 'tel_fax' =>
'tel_fax',
- 'email' =>
'email',
- 'url' =>
'url',
- 'adr_one_countryname' =>
'adr_one_countryname',
- 'adr_two_street' =>
'adr_two_street',
- 'adr_two_locality' =>
'adr_two_locality',
- 'adr_two_postalcode' => 'adr_two_postalcode',
- 'adr_two_region' =>
'adr_two_region',
- 'adr_two_countryname' =>
'adr_two_countryname',
- 'tel_home' =>
'tel_home',
- 'email_home' => 'email_home'
+ 'n_given' => 'n_given',
+ 'n_family' => 'n_family',
+ 'title' => 'title',
+ 'org_name' => 'org_name',
+ 'org_unit' => 'org_unit',
+ 'adr_one_street' => 'adr_one_street',
+ 'adr_one_locality' => 'adr_one_locality',
+ 'adr_one_postalcode' => 'adr_one_postalcode',
+ 'adr_one_region' => 'adr_one_region',
+ 'tel_work' => 'tel_work',
+ 'tel_fax' => 'tel_fax',
+ 'email' => 'email',
+ 'url' => 'url',
+ 'adr_one_countryname' => 'adr_one_countryname',
+ 'adr_two_street' => 'adr_two_street',
+ 'adr_two_locality' => 'adr_two_locality',
+ 'adr_two_postalcode' => 'adr_two_postalcode',
+ 'adr_two_region' => 'adr_two_region',
+ 'adr_two_countryname' => 'adr_two_countryname',
+ 'tel_home' => 'tel_home',
+ 'email_home' => 'email_home'
);
- list($address) = $this->read_single_entry($id,$fields);
- foreach($address as $k => $val)
+ list($address) = $this->read_single_entry($id, $fields);
+ foreach ($address as $k => $val)
{
$address[$k] =
$GLOBALS['phpgw']->strip_html($val);
}
@@ -435,32 +477,32 @@
$company = $title . $address['n_given']
. ' ' . $address['n_family'];
}
- $street = $address['adr_one_street'];
- $city = $address['adr_one_locality'];
- $zip =
$address['adr_one_postalcode'];
- $state = $address['adr_one_region'];
- $country =
$address['adr_one_countryname'];
- $tel = $address['tel_work'];
- $email = $address['email'];
+ $street = $address['adr_one_street'];
+ $city = $address['adr_one_locality'];
+ $zip = $address['adr_one_postalcode'];
+ $state = $address['adr_one_region'];
+ $country = $address['adr_one_countryname'];
+ $tel = $address['tel_work'];
+ $email = $address['email'];
}
else
{
- $company = $title . $address['n_given']
. ' ' . $address['n_family'];
- $street = $address['adr_two_street'];
- $city = $address['adr_two_locality'];
- $zip =
$address['adr_two_postalcode'];
- $state = $address['adr_two_region'];
- $country =
$address['adr_two_countryname'];
- $tel = $address['tel_home'];
- $email = $address['email_home'];
+ $company = $title . $address['n_given'] .
' ' . $address['n_family'];
+ $street = $address['adr_two_street'];
+ $city = $address['adr_two_locality'];
+ $zip = $address['adr_two_postalcode'];
+ $state = $address['adr_two_region'];
+ $country = $address['adr_two_countryname'];
+ $tel = $address['tel_home'];
+ $email = $address['email_home'];
}
- if (! $country)
+ if (!$country)
{
$country =
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
}
- if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP .'default' . SEP . 'full_format_' .
strtolower($country) . '.tpl'))
+ if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP . 'default' . SEP . 'full_format_' .
strtolower($country) . '.tpl'))
{
$a = $t->set_file(array('address_format' =>
'full_format_' . strtolower($country) . '.tpl'));
}
@@ -474,58 +516,58 @@
$afont =
$GLOBALS['phpgw_info']['theme']['font'];
}
- $a .= $t->set_var('font',$afont);
- $a .= $t->set_var('fontsize',$asize);
- $a .= $t->set_var('lang_url',lang('url'));
- $a .= $t->set_var('lang_email',lang('email'));
- $a .= $t->set_var('lang_fax',lang('fax number'));
- $a .= $t->set_var('lang_fon',lang('phone number'));
- $a .= $t->set_var('company',$company);
- $a .= $t->set_var('department',$address['org_unit']);
- $a .= $t->set_var('street',$street);
- $a .= $t->set_var('city',$city);
- $a .= $t->set_var('zip',$zip);
- $a .= $t->set_var('state',$state);
- $a .= $t->set_var('email',$email);
- $a .= $t->set_var('tel',$tel);
- $a .= $t->set_var('fax',$address['tel_fax']);
- $a .= $t->set_var('url',$address['url']);
+ $a .= $t->set_var('font', $afont);
+ $a .= $t->set_var('fontsize', $asize);
+ $a .= $t->set_var('lang_url', lang('url'));
+ $a .= $t->set_var('lang_email', lang('email'));
+ $a .= $t->set_var('lang_fax', lang('fax number'));
+ $a .= $t->set_var('lang_fon', lang('phone number'));
+ $a .= $t->set_var('company', $company);
+ $a .= $t->set_var('department', $address['org_unit']);
+ $a .= $t->set_var('street', $street);
+ $a .= $t->set_var('city', $city);
+ $a .= $t->set_var('zip', $zip);
+ $a .= $t->set_var('state', $state);
+ $a .= $t->set_var('email', $email);
+ $a .= $t->set_var('tel', $tel);
+ $a .= $t->set_var('fax', $address['tel_fax']);
+ $a .= $t->set_var('url', $address['url']);
if ($country !=
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
{
$countryname = $s->get_full_name($country);
- $a .= $t->set_var('country',lang($countryname));
+ $a .= $t->set_var('country',
lang($countryname));
}
- $a .= $t->fp('out','address_format');
+ $a .= $t->fp('out', 'address_format');
return $a;
}
- function formatted_address_line($id, $business = True, $afont =
'', $asize = '2')
+ function formatted_address_line( $id, $business = True, $afont
= '', $asize = '2' )
{
- $t =
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
+ $t = createObject('phpgwapi.Template',
$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
$s = createObject('phpgwapi.sbox');
$fields = array
- (
- 'n_given' =>
'n_given',
- 'n_family' =>
'n_family',
- 'title' =>
'title',
- 'org_name' =>
'org_name',
- 'adr_one_street' =>
'adr_one_street',
- 'adr_one_locality' =>
'adr_one_locality',
- 'adr_one_postalcode' => 'adr_one_postalcode',
- 'adr_one_region' =>
'adr_one_region',
- 'adr_one_countryname' =>
'adr_one_countryname',
- 'adr_two_street' =>
'adr_two_street',
- 'adr_two_locality' =>
'adr_two_locality',
- 'adr_two_postalcode' => 'adr_two_postalcode',
- 'adr_two_region' =>
'adr_two_region',
- 'adr_two_countryname' => 'adr_two_countryname'
+ (
+ 'n_given' => 'n_given',
+ 'n_family' => 'n_family',
+ 'title' => 'title',
+ 'org_name' => 'org_name',
+ 'adr_one_street' => 'adr_one_street',
+ 'adr_one_locality' => 'adr_one_locality',
+ 'adr_one_postalcode' => 'adr_one_postalcode',
+ 'adr_one_region' => 'adr_one_region',
+ 'adr_one_countryname' => 'adr_one_countryname',
+ 'adr_two_street' => 'adr_two_street',
+ 'adr_two_locality' => 'adr_two_locality',
+ 'adr_two_postalcode' => 'adr_two_postalcode',
+ 'adr_two_region' => 'adr_two_region',
+ 'adr_two_countryname' => 'adr_two_countryname'
);
- list($address) = $this->read_single_entry($id,$fields);
- foreach($address as $k => $val)
+ list($address) = $this->read_single_entry($id, $fields);
+ foreach ($address as $k => $val)
{
$address[$k] =
$GLOBALS['phpgw']->strip_html($val);
}
@@ -546,28 +588,28 @@
$company = $title . $address['n_given']
. ' ' . $address['n_family'];
}
- $street = $address['adr_one_street'];
- $city = $address['adr_one_locality'];
- $zip = $address['adr_one_postalcode'];
- $state = $address['adr_one_region'];
+ $street = $address['adr_one_street'];
+ $city = $address['adr_one_locality'];
+ $zip = $address['adr_one_postalcode'];
+ $state = $address['adr_one_region'];
$country = $address['adr_one_countryname'];
}
else
{
$company = $title . $address['n_given'] .
' ' . $address['n_family'];
- $street = $address['adr_two_street'];
- $city = $address['adr_two_locality'];
- $zip = $address['adr_two_postalcode'];
- $state = $address['adr_two_region'];
+ $street = $address['adr_two_street'];
+ $city = $address['adr_two_locality'];
+ $zip = $address['adr_two_postalcode'];
+ $state = $address['adr_two_region'];
$country = $address['adr_two_countryname'];
}
- if (! $country)
+ if (!$country)
{
$country =
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
}
- if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP .'default' . SEP . 'line_format_' .
strtolower($country) . '.tpl'))
+ if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook'
. SEP . 'templates' . SEP . 'default' . SEP . 'line_format_' .
strtolower($country) . '.tpl'))
{
$a = $t->set_file(array('address_format' =>
'line_format_' . strtolower($country) . '.tpl'));
}
@@ -581,21 +623,21 @@
$afont =
$GLOBALS['phpgw_info']['theme']['font'];
}
- $a .= $t->set_var('font',$afont);
- $a .= $t->set_var('fontsize',$asize);
- $a .= $t->set_var('company',$company);
- $a .= $t->set_var('street',$street);
- $a .= $t->set_var('city',$city);
- $a .= $t->set_var('zip',$zip);
- $a .= $t->set_var('state',$state);
+ $a .= $t->set_var('font', $afont);
+ $a .= $t->set_var('fontsize', $asize);
+ $a .= $t->set_var('company', $company);
+ $a .= $t->set_var('street', $street);
+ $a .= $t->set_var('city', $city);
+ $a .= $t->set_var('zip', $zip);
+ $a .= $t->set_var('state', $state);
if ($country !=
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
{
$countryname = $s->get_full_name($country);
- $a .= $t->set_var('country',' ' .
lang($countryname));
+ $a .= $t->set_var('country', ' ' .
lang($countryname));
}
- $a .= $t->fp('out','address_format');
+ $a .= $t->fp('out', 'address_format');
return $a;
}
- }
+ }
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.contacts_sql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.contacts_sql.inc.php 2017-12-24 11:02:24 UTC
(rev 17462)
+++ trunk/phpgwapi/inc/class.contacts_sql.inc.php 2017-12-24 11:25:53 UTC
(rev 17463)
@@ -1,66 +1,66 @@
<?php
/**
- * View and manipulate contact records using SQL
- * @author Jonathan Alberto Rivera Gomez <address@hidden>
- * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package phpgwapi
- * @subpackage contacts
- * @version $Id$
- * @internal Development of this application was funded by
http://www.sogrp.com
- */
-
+ * View and manipulate contact records using SQL
+ * @author Jonathan Alberto Rivera Gomez <address@hidden>
+ * @copyright Copyright (C) 2003,2004 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package phpgwapi
+ * @subpackage contacts
+ * @version $Id$
+ * @internal Development of this application was funded by
http://www.sogrp.com
+ */
/**
- * Include SQL Builder
- * @see sql_builder
- */
+ * Include SQL Builder
+ * @see sql_builder
+ */
phpgw::import_class('phpgwapi.sql_builder');
/**
- * Include SQL criteria
- * @see phpgwapi_sql_criteria
- */
+ * Include SQL criteria
+ * @see phpgwapi_sql_criteria
+ */
phpgw::import_class('phpgwapi.sql_criteria');
/**
- * Include SQL entity
- * @see sql_entity
- */
+ * Include SQL entity
+ * @see sql_entity
+ */
phpgw::import_class('phpgwapi.sql_entity');
/**
- * All categories
- */
+ * All categories
+ */
define('PHPGW_CONTACTS_CATEGORIES_ALL', -3);
/**
- * All records
- */
+ * All records
+ */
define('PHPGW_CONTACTS_ALL', 1);
/**
- * Only current user's records
- */
+ * Only current user's records
+ */
define('PHPGW_CONTACTS_MINE', 2);
/**
- * Only current user's private records
- */
+ * Only current user's private records
+ */
define('PHPGW_CONTACTS_PRIVATE', 3);
/**
- * Contact Management System
- *
- * This class provides a contact database scheme.
- * It attempts to be based on the vcard 2.1 standard,
- * with mods as needed to make for more reasonable sql storage.
- * Note that changes here must also work in the LDAP version.
- * @package phpgwapi
- * @subpackage contacts
- * @internal example: $contacts = createObject('phpgwapi.contacts');
- */
+ * Contact Management System
+ *
+ * This class provides a contact database scheme.
+ * It attempts to be based on the vcard 2.1 standard,
+ * with mods as needed to make for more reasonable sql storage.
+ * Note that changes here must also work in the LDAP version.
+ * @package phpgwapi
+ * @subpackage contacts
+ * @internal example: $contacts = createObject('phpgwapi.contacts');
+ */
class contacts_ extends sql_builder
{
+
var $db = '';
var $account_id = 0;
var $total_records = 0;
@@ -67,570 +67,543 @@
var $grants;
protected $global_lock = false;
protected $local_lock = false;
+
/**
- * All exporteds fields
- *
- * We used to have a simple array that told us what the false
fields were.
- * this used to be its name.
- * Now, what this holds is a reference to the
$contact_fields['showable'] array that
- * tells us what false fields can we show and their translation
to english
- * @deprecated New Apps must use new api
- */
+ * All exporteds fields
+ *
+ * We used to have a simple array that told us what the false
fields were.
+ * this used to be its name.
+ * Now, what this holds is a reference to the
$contact_fields['showable'] array that
+ * tells us what false fields can we show and their translation
to english
+ * @deprecated New Apps must use new api
+ */
var $stock_contact_fields;
/**
- * This is an array of three elements that are arrays themselves.
- *
- * The purpose of the whole thing is to give us all the fields
we can manage.
- * This includes old false fields (deprecated), and all of the
new data we can manage.
- * Most importantly, this tree categorizes the said elements
this way:
- * 1. contact_fields['showable'] are fields we can show in the
index page, selectable
- * from the preferences page...etc.
- * 2. contact_fields['retreivable'] the rest of the fields that
we generaly dont show in
- * the addressbook ui.
- * 3. contact_fields['catalogs'] fields that belong to catalogs
and, as such, we never
- * show in raw form as they correspond to the database but we
need to query for them.
- *
- * All of the array data points to the english translation of
the field that should then
- * be langed to get a label for the field
- * @access private
- */
+ * This is an array of three elements that are arrays
themselves.
+ *
+ * The purpose of the whole thing is to give us all the fields
we can manage.
+ * This includes old false fields (deprecated), and all of the
new data we can manage.
+ * Most importantly, this tree categorizes the said elements
this way:
+ * 1. contact_fields['showable'] are fields we can show in the
index page, selectable
+ * from the preferences page...etc.
+ * 2. contact_fields['retreivable'] the rest of the fields that
we generaly dont show in
+ * the addressbook ui.
+ * 3. contact_fields['catalogs'] fields that belong to catalogs
and, as such, we never
+ * show in raw form as they correspond to the database but we
need to query for them.
+ *
+ * All of the array data points to the english translation of
the field that should then
+ * be langed to get a label for the field
+ * @access private
+ */
var $contact_fields = array('showable' =>
- array(
- 'per_full_name'
=> 'full name',
- 'per_first_name'
=> 'first name',
- 'per_last_name'
=> 'last name',
- 'per_middle_name'
=> 'middle name',
- 'per_initials'
=> 'initials',
- 'per_prefix'
=> 'prefix',
- 'per_suffix'
=> 'suffix',
- 'per_birthday'
=> 'birthday',
- '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',
- 'org_active'
=> 'active company',
- 'org_parent'
=> 'parent organization',
- 'addr_type'
=> 'address type',
- 'addr_add1'
=> 'street first',
- 'addr_add2'
=> 'street second',
- 'addr_city'
=> 'city',
- 'addr_state'
=> 'state',
- 'addr_postal_code'
=> 'postal code',
- 'addr_country'
=> 'country'
- ),
- // 'addr_address'
=> 'street address',
- 'retrievable' =>
- array(
- //deprecated start
- 'adr_one_street' =>
'business street',
- 'adr_one_locality' =>
'business city',
- 'adr_one_region' =>
'business state',
- 'adr_one_postalcode' =>
'business zip code',
- 'adr_one_countryname'
=> 'business country',
- 'adr_one_type' =>
'business address type',
- 'adr_two_street' =>
'home street',
- 'adr_two_locality' =>
'home city',
- 'adr_two_region' =>
'home state',
- 'adr_two_postalcode' =>
'home zip code',
- 'adr_two_countryname'
=> 'home country',
- 'adr_two_type' => 'home
address type',
- 'tz' => 'time zone',
- 'geo' => 'geo',
- 'fn' => 'full name',
- 'sound' => 'Sound',
- 'org_name' => 'company
name',
- 'org_unit' =>
'department',
- 'title' => 'title',
- 'n_prefix' => 'prefix',
- 'n_given' => 'first
name',
- 'n_middle' => 'middle
name',
- 'n_family' => 'last
name',
- 'n_suffix' => 'suffix',
- 'label' => 'label',
- 'note' => 'notes',
- 'email' => 'business
email',
- 'email_type' =>
'business email type',
- 'email_home' => 'home
email',
- 'email_home_type' =>
'home email type',
- 'address2' => 'address
line 2',
- 'address3' => 'address
line 3',
- 'tel_home' => 'home
phone',
- 'tel_voice' => 'voice
phone',
- 'tel_msg' => 'message
phone',
- 'tel_fax' => 'fax',
- 'tel_pager' => 'pager',
- 'tel_cell' => 'mobile
phone',
- 'tel_bbs' => 'bbs
phone',
- 'tel_modem' => 'modem
phone',
- 'tel_isdn' => 'isdn
phone',
- 'tel_car' => 'car
phone',
- 'tel_video' => 'video
phone',
- 'tel_prefer' =>
'preferred phone',
- 'ophone' => 'Other
Phone',
- 'bday' => 'birthday',
- 'url' => 'url',
- 'pubkey' => 'public
key',
- 'tel_work' => 'business
phone',
+ array(
+ 'per_full_name' => 'full name',
+ 'per_first_name' => 'first name',
+ 'per_last_name' => 'last name',
+ 'per_middle_name' => 'middle name',
+ 'per_initials' => 'initials',
+ 'per_prefix' => 'prefix',
+ 'per_suffix' => 'suffix',
+ 'per_birthday' => 'birthday',
+ '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',
+ 'org_active' => 'active company',
+ 'org_parent' => 'parent organization',
+ 'addr_type' => 'address type',
+ 'addr_add1' => 'street first',
+ 'addr_add2' => 'street second',
+ 'addr_city' => 'city',
+ 'addr_state' => 'state',
+ 'addr_postal_code' => 'postal code',
+ 'addr_country' => 'country'
+ ),
+ // 'addr_address' => 'street
address',
+ 'retrievable' =>
+ array(
+ //deprecated start
+ 'adr_one_street' => 'business street',
+ 'adr_one_locality' => 'business city',
+ 'adr_one_region' => 'business state',
+ 'adr_one_postalcode' => 'business zip code',
+ 'adr_one_countryname' => 'business country',
+ 'adr_one_type' => 'business address type',
+ 'adr_two_street' => 'home street',
+ 'adr_two_locality' => 'home city',
+ 'adr_two_region' => 'home state',
+ 'adr_two_postalcode' => 'home zip code',
+ 'adr_two_countryname' => 'home country',
+ 'adr_two_type' => 'home address type',
+ 'tz' => 'time zone',
+ 'geo' => 'geo',
+ 'fn' => 'full name',
+ 'sound' => 'Sound',
+ 'org_name' => 'company name',
+ 'org_unit' => 'department',
+ 'title' => 'title',
+ 'n_prefix' => 'prefix',
+ 'n_given' => 'first name',
+ 'n_middle' => 'middle name',
+ 'n_family' => 'last name',
+ 'n_suffix' => 'suffix',
+ 'label' => 'label',
+ 'note' => 'notes',
+ 'email' => 'business email',
+ 'email_type' => 'business email type',
+ 'email_home' => 'home email',
+ 'email_home_type' => 'home email type',
+ 'address2' => 'address line 2',
+ 'address3' => 'address line 3',
+ 'tel_home' => 'home phone',
+ 'tel_voice' => 'voice phone',
+ 'tel_msg' => 'message phone',
+ 'tel_fax' => 'fax',
+ 'tel_pager' => 'pager',
+ 'tel_cell' => 'mobile phone',
+ 'tel_bbs' => 'bbs phone',
+ 'tel_modem' => 'modem phone',
+ 'tel_isdn' => 'isdn phone',
+ 'tel_car' => 'car phone',
+ 'tel_video' => 'video phone',
+ 'tel_prefer' => 'preferred phone',
+ 'ophone' => 'Other Phone',
+ 'bday' => 'birthday',
+ 'url' => 'url',
+ 'pubkey' => 'public key',
+ 'tel_work' => 'business phone',
+ //deprecated end
+ 'addr_preferred' => 'preffered address',
+ 'owner' => 'owner',
+ 'access' => 'access',
+ 'addr_pref_val' => 'preferred address value',
+ 'other_name' => 'custom name',
+ 'other_value' => 'custom value',
+ 'other_owner' => 'custom owner',
+ 'other_count_row' => 'custom number',
+ 'org_creaton' => 'created on',
+ 'org_creatby' => 'created by',
+ 'org_modon' => 'modified on',
+ 'org_modby' => 'modified by',
+ 'count_orgs' => 'number of organizations',
+ //'account_id' => 'account id',
+ 'count_persons' => 'number of persons',
+ 'contact_id' => 'contact id',
+ 'cat_id' => 'category id',
+ 'count_contacts' => 'number of contacts',
+ 'org_id' => 'organization id',
+ 'person_id' => 'person id',
+ 'my_org_id' => 'private organization id',
+ 'my_person_id' => 'private person id',
+ 'my_addr_id' => 'private address id',
+ 'my_preferred' => 'private preferred address',
+ 'my_creaton' => 'private created on',
+ 'my_creatby' => 'private created by',
+ 'key_addr_id' => 'address id',
+ 'addr_creaton' => 'created on',
+ 'addr_creatby' => 'created by',
+ 'addr_modon' => 'modified on',
+ 'addr_modby' => 'modified by',
+ 'addr_contact_id' => 'address contact id',
+ 'key_other_id' => 'custom id',
+ 'other_contact_id' => 'custom contact id',
+ 'addr_type_id' => 'address type id',
+ //'account_id' => 'account id',
+ //'account_person_id' => 'account person id',
+ 'person_only' => 'only persons',
+ 'per_active' => 'active person',
+ 'per_creaton' => 'created on',
+ 'per_creatby' => 'created by',
+ 'per_modon' => 'modified on',
+ 'per_modby' => 'modified by',
+ 'key_cat_id' => 'category id'
+ ),
+ 'catalogs' =>
+ array(
+ 'comm_descr' => 'communication type
description',
+ 'comm_preferred' => 'communication type
preferred',
+ 'comm_data' => 'communication type data',
+ 'contact_type_descr' => 'contact type
description',
+ 'contact_type_table' => 'contact type table',
+ 'comm_description' => 'communication media
description',
+ 'comm_type' => 'communication media type',
+ 'comm_find_descr' => 'find communication media
description',
+ 'comm_type_description' => 'communication media
type description',
+ 'comm_active' => 'active communication media
type',
+ 'comm_class' => 'communication media class',
+ 'addr_description' => 'address type
description',
+ 'comm_creaton' => 'created on',
+ 'comm_creatby' => 'created by',
+ 'comm_modon' => 'modified on',
+ 'comm_modby' => 'modified by',
+ 'contact_type_id' => 'contact type id',
+ 'comm_descr_id' => 'communication media
description id',
+ 'comm_contact_id' => 'communication type
contact id',
+ 'comm_type_id' => 'communication media type id',
+ 'key_comm_id' => 'communication type id',
+ 'note_type_id' => 'note type id',
+ 'note_type' => 'note type',
+ 'note_text' => 'note text',
+ 'note_description' => 'note type description',
+ 'key_note_id' => 'note id',
+ 'note_contact_id' => 'note contact id',
+ 'note_creaton' => 'created on',
+ 'note_creatby' => 'created by',
+ 'note_modon' => 'modified on',
+ 'note_modby' => 'modified by',
+ 'contact_type' => 'contact type'
+ )
+ );
- //deprecated end
-
- 'addr_preferred'
=> 'preffered address',
- 'owner'
=> 'owner',
- 'access'
=> 'access',
- 'addr_pref_val'
=> 'preferred address value',
- 'other_name'
=> 'custom name',
- 'other_value'
=> 'custom value',
- 'other_owner'
=> 'custom owner',
- 'other_count_row'
=> 'custom number',
- 'org_creaton'
=> 'created on',
- 'org_creatby'
=> 'created by',
- 'org_modon'
=> 'modified on',
- 'org_modby'
=> 'modified by',
- 'count_orgs'
=> 'number of organizations',
- //'account_id'
=> 'account id',
- 'count_persons'
=> 'number of persons',
-
-
-
- 'contact_id'
=> 'contact id',
- 'cat_id'
=> 'category id',
- 'count_contacts'
=> 'number of contacts',
- 'org_id'
=> 'organization id',
- 'person_id'
=> 'person id',
- 'my_org_id'
=> 'private organization id',
- 'my_person_id'
=> 'private person id',
- 'my_addr_id'
=> 'private address id',
- 'my_preferred'
=> 'private preferred address',
- 'my_creaton'
=> 'private created on',
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] | Current Thread | [Next in Thread] |