[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/inc/class.bo_sync.inc.php, 1.34
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/inc/class.bo_sync.inc.php, 1.34 |
Date: |
Sun, 23 May 2004 01:13:36 -0000 |
Update of /sync/inc
Modified Files:
Branch:
class.bo_sync.inc.php
date: 2004/05/03 14:40:00; author: mkaemmerer; state: Exp; lines: +14 -1
Log Message:
- moved conflictsettings from ipc to bo
=====================================================================
Index: sync/inc/class.bo_sync.inc.php
diff -u sync/inc/class.bo_sync.inc.php:1.33 sync/inc/class.bo_sync.inc.php:1.34
--- sync/inc/class.bo_sync.inc.php:1.33 Sat May 1 10:15:37 2004
+++ sync/inc/class.bo_sync.inc.php Mon May 3 14:40:00 2004
@@ -36,6 +36,19 @@
*/
var $ipc;
+ /**
+ * @var array $conflictsolutions holds the mapping array
+ * ID (integer) to string of the supported handling
+ * of conflicts
+ * @access public
+ */
+
+ var $conflictsolutions = array(
+ 1 => 'serverwins',
+ 2 => 'clientwins',
+ 3 => 'duplicate',
+ 4 => 'donothing');
+
/**
* @var object $ipcManager variable ipc manager
* @access private
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/inc/class.bo_sync.inc.php, 1.34,
nomail <=