]> git.mxchange.org Git - friendica.git/blobdiff - mod/message.php
sn subscription fix
[friendica.git] / mod / message.php
index 0f56502566b0c90d065755d412a8d1acdf631abc..7ca3fba70af9e939b744ca45b9cdec7797162a22 100644 (file)
@@ -1,6 +1,36 @@
 <?php
 
 require_once('include/acl_selectors.php');
+require_once('include/message.php');
+
+function message_init(&$a) {
+       $tabs = array();
+       $new = array(
+               'label' => t('New Message'),
+               'url' => $a->get_baseurl(true) . '/message/new',
+               'sel'=> ($a->argv[1] == 'new'),
+       );
+       
+       $tpl = get_markup_template('message_side.tpl');
+       $a->page['aside'] = replace_macros($tpl, array(
+               '$tabs'=>$tabs,
+               '$new'=>$new,
+       ));
+       $base = $a->get_baseurl();
+
+       $head_tpl = get_markup_template('message-head.tpl');
+       $a->page['htmlhead'] .= replace_macros($head_tpl,array(
+               '$baseurl' => $a->get_baseurl(true),
+               '$base' => $base
+       ));
+
+       $end_tpl = get_markup_template('message-end.tpl');
+       $a->page['end'] .= replace_macros($end_tpl,array(
+               '$baseurl' => $a->get_baseurl(true),
+               '$base' => $base
+       ));
+       
+}
 
 function message_post(&$a) {
 
@@ -9,123 +39,146 @@ function message_post(&$a) {
                return;
        }
 
-       $replyto   = ((x($_POST,'replyto'))   ? notags(trim($_POST['replyto']))   : '');
-       $subject   = ((x($_POST,'subject'))   ? notags(trim($_POST['subject']))   : '');
-       $body      = ((x($_POST,'body'))      ? escape_tags(trim($_POST['body'])) : '');
-       $recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto'])       : 0 );
+       $replyto   = ((x($_REQUEST,'replyto'))   ? notags(trim($_REQUEST['replyto']))   : '');
+       $subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
+       $body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
+       $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
 
-       if(! $recipient) {
-               notice( t('No recipient selected.') . EOL );
-               return;
-       }
+       // Work around doubled linefeeds in Tinymce 3.5b2
 
-       if(! strlen($subject))
-               $subject = t('[no subject]');
+/*     $plaintext = intval(get_pconfig(local_user(),'system','plaintext') && !feature_enabled(local_user(),'richtext'));
+       if(! $plaintext) {
+               $body = fix_mce_lf($body);
+       }*/
+       $plaintext = intval(!feature_enabled(local_user(),'richtext'));
+       if(! $plaintext) {
+               $body = fix_mce_lf($body);
+       }
+       
+       $ret = send_message($recipient, $body, $subject, $replyto);
+       $norecip = false;
+
+       switch($ret){
+               case -1:
+                       notice( t('No recipient selected.') . EOL );
+                       $norecip = true;
+                       break;
+               case -2:
+                       notice( t('Unable to locate contact information.') . EOL );
+                       break;
+               case -3:
+                       notice( t('Message could not be sent.') . EOL );
+                       break;
+               case -4:
+                       notice( t('Message collection failure.') . EOL );
+                       break;
+               default:
+                       info( t('Message sent.') . EOL );
+       }
 
-       $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-               intval(local_user())
-       );
-       $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($recipient),
-                       intval(local_user())
-       );
+       // fake it to go back to the input form if no recipient listed
 
