linkify - need at least one character after ://

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 3f5b71cc2f34bb50eedab36e26648a35b5ff1948..9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -47,8 +47,8 @@ function message_post(&$a) {
                $replyto = $uri;
 
        $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`, 
-               `contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
+               `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']),
@@ -56,7 +56,6 @@ function message_post(&$a) {
                intval($recipient),
                dbesc($subject),
                dbesc($body),
-               0,
                1,
                0,
                dbesc($uri),
@@ -138,16 +137,6 @@ function message_content(&$a) {
                }       
        
        }
-       if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
-               $post_id = intval($a->argv[2]);
-               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" & ",
-                       array(),$foo));
-               goaway($a->get_baseurl() . '/message' );
-       }
-
-
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
@@ -213,7 +202,7 @@ function message_content(&$a) {
                                '$from_name' =>$rr['from-name'],
                                '$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
                                '$sparkle' => ' sparkle',
-                               '$from_photo' => $rr['from-photo'],
+                               '$from_photo' => $rr['thumb'],
                                '$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
                                '$delete' => t('Delete conversation'),
                                '$body' => $rr['body'],
@@ -258,7 +247,10 @@ function message_content(&$a) {
 
                $tpl = load_view_file('view/msg-header.tpl');
        
-               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+               $a->page['htmlhead'] .= replace_macros($tpl, array(
+                       '$nickname' => $a->user['nickname'],
+                       '$baseurl' => $a->get_baseurl()
+               ));
 
 
                $tpl = load_view_file('view/mail_conv.tpl');
@@ -278,7 +270,7 @@ function message_content(&$a) {
                                '$sparkle' => $sparkle,
                                '$from_photo' => $message['from-photo'],
                                '$subject' => $message['title'],
-                               '$body' => bbcode($message['body']),
+                               '$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')