[Phpgroupware-cvs] sync/inc/class.bo_sync.inc.php, 1.57

[nomail]

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

date: 2004/07/12 19:35:27;  author: mleonhardt;  state: Exp;  lines: +5 -12

Log Message:
- documentation fixes
- code review + cleaning up
=====================================================================
Index: sync/inc/class.bo_sync.inc.php
diff -u sync/inc/class.bo_sync.inc.php:1.56 sync/inc/class.bo_sync.inc.php:1.57
--- sync/inc/class.bo_sync.inc.php:1.56 Wed Jul  7 11:14:58 2004
+++ sync/inc/class.bo_sync.inc.php      Mon Jul 12 19:35:27 2004
@@ -556,14 +556,6 @@
     {
       $channelid = $this->so->GetChannelIDfromSourceAndDeviceID($deviceid, 
$source);
       $LUIDs = $this->so->GetAllLUIDs($channelid);
-//      $result = array();
-//      foreach($LUIDs as $LUID) {
-//        // fake a mapping with GUID = LUID because we want to 
-//        // handle mapping in phpgw syncmodule for ourselves
-//        $result[] = array((string) $LUID, (string) $LUID);
-//      }
-//      return $result;
-//   changed behavior - to prevent sending redundant info through xmlrpc 
       return $LUIDs;
     }
 
@@ -681,7 +673,7 @@
    *
    * @param integer $deviceid unique device ID for internal devices database
    * @param string $source Source name from device (e.g. 'contacts')
-    * @param integer $conflictid unique conflict ID of table 
phpgw_syncconflicts     
+   * @param integer $conflictid unique conflict ID of table 
phpgw_syncconflicts     
    * @param string $ldata data value of the record from the device 
    * @return integer >= 0 if successfull, < 0 in case of error  
    */
@@ -754,15 +746,16 @@
                        $GUID = $this->so->getGUIDExt($deviceid, $source, 
$LUID);
                        $conflictmimetype = 'x-phpgroupware/' . $modulename . 
'-appl-data-array'; 
 
+                       // set new data to get actual timestamp -> update 
client on next sync
                        if ($action == 'server')
                        {
+                               // use data from phpgw-server (gdata)
                                $gdata = $this->ipc->getdata($GUID, 
$conflictmimetype);
-                               // set new data to get actual timestamp -> 
update client on next sync
                                $result = $this->ipc->replaceData($GUID, 
$gdata, $conflictmimetype, '', time());
                        }
                        else
                        {
-       //                      $ldata = 
$this->ipc->convertdata(base64_decode($ldata), 'text/vcard', '3.0', 
$conflictmimetype, '');
+                               // use data from syncml-client (ldata)
                                $ldata = unserialize(base64_decode($ldata));
                                $result = $this->ipc->replaceData($GUID, 
$ldata, $conflictmimetype, '', time());
                        }