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

[nomail]

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

date: 2004/06/09 18:35:09;  author: mkaemmerer;  state: Exp;  lines: +27 -25

Log Message:
- new sourceinfo and  mimetype handling
=====================================================================
Index: sync/inc/class.ipc_sync.inc.php
diff -u sync/inc/class.ipc_sync.inc.php:1.22 
sync/inc/class.ipc_sync.inc.php:1.23
--- sync/inc/class.ipc_sync.inc.php:1.22        Wed Jun  9 13:15:52 2004
+++ sync/inc/class.ipc_sync.inc.php     Wed Jun  9 18:35:09 2004
@@ -167,7 +167,7 @@
   
   function readPrincipalByID($deviceid) {
     if ($this->debug)
-      error_log("readPricipalByID device: [$deviceid]");
+      error_log("readPrincipalByID device: [$deviceid]");
     
     return $this->bo->readDeviceInfoByID($deviceid);
   }
@@ -186,7 +186,8 @@
   *  array[2] itemdata - returns the Item binary data
   */
   
-  function getSyncItemFromId($deviceid, $source, $LUID, $mimetype) {
+  function getSyncItemFromId($deviceid, $source, $LUID, $mimetype) 
+  {
     if ($this->debug)
       error_log("getSyncItemFromId: '$deviceid', '$source', '$LUID', 
'$mimetype'");
 
@@ -208,20 +209,19 @@
   * @return boolean returns true if SyncItem is successful set
   */
   
-  function setSyncItem($deviceid, $source, $LUID, $mimetype, $Itemdata) {
-    if ($this->debug)
+  function setSyncItem($deviceid, $source, $LUID, $mimetype, $Itemdata) 
+  {
+    // distinguish between encoded data from XML-RPC and data from internal 
classes 
+    if (is_array($Itemdata)) 
     {
-      // distinguish between encoded data from XML-RPC and data from internal 
classes 
-      if (is_array($Itemdata)) {
-        if ($this->debug)
-          error_log("setSyncItem: $deviceid, $source, $LUID, $mimetype |" . 
serialize($Itemdata));
-        return $this->bo->setSyncItem($deviceid, $source, $LUID, $mimetype, 
$Itemdata);    
-      } else
-      {
-        if ($this->debug)
-          error_log("setSyncItem: $deviceid, $source, $LUID, $mimetype |" . 
base64_decode($Itemdata));
-        return $this->bo->setSyncItem($deviceid, $source, $LUID, $mimetype, 
base64_decode($Itemdata));    
-      }
+      if ($this->debug)
+        error_log("setSyncItem: $deviceid, $source, $LUID |" . 
serialize($Itemdata));
+      return $this->bo->setSyncItem($deviceid, $source, $LUID, $mimetype, 
$Itemdata);    
+    } else
+    {
+      if ($this->debug)
+        error_log("setSyncItem: $deviceid, $source, $LUID |" . 
base64_decode($Itemdata));
+      return $this->bo->setSyncItem($deviceid, $source, $LUID, $mimetype, 
base64_decode($Itemdata));    
     }
   }
   
@@ -402,8 +402,11 @@
     {
       $syncstart = $syncstart -3;
     }
-    $data = array('syncstart_timestamp' => $syncstart);
-    $GLOBALS['phpgw']->session->appsession('session_data','sync', $data);
+    
+    // add syncstart_timestamp to current session data
+    $session_data = 
$GLOBALS['phpgw']->session->appsession('session_data','sync');
+    $session_data['syncstart_timestamp'] = $syncstart;
+    $GLOBALS['phpgw']->session->appsession('session_data','sync', 
$session_data);
     
     return $result;
   } 
@@ -513,11 +516,11 @@
   function setPrefSourceInfo($deviceuri, $sourceinfo)
   {
     if ($this->debug)
-    {
-      error_log("setPrefSourceInfo($deviceuri, " . serialize($sourceinfo));
-    }
-    $data = array('sync_actualsourceinfo' => $sourceinfo);
-    $GLOBALS['phpgw']->session->appsession('session_data','sync', $data);
+      error_log("setPrefSourceInfo($deviceuri, " . serialize($sourceinfo) . 
")");
+    
+    $session_data = 
$GLOBALS['phpgw']->session->appsession('session_data','sync');
+    $session_data['sync_currentsourceinfo'] = $sourceinfo;
+    $GLOBALS['phpgw']->session->appsession('session_data','sync', 
$session_data);
     
     return 1;
   }  
@@ -529,9 +532,8 @@
   function setDevInf($deviceuri, $devicename)
   {
     if ($this->debug)
-    {
       error_log("setDevInf($deviceuri, $devicename)");
-    }
+    
     return 1;
   }  
 }