Thomas Bruederli
2012-07-13 384948886c4a1bedb17318af63c944c33ae0b3b6
Prepare to show contact photo of email sender in mail views
3 files modified
52 ■■■■■ changed files
program/steps/addressbook/func.inc 6 ●●●● patch | view | raw | blame | history
program/steps/addressbook/show.inc 32 ●●●●● patch | view | raw | blame | history
program/steps/mail/show.inc 14 ●●●●● patch | view | raw | blame | history
program/steps/addressbook/func.inc
@@ -709,7 +709,11 @@
    $RCMAIL->output->set_env('photo_placeholder', $photo_img);
    unset($attrib['placeholder']);
    if (preg_match('!^https?://!i', $record['photo']))
    $plugin = $RCMAIL->plugins->exec_hook('contact_photo', array('record' => $record, 'data' => $record['photo']));
    if ($plugin['url'])
        $photo_img = $plugin['url'];
    else if (preg_match('!^https?://!i', $record['photo']))
        $photo_img = $record['photo'];
    else if ($record['photo'])
        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID));
program/steps/addressbook/show.inc
@@ -22,7 +22,7 @@
// Get contact ID and source ID from request
$cids   = rcmail_get_cids();
$source = key($cids);
$cid    = array_shift($cids[$source]);
$cid    = $cids ? array_shift($cids[$source]) : null;
// Initialize addressbook source
$CONTACTS  = rcmail_contact_source($source, true);
@@ -39,6 +39,19 @@
// return raw photo of the given contact
if ($RCMAIL->action == 'photo') {
    // search for contact first
    if (!$record && ($email = get_input_value('_email', RCUBE_INPUT_GPC))) {
        foreach ($RCMAIL->get_address_sources() as $s) {
            $abook = $RCMAIL->get_address_book($s['id']);
            $result = $abook->search(array('email'), $email, 1, true, true, 'photo');
            while ($result && ($record = $result->iterate())) {
                if ($record['photo'])
                    break 2;
            }
        }
    }
    // read the referenced file
    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']) {
@@ -54,6 +67,23 @@
            $data = base64_decode($data, true);
    }
    // let plugins do fancy things with contact photos
    $plugin = $RCMAIL->plugins->exec_hook('contact_photo', array('record' => $record, 'email' => $email, 'data' => $data));
    // redirect to url provided by a plugin
    if ($plugin['url'])
        $RCMAIL->output->redirect($plugin['url']);
    else
        $data = $plugin['data'];
    // deliver alt image
    if (!$data && ($alt_img = get_input_value('_alt', RCUBE_INPUT_GPC)) && is_file($alt_img))
        $data = file_get_contents($alt_img);
    // cache for one day if requested by email
    if (!$cid && $email)
        $RCMAIL->output->future_expire_header(86400);
    header('Content-Type: ' . rc_image_content_type($data));
    echo $data ? $data : file_get_contents('program/blank.gif');
    exit;
program/steps/mail/show.inc
@@ -266,11 +266,25 @@
  return false;
}
function rcmail_message_contactphoto($attrib)
{
  global $RCMAIL, $MESSAGE;
  $placeholder = $attrib['placeholder'] ? $RCMAIL->config->get('skin_path') . $attrib['placeholder'] : null;
  if ($MESSAGE->sender)
    $photo_img = $RCMAIL->url(array('_task' => 'addressbook', '_action' => 'photo', '_email' => $MESSAGE->sender['mailto'], '_alt' => $placeholder));
  else
    $photo_img = $placeholder ? $placeholder : 'program/blank.gif';
  return html::img(array('src' => $photo_img) + $attrib);
}
$OUTPUT->add_handlers(array(
  'messageattachments' => 'rcmail_message_attachments',
  'mailboxname' => 'rcmail_mailbox_name_display',
  'messageobjects' => 'rcmail_message_objects',
  'contactphoto' => 'rcmail_message_contactphoto',
));