ZP-112 Replace Acacia by KOP.

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));
             }
 
-            // Acacia 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)
+            // 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)
             // 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("Acacia OL Plugin: %s / %s / %s", $this->device->GetOLPluginVersion(), $this->device->GetOLPluginBuild(), strftime("%Y-%m-%d %H:%M", $this->device->GetOLPluginBuildDate())));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOP: %s / %s / %s", $this->device->GetOLPluginVersion(), $this->device->GetOLPluginBuild(), strftime("%Y-%m-%d %H:%M", $this->device->GetOLPluginBuildDate())));
         }
     }
 

src/lib/core/streamimporter.php

@@ -88,7 +88,7 @@ class ImportChangesStream implements IImportChanges {
             return false;
         }
 
-        // Acacia ZO-42: to sync Notes to Outlook we sync them as Appointments
+        // KOP ZO-42: to sync Notes to Outlook we sync them as Appointments
         if ($this->classAsString == "SyncNote" && ZPush::GetDeviceManager()->IsOutlookClient()) {
             // update category from SyncNote->Color
             $message->SetCategoryFromColor();
@@ -138,7 +138,7 @@ class ImportChangesStream implements IImportChanges {
             return $stat;
         }
 
-        // Acacia ZO-3: Stream reply/forward flag and time as additional category to Outlook
+        // KOP ZO-3: Stream reply/forward flag and time as additional category to Outlook
         if (ZPush::GetDeviceManager()->IsOutlookClient() && isset($message->lastverbexectime) && isset($message->lastverbexecuted) && $message->lastverbexecuted > 0) {
             ZLog::Write(LOGLEVEL_DEBUG, "ImportChangesStream->ImportMessageChange('%s'): Outlook client 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() ||
-                // Acacia ZO-42: Notes are synched as Appointments
+                // KOP ZO-42: Notes are synched as Appointments
                 (self::$deviceManager->IsOutlookClient() && $class == "Calendar" && $spa->GetContentClass() == "Notes")
             ) {
             return true;

src/lib/request/settings.php

@@ -60,7 +60,7 @@ class Settings extends RequestProcessor {
             self::$specialHeaders = array();
             // TODO these values need to be configurable, ZO-41
             self::$specialHeaders[] = "X-Push-Capabilities: gab,receiveflags,sendflags,ooftime,recover,notes"; // "oof" removed as "ooftime" superseeds it
-            self::$specialHeaders[] = "X-Push-GAB-Name: Z-Push-OL-GAB-Acacia";
+            self::$specialHeaders[] = "X-Push-GAB-Name: Z-Push-KOB-GAB";
         }
 
         //save the request parameters

src/lib/request/sync.php

@@ -454,7 +454,7 @@ 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 Appointments
+                                // KOP ZO-42: OL sends Notes as Appointments
                                 if ($spa->GetContentClass() == "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();

src/z-push-admin.php

@@ -863,7 +863,7 @@ class ZPushAdminCLI {
         echo "Policy name:\t\t". ($device->GetPolicyName() ? $device->GetPolicyName() : ASDevice::DEFAULTPOLICYNAME)."\n";
 
         if ($device->GetOLPluginVersion()) {
-            echo "Acacia OL Plugin:\n";
+            echo "Kopano OL Plugin:\n";
             echo "\tVersion:\t". $device->GetOLPluginVersion() ."\n";
             echo "\tBuild:\t\t". $device->GetOLPluginBuild() ."\n";
             echo "\tBuild Date:\t". strftime("%Y-%m-%d %H:%M",$device->GetOLPluginBuildDate()) ."\n";

tools/gab-sync/config.php

@@ -35,4 +35,4 @@ define('CERTIFICATE_PASSWORD', null);
 define('HIDDEN_FOLDERSTORE', 'SYSTEM');
 
 /// Do not change (unless you know exactly what you do)
-define('HIDDEN_FOLDERNAME', 'Z-Push-OL-GAB-Acacia');
+define('HIDDEN_FOLDERNAME', 'Z-Push-KOP-GAB');