Merge pull request #2465 from annando/1604-no-unknown

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 1724ebc424e7ac048cd68cb25195eddc4c78e772..8c4151542d1185d476ebc84f5a21f5072cebd13f 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,6 +2,7 @@
 
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
+require_once('include/Smilies.php');
 
 function message_init(&$a) {
 
@@ -13,7 +14,7 @@ function message_init(&$a) {
 
        $new = array(
                'label' => t('New Message'),
-               'url' => $a->get_baseurl(true) . '/message/new',
+               'url' => 'message/new',
                'sel'=> ($a->argv[1] == 'new'),
                'accesskey' => 'm',
        );
@@ -90,7 +91,7 @@ function message_post(&$a) {
                $a->argv[1] = 'new';
        }
        else
-               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+               goaway($_SESSION['return_url']);
 
 }
 
@@ -182,7 +183,7 @@ function message_content(&$a) {
                return;
        }
 
-       $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+       $myprofile = 'profile/' . $a->user['nickname'];
 
        $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
@@ -221,7 +222,7 @@ function message_content(&$a) {
                }
                // Now check how the user responded to the confirmation query
                if($_REQUEST['canceled']) {
-                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                       goaway($_SESSION['return_url']);
                }
 
                $cmd = $a->argv[1];
@@ -234,7 +235,7 @@ function message_content(&$a) {
                                info( t('Message deleted.') . EOL );
                        }
                        //goaway($a->get_baseurl(true) . '/message' );
-                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                       goaway($_SESSION['return_url']);
                }
                else {
                        $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -265,7 +266,7 @@ function message_content(&$a) {
                                        info( t('Conversation removed.') . EOL );
                        }
                        //goaway($a->get_baseurl(true) . '/message' );
-                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                       goaway($_SESSION['return_url']);
                }
 
        }
@@ -448,7 +449,7 @@ function message_content(&$a) {
                                $sparkle = '';
                        }
                        else {
-                               $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
+                               $from_url = 'redir/' . $message['contact-id'];
                                $sparkle = ' sparkle';
                        }
 
@@ -460,13 +461,13 @@ function message_content(&$a) {
                        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'])));
+                               $body_e = template_escape(Smilies::replace(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']));
+                               $body_e = Smilies::replace(bbcode($message['body']));
                                $to_name_e = $message['name'];
                        }
 
@@ -549,7 +550,7 @@ function render_messages($msg, $t) {
        $tpl = get_markup_template($t);
        $rslt = '';
 
-       $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+       $myprofile = 'profile/' . $a->user['nickname'];
 
        foreach($msg as $rr) {
 
@@ -577,7 +578,7 @@ function render_messages($msg, $t) {
                $rslt .= replace_macros($tpl, array(
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
-                       '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
+                       '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
                        '$sparkle' => ' sparkle',
                        '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
                        '$subject' => $subject_e,