-       if(! (count($me) && (count($contact)))) {
-               notice( t('Unable to locate contact information.') . EOL );
-               return;
+       if($norecip) {
+               $a->argc = 2;
+               $a->argv[1] = 'new';
        }
 
-       $hash = random_string();
-       $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
-
-       if(! strlen($replyto))
-               $replyto = $uri;
-
-       $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`, 
-               `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
-               intval(local_user()),
-               dbesc($me[0]['name']),
-               dbesc($me[0]['thumb']),
-               dbesc($me[0]['url']),
-               intval($recipient),
-               dbesc($subject),
-               dbesc($body),
-               1,
-               0,
-               dbesc($uri),
-               dbesc($replyto),
-               datetime_convert()
-       );
-       $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
-               dbesc($uri),
-               intval(local_user())
-       );
-       if(count($r))
-               $post_id = $r[0]['id'];
-
-       /**
-        *
-        * When a photo was uploaded into the message using the (profile wall) ajax 
-        * uploader, The permissions are initially set to disallow anybody but the
-        * owner from seeing it. This is because the permissions may not yet have been
-        * set for the post. If it's private, the photo permissions should be set
-        * appropriately. But we didn't know the final permissions on the post until
-        * now. So now we'll look for links of uploaded messages that are in the
-        * post and set them to the same permissions as the post itself.
-        *
-        */
-
-       $match = null;
-
-       if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
-               $images = $match[1];
-               if(count($images)) {
-                       foreach($images as $image) {
-                               if(! stristr($image,$a->get_baseurl() . '/photo/'))
-                                       continue;
-                               $image_uri = substr($image,strrpos($image,'/') + 1);
-                               $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-                               $r = q("UPDATE `photo` SET `allow_cid` = '%s'
-                                       WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
-                                       dbesc('<' . $recipient . '>'),
-                                       dbesc($image_uri),
-                                       dbesc( t('Wall Photos')),
-                                       intval(local_user())
-                               ); 
-                       }
+}
+
+// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
+// is identical to the code in include/conversation.php
+if(! function_exists('item_extract_images')) {
+function item_extract_images($body) {
+
+       $saved_image = array();
+       $orig_body = $body;
+       $new_body = '';
+
+       $cnt = 0;
+       $img_start = strpos($orig_body, '[img');
+       $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
+       $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
+       while(($img_st_close !== false) && ($img_end !== false)) {
+
+               $img_st_close++; // make it point to AFTER the closing bracket
+               $img_end += $img_start;
+
+               if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+                       // This is an embedded image
+
+                       $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
+                       $new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]';
+
+                       $cnt++;
                }
+               else
+                       $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
+
+               $orig_body = substr($orig_body, $img_end + strlen('[/img]'));
+
+               if($orig_body === false) // in case the body ends on a closing image tag
+                       $orig_body = '';
+
+               $img_start = strpos($orig_body, '[img');
+               $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
+               $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
        }
-       
-       if($post_id) {
-               proc_run('php',"include/notifier.php","mail","$post_id");
-               notice( t('Message sent.') . EOL );
+
+       $new_body = $new_body . $orig_body;
+
+       return array('body' => $new_body, 'images' => $saved_image);
+}}
+
+if(! function_exists('item_redir_and_replace_images')) {
+function item_redir_and_replace_images($body, $images, $cid) {
+
+       $origbody = $body;
+       $newbody = '';
+
+       for($i = 0; $i < count($images); $i++) {
+               $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
+               $replace = '[url=' . z_path() . '/redir/' . $cid 
+                          . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
+
+               $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
+               $process_part = substr($origbody, 0, $img_end);
+               $origbody = substr($origbody, $img_end);
+
+               $process_part = preg_replace($search, $replace, $process_part);
+               $newbody = $newbody . $process_part;
        }
-       else {
-               notice( t('Message could not be sent.') . EOL );
+       $newbody = $newbody . $origbody;
+
+       $cnt = 0;
+       foreach($images as $image) {
+               // We're depending on the property of 'foreach' (specified on the PHP website) that
+               // it loops over the array starting from the first element and going sequentially
+               // to the last element
+               $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody);
+               $cnt++;
        }
-       return;
-}
+
+       return $newbody;
+}}
+
+
 
 function message_content(&$a) {
 
        $o = '';
-       $o .= '<script> $(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
+       nav_set_selected('messages');
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-
+       $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
-       $tpl = file_get_contents('view/mail_head.tpl');
+       $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
-               '$inbox' => t('Inbox'),
-               '$outbox' => t('Outbox'),
-               '$new' => t('New Message')
+               '$tab_content' => $tab_content
        ));
 
 
