Merge pull request #2425 from annando/1603-ostatus

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 2a64c2e0518867098c69fa8865a2021544b7ac6a..734bf3471017dd49560daa474f68a718ed3d466c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -7,12 +7,13 @@ function message_init(&$a) {
 
        $tabs = '';
 
-       if (is_numeric($a->argv[1]))
+       if ($a->argc >1 && is_numeric($a->argv[1])) {
         $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+       }
 
        $new = array(
                'label' => t('New Message'),
-               'url' => $a->get_baseurl(true) . '/message/new',
+               'url' => 'message/new',
                'sel'=> ($a->argv[1] == 'new'),
                'accesskey' => 'm',
        );
@@ -89,7 +90,7 @@ function message_post(&$a) {
                $a->argv[1] = 'new';
        }
        else
-               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+               goaway($_SESSION['return_url']);
 
 }
 
@@ -181,7 +182,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(
@@ -220,7 +221,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];
@@ -233,7 +234,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",
@@ -264,7 +265,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']);
                }
 
        }
@@ -447,7 +448,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';
                        }
 
@@ -548,6 +549,8 @@ function render_messages($msg, $t) {
        $tpl = get_markup_template($t);
        $rslt = '';
 
+       $myprofile = 'profile/' . $a->user['nickname'];
+
        foreach($msg as $rr) {
 
                if($rr['unknown']) {
@@ -574,7 +577,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,