From 0501b637a3177cce441166b5fcfe27c9bd9fbe0f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 18 Jan 2011 13:00:57 -0500
Subject: [PATCH] Merge branch devel-addressbook (r4193:4382) back into trunk
---
program/steps/addressbook/show.inc | 135 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 43ded2a..eb26450 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -25,8 +25,30 @@
$OUTPUT->set_env('cid', $record['ID']);
}
+// return raw photo of the given contact
+if ($RCMAIL->action == 'photo') {
+ if (($file_id = get_input_value('_photo', RCUBE_INPUT_GPC)) && ($tempfile = $_SESSION['contacts']['files'][$file_id])) {
+ $tempfile = $RCMAIL->plugins->exec_hook('attachment_display', $tempfile);
+ if ($tempfile['status']) {
+ if ($tempfile['data'])
+ $data = $tempfile['data'];
+ else if ($tempfile['path'])
+ $data = file_get_contents($tempfile['path']);
+ }
+ }
+ else if ($record['photo']) {
+ $data = is_array($record['photo']) ? $record['photo'][0] : $record['photo'];
+ if (!preg_match('![^a-z0-9/=+-]!i', $data))
+ $data = base64_decode($data, true);
+ }
+
+ header('Content-Type: ' . rc_image_content_type($data));
+ echo $data ? $data : file_get_contents('program/blank.gif');
+ exit;
+}
-function rcmail_contact_details($attrib)
+
+function rcmail_contact_head($attrib)
{
global $CONTACTS, $RCMAIL;
@@ -36,51 +58,96 @@
return false;
}
- $i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
- $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
- $t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;
-
$microformats = array('name' => 'fn', 'email' => 'email');
+
+ $form = array(
+ 'head' => array( // section 'head' is magic!
+ 'content' => array(
+ 'prefix' => array('type' => 'text'),
+ 'firstname' => array('type' => 'text'),
+ 'middlename' => array('type' => 'text'),
+ 'surname' => array('type' => 'text'),
+ 'suffix' => array('type' => 'text'),
+ ),
+ ),
+ );
+
+ unset($attrib['name']);
+ return rcmail_contact_form($form, $record, $attrib);
+}
+
+
+function rcmail_contact_details($attrib)
+{
+ global $CONTACTS, $RCMAIL, $CONTACT_COLTYPES;
+
+ // check if we have a valid result
+ if (!(($result = $CONTACTS->get_result()) && ($record = $result->first()))) {
+ //$RCMAIL->output->show_message('contactnotfound');
+ return false;
+ }
+
+ $i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
$form = array(
'info' => array(
'name' => rcube_label('contactproperties'),
'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),
+ 'gender' => array('size' => $i_size),
+ 'maidenname' => array('size' => $i_size),
+ 'email' => array('size' => $i_size, 'render_func' => 'rcmail_render_email_value'),
+ 'phone' => array('size' => $i_size),
+ 'address' => array(),
+ 'birthday' => array('size' => $i_size),
+ 'anniversary' => array('size' => $i_size),
+ 'website' => array('size' => $i_size, 'render_func' => 'rcmail_render_url_value'),
+ 'im' => array('size' => $i_size),
+ 'manager' => array('size' => $i_size),
+ 'assistant' => array('size' => $i_size),
+ 'spouse' => array('size' => $i_size),
),
),
- 'groups' => array(
- 'name' => rcube_label('groups'),
- 'content' => '',
- ),
);
-
- // Get content of groups fieldset
- if ($groups = rcmail_contact_record_groups($record['ID'])) {
- $form['groups']['content'] = $groups;
+
+ if (isset($CONTACT_COLTYPES['notes'])) {
+ $form['notes'] = array(
+ 'name' => rcube_label('notes'),
+ 'content' => array(
+ 'notes' => array('type' => 'textarea', 'label' => false),
+ ),
+ );
}
- else {
- unset($form['groups']);
- }
-
- if (!empty($record['email'])) {
- $form['info']['content']['email']['value'] = html::a(array(
- 'href' => 'mailto:' . $record['email'],
- 'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($record['email'])),
- 'title' => rcube_label('composeto'),
- 'class' => $microformats['email'],
- ), Q($record['email']));
- }
- foreach (array('name', 'firstname', 'surname') as $col) {
- if ($record[$col]) {
- $form['info']['content'][$col]['value'] = html::span($microformats[$col], Q($record[$col]));
- }
+
+ if ($CONTACTS->groups) {
+ $form['groups'] = array(
+ 'name' => rcube_label('groups'),
+ 'content' => rcmail_contact_record_groups($record['ID']),
+ );
}
return rcmail_contact_form($form, $record);
+}
+
+
+function rcmail_render_email_value($email, $col)
+{
+ return html::a(array(
+ 'href' => 'mailto:' . $email,
+ 'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($email)),
+ 'title' => rcube_label('composeto'),
+ 'class' => 'email',
+ ), Q($email));
+}
+
+
+function rcmail_render_url_value($url, $col)
+{
+ $prefix = preg_match('![htfps]+://!', $url) ? '' : 'http://';
+ return html::a(array(
+ 'href' => $prefix . $url,
+ 'target' => '_blank',
+ 'class' => 'url',
+ ), Q($url));
}
@@ -124,6 +191,8 @@
//$OUTPUT->framed = $_framed;
+$OUTPUT->add_handler('contacthead', 'rcmail_contact_head');
$OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');
+$OUTPUT->add_handler('contactphoto', 'rcmail_contact_photo');
$OUTPUT->send('contact');
--
Gitblit v1.9.1