[Phpgroupware-cvs] sync/inc/class.so_sync.inc.php, 1.49

[nomail]

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

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

Log Message:
- documentation fixes
- code review + cleaning up
=====================================================================
Index: sync/inc/class.so_sync.inc.php
diff -u sync/inc/class.so_sync.inc.php:1.48 sync/inc/class.so_sync.inc.php:1.49
--- sync/inc/class.so_sync.inc.php:1.48 Tue Jul  6 10:11:40 2004
+++ sync/inc/class.so_sync.inc.php      Mon Jul 12 19:35:27 2004
@@ -245,9 +245,17 @@
    /**
     * Get all conflicts of a given phpGW user
     *
+    * please also have a look at function GetConflict
+    *
     * @param integer $deviceid unique device ID for internal devices database  
   
     * @param string  $source Source name from device (e.g. 'contacts')
-    * @param array &$conflictlist output var which holds the conflictlist
+    * @param array &$conflictlist output var which holds the conflictlist 
array<br>
+    *     array(<br>
+    *      conflictid,<br>
+    *      channelid,<br>
+    *      luid,<br>
+    *      ldata, (as base64encoded serialized array (mimetype: 
$appname-data-array<br>
+    *      timestamp);
     * @return boolean true if the user has conflicts
     */
     
@@ -281,11 +289,13 @@
    /**
     * Get one conflict of a given conflictid
     *
+    * please also have a look at function GetConflictList
+               *
     * @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     
-    * @return array $conflict array(<br>'conflictid' => x, <br>'channelid' => 
x, 
-    * <br>'luid' => x, <br>'ldata' => x, <br>'timestamp' => x<br>)
+    * @return array $conflict array(<br>conflictid, <br>channelid, 
+    * <br>luid, <br>ldata, <br>timestamp<br>)
     */
     
     function GetConflict($deviceid, $source, $conflictid)
@@ -463,6 +473,7 @@
     * @param string  $source Source name from device (e.g. 'contacts')
     * @return integer channelid or -1 in case of non existing channel or error 
     */
+    
     function GetChannelIDfromSourceAndDeviceID($deviceid, $source)
     {
       $GLOBALS['phpgw']->db->query("SELECT channelid FROM phpgw_syncsources, 
phpgw_syncchannels WHERE phpgw_syncsources.uri='$source' and 
phpgw_syncchannels.deviceid='$deviceid' and phpgw_syncchannels.sourceid = 
phpgw_syncsources.sourceid",__LINE__,__FILE__);
@@ -578,6 +589,7 @@
     * @param string  $source Source name from device (e.g. 'contacts')
     * @return integer channelid or -1 in case of non existing channel or error 
     */
+    
     function GetConflictHandleSetting($deviceid, $source)
     {
       $GLOBALS['phpgw']->db->query(