Kolab Groupware OBS

Changes of Revision 3

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync.php Changed

@@ -45,6 +45,8 @@
     public $username;
     public $password;
 
+    public $task = null;
+
     const CHARSET = 'UTF-8';
     const VERSION = "2.3.22";
 
@@ -207,7 +209,7 @@
             }
 
             // LDAP server failure... send 503 error
-            if ($auth'kolab_ldap_error') {
+            if ($auth'kolab_ldap_error' ?? null) {
                 self::server_error();
             }
 
@@ -223,7 +225,7 @@
         }
 
         // Authenticate - get Roundcube user ID
-        if (!$auth'abort' && ($userid = $this->login($auth'user', $auth'pass', $auth'host', $err))) {
+        if (!($auth'abort' ?? false) && ($userid = $this->login($auth'user', $auth'pass', $auth'host', $err))) {
             // set real username
             $this->username = $auth'user';
             return $userid;
@@ -298,6 +300,7 @@
 
         // parse $host
         $a_host = parse_url($host);
+        $port = null;
         if ($a_host'host') {
             $host = $a_host'host';
             $ssl = (isset($a_host'scheme') && in_array($a_host'scheme', array('ssl','imaps','tls'))) ? $a_host'scheme' : null;

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_data_email.php Changed

@@ -633,7 +633,7 @@
     }
 
     /**
-     * delete entry
+     * Delete an email (or move to Trash)
      *
      * @param string                         $folderId
      * @param string                         $serverId
@@ -648,17 +648,26 @@
             throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
         }
 
+        // Note: If DeletesAsMoves is not specified in the request, its default is 1 (true).
+
         // move message to trash folder
-        if ($collection->deletesAsMoves
+        if ((!isset($collection->deletesAsMoves) || !empty($collection->deletesAsMoves))
             && strlen($trash)
             && $trash != $msg'foldername'
             && $this->storage->folder_exists($trash)
         ) {
             $this->storage->move_message($msg'uid', $trash, $msg'foldername');
         }
-        // set delete flag
+        // delete the message
         else {
-            $this->storage->set_flag($msg'uid', 'DELETED', $msg'foldername');
+            // According to the ActiveSync spec. "If the DeletesAsMoves element is set to false,
+            // the deletion is PERMANENT.", therefore we delete the message, and not flag as deleted.
+            $this->storage->delete_message($msg'uid', $msg'foldername');
+
+            // FIXME: We could consider acting according to the 'flag_for_deletion' setting.
+            //        Don't forget about 'read_when_deleted' setting then.
+            // $this->storage->set_flag($msg'uid', 'DELETED', $msg'foldername');
+            // $this->storage->set_flag($msg'uid', 'SEEN', $msg'foldername');
         }
     }