Rename Horde_ActiveSync_Exporter to Horde_ActiveSync_Sync to reflect it's real function.

Name is left over from legacy z-push code. This class is now only responsible for iterating
changesets and sending changes to PIM when appropriate.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
index e2a1336..717d759 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
@@ -360,9 +360,9 @@ abstract class Horde_ActiveSync_Driver_Base
      * @return unknown_type
      *
      */
-    public function getExporter()
+    public function getSyncObject()
     {
-        $exporter = new Horde_ActiveSync_Exporter($this);
+        $exporter = new Horde_ActiveSync_Sync($this);
         $exporter->setLogger($this->_logger);
 
         return $exporter;

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Exporter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Exporter.php
index cedd6f7..8a77e2a 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Exporter.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Exporter.php
@@ -41,7 +41,7 @@ define('BACKEND_DISCARD_DATA', 1);
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Horde_ActiveSync
  */
-class Horde_ActiveSync_Exporter
+class Horde_ActiveSync_Sync
 {
     /**
      * Local copy of changes to push to PIM

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php
index 62af78c..3f08993 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php
@@ -147,7 +147,7 @@ class Horde_ActiveSync_Request_FolderSync extends Horde_ActiveSync_Request_Base
         // directly to WBXML.
         // TODO: Combine all these import caches into a single Class
         $importer = new Horde_ActiveSync_HierarchyCache();
-        $exporter = $this->_driver->GetExporter();
+        $exporter = $this->_driver->GetSyncObject();
         $exporter->init($state, $importer, array('synckey' => $synckey));
 
         /* Perform the actual sync operation */

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php
index 319a0ea..e8bc880 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php
@@ -133,7 +133,7 @@ class Horde_ActiveSync_Request_GetItemEstimate extends Horde_ActiveSync_Request_
             $importer = new Horde_ActiveSync_ContentsCache();
             $state = $this->_driver->getStateObject($collection);
             $state->loadState($collection['synckey']);
-            $exporter = $this->_driver->GetExporter();
+            $exporter = $this->_driver->getSyncObject();
             $exporter->init($state, $importer, $collection);
 
             $this->_encoder->content($exporter->GetChangeCount());

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
index 86b677a..7eb3e82 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
@@ -126,7 +126,7 @@ class Horde_ActiveSync_Request_Ping extends Horde_ActiveSync_Request_Base
                     // Make sure we have the synckey (which is the devid for
                     // PING requests.
                     $collection['synckey'] = $this->_devId;
-                    $exporter = $this->_driver->getExporter();
+                    $exporter = $this->_driver->getSyncObject();
                     $state->loadPingCollectionState($collection);
                     try {
                         $exporter->init($state, false, $collection);

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
index dd6260e..319d602 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
@@ -200,7 +200,6 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base
         if ($rwstatus == self::RWSTATUS_PENDING || $rwstatus == self::RWSTATUS_WIPED) {
             $this->_encoder->startTag(SYNC_PROVISION_REMOTEWIPE, false, true);
             $state->setDeviceRWStatus($this->_devId, self::RWSTATUS_WIPED);
-            //$rwstatus = SYNC_PROVISION_RWSTATUS_WIPED;
         }
 
         $this->_encoder->endTag();//provision

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
index 8274326..f443578 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
@@ -436,7 +436,7 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base
             if (isset($collection['getchanges'])) {
                 $filtertype = isset($collection['filtertype']) ? $collection['filtertype'] : false;
                 $streamer = new Horde_ActiveSync_Streamer($this->_encoder, $collection['class']);
-                $exporter = $this->_driver->getExporter();
+                $exporter = $this->_driver->getSyncObject();
                 $exporter->init($state, $streamer, $collection);
                 $changecount = $exporter->getChangeCount();
                 if (!empty($collection['windowsize']) && $changecount > $collection['windowsize']) {