nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-07-26 12:49:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch for caldav sync from Pierre-Arnaud Poudret.

Browse Source
This commit is contained in:
Andrew McMillan 2010-11-06 22:38:24 +13:00
parent 4614ae6449
commit b8f4a26515
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/sync-remote-caldav.php
View File

@ -324,10 +324,11 @@ if ( $qry->Exec('sync-pull',__LINE__,__FILE__) && $qry->rows() > 0 ) {
if ( !$sync_all ) {
foreach( $cache->local_etags AS $href => $etag ) {
$fname = preg_replace('{^.*/}', '', $local->dav_name);
$fname = preg_replace('{^.*/}', '', $href);
if ( !isset($insert_urls[$remote_event_prefix.$fname])
&& !isset($update_urls[$remote_event_prefix.$fname])
&& isset($cache->server_etags[$remote_event_prefix.$fname]) ) {
&& isset($cache->server_etags[$fname]) ) {
$server_delete_urls[$fname] = $cache->server_etags[$remote_event_prefix.$fname];
printf( "Need to delete remote '%s'.\n", $fname );
}
@ -344,7 +345,7 @@ if ( $sync_in ) {
foreach( $local_delete_urls AS $href => $v ) {
$fname = preg_replace('{^.*/}', '', $href);
$local_fname = $args->local_collection_path . $fname;
$qry = new AwlQuery('DELETE FROM caldav_data WHERE dav_name = :dav_name', array( ':dav_name' => $local_fname ) );
$qry = new AwlQuery('DELETE FROM caldav_data WHERE caldav_type!=\'VTODO\' and dav_name = :dav_name', array( ':dav_name' => $local_fname ) );
$qry->Exec('sync_pull',__LINE__,__FILE__);
unset($newcache->local_etags[$fname]);
}