From 83ba22c77b8790d8cbea8c684c4e1a0c431b83d6 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 4 Nov 2010 09:59:55 +0000 Subject: - Unify template files naming --- program/steps/addressbook/edit.inc | 12 ++++++------ program/steps/addressbook/show.inc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'program/steps/addressbook') diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index d975c76f1..831390382 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -79,15 +79,15 @@ function get_form_tags($attrib) global $CONTACTS, $EDIT_FORM, $RCMAIL; $form_start = $form_end = ''; - + if (empty($EDIT_FORM)) { $hiddenfields = new html_hiddenfield(array( 'name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC))); $hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id)); - + if (($result = $CONTACTS->get_result()) && ($record = $result->first())) $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID'])); - + $form_start = $RCMAIL->output->request_form(array( 'name' => "form", 'method' => "post", 'task' => $RCMAIL->task, 'action' => 'save', @@ -105,8 +105,8 @@ function get_form_tags($attrib) $OUTPUT->add_handler('contacteditform', 'rcmail_contact_editform'); -if (!$CONTACTS->get_result() && $OUTPUT->template_exists('addcontact')) - $OUTPUT->send('addcontact'); +if (!$CONTACTS->get_result() && $OUTPUT->template_exists('contactadd')) + $OUTPUT->send('contactadd'); // this will be executed if no template for addcontact exists -$OUTPUT->send('editcontact'); +$OUTPUT->send('contactedit'); diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 67eaa53ef..f1c23b8e3 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -126,4 +126,4 @@ function rcmail_contact_record_groups($contact_id) //$OUTPUT->framed = $_framed; $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details'); -$OUTPUT->send('showcontact'); +$OUTPUT->send('contact'); -- cgit v1.2.3