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

merged latest changes from Andreas B. with the following changes:

Browse Source 
- adapted searchquery so that parameters are equal for gal, mailbox and documentlibrary searches
 - Fix SAMSUNG Android 2.3.3 client compose_Saveinsentitems breaking
 - Corrected searchquery for GAL so that it includes the search range for backends that filter range already during query 
 - Take correct exporter to find changecount for optionfolder 
 - Fix for handling Sync requests where same item gets read and removed.
This commit is contained in:
Philip Herbert 2011-06-14 15:33:11 +00:00
parent 9b794c71e5
commit 1a51ac86f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_activesync.inc.php
View File

@ -82,7 +82,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
//'radiophonenumber' => '', //'radiophonenumber' => '',
//'spouse' => '', //'spouse' => '',
'suffix' => 'n_suffix', 'suffix' => 'n_suffix',
'title' => 'title', // @TODO: check if n_prefix 'title' => 'n_prefix',
'webpage' => 'url', 'webpage' => 'url',
//'yomicompanyname' => '', //'yomicompanyname' => '',
//'yomifirstname' => '', //'yomifirstname' => '',
@ -128,7 +128,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
if ($return_all_in_one && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one']) if ($return_all_in_one && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
{ {
$abs = array( $abs = array(
$GLOBALS['egw_info']['user']['account_id'] => lang('All'), $GLOBALS['egw_info']['user']['account_id'] => lang('personal'),
); );
} }
else else
@ -695,7 +695,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo(); if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
$items = array(); $items = array();
if (($contacts =& $this->addressbook->search($searchquery, false, false, '', '%', false, 'OR'))) if (($contacts =& $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR')))
{ {
foreach($contacts as $contact) foreach($contacts as $contact)
{ {