Commit Graph

22 Commits

Author SHA1 Message Date
Jörg Lehrke
81d8ea7bbb Fix conflict handling issues 2009-11-11 20:16:34 +00:00
Jörg Lehrke
b1a9d0f546 Fix issue with adding new entries from device 2009-09-28 19:45:35 +00:00
Jörg Lehrke
217f0de233 Calendar special pseudo recurrence exception handling moved to SyncML code
- content type is now available in replace method
  - pseudo to real exception propagation does now work within a single session
2009-09-23 19:20:15 +00:00
Ralf Becker
e667e168b4 - merged SyncML-1.2 branch with trunk:
svn merge ^/trunk/phpgwapi@27377 ^/branches/SyncML-1.2/phpgwapi .
2009-07-15 19:31:25 +00:00
Ralf Becker
232252475f patch fixing many depricated functions (eg. posix regular expressions) and features, which fill up the error_log under php5.3 (and will no longer be available under php6).
Patch is mostly created by script in egroupware/doc/fix_depricated.php in separate commit.
I do NOT advice to apply this patch to a production system (it's commited to trunk!), as the automatic modified regular expressions have a good change to break something ...
2009-06-08 16:21:14 +00:00
Ralf Becker
1baa158195 Big SyncML patch from Philip Herbert <pherbert(at)knauber.de>:
- change the processing of slowsync, to use the content_map instead of
  trying to build a new one. This caused duplication issues on the
  client if multiple similar records where stored, because only the first
  one found in the server-db was matched, These duplicate entries at client
  side had no entry at serverside, so deleting the wrong one
  on the client (the content with a valid map entry) could cause
  unwanted data loss at server side, because it is impossible for the
  user to see what is a duplicate, and what is not.

see also: 
http://www.nabble.com/again---syncml-duplication-issue-to20333619s3741.html

- reenabled UID from syncml clients, because it was partly used this caused
  issues during SlowSync if the content was changed. 

- infolog, calendar if a uid is found in the provided data, allway try to
  find the corresponding content first   using only the UID, instead of
  using the content-id taken from content_map.

also fixed:

- a few fixes in ./notes
- creating an entry on the client that can not be imported,
  (Example, Nokia E Series Appointment without a Title)
  will no longer create an invalid content-map entry
  However, at client side this is still counted in the Protocol as
  Server-Add
2008-11-16 10:42:29 +00:00
Ralf Becker
71edd1c938 Big patch from Philip Herbert (Knauber) modifying the SyncML code to no
longer use GUIDs containing eGW's install_id, as the information is
irrellevant for SyncML and cause doublications of entries if the
install_id changes.
I plan to have a new rc4 Wednesday or Thursday containing these changes.
2008-11-03 07:44:02 +00:00
Ralf Becker
2349c28fa8 phpgw --> egw 2008-10-08 18:40:01 +00:00
Ralf Becker
7b6a1013fc SyncML patches from patrick.bihan-faou-AT-mindstep.com (without
logout+mbstring stuff), small modification to use the already exiting
methodes to generate full name and fileas)
The code is commited to trunk only at the moment to allow testing of it.
If everything goes well, we intend to commit it to 1.4 branch too.
Here's the original description of the patch by Patrick:
- handles the default config for current versions of funambol (i.e. the
scard/stask/snote/scal locations)
- tries to be a bit smarter on how the data content should be encoded
based on what the client specified (sif+base64/vcard, / fragmented or
not, etc.)
- workaround a bug in some versions of funambol, where funambol does not
specify the proper sif type for the type of requested data
- imported patch #117 from egw's tracker
- make sure that the logs generated by the horde code go to stderr so
they can be view in the webserver's logs
- as much as possible reduce code duplication. For example, the
categories are handled in the parent classes for both the SIF avn VCAL
formats for each type of data (addressbook,infolog,calendar).
- make sure the code can handle more than one categories in each
  direction
- treat the 'sony ericsson' vendor string just like 'sonyericsson', the
newer phones apparently have a space in the vendor string... (this
touches some files in the icalsrv as well)
- handle notes: these should now work with everything (funambol or
  other)
- remove more code duplication: the syncml "api" for the various data
types (calendar, contacts, infolog) is now common for both the vcard and
sif data formats (cf the files that need to be removed)
- handle the "privat" filter in infolog like the "private" filter (some
part of the code use the name without the trailing e)
- imported patch # 267 from egw's tracker
2007-09-29 10:29:48 +00:00
Lars Kneschke
495abdd139 fixed handling of too long syncml id's 2007-06-25 08:55:20 +00:00
Lars Kneschke
d999a797d4 made refresh from server working
the new funambol outlook client support this
2006-10-04 18:16:58 +00:00
Lars Kneschke
45200da684 various syncml fixes
- when doing slowsync we don't update the entries anymore. we just add the needed mapping to the database.
- improved handing of deviceinfo
2006-08-15 14:42:13 +00:00
Lars Kneschke
46b151baa4 improved handling of slowsync and twowaysync 2006-07-09 07:27:23 +00:00
Lars Kneschke
fcbe2e5dd5 SyncML fixes 2006-06-01 13:38:37 +00:00
Lars Kneschke
73441f3ac3 SyncML fixes 2006-05-17 03:33:50 +00:00
Lars Kneschke
955f766a19 some minor fixes to make funambol happy 2006-04-28 05:44:43 +00:00
Lars Kneschke
ea7b5a8afa various small bugfixes 2006-04-07 08:11:17 +00:00
Lars Kneschke
23df97648d various bugfixes 2006-03-27 23:24:17 +00:00
Lars Kneschke
2dedbf0f7c support for slowsync with search
added real working state machine
SyncML conformance improvment
2006-03-21 13:49:13 +00:00
Lars Kneschke
735dcde161 different SyncML fixes 2006-01-16 09:49:51 +00:00
Ralf Becker
83b0801533 commit for Lars: latest SyncML updates 2005-07-20 12:09:32 +00:00
Lars Kneschke
d43bf7d44f first commit of syncml code 2005-06-19 19:00:58 +00:00