@@ -139,105 +192,188 @@ function message_content(&$a) {
                                intval(local_user())
                        );
                        if($r) {
-                               notice( t('Message deleted.') . EOL );
+                               info( t('Message deleted.') . EOL );
                        }
-                       goaway($a->get_baseurl() . '/message' );
+                       goaway($a->get_baseurl(true) . '/message' );
                }
                else {
-                       $r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
                                intval(local_user())
                        );
                        if(count($r)) {
                                $parent = $r[0]['parent-uri'];
+                               $convid = $r[0]['convid'];
+
                                $r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                        dbesc($parent),
                                        intval(local_user())
                                );
+
+                               // remove diaspora conversation pointer
+                               // Actually if we do this, we can never receive another reply to that conversation,
+                               // as we will never again have the info we need to re-create it. 
+                               // We'll just have to orphan it. 
+
+                               //if($convid) {
+                               //      q("delete from conv where id = %d limit 1",
+                               //              intval($convid)
+                               //      );
+                               //}
+
                                if($r)
-                                       notice( t('Conversation removed.') . EOL );
+                                       info( t('Conversation removed.') . EOL );
                        } 
-                       goaway($a->get_baseurl() . '/message' );
+                       goaway($a->get_baseurl(true) . '/message' );
                }       
        
        }
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
-               $tpl = file_get_contents('view/msg-header.tpl');
+               $o .= $header;
+               
+/*             $plaintext = false;
+               if(intval(get_pconfig(local_user(),'system','plaintext')))
+                       $plaintext = true;*/
+               $plaintext = true;
+               if( local_user() && feature_enabled(local_user(),'richtext') )
+                       $plaintext = false;
 
+
+               $tpl = get_markup_template('msg-header.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(),
+                       '$baseurl' => $a->get_baseurl(true),
+                       '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
                ));
        
-               $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+               $tpl = get_markup_template('msg-end.tpl');
+               $a->page['end'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(true),
+                       '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+                       '$nickname' => $a->user['nickname'],
+                       '$linkurl' => t('Please enter a link URL:')
+               ));
        
-               $select = contact_select('messageto','message-to-select', $preselect, 4, true);
-               $tpl = file_get_contents('view/prv_message.tpl');
-               $o .= replace_macros($tpl,array(
-                       '$header' => t('Send Private Message'),
-                       '$to' => t('To:'),
-                       '$subject' => t('Subject:'),
-                       '$subjtxt' => '',
-                       '$readonly' => '',
-                       '$yourmessage' => t('Your message:'),
-                       '$select' => $select,
-                       '$parent' => '',
-                       '$upload' => t('Upload photo'),
-                       '$insert' => t('Insert web link'),
-                       '$wait' => t('Please wait')
+               $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+                       
 
+               $prename = $preurl = $preid = '';
+
+               if($preselect) {
+                       $r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
+                               intval(local_user()),
+                               intval($a->argv[2])
+                       );
+                       if(count($r)) {
+                               $prename = $r[0]['name'];
+                               $preurl = $r[0]['url'];
+                               $preid = $r[0]['id'];
+                       }
+               }        
+
+               $prefill = (($preselect) ? $prename  : '');
+
+               // the ugly select box
+               
+               $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+
+               $tpl = get_markup_template('prv_message.tpl');
+               $o .= replace_macros($tpl,array(
+                       '$reply' => array(
+                               'header' => t('Send Private Message'),
+                               'to' => t('To:'),
+                               'showinputs' => 'true', 
+                               'prefill' => $prefill,
+                               'autocomp' => $autocomp,
+                               'preid' => $preid,
+                               'subject' => t('Subject:'),
+                               'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+                               'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+                               'readonly' => '',
+                               'yourmessage' => t('Your message:'),
+                               'select' => $select,
+                               'parent' => '',
+                               'upload' => t('Upload photo'),
+                               'insert' => t('Insert web link'),
+                               'wait' => t('Please wait'),
+                               'submit' => t('Submit')
+                       )
                ));
 
                return $o;
        }
 
