[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/inc/class.ipc_sync.inc.php, 1.14
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/inc/class.ipc_sync.inc.php, 1.14 |
Date: |
Fri, 21 May 2004 21:18:36 -0000 |
Update of /sync/inc
Modified Files:
Branch:
class.ipc_sync.inc.php
date: 2004/04/27 09:46:14; author: mkaemmerer; state: Exp; lines: +10 -6
Log Message:
- added temporary handleconflict
=====================================================================
Index: sync/inc/class.ipc_sync.inc.php
diff -u sync/inc/class.ipc_sync.inc.php:1.13
sync/inc/class.ipc_sync.inc.php:1.14
--- sync/inc/class.ipc_sync.inc.php:1.13 Sun Apr 18 13:05:23 2004
+++ sync/inc/class.ipc_sync.inc.php Tue Apr 27 09:46:14 2004
@@ -423,12 +423,16 @@
return $this->bo->addClientMappings($deviceid, $source, $mapping);
}
- /**
- * TODO: documentation
- */
-
- function handleConflict()
+ /*
+ * //Tdodo: !! add documentation
+ * possible values:
+ * serverwins, clientwins, serverloses, clientloses, donothing
+ */
+ function handleConflict($device_id, $source, $GUID, $LUID)
{
+ if ($this->debug)
+ error_log("handleConflict: $device_id, $source, $GUID, $LUID");
+ return "donothing";
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/inc/class.ipc_sync.inc.php, 1.14,
nomail <=