Skip to content

Commit bbd20f4

Browse files
amulet1amulet1
committed
Store encoder in the variable to simplify the code
1 parent 1e04da9 commit bbd20f4

File tree

1 file changed

+70
-69
lines changed

1 file changed

+70
-69
lines changed

‎lib/Horde/ActiveSync/Request/Settings.php‎

Lines changed: 70 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -210,123 +210,124 @@ protected function _handle()
210210
}
211211

212212
// Output response
213-
$this->_encoder->startWBXML();
214-
$this->_encoder->startTag(self::SETTINGS_SETTINGS);
215-
$this->_encoder->startTag(self::SETTINGS_STATUS);
216-
$this->_encoder->content(self::STATUS_SUCCESS);
217-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
213+
$encoder = $this->_encoder;
214+
$encoder->startWBXML();
215+
$encoder->startTag(self::SETTINGS_SETTINGS);
216+
$encoder->startTag(self::SETTINGS_STATUS);
217+
$encoder->content(self::STATUS_SUCCESS);
218+
$encoder->endTag(); // end self::SETTINGS_STATUS
218219
if (isset($request['set']['oof'])) {
219-
$this->_encoder->startTag(self::SETTINGS_OOF);
220-
$this->_encoder->startTag(self::SETTINGS_STATUS);
220+
$encoder->startTag(self::SETTINGS_OOF);
221+
$encoder->startTag(self::SETTINGS_STATUS);
221222
if (!isset($result['set']['oof'])) {
222-
$this->_encoder->content(self::OOF_STATE_DISABLED);
223+
$encoder->content(self::OOF_STATE_DISABLED);
223224
} else {
224-
$this->_encoder->content($result['set']['oof']);
225+
$encoder->content($result['set']['oof']);
225226
}
226-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
227-
$this->_encoder->endTag(); // end self::SETTINGS_OOF
227+
$encoder->endTag(); // end self::SETTINGS_STATUS
228+
$encoder->endTag(); // end self::SETTINGS_OOF
228229
}
229230
if (isset($device_properties)) {
230-
$this->_encoder->startTag(self::SETTINGS_DEVICEINFORMATION);
231-
$this->_encoder->startTag(self::SETTINGS_STATUS);
232-
$this->_encoder->content(Horde_ActiveSync_Request_Settings::STATUS_SUCCESS);
233-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
234-
$this->_encoder->endTag(); // end self::SETTINGS_DEVICEINFORMATION
231+
$encoder->startTag(self::SETTINGS_DEVICEINFORMATION);
232+
$encoder->startTag(self::SETTINGS_STATUS);
233+
$encoder->content(Horde_ActiveSync_Request_Settings::STATUS_SUCCESS);
234+
$encoder->endTag(); // end self::SETTINGS_STATUS
235+
$encoder->endTag(); // end self::SETTINGS_DEVICEINFORMATION
235236
}
236237
if (isset($request['set']['devicepassword'])) {
237-
$this->_encoder->startTag(self::SETTINGS_DEVICEPASSWORD);
238-
$this->_encoder->startTag(self::SETTINGS_STATUS);
238+
$encoder->startTag(self::SETTINGS_DEVICEPASSWORD);
239+
$encoder->startTag(self::SETTINGS_STATUS);
239240
if (!isset($result['set']['devicepassword'])) {
240-
$this->_encoder->content(0);
241+
$encoder->content(0);
241242
} else {
242-
$this->_encoder->content($result['set']['devicepassword']);
243+
$encoder->content($result['set']['devicepassword']);
243244
}
244-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
245-
$this->_encoder->endTag(); // end self::SETTINGS_DEVICEPASSWORD
245+
$encoder->endTag(); // end self::SETTINGS_STATUS
246+
$encoder->endTag(); // end self::SETTINGS_DEVICEPASSWORD
246247
}
247248
if (isset($request['get']['userinformation']) && isset($result['get']['userinformation'])) {
248-
$this->_encoder->startTag(self::SETTINGS_USERINFORMATION);
249-
$this->_encoder->startTag(self::SETTINGS_STATUS);
250-
$this->_encoder->content($result['get']['userinformation']['status']);
251-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
252-
$this->_encoder->startTag(self::SETTINGS_GET);
249+
$encoder->startTag(self::SETTINGS_USERINFORMATION);
250+
$encoder->startTag(self::SETTINGS_STATUS);
251+
$encoder->content($result['get']['userinformation']['status']);
252+
$encoder->endTag(); // end self::SETTINGS_STATUS
253+
$encoder->startTag(self::SETTINGS_GET);
253254

254255
// @todo remove accounts existence check for H6.
255256
if ($version >= Horde_ActiveSync::VERSION_FOURTEENONE &&
256257
!empty($result['get']['userinformation']['accounts'])) {
257-
$this->_encoder->startTag(self::SETTINGS_ACCOUNTS);
258+
$encoder->startTag(self::SETTINGS_ACCOUNTS);
258259
foreach ($result['get']['userinformation']['accounts'] as $account) {
259-
$this->_encoder->startTag(self::SETTINGS_ACCOUNT);
260+
$encoder->startTag(self::SETTINGS_ACCOUNT);
260261

261262
if (!empty($account['id'])) {
262-
$this->_encoder->startTag(self::SETTINGS_ACCOUNTID);
263-
$this->_encoder->content($account['id']);
264-
$this->_encoder->endTag();
263+
$encoder->startTag(self::SETTINGS_ACCOUNTID);
264+
$encoder->content($account['id']);
265+
$encoder->endTag();
265266
}
266267
if (!empty($account['accountname'])) {
267-
$this->_encoder->startTag(self::SETTINGS_ACCOUNTNAME);
268-
$this->_encoder->content($account['accountname']);
269-
$this->_encoder->endTag();
268+
$encoder->startTag(self::SETTINGS_ACCOUNTNAME);
269+
$encoder->content($account['accountname']);
270+
$encoder->endTag();
270271
}
271272
if (!empty($account['fullname'])) {
272-
$this->_encoder->startTag(self::SETTINGS_USERDISPLAYNAME);
273-
$this->_encoder->content($account['fullname']);
274-
$this->_encoder->endTag();
273+
$encoder->startTag(self::SETTINGS_USERDISPLAYNAME);
274+
$encoder->content($account['fullname']);
275+
$encoder->endTag();
275276
}
276277
if (!empty($account['emailaddresses'])) {
277-
$this->_encoder->startTag(self::SETTINGS_EMAILADDRESSES);
278-
$this->_encoder->startTag(self::SETTINGS_PRIMARYSMTPADDRESS);
279-
$this->_encoder->content($account['emailaddresses'][0]);
280-
$this->_encoder->endTag(); // end self::SETTINGS_PRIMARYSMTPADDRESS
278+
$encoder->startTag(self::SETTINGS_EMAILADDRESSES);
279+
$encoder->startTag(self::SETTINGS_PRIMARYSMTPADDRESS);
280+
$encoder->content($account['emailaddresses'][0]);
281+
$encoder->endTag(); // end self::SETTINGS_PRIMARYSMTPADDRESS
281282
foreach($account['emailaddresses'] as $value) {
282-
$this->_encoder->startTag(self::SETTINGS_SMTPADDRESS);
283-
$this->_encoder->content($value);
284-
$this->_encoder->endTag(); // end self::SETTINGS_SMTPADDRESS
283+
$encoder->startTag(self::SETTINGS_SMTPADDRESS);
284+
$encoder->content($value);
285+
$encoder->endTag(); // end self::SETTINGS_SMTPADDRESS
285286
}
286-
$this->_encoder->endTag(); // SETTINGS_EMAILADDRESSES
287+
$encoder->endTag(); // SETTINGS_EMAILADDRESSES
287288
}
288-
$this->_encoder->endTag(); // SETTINGS_ACCOUNT
289+
$encoder->endTag(); // SETTINGS_ACCOUNT
289290
}
290-
$this->_encoder->endTag(); // SETTINGS_ACCOUNTS
291+
$encoder->endTag(); // SETTINGS_ACCOUNTS
291292
} else {
292-
$this->_encoder->startTag(self::SETTINGS_EMAILADDRESSES);
293+
$encoder->startTag(self::SETTINGS_EMAILADDRESSES);
293294
if (!empty($result['get']['userinformation']['emailaddresses'])) {
294295
foreach($result['get']['userinformation']['emailaddresses'] as $value) {
295-
$this->_encoder->startTag(self::SETTINGS_SMTPADDRESS);
296-
$this->_encoder->content($value);
297-
$this->_encoder->endTag(); // end self::SETTINGS_SMTPADDRESS
296+
$encoder->startTag(self::SETTINGS_SMTPADDRESS);
297+
$encoder->content($value);
298+
$encoder->endTag(); // end self::SETTINGS_SMTPADDRESS
298299
}
299300
}
300-
$this->_encoder->endTag(); // end self::SETTINGS_EMAILADDRESSES
301+
$encoder->endTag(); // end self::SETTINGS_EMAILADDRESSES
301302
}
302-
$this->_encoder->endTag(); // end self::SETTINGS_GET
303-
$this->_encoder->endTag(); // end self::SETTINGS_USERINFORMATION
303+
$encoder->endTag(); // end self::SETTINGS_GET
304+
$encoder->endTag(); // end self::SETTINGS_USERINFORMATION
304305
}
305306
if (isset($request['get']['oof'])) {
306307
$oof = $this->_getOofObject($result['get']['oof']);
307-
$this->_encoder->startTag(self::SETTINGS_OOF);
308+
$encoder->startTag(self::SETTINGS_OOF);
308309

309-
$this->_encoder->startTag(self::SETTINGS_STATUS);
310-
$this->_encoder->content($result['get']['oof']['status']);
311-
$this->_encoder->endTag(); // end self::SETTINGS_STATUS
310+
$encoder->startTag(self::SETTINGS_STATUS);
311+
$encoder->content($result['get']['oof']['status']);
312+
$encoder->endTag(); // end self::SETTINGS_STATUS
312313

313314
if ($result['get']['oof']['status'] == self::STATUS_SUCCESS) {
314-
$this->_encoder->startTag(self::SETTINGS_GET);
315-
$oof->encodeStream($this->_encoder);
316-
$this->_encoder->endTag(); // end self::SETTINGS_GET
315+
$encoder->startTag(self::SETTINGS_GET);
316+
$oof->encodeStream($encoder);
317+
$encoder->endTag(); // end self::SETTINGS_GET
317318
}
318319

319-
$this->_encoder->endTag(); // end self::SETTINGS_OOF
320+
$encoder->endTag(); // end self::SETTINGS_OOF
320321
}
321322
if (isset($request['get']['rightsmanagementinfo'])) {
322-
$this->_encoder->startTag(self::SETTINGS_RIGHTSMANAGEMENTINFO);
323-
$this->_encoder->startTag(self::SETTINGS_STATUS);
324-
$this->_encoder->content(self::STATUS_SUCCESS);
325-
$this->_encoder->endTag();
326-
$this->_encoder->endTag();
323+
$encoder->startTag(self::SETTINGS_RIGHTSMANAGEMENTINFO);
324+
$encoder->startTag(self::SETTINGS_STATUS);
325+
$encoder->content(self::STATUS_SUCCESS);
326+
$encoder->endTag();
327+
$encoder->endTag();
327328
}
328329

329-
$this->_encoder->endTag(); // end self::SETTINGS_SETTINGS
330+
$encoder->endTag(); // end self::SETTINGS_SETTINGS
330331

331332
return true;
332333
}

0 commit comments

Comments
 (0)