Use the new DeviceInformation object.

horde · Dec 20, 2014 · f1a3cac · f1a3cac
1 parent 85331e5
commit f1a3cac
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
@@ -338,21 +338,18 @@ protected function _handleSettings()
             return false;
         }
         $di = array();
-        while (($field = ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_MODEL) ? Horde_ActiveSync_Request_Settings::SETTINGS_MODEL :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_IMEI) ? Horde_ActiveSync_Request_Settings::SETTINGS_IMEI :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_FRIENDLYNAME) ? Horde_ActiveSync_Request_Settings::SETTINGS_FRIENDLYNAME :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_OS) ? Horde_ActiveSync_Request_Settings::SETTINGS_OS :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_OSLANGUAGE) ? Horde_ActiveSync_Request_Settings::SETTINGS_OSLANGUAGE :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_PHONENUMBER) ? Horde_ActiveSync_Request_Settings::SETTINGS_PHONENUMBER :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_USERAGENT) ? Horde_ActiveSync_Request_Settings::SETTINGS_USERAGENT :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_MOBILEOPERATOR) ? Horde_ActiveSync_Request_Settings::SETTINGS_MOBILEOPERATOR :
-               ($this->_decoder->getElementStartTag(Horde_ActiveSync_Request_Settings::SETTINGS_ENABLEOUTBOUNDSMS) ? Horde_ActiveSync_Request_Settings::SETTINGS_ENABLEOUTBOUNDSMS :
-               -1)))))))))) != -1) {
-
-            if (($di[$field] = $this->_decoder->getElementContent()) !== false) {
-                $this->_decoder->getElementEndTag(); // end $field
-            }
-        }
+        $settings = Horde_ActiveSync::messageFactory('DeviceInformation');
+        $settings->decodeStream($this->_decoder);
+        $di[self::SETTINGS_MODEL] = $settings->model;
+        $di[self::SETTINGS_IMEI] = $settings->imei;
+        $di[self::SETTINGS_FRIENDLYNAME] = $settings->friendlyname;
+        $di[self::SETTINGS_OS] = $settings->os;
+        $di[self::SETTINGS_OSLANGUAGE] = $settings->oslanguage;
+        $di[self::SETTINGS_PHONENUMBER] = $settings->phonenumber;
+        $di[self::SETTINGS_USERAGENT] = $settings->useragent;
+        $di[self::SETTINGS_MOBILEOPERATOR] = $settings->mobileoperator;
+        $di[self::SETTINGS_ENABLEOUTBOUNDSMS] = $settings->enableoutboundsms;
+
         $this->_decoder->getElementEndTag();
         $this->_decoder->getElementEndTag();