Bug: 13278 Fix removing EAS device pairings via the RemoveUserData API.

horde · Jun 20, 2014 · 5d5b34a · 5d5b34a
1 parent a11189e
commit 5d5b34a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/horde/lib/Api.php b/horde/lib/Api.php
@@ -232,11 +232,6 @@ public function removeUserData($user, $app = false)
         }
 
         $GLOBALS['registry']->removeUserData($user, $app);
-
-        if ($GLOBALS['conf']['activesync']['enabled']) {
-            $GLOBALS['injector']->getInstance('Horde_ActiveSyncState')
-                ->removeState(array('user' => $user));
-        }
     }
 
     /* Groups. */

diff --git a/horde/lib/Application.php b/horde/lib/Application.php
@@ -189,6 +189,17 @@ public function removeUserData($user)
             }
         }
 
+        // Remove any activesync device pairings.
+        if ($GLOBALS['conf']['activesync']['enabled']) {
+            try {
+                $GLOBALS['injector']->getInstance('Horde_ActiveSyncState')
+                    ->removeState(array('user' => $user));
+            } catch (Horde_ActiveSync_Exception $e) {
+                Horde::log($e, 'NOTICE');
+                $error = true;
+            }
+        }
+
         if ($error) {
             throw new Horde_Exception(sprintf(_("There was an error removing global data for %s. Details have been logged."), $user));
         }