Merge pull request #2425 from annando/1603-ostatus

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 1f11797d8b9ac6255c4e8a6b1a46e1f3d4c5489b..734bf3471017dd49560daa474f68a718ed3d466c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -3,7 +3,6 @@
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
 
-if(! function_exists('message_init')) {
 function message_init(&$a) {
 
        $tabs = '';
@@ -14,7 +13,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',
        );
@@ -37,10 +36,9 @@ function message_init(&$a) {
                '$baseurl' => $a->get_baseurl(true),
                '$base' => $base
        ));
-}
+
 }
 
-if(! function_exists('message_post')) {
 function message_post(&$a) {
 
        if(! local_user()) {
@@ -92,8 +90,8 @@ function message_post(&$a) {
                $a->argv[1] = 'new';
        }
        else
-               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
-}
+               goaway($_SESSION['return_url']);
+
 }
 
 // Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
@@ -173,7 +171,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 }}
 
 
-if(! function_exists('message_content')) {
+
 function message_content(&$a) {
 
        $o = '';
@@ -184,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(
@@ -223,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];
@@ -236,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",
@@ -267,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']);
                }
 
        }
@@ -450,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';
                        }
 
@@ -532,9 +530,7 @@ function message_content(&$a) {
                return $o;
        }
 }
-}
 
-if(! function_exists('get_messages')) {
 function get_messages($user, $lstart, $lend) {
 
        return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
@@ -545,9 +541,7 @@ function get_messages($user, $lstart, $lend) {
                intval($user), intval($lstart), intval($lend)
        );
 }
-}
 
-if(! function_exists('render_messages')) {
 function render_messages($msg, $t) {
 
        $a = get_app();
@@ -555,7 +549,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) {
 
@@ -583,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,
@@ -599,4 +593,3 @@ function render_messages($msg, $t) {
 
        return $rslt;
 }
-}