[Phpgroupware-cvs] sync/inc/class.ipc_sync.inc.php, 1.17

[nomail]

Update of /sync/inc
Modified Files:
        Branch: 
          class.ipc_sync.inc.php

date: 2004/05/13 16:50:57;  author: mkaemmerer;  state: Exp;  lines: +10 -4

Log Message:
- save conflicts now in database
=====================================================================
Index: sync/inc/class.ipc_sync.inc.php
diff -u sync/inc/class.ipc_sync.inc.php:1.16 
sync/inc/class.ipc_sync.inc.php:1.17
--- sync/inc/class.ipc_sync.inc.php:1.16        Mon May  3 14:40:01 2004
+++ sync/inc/class.ipc_sync.inc.php     Thu May 13 16:50:57 2004
@@ -429,13 +429,19 @@
   * possible values:
   * serverwins, clientwins, duplicate, donothing
   */ 
-  function handleConflict($deviceid, $source, $LUID, $LUIDData)
+  function handleConflict($deviceid, $source, $LUID, $LData)
   {
     $id = $this->so->GetConflictHandleSetting($deviceid, $source);
     $res = $this->bo->conflictsolutions[$id];
     if ($this->debug)
-      error_log("handleConflict: Device: $deviceid URI: $source Result: $res 
LUID: $LUID LUID-Data: $LUIDData");
-    
+      error_log("handleConflict: Device: $deviceid URI: $source Result: $res 
LUID: $LUID LData: $LData");
+      
+    if ($id == 4) // == do nothing, resolve conflict later in phpGW
+    {
+      $conflictid = $this->so->AddConfict($deviceid, $source, $LUID, $LData);
+      error_log("handleConflict: saved conflict with conflictid: $conflictid 
for later resolveing");
+    }
+      
     return $res;    
   }