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

[nomail]

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

date: 2004/06/17 16:00:26;  author: mleonhardt;  state: Exp;  lines: +13 -4

Log Message:
- completed sourcelist editor
- now using official get admin acl for admin-functionality
- changed mimetype handling
=====================================================================
Index: sync/inc/class.bo_sync.inc.php
diff -u sync/inc/class.bo_sync.inc.php:1.45 sync/inc/class.bo_sync.inc.php:1.46
--- sync/inc/class.bo_sync.inc.php:1.45 Tue Jun 15 09:53:08 2004
+++ sync/inc/class.bo_sync.inc.php      Thu Jun 17 16:00:26 2004
@@ -194,7 +194,6 @@
     *        do the sync
     * @param string $source Source-URI of the source to sync
     * @param string $LUID - the Items Unique Identifier ID (also called key)
-    * @param string $mimetype - holds the mimetype of Itemdata
     * @return array returns an array containing of<br>
     *  array[0] integer value >= 0 if Item is available<br>
     *           integer value -1 if there is a problem getting data trough 
IPC<br>
@@ -203,7 +202,7 @@
     *  array[2] itemdata - returns the Item binary data
     */
   
-    function getSyncItemFromId($deviceid, $source, $LUID, $mimetype) {
+    function getSyncItemFromId($deviceid, $source, $LUID) {
       // get the responsible IPC class
       //TODO: error-handling!
       $this->GetIpcforSource($source);
@@ -226,6 +225,11 @@
           $mimetype = 
$session_data['sync_currentsourceinfo']['contentType.RX.type'];
           $mimeversion = 
$session_data['sync_currentsourceinfo']['contentType.RX.version'];
         }
+             else 
+             {
+               error_log("error getting mimetype and version while getting 
data from source $source");
+               return array(-1, $LUID, null);
+             }
                 
        $data = $this->ipc->getData($GUID, $mimetype, $mimeversion);
 
@@ -262,7 +266,7 @@
     * @return boolean true if SyncItem is successful set
     */
   
-    function setSyncItem($deviceid, $source, $LUID, $mimetype, $Itemdata) {
+    function setSyncItem($deviceid, $source, $LUID, $Itemdata) {
       // set the responsible IPC class of the responsible module
       if ($this->GetIpcforSource($source) == false) return false;
   
@@ -271,6 +275,11 @@
       {
         $mimetype = 
$session_data['sync_currentsourceinfo']['contentType.TX.type'];
         $mimeversion = 
$session_data['sync_currentsourceinfo']['contentType.TX.version'];
+      } 
+      else 
+      {
+       error_log("error getting mimetype and version while setting data to 
source $source");
+       return false;
       }
 
       // get the mapped GUID