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

[nomail]

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

date: 2004/05/03 14:40:01;  author: mkaemmerer;  state: Exp;  lines: +2 -16

Log Message:
- moved conflictsettings from ipc to bo
=====================================================================
Index: sync/inc/class.ipc_sync.inc.php
diff -u sync/inc/class.ipc_sync.inc.php:1.15 
sync/inc/class.ipc_sync.inc.php:1.16
--- sync/inc/class.ipc_sync.inc.php:1.15        Mon May  3 14:36:02 2004
+++ sync/inc/class.ipc_sync.inc.php     Mon May  3 14:40:01 2004
@@ -43,20 +43,6 @@
   var $ipcManager;
 
   /**
-   * @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     boolean   $debug enable debug-infos
    */
   var $debug=true;
@@ -446,7 +432,7 @@
   function handleConflict($deviceid, $source, $LUID, $LUIDData)
   {
     $id = $this->so->GetConflictHandleSetting($deviceid, $source);
-    $res = $this->conflictsolutions[$id];
+    $res = $this->bo->conflictsolutions[$id];
     if ($this->debug)
       error_log("handleConflict: Device: $deviceid URI: $source Result: $res 
LUID: $LUID LUID-Data: $LUIDData");