Merge pull request #19 in ZO/z-push from...

Merge pull request #19 in ZO/z-push from bugfix/ZO-113-devicemanager--isoutlookclient-returns to develop

* commit '0d4bf4ea':
  ZO-113 KOE confirmed also when stat headers are present.
  ZO-113 Rename to KOE

src/config.php

@@ -281,7 +281,7 @@
     define('SEARCH_MAXRESULTS', 10);
 
 /**********************************************************************************
- *  Kopano Outlook Plugin - Settings
+ *  Kopano Outlook Extension - Settings
  *
  *  The Kopano Outlook Extension (KOE) provides MS Outlook 2013 and newer with
  *  functionality not provided by ActiveSync or not implemented by Outlook.

src/lib/core/changesmemorywrapper.php

@@ -204,7 +204,7 @@ class ChangesMemoryWrapper extends HierarchyCache implements IImportChanges, IEx
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("ChangesMemoryWrapper->ImportFolderChange(): Set foldertype for folder '%s' from cache as it was not sent: '%s'", $folder->displayname, $folder->type));
             }
 
-            // KOP ZO-42: When Notes folders are updated in Outlook, it tries to update the name (that fails by default, as it's a system folder)
+            // KOE ZO-42: When Notes folders are updated in Outlook, it tries to update the name (that fails by default, as it's a system folder)
             // catch this case here and ignore the change
             if (($folder->type == SYNC_FOLDER_TYPE_NOTE || $folder->type == SYNC_FOLDER_TYPE_USER_NOTE) && ZPush::GetDeviceManager()->IsOutlookClient()) {
                 $retFolder = false;

src/lib/core/devicemanager.php

@@ -104,7 +104,7 @@ class DeviceManager {
         $this->additionalFoldersHash = $this->getAdditionalFoldersHash();
 
         if ($this->IsOutlookClient()) {
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOP: %s / %s / %s", $this->device->GetOLPluginVersion(), $this->device->GetOLPluginBuild(), strftime("%Y-%m-%d %H:%M", $this->device->GetOLPluginBuildDate())));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOE: %s / %s / %s", $this->device->GetOLPluginVersion(), $this->device->GetOLPluginBuild(), strftime("%Y-%m-%d %H:%M", $this->device->GetOLPluginBuildDate())));
         }
     }
 
@@ -712,7 +712,7 @@ class DeviceManager {
      * @return boolean
      */
     public function IsOutlookClient() {
-        if (Request::GetDeviceType() == "WindowsOutlook" && $this->device->GetOLPluginVersion() !== false) {
+        if (Request::GetDeviceType() == "WindowsOutlook" && ($this->device->GetOLPluginVersion() !== false || Request::HasOLPluginStats())) {
             return true;
         }
         return false;

src/lib/core/streamimporter.php

@@ -88,7 +88,7 @@ class ImportChangesStream implements IImportChanges {
             return false;
         }
 
-        // KOP ZO-42: to sync Notes to Outlook we sync them as Appointments
+        // KOE ZO-42: to sync Notes to Outlook we sync them as Appointments
         if (KOE_CAPABILITY_NOTES && $this->classAsString == "SyncNote" && ZPush::GetDeviceManager()->IsOutlookClient()) {
             // update category from SyncNote->Color
             $message->SetCategoryFromColor();
@@ -138,7 +138,7 @@ class ImportChangesStream implements IImportChanges {
             return $stat;
         }
 
-        // KOP ZO-3: Stream reply/forward flag and time as additional category to Outlook
+        // KOE ZO-3: Stream reply/forward flag and time as additional category to Outlook
         if (ZPush::GetDeviceManager()->IsOutlookClient() && KOE_CAPABILITY_RECEIVEFLAGS && isset($message->lastverbexectime) && isset($message->lastverbexecuted) && $message->lastverbexecuted > 0) {
             ZLog::Write(LOGLEVEL_DEBUG, "ImportChangesStream->ImportMessageChange('%s'): KOE detected. Adding LastVerb information as category.");
             if (!isset($message->categories)){

src/lib/request/ping.php

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

src/lib/request/sendmail.php

@@ -88,7 +88,7 @@ class SendMail extends RequestProcessor {
             $sm->saveinsent = Request::GetGETSaveInSent();
         }
 
-        // KOP ZO-6: grep for the OL header and set flags accordingly.
+        // KOE ZO-6: grep for the OL header and set flags accordingly.
         // The header has the values verb/message-source-key/folder-source-key
         if (KOE_CAPABILITY_SENDFLAGS && preg_match("/X-Push-Flags: (\d{3})\/([\da-f]+)\/([\da-f]+)/i", $sm->mime, $ol_flags)) {
             // "reply" and "reply-all" are handled as "reply"
@@ -106,7 +106,7 @@ class SendMail extends RequestProcessor {
             $sm->source->folderid = $ol_flags[3];
             $sm->replacemime = true;
 
-            ZLog::Write(LOGLEVEL_DEBUG, "SendMail(): KOP support: overwrite reply/forward flag, set parent-id and item-id, replacemime - original message should not be attached.");
+            ZLog::Write(LOGLEVEL_DEBUG, "SendMail(): KOE support: overwrite reply/forward flag, set parent-id and item-id, replacemime - original message should not be attached.");
         }
 
         // Check if it is a reply or forward. Two cases are possible:

src/lib/request/sync.php

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