ZP-897 Fixed ImportMessageDeletion() footprint. Added missing

parenthesis in kopano/config.php.

Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/kopano/config.php

@@ -53,13 +53,13 @@
 // Examples: define("MAPI_SERVER", "default:");
 //           define("MAPI_SERVER", "http://localhost:236/kopano");
 //           define("MAPI_SERVER", "https://localhost:237/kopano");
-//           define("MAPI_SERVER", "file:///var/run/kopano/server.sock";
+//           define("MAPI_SERVER", "file:///var/run/kopano/server.sock");
 // If you are using ZCP >= 7.2.0, set it to the zarafa location, e.g.
 //           define("MAPI_SERVER", "http://localhost:236/zarafa");
 //           define("MAPI_SERVER", "https://localhost:237/zarafa");
-//           define("MAPI_SERVER", "file:///var/run/zarafad/server.sock";
+//           define("MAPI_SERVER", "file:///var/run/zarafad/server.sock");
 // For ZCP versions prior to 7.2.0 the socket location is different (http(s) sockets are the same):
-//           define("MAPI_SERVER", "file:///var/run/zarafa";
+//           define("MAPI_SERVER", "file:///var/run/zarafa");
 
 define('MAPI_SERVER', 'default:');
 

src/backend/zarafa/kopanochangeswrapper.php

@@ -357,12 +357,12 @@ class KopanoChangesWrapper implements IImportChanges, IExportChanges {
      * Imports a deletion. This may conflict if the local object has been modified.
      *
      * @param string        $id
+     * @param boolean       $asSoftDelete   (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
      *
      * @access public
      * @return boolean
-     * @throws StatusException
      */
-    public function ImportMessageDeletion($id) {
+    public function ImportMessageDeletion($id, $asSoftDelete = false) {
         return $this->current->ImportMessageDeletion($id);
     }
 

src/backend/zarafa/replybackimexporter.php

@@ -302,14 +302,16 @@ class ReplyBackImExporter implements IImportChanges, IExportChanges {
     }
 
     /**
-     * Imports a message deletion, which is imported into memory.
+     * Imports a deletion. This may conflict if the local object has been modified.
      *
-     * @param string        $id     id of message which is deleted
+     * @param string        $id
+     * @param boolean       $asSoftDelete   (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
      *
      * @access public
      * @return boolean
      */
-    public function ImportMessageDeletion($id) {
+    public function ImportMessageDeletion($id, $asSoftDelete = false) {
+        // TODO do something different due to $asSoftDelete?
         $this->changes[] = array(self::DELETION, $id, null);
         throw new StatusException(sprintf("ReplyBackImExporter->ImportMessageDeletion('%s'): Read only folder. Data from PIM will be dropped! Server will read data.", $id), SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT, null, LOGLEVEL_INFO);
     }