From 37656232a6fe1f164adb3df9f2ba86b024861113 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 13 Apr 2010 11:09:21 -0400 Subject: [PATCH] Call Horde_ActiveSync_Driver#logOff after request is handled. --- framework/ActiveSync/lib/Horde/ActiveSync.php | 5 ++++- .../ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 2 +- .../ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php | 4 ++-- .../test/Horde/ActiveSync/FolderSyncTest.php | Bin 4093 -> 4338 bytes 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php index 905494727..9ca0a1520 100644 --- 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 e7c5393ad..3476ad373 100644 --- 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 efc045a0e..0fa707522 100644 --- 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 1f96fa077ad2538e8b09b0530fbb6b0019303029..4fc053b9aebd45e8bec25c76f13ba314a6202a39 100644 GIT binary patch delta 328 zcmew>|4DJf8a5_<{mpCG1Xx-8N^^2HAL6!VtWVA;(lDqnFxFJiQ-HD!L2UIbb%clk zk}QbLrGNyWy3E14!hDdlfelqRL=r(Z2y9KgdJs?=n|WZ(D%q)(*qs4!q+d9a;UFC- qCaD`UF#3C-sZdZ4Ni5DThKeeIJdf@wR6{mv@lIv}hTP=6{0;!id`yl2 delta 83 zcmeyQ_*Z_z8n(&#%p9Ayv2n1n1(y`1CgyHF#BI%}tIo`r#lXNG=EH2rz!=1=uArx& mlAT%!q|_N0{lb}z85sRNm_rhavx^xRH_P%(W}3W7zySc-1{GTX -- 2.11.0