Call Horde_ActiveSync_Driver#logOff after request is handled.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php
index 9054947..9ca0a15 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync.php
@@ -1005,7 +1005,10 @@ class Horde_ActiveSync
                                   $this->_provisioning);
             $request->setLogger($this->_logger);
 
-            return $request->handle($this, $devId);
+            $result = $request->handle($this, $devId);
+            $this->_driver->logOff();
+
+            return $result;
         }
 
         // @TODO: Leave the following in place until all are refactored...then throw

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
index e7c5393..3476ad3 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
@@ -288,7 +288,7 @@ abstract class Horde_ActiveSync_Driver_Base
      *
      * @return boolean
      */
-    public function Logoff()
+    public function logOff()
     {
         return true;
     }

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
index efc045a..0fa7075 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
@@ -84,9 +84,9 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
      *
      * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#Logoff()
      */
-    public function Logoff()
+    public function logOff()
     {
-        $this->_logger->info('Horde_ActiveSync_Driver_Horde::logoff');
+        $this->_logger->info('User ' . $this->_user . ' logged off');
         return true;
     }
 

diff --git a/framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php b/framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php
index 1f96fa0..4fc053b 100644 (file)
Binary files a/framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php and b/framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php differ