holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change addressbook_so to extend so_sql_cf

Browse Source
This commit is contained in:
Nathan Gray 2010-04-08 22:42:25 +00:00
parent 549626cbf9
commit b69a151568
3 changed files with 77 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
addressbook/inc/class.addressbook_so.inc.php
View File

@ -297,7 +297,14 @@ class addressbook_so
// ToDo: it should be the other way arround, the backend should set the grants it uses
$this->somain->grants =& $this->grants;
$this->soextra = new so_sql('phpgwapi',$this->extra_table);
if($this->somain instanceof addressbook_sql)
{
$this->soextra =& $this->somain;
}
else
{
$this->soextra = new addressbook_sql();
}
$this->customfields = config::get_customfields('addressbook');
$this->content_types = config::get_content_types('addressbook');
@ -345,30 +352,7 @@ class addressbook_so
*/
function read_customfields($ids,$field_names=null)
{
if ($this->contact_repository == 'ldap')
{
return array(); // ldap does not support custom-fields (non-nummeric uid)
}
if (is_null($field_names)) $field_names = array_keys($this->customfields);
if(!is_array($ids) && is_numeric($ids)) {
$ids = array((int)$ids);
}
foreach($ids as $key => $id)
{
if (!(int)$id) unset($ids[$key]);
}
if (!$ids || !$field_names) return array(); // nothing to do, eg. all these contacts are in ldap
$fields = array();
foreach((array)$this->soextra->search(array(
$this->extra_id => $ids,
$this->extra_key => $field_names,
),false) as $data)
{
if ($data) $fields[$data[$this->extra_id]][$data[$this->extra_key]] = $data[$this->extra_value];
}
return $fields;
return $this->soextra->read_customfields($ids,$fieldnames);
}
/**
@ -448,7 +432,9 @@ class addressbook_so
if ($this->somain->delete($where))
{
// delete customfields, can return 0 if there are no customfields
$this->soextra->delete(array($this->extra_id => $contact));
if(!($this->somain instanceof addressbook_sql)) {
$this->soextra->delete(array($this->extra_id => $contact));
}
// delete from distribution list(s)
$this->remove_from_list($contact);
@ -517,26 +503,9 @@ class addressbook_so
}
if($error_nr) return $error_nr;
// save customfields
foreach ((array)$this->customfields as $field => $options)
{
if (!isset($contact['#'.$field])) continue;
$data = array(
$this->extra_id => $contact['id'],
$this->extra_owner => $contact['owner'],
$this->extra_key => $field,
);
if((string) $contact['#'.$field] === '') // dont write empty values
{
$this->soextra->delete($data); // just delete them, in case they were previously set
continue;
}
$data[$this->extra_value] = $contact['#'.$field];
if (($error_nr = $this->soextra->save($data)))
{
return $error_nr;
}
// save customfields, if not already done by somain->save();
if(!($this->somain instanceof addressbook_sql)) {
$this->soextra->save($this->data2db($contact));
}
return false; // no error
}
@ -559,18 +528,6 @@ class addressbook_so
{
return $contact;
}
// try reading customfields only if we have some (none for LDAP!)
if ($this->customfields && $this->contact_repository != 'ldap')
{
$customfields = $this->soextra->search(array(
$this->extra_id => $contact['id'],
$this->extra_key => array_keys($this->customfields),
),false);
foreach ((array)$customfields as $field)
{
$contact['#'.$field[$this->extra_key]] = $field[$this->extra_value];
}
}
$dl_list=$this->read_distributionlist(array($contact['id']));
if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
return $this->db2data($contact);
@ -637,6 +594,9 @@ class addressbook_so
}
if($backend instanceof addressbook_sql)
{
// Keep a string, let the parent handle it
$criteria = $search;
foreach($cols as $key => &$col)
{
if(!array_key_exists($col, $backend->db_cols))
@ -648,7 +608,8 @@ class addressbook_so
}
}
}
$criteria = so_sql::search2criteria($search, $wildcard, $op, null, $cols);
$backend->columns_to_search = $cols;
}
else
{
@ -657,11 +618,6 @@ class addressbook_so
$criteria[$col] = $search;
}
}
// search the customfields only if some exist, but only for sql!
if (get_class($backend) == 'addressbook_sql' && $this->customfields)
{
$criteria[$this->extra_value] = $search;
}
}
if (is_array($criteria) && count($criteria))
{
@ -781,7 +737,9 @@ class addressbook_so
if (!$new_owner)
{
$this->somain->delete(array('owner' => $account_id));
$this->soextra->delete(array($this->extra_owner => $account_id));
if(!($this->somain instanceof addressbook_sql)) {
$this->soextra->delete(array($this->extra_owner => $account_id));
}
}
else
{

135
addressbook/inc/class.addressbook_sql.inc.php
View File

@ -10,22 +10,16 @@
* @version $Id$
*/
include_once(EGW_INCLUDE_ROOT.'/etemplate/inc/class.so_sql.inc.php');
/**
* SQL storage object of the adressbook
*/
class addressbook_sql extends so_sql
class addressbook_sql extends so_sql_cf
{
/**
* name of customefields table
* name of custom fields table
*
* @var string
*/
var $extra_table = 'egw_addressbook_extra';
var $extra_join = ' LEFT JOIN egw_addressbook_extra ON egw_addressbook.contact_id=egw_addressbook_extra.contact_id';
var $extra_join_order = ' LEFT JOIN egw_addressbook_extra extra_order ON egw_addressbook.contact_id=extra_order.contact_id';
var $extra_join_filter = ' JOIN egw_addressbook_extra extra_filter ON egw_addressbook.contact_id=extra_filter.contact_id';
var $account_repository = 'sql';
var $contact_repository = 'sql';
var $grants;
@ -62,7 +56,10 @@ class addressbook_sql extends so_sql
function __construct()
{
$this->so_sql('phpgwapi','egw_addressbook',null,'contact_',true); // true = using the global db object, no clone!
parent::__construct('phpgwapi','egw_addressbook','egw_addressbook_extra','contact_');
// Get custom fields from addressbook instead of phpgwapi
$this->customfields = config::get_customfields('addressbook');
if ($GLOBALS['egw_info']['server']['account_repository'])
{
@ -282,81 +279,6 @@ class addressbook_sql extends so_sql
implode(',',array_keys($this->grants)).") OR $this->table_name.contact_owner IS NULL)";
}
}
$search_customfields = isset($criteria['contact_value']) && !empty($criteria['contact_value']);
if (is_array($criteria))
{
foreach($criteria as $col => $val)
{
if ($col[0] === '#') // search for a value in a certain custom field
{
$valarray=array();
# val may be a list of values, constructed by multiple select fields, to be able to do the contains feature of adv-search
# we split the value and search for each part individually
if ($wildcard !='') {
$valarray=explode(',',$val);
} else {
$valarray[]=$val;
}
$negate = false; //negate the search funktion
if ($criteria[$col][0] == '!') $negate = True;
unset($criteria[$col]);
foreach ($valarray as $vkey => $part)
{
$criteria[] =$this->table_name.'.contact_id'.($negate ? ' not ' :'').' in (select '.$this->extra_table.'.contact_id from '.$this->extra_table.' where '.
"(".$this->extra_table.".contact_name='".substr($col,1)."' AND ".$this->extra_table.".contact_value".(!$wildcard?' = ':' LIKE ')."'".$wildcard.($negate?substr($part,1):$part).$wildcard."'"."))";
}
$search_customfields = true;
}
elseif($col === 'cat_id') // search in comma-sep. cat-column
{
$criteria = array_merge($criteria,$this->_cat_search($val));
unset($criteria[$col]);
}
elseif($col === 'contact_value')
{
if ($order_by[0] == '#')
{
$criteria =array_merge($criteria,array('extra_order.contact_value'=>$val));
unset($criteria[$col]);
}
}
}
}
if ($search_customfields) // search the custom-fields
{
$join .= $this->extra_join;
}
// do we order by a cf?
if ($order_by[0] == '#')
{
list($val) = explode("<>''",$order_by);
$order_by = str_replace($val,'extra_order.contact_value',$order_by);
$join .= $this->extra_join_order.' AND extra_order.contact_name='.$this->db->quote(substr($val,1));
}
// do we filter by a cf?
$extra_filter = '';
foreach($filter as $name => $val)
{
if ($name[0] == '#')
{
if (!empty($val)) // empty -> dont filter
{
$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.' AND extra_filter.contact_name='.$this->db->quote(substr($name,1)).
' AND extra_filter.contact_value='.$this->db->quote($val));
++$extra_filter;
}
unset($filter[$name]);
}
elseif($val[0] == '#') // lettersearch: #cfname like 's%'
{
list($cf) = explode(' ',$val);
$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.' AND extra_filter.contact_name='.$this->db->quote(substr($cf,1)).
' AND '.str_replace($cf,'extra_filter.contact_value',$val));
++$extra_filter;
unset($filter[$name]);
}
}
if (isset($filter['list']))
{
$join .= " JOIN $this->ab2list_table ON $this->table_name.contact_id=$this->ab2list_table.contact_id AND list_id=".(int)$filter['list'];
@ -618,6 +540,14 @@ class addressbook_sql extends so_sql
$keys = array('contact_uid' => $keys);
}
$contact = parent::read($keys,$extra_cols,$join);
// Change autoinc_id to match $this->db_cols
$this->autoinc_id = $this->db_cols[$this->autoinc_id];
if(($id = (int)$this->data[$this->autoinc_id]) && $cfs = $this->read_customfields($keys)) {
$contact = array_merge($contact,$cfs[$id]);
}
$this->autoinc_id = array_search($this->autoinc_id, $this->db_cols);
// enforce a minium uid strength
if (is_array($contact) && (!isset($contact['uid'])
|| strlen($contact['uid']) < $minimum_uid_length)) {
@ -666,6 +596,7 @@ class addressbook_sql extends so_sql
$this->data['etag'] = 0;
}
}
// enforce a minium uid strength
if (!$err && (!isset($this->data['uid'])
|| strlen($this->data['uid']) < $minimum_uid_length)) {
@ -688,4 +619,40 @@ class addressbook_sql extends so_sql
return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
}
/**
* saves custom field data
* Re-implemented to deal with extra contact_owner column
*
* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
* @return bool false on success, errornumber on failure
*/
function save_customfields($data)
{
foreach ((array)$this->customfields as $name => $options)
{
if (!isset($data[$field = $this->get_cf_field($name)])) continue;
$where = array(
$this->extra_id => $data['id'],
$this->extra_key => $name,
);
$is_multiple = $this->is_multiple($name);
// we explicitly need to delete fields, if value is empty or field allows multiple values or we have no unique index
if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
{
$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
if (empty($data[$field])) continue; // nothing else to do for empty values
}
foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) : (array)$data[$field] as $value)
{
if (!$this->db->insert($this->extra_table,array($this->extra_value => $value, 'contact_owner' => $data['owner']),$where,__LINE__,__FILE__,$this->app))
{
return $this->db->Errno;
}
}
}
return false; // no error
}
}

5
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -916,7 +916,7 @@ class addressbook_ui extends addressbook_bo
default:
if ($query['order'][0] == '#') // we order by a custom field
{
$order = "$query[order]<>'' DESC,$query[order] $sort,org_name $sort,n_family $sort,n_given $sort";
$order = "{$query['order']} $sort,org_name $sort,n_family $sort,n_given $sort";
break;
}
$query['order'] = 'n_family';
@ -951,6 +951,7 @@ class addressbook_ui extends addressbook_bo
$wildcard = $query['advanced_search']['meth_select'];
unset($query['advanced_search']['meth_select']);
}
$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'],$id_only,
$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
@ -1060,7 +1061,7 @@ class addressbook_ui extends addressbook_bo
{
foreach($this->customfields as $name => $data)
{
$row['#'.$name] = $customfields[$row['id']][$name];
$row['#'.$name] = $customfields[$row['id']]['#'.$name];
}
}
if (isset($distributionlist[$row['id']]))