From d575e46067c06f1165adb249865f3812e270df12 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 31 Dec 2013 16:57:58 +0100 Subject: CS fixes --- program/steps/settings/responses.inc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'program/steps/settings/responses.inc') diff --git a/program/steps/settings/responses.inc b/program/steps/settings/responses.inc index 45d1405f7..fcc9c9a10 100644 --- a/program/steps/settings/responses.inc +++ b/program/steps/settings/responses.inc @@ -51,7 +51,6 @@ if (!empty($_POST['_insert'])) { $RCMAIL->output->send(); } - if ($RCMAIL->action == 'delete-response') { if ($key = rcube_utils::get_input_value('_key', rcube_utils::INPUT_GPC)) { $responses = $RCMAIL->get_compose_responses(false, true); @@ -80,6 +79,14 @@ if ($RCMAIL->action == 'delete-response') { $OUTPUT->set_pagetitle($RCMAIL->gettext('responses')); $OUTPUT->include_script('list.js'); +$OUTPUT->add_handlers(array( + 'responseframe' => 'rcmail_response_frame', + 'responseslist' => 'rcmail_responses_list', +)); +$OUTPUT->add_label('deleteresponseconfirm'); + +$OUTPUT->send('responses'); + /** * @@ -105,7 +112,6 @@ function rcmail_responses_list($attrib) return $out; } - // similar function as /steps/addressbook/func.inc::rcmail_contact_frame() function rcmail_response_frame($attrib) { @@ -116,13 +122,6 @@ function rcmail_response_frame($attrib) } $OUTPUT->set_env('contentframe', $attrib['id']); + return $OUTPUT->frame($attrib, true); } - -$OUTPUT->add_handlers(array( - 'responseframe' => 'rcmail_response_frame', - 'responseslist' => 'rcmail_responses_list', -)); -$OUTPUT->add_label('deleteresponseconfirm'); - -$OUTPUT->send('responses'); -- cgit v1.2.3