ZO-81 Transport Notes as Appointments.

src/lib/core/streamimporter.php

@@ -88,19 +88,19 @@ class ImportChangesStream implements IImportChanges {
             return false;
         }
 
-        // Acacia ZO-42: to sync Notes to Outlook we sync them as Tasks
+        // Acacia ZO-42: to sync Notes to Outlook we sync them as Appointments
         if ($this->classAsString == "SyncNote" && ZPush::GetDeviceManager()->IsOutlookClient()) {
-            $task = new SyncTask();
-            $task->flags = $message->flags;
+            $appointment = new SyncAppointment();
+            $appointment->flags = $message->flags;
             if (isset($message->asbody))
-                $task->asbody = $message->asbody;
+                $appointment->asbody = $message->asbody;
             if (isset($message->categories))
-                $task->categories = $message->categories;
+                $appointment->categories = $message->categories;
             if (isset($message->subject))
-                $task->subject = $message->subject;
+                $appointment->subject = $message->subject;
             // TODO color of the note
 
-            $message = $task;
+            $message = $appointment;
         }
 
         // prevent sending the same object twice in one request

src/lib/request/ping.php

@@ -283,8 +283,8 @@ class Ping extends RequestProcessor {
      */
     private function isClassValid($class, $spa) {
         if ($class == $spa->GetContentClass() ||
-                // Acacia ZO-42: Notes are synched as Tasks
-                (self::$deviceManager->IsOutlookClient() && $class == "Tasks" && $spa->GetContentClass() == "Notes")
+                // Acacia ZO-42: Notes are synched as Appointments
+                (self::$deviceManager->IsOutlookClient() && $class == "Calendar" && $spa->GetContentClass() == "Notes")
             ) {
             return true;
         }

src/lib/request/sync.php

@@ -453,10 +453,10 @@ class Sync extends RequestProcessor {
                             if(($el = self::$decoder->getElementStartTag(SYNC_DATA)) && ($el[EN_FLAGS] & EN_FLAGS_CONTENT)) {
                                 $message = ZPush::getSyncObjectFromFolderClass($spa->GetContentClass());
 
-                                // Acacia ZO-42: OL sends Notes as Tasks
+                                // Acacia ZO-42: OL sends Notes as Appointments
                                 if ($spa->GetContentClass() == "Notes" && self::$deviceManager->IsOutlookClient()) {
-                                    ZLog::Write(LOGLEVEL_DEBUG, "HandleSync(): Outlook sends Notes as Tasks, read as Tasks and convert it into a SyncNote object.");
-                                    $message = new SyncTask();
+                                    ZLog::Write(LOGLEVEL_DEBUG, "HandleSync(): Outlook sends Notes as Appointments, read as SyncAppointment and convert it into a SyncNote object.");
+                                    $message = new SyncAppointment();
                                     $message->Decode(self::$decoder);
 
                                     $note = new SyncNote();