From 1c029b9c7c67c9603e9044b65c843300dd73ecb8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 01 Jan 2012 07:55:35 -0500
Subject: [PATCH] - Fix label too long (#1488283), fix polish translation
---
program/steps/addressbook/edit.inc | 223 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 194 insertions(+), 29 deletions(-)
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index a65eafe..1dde84a 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -19,70 +19,206 @@
*/
+if ($RCMAIL->action == 'edit') {
+ // Get contact ID and source ID from request
+ $cids = rcmail_get_cids();
+ $source = key($cids);
+ $cid = array_shift($cids[$source]);
-if (($cid = get_input_value('_cid', RCUBE_INPUT_GPC)) && ($record = $CONTACTS->get_record($cid, true)))
- $OUTPUT->set_env('cid', $record['ID']);
+ // Initialize addressbook
+ $CONTACTS = rcmail_contact_source($source, true);
-// adding not allowed here
-if ($CONTACTS->readonly) {
- $OUTPUT->show_message('sourceisreadonly');
- rcmail_overwrite_action('show');
- return;
+ // Contact edit
+ if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
+ $OUTPUT->set_env('cid', $record['ID']);
+ }
+
+ // adding not allowed here
+ if ($CONTACTS->readonly) {
+ $OUTPUT->show_message('sourceisreadonly');
+ rcmail_overwrite_action('show');
+ return;
+ }
+}
+else {
+ $source = get_input_value('_source', RCUBE_INPUT_GPC);
+
+ if (!strlen($source)) {
+ // Give priority to configured default
+ $source = $RCMAIL->config->get('default_addressbook');
+ }
+
+ $CONTACTS = $RCMAIL->get_address_book($source, true);
+
+ // find writable addressbook
+ if (!$CONTACTS || $CONTACTS->readonly)
+ $source = rcmail_default_source(true);
+
+ // Initialize addressbook
+ $CONTACTS = rcmail_contact_source($source, true);
}
+$SOURCE_ID = $source;
+rcmail_set_sourcename($CONTACTS);
+
+function rcmail_get_edit_record()
+{
+ global $RCMAIL, $CONTACTS;
+
+ // check if we have a valid result
+ if ($GLOBALS['EDIT_RECORD']) {
+ $record = $GLOBALS['EDIT_RECORD'];
+ }
+ else if ($RCMAIL->action != 'add'
+ && !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
+ ) {
+ $RCMAIL->output->show_message('contactnotfound');
+ return false;
+ }
+
+ return $record;
+}
+
+function rcmail_contact_edithead($attrib)
+{
+ // check if we have a valid result
+ $record = rcmail_get_edit_record();
+ $i_size = !empty($attrib['size']) ? $attrib['size'] : 20;
+
+ $form = array(
+ 'head' => array(
+ 'content' => array(
+ 'prefix' => array('size' => $i_size),
+ 'firstname' => array('size' => $i_size, 'visible' => true),
+ 'middlename' => array('size' => $i_size),
+ 'surname' => array('size' => $i_size, 'visible' => true),
+ 'suffix' => array('size' => $i_size),
+ 'name' => array('size' => 2*$i_size),
+ 'nickname' => array('size' => 2*$i_size),
+ 'organization' => array('size' => 2*$i_size),
+ 'department' => array('size' => 2*$i_size),
+ 'jobtitle' => array('size' => 2*$i_size),
+ )
+ )
+ );
+
+ list($form_start, $form_end) = get_form_tags($attrib);
+ unset($attrib['form'], $attrib['name'], $attrib['size']);
+
+ // return the address edit form
+ $out = rcmail_contact_form($form, $record, $attrib);
+
+ return $form_start . $out . $form_end;
+}
function rcmail_contact_editform($attrib)
{
- global $RCMAIL, $CONTACTS, $OUTPUT;
+ global $RCMAIL, $CONTACT_COLTYPES;
- // check if we have a valid result
- if ($RCMAIL->action != 'add'
- && !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
- ) {
- $OUTPUT->show_message('contactnotfound');
- return false;
- }
+ $record = rcmail_get_edit_record();
// add some labels to client
- $OUTPUT->add_label('noemailwarning', 'nonamewarning');
+ $RCMAIL->output->add_label('noemailwarning', 'nonamewarning');
+
+ // copy (parsed) address template to client
+ if (preg_match_all('/\{([a-z0-9]+)\}([^{]*)/i', $RCMAIL->config->get('address_template', ''), $templ, PREG_SET_ORDER))
+ $RCMAIL->output->set_env('address_template', $templ);
$i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
- $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
+ $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 10;
$t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;
$form = array(
- 'info' => array(
- 'name' => rcube_label('contactproperties'),
+ 'contact' => array(
+ 'name' => rcube_label('properties'),
'content' => array(
- 'name' => array('type' => 'text', 'size' => $i_size),
- 'firstname' => array('type' => 'text', 'size' => $i_size),
- 'surname' => array('type' => 'text', 'size' => $i_size),
- 'email' => array('type' => 'text', 'size' => $i_size),
+ 'email' => array('size' => $i_size, 'visible' => true),
+ 'phone' => array('size' => $i_size, 'visible' => true),
+ 'address' => array('visible' => true),
+ 'website' => array('size' => $i_size),
+ 'im' => array('size' => $i_size),
+ ),
+ ),
+ 'personal' => array(
+ 'name' => rcube_label('personalinfo'),
+ 'content' => array(
+ 'gender' => array('visible' => true),
+ 'maidenname' => array('size' => $i_size),
+ 'birthday' => array('visible' => true),
+ 'anniversary' => array(),
+ 'manager' => array('size' => $i_size),
+ 'assistant' => array('size' => $i_size),
+ 'spouse' => array('size' => $i_size),
),
),
);
+ if (isset($CONTACT_COLTYPES['notes'])) {
+ $form['notes'] = array(
+ 'name' => rcube_label('notes'),
+ 'content' => array(
+ 'notes' => array('size' => $t_cols, 'rows' => $t_rows, 'label' => false, 'visible' => true, 'limit' => 1),
+ ),
+ 'single' => true,
+ );
+ }
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
// return the complete address edit form as table
- $out = rcmail_contact_form($form, $record);
+ $out = rcmail_contact_form($form, $record, $attrib);
return $form_start . $out . $form_end;
}
+function rcmail_upload_photo_form($attrib)
+{
+ global $OUTPUT;
+
+ // set defaults
+ $attrib += array('id' => 'rcmUploadform', 'buttons' => 'yes');
+
+ // find max filesize value
+ $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
+ $max_postsize = parse_bytes(ini_get('post_max_size'));
+ if ($max_postsize && $max_postsize < $max_filesize)
+ $max_filesize = $max_postsize;
+ $max_filesize = show_bytes($max_filesize);
+
+ $hidden = new html_hiddenfield(array('name' => '_cid', 'value' => $GLOBALS['cid']));
+ $input = new html_inputfield(array('type' => 'file', 'name' => '_photo', 'size' => $attrib['size']));
+ $button = new html_inputfield(array('type' => 'button'));
+
+ $out = html::div($attrib,
+ $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
+ $hidden->show() .
+ html::div(null, $input->show()) .
+ html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
+ (get_boolean($attrib['buttons']) ? html::div('buttons',
+ $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
+ $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('upload-photo', this.form)"))
+ ) : '')
+ )
+ );
+
+ $OUTPUT->add_label('addphoto','replacephoto');
+ $OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
+ return $out;
+}
// similar function as in /steps/settings/edit_identity.inc
function get_form_tags($attrib)
{
- global $CONTACTS, $EDIT_FORM, $RCMAIL;
+ global $CONTACTS, $EDIT_FORM, $RCMAIL, $SOURCE_ID;
$form_start = $form_end = '';
if (empty($EDIT_FORM)) {
- $hiddenfields = new html_hiddenfield(array(
- 'name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $hiddenfields = new html_hiddenfield();
+
+ if ($RCMAIL->action == 'edit')
+ $hiddenfields->add(array('name' => '_source', 'value' => $SOURCE_ID));
$hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id));
if (($result = $CONTACTS->get_result()) && ($record = $result->first()))
@@ -102,10 +238,39 @@
return array($form_start, $form_end);
}
+function rcmail_source_selector($attrib)
+{
+ global $RCMAIL, $SOURCE_ID;
-$OUTPUT->add_handler('contacteditform', 'rcmail_contact_editform');
+ $sources_list = $RCMAIL->get_address_sources(true);
-if (!$CONTACTS->get_result() && $OUTPUT->template_exists('contactadd'))
+ if (count($sources_list) < 2) {
+ $source = $sources_list[$SOURCE_ID];
+ $hiddenfield = new html_hiddenfield(array('name' => '_source', 'value' => $SOURCE_ID));
+ return html::span($attrib, Q($source['name']) . $hiddenfield->show());
+ }
+
+ $attrib['name'] = '_source';
+ $attrib['onchange'] = JS_OBJECT_NAME . ".command('save', 'reload', this.form)";
+
+ $select = new html_select($attrib);
+
+ foreach ($sources_list as $source)
+ $select->add($source['name'], $source['id']);
+
+ return $select->show($SOURCE_ID);
+}
+
+
+$OUTPUT->add_handlers(array(
+ 'contactedithead' => 'rcmail_contact_edithead',
+ 'contacteditform' => 'rcmail_contact_editform',
+ 'contactphoto' => 'rcmail_contact_photo',
+ 'photouploadform' => 'rcmail_upload_photo_form',
+ 'sourceselector' => 'rcmail_source_selector',
+));
+
+if ($RCMAIL->action == 'add' && $OUTPUT->template_exists('contactadd'))
$OUTPUT->send('contactadd');
// this will be executed if no template for addcontact exists
--
Gitblit v1.9.1