-       if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
+       if($a->argc == 1) {
+
+               // list messages
 
                $o .= $header;
-               
-               if($a->argc == 2)
-                       $eq = '='; // I'm not going to bother escaping this.
-               else
-                       $eq = '!='; // or this.
 
+               
                $r = q("SELECT count(*) AS `total` FROM `mail` 
-                       WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
+                       WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
                        intval(local_user()),
                        dbesc($myprofile)
                );
                if(count($r))
                        $a->set_pager_total($r[0]['total']);
-       
+
                $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
-                       `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
+                       `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
+                       count( * ) as count
                        FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
-                       WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC  LIMIT %d , %d ",
+                       WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
                        intval(local_user()),
-                       dbesc($myprofile),
+                       //
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
                );
+
                if(! count($r)) {
-                       notice( t('No messages.') . EOL);
+                       info( t('No messages.') . EOL);
                        return $o;
                }
 
-               $tpl = file_get_contents('view/mail_list.tpl');
+               $tpl = get_markup_template('mail_list.tpl');
                foreach($r as $rr) {
+                       if($rr['unknown']) {
+                               $partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+                       }
+                       elseif (link_compare($rr['from-url'],$myprofile)){
+                               $partecipants = sprintf( t("You and %s"), $rr['name']);
+                       }
+                       else {
+                               $partecipants = sprintf( t("%s and You"), $rr['from-name']);
+                       }
+
+                       if($a->theme['template_engine'] === 'internal') {
+                               $subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
+                               $body_e = template_escape($rr['body']);
+                               $to_name_e = template_escape($rr['name']);
+                       }
+                       else {
+                               $subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
+                               $body_e = $rr['body'];
+                               $to_name_e = $rr['name'];
+                       }
+                       
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
-                               '$from_name' =>$rr['from-name'],
-                               '$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
+                               '$from_name' => $partecipants,
+                               '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
                                '$sparkle' => ' sparkle',
-                               '$from_photo' => $rr['thumb'],
-                               '$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+                               '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
+                               '$subject' => $subject_e,
                                '$delete' => t('Delete conversation'),
-                               '$body' => $rr['body'],
-                               '$to_name' => $rr['name'],
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A'))
+                               '$body' => $body_e,
+                               '$to_name' => $to_name_e,
+                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
+                                '$ago' => relative_date($rr['mailcreated']),
+                               '$seen' => $rr['mailseen'],
+                               '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
                        ));
                }
                $o .= paginate($a);     
@@ -248,6 +384,10 @@ function message_content(&$a) {
 
                $o .= $header;
 
+               $plaintext = true;
+               if( local_user() && feature_enabled(local_user(),'richtext') )
+                       $plaintext = false;
+
                $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
                        FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
                        WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
@@ -256,11 +396,19 @@ function message_content(&$a) {
                );
                if(count($r)) { 
                        $contact_id = $r[0]['contact-id'];
+                       $convid = $r[0]['convid'];
+
+                       $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
+                       if($convid)
+                               $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
+                                       dbesc($r[0]['parent-uri']),
+                                       intval($convid)
+                               );  
+
                        $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
                                FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
-                               WHERE `mail`.`uid` = %d AND `mail`.`parent-uri` = '%s' ORDER BY `mail`.`created` ASC",
-                               intval(local_user()),
-                               dbesc($r[0]['parent-uri'])
+                               WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
+                               intval(local_user())
                        );
                }
                if(! count($messages)) {
@@ -275,57 +423,123 @@ function message_content(&$a) {
 
                require_once("include/bbcode.php");
 
-               $tpl = file_get_contents('view/msg-header.tpl');
-       
+               $tpl = get_markup_template('msg-header.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(true),
+                       '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+                       '$nickname' => $a->user['nickname'],
+                       '$linkurl' => t('Please enter a link URL:')
+               ));
+
+               $tpl = get_markup_template('msg-end.tpl');
+               $a->page['end'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(true),
+                       '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
-                       '$baseurl' => $a->get_baseurl()
+                       '$linkurl' => t('Please enter a link URL:')
                ));
 
 
-               $tpl = file_get_contents('view/mail_conv.tpl');
+               $mails = array();
+               $seen = 0;
+               $unknown = false;
+
                foreach($messages as $message) {
+                       if($message['unknown'])
+                               $unknown = true;
                        if($message['from-url'] == $myprofile) {
                                $from_url = $myprofile;
                                $sparkle = '';
                        }
                        else {
-                               $from_url = $a->get_baseurl() . '/redir/' . $message['contact-id'];
+                               $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
                                $sparkle = ' sparkle';
                        }
-                       $o .= replace_macros($tpl, array(
-                               '$id' => $message['id'],
-                               '$from_name' =>$message['from-name'],
-                               '$from_url' => $from_url,
-                               '$sparkle' => $sparkle,
-                               '$from_photo' => $message['from-photo'],
-                               '$subject' => $message['title'],
-                               '$body' => smilies(bbcode($message['body'])),
-                               '$delete' => t('Delete message'),
-                               '$to_name' => $message['name'],
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')
-                       ));
+
+
+                       $extracted = item_extract_images($message['body']);
+                       if($extracted['images'])
+                               $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
+
+                       if($a->theme['template_engine'] === 'internal') {
+                               $from_name_e = template_escape($message['from-name']);
+                               $subject_e = template_escape($message['title']);
+                               $body_e = template_escape(smilies(bbcode($message['body'])));
+                               $to_name_e = template_escape($message['name']);
+                       }
+                       else {
+                               $from_name_e = $message['from-name'];
+                               $subject_e = $message['title'];
+                               $body_e = smilies(bbcode($message['body']));
+                               $to_name_e = $message['name'];
+                       }
+
+                       $mails[] = array(
+                               'id' => $message['id'],
+                               'from_name' => $from_name_e,
+                               'from_url' => $from_url,
+                               'sparkle' => $sparkle,
+                               'from_photo' => $message['from-photo'],
+                               'subject' => $subject_e,
+                               'body' => $body_e,
+                               'delete' => t('Delete message'),
+                               'to_name' => $to_name_e,
+                               'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+                                'ago' => relative_date($message['created']),
+                       );
                                
+                       $seen = $message['seen'];
                }
+
+
                $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-               $tpl = file_get_contents('view/prv_message.tpl');
-               $o .= replace_macros($tpl,array(
-                       '$header' => t('Send Reply'),
-                       '$to' => t('To:'),
-                       '$subject' => t('Subject:'),
-                       '$subjtxt' => $message['title'],
-                       '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-                       '$yourmessage' => t('Your message:'),
-                       '$select' => $select,
-                       '$parent' => $parent,
-                       '$upload' => t('Upload photo'),
-                       '$insert' => t('Insert web link'),
-                       '$wait' => t('Please wait')
+
+               $tpl = get_markup_template('mail_display.tpl');
+
+               $includes = array(
+                       '$mail_conv' => 'mail_conv.tpl',
+                       '$prv_message' => 'prv_message.tpl',
+               );
+               $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+               if($a->theme['template_engine'] === 'internal') {
+                       $subjtxt_e = template_escape($message['title']);
+               }
+               else {
+                       $subjtxt_e = $message['title'];
+               }
+
+               $o = replace_macros($tpl, $includes + array(
+                       '$thread_id' => $a->argv[1],
+                       '$thread_subject' => $message['title'],
+                       '$thread_seen' => $seen,
+                       '$delete' =>  t('Delete conversation'),
+                       '$canreply' => (($unknown) ? false : '1'),
+                       '$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),                        
+                       '$mails' => $mails,
+                       
+                       // reply
+                       '$reply_info' => array(
+                               'header' => t('Send Reply'),
+                               'to' => t('To:'),
+                               'showinputs' => '',
+                               'subject' => t('Subject:'),
+                               'subjtxt' => $subjtxt_e,
+                               'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+                               'yourmessage' => t('Your message:'),
+                               'text' => '',
+                               'select' => $select,
+                               'parent' => $parent,
+                               'upload' => t('Upload photo'),
+                               'insert' => t('Insert web link'),
+                               'submit' => t('Submit'),
+                               'wait' => t('Please wait'),
+                       ),
 
                ));
 
                return $o;
        }
 
-}
\ No newline at end of file
+}