From c2595704965dbed1ce1a65f61bf6b48318267b88 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 2 Jun 2010 13:43:43 -0400
Subject: [PATCH] Horde_Db_Base -> Horde_Db_Adapter_Base

---
 horde/admin/activesync.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/horde/admin/activesync.php b/horde/admin/activesync.php
index 38cbb9354..a4fdddc04 100644
--- a/horde/admin/activesync.php
+++ b/horde/admin/activesync.php
@@ -13,17 +13,18 @@
 require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('horde', array('admin' => true));
 
-/** Check for any actions **/
-$actionID = Horde_Util::getPost('actionID');
-if ($actionID) {
-    $deviceID = Horde_Util::getPost('deviceID');
-
-    /* Get the state machine */
+if (!empty($conf['activesync']['enabled'])) {
     $state_params = $conf['activesync']['state']['params'];
-    $state_params['db'] = $injector->getInstance('Horde_Db_Base');
+    $state_params['db'] = $injector->getInstance('Horde_Db_Adapter_Base');
     $stateMachine = new Horde_ActiveSync_State_History($state_params);
     $stateMachine->setLogger($injector->getInstance('Horde_Log_Logger'));
+} else {
+    throw new Horde_Exception_PermissionDenied(_("ActiveSync not activated."));
+}
 
+/** Check for any actions **/
+if ($actionID = Horde_Util::getPost('actionID')) {
+    $deviceID = Horde_Util::getPost('deviceID');
     switch ($actionID) {
     case 'wipe':
         $stateMachine->setDeviceRWStatus($deviceID, Horde_ActiveSync::RWSTATUS_PENDING);
@@ -42,14 +43,6 @@ if ($actionID) {
 }
 
 Horde::addScriptFile('activesyncadmin.js');
-if (!empty($conf['activesync']['enabled'])) {
-        $state_params = $conf['activesync']['state']['params'];
-        $state_params['db'] = $injector->getInstance('Horde_Db_Base');
-        $stateMachine = new Horde_ActiveSync_State_History($state_params);
-} else {
-    throw new Horde_Exception_PermissionDenied(_("ActiveSync not activated."));
-}
-
 $devices = $stateMachine->listDevices();
 
 $title = _("ActiveSync Device Administration");
-- 
2.11.0