fix typo, remove cruft.

horde · Oct 4, 2013 · 50f3122 · 50f3122
1 parent b0ce0db
commit 50f3122
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php
@@ -690,7 +690,7 @@ public function resetAllPolicyKeys()
     public function setDeviceRWStatus($devId, $status)
     {
         $query = array('_id' => $devId);
-        $new_data = array('device_rwstate' => $status);
+        $new_data = array('device_rwstatus' => $status);
         if ($status == Horde_ActiveSync::RWSTATUS_PENDING) {
             $new_data['users.device_policykey'] = 0;
         }
@@ -840,7 +840,7 @@ public function removeState(array $options)
         if (!empty($options['devId']) && !empty($options['user'])) {
             $query = array(
                 'device_id' => $options['devId'],
-                '$or' => array(array('device_rwstate' => Horde_ActiveSync::RWSTATUS_PENDING), array('device_rwstate' => Horde_ActiveSync::RWSTATUS_WIPED))
+                '$or' => array(array('device_rwstatus' => Horde_ActiveSync::RWSTATUS_PENDING), array('device_rwstatus' => Horde_ActiveSync::RWSTATUS_WIPED))
             );
             try {
                 $results = $this->_db->device->findOne($query);
@@ -1286,9 +1286,6 @@ function() {
         }
 EOT;
         foreach (array($this->_db->map, $this->_db->mailmap) as $c) {
-            $remove = array();
-            $sql = 'SELECT sync_key FROM ' . $table
-                . ' WHERE sync_devid = ? AND sync_user = ?';
             $query = array(
                 'sync_devid' => $this->_deviceInfo->id,
                 'sync_user' => $this->_deviceInfo->user,