Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index f0ab7d2ac907683519cfa1bd1a7bb1d12a8089bf..5f5f9f98efbd8f432048fcf2dc1f7ec87a6f7d5d 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -4,12 +4,12 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 require_once('include/Smilies.php');
 
-function message_init(&$a) {
+function message_init(App $a) {
 
        $tabs = '';
 
        if ($a->argc >1 && is_numeric($a->argv[1])) {
-        $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+               $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
        }
 
        $new = array(
@@ -24,25 +24,25 @@ function message_init(&$a) {
                '$tabs'=>$tabs,
                '$new'=>$new,
        ));
-       $base = $a->get_baseurl();
+       $base = App::get_baseurl();
 
        $head_tpl = get_markup_template('message-head.tpl');
        $a->page['htmlhead'] .= replace_macros($head_tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => App::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),
+               '$baseurl' => App::get_baseurl(true),
                '$base' => $base
        ));
 
 }
 
-function message_post(&$a) {
+function message_post(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -160,7 +160,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
        $newbody = $newbody . $origbody;
 
        $cnt = 0;
-       foreach($images as $image) {
+       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
@@ -173,17 +173,17 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
 
 
-function message_content(&$a) {
+function message_content(App $a) {
 
        $o = '';
        nav_set_selected('messages');
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
+       $myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
 
        $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
@@ -231,10 +231,10 @@ function message_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if($r) {
+                       if ($r) {
                                info( t('Message deleted.') . EOL );
                        }
-                       //goaway($a->get_baseurl(true) . '/message' );
+                       //goaway(App::get_baseurl(true) . '/message' );
                        goaway($_SESSION['return_url']);
                }
                else {
@@ -242,7 +242,7 @@ function message_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if(count($r)) {
+                       if (dbm::is_result($r)) {
                                $parent = $r[0]['parent-uri'];
                                $convid = $r[0]['convid'];
 
@@ -265,7 +265,7 @@ function message_content(&$a) {
                                if($r)
                                        info( t('Conversation removed.') . EOL );
                        }
-                       //goaway($a->get_baseurl(true) . '/message' );
+                       //goaway(App::get_baseurl(true) . '/message' );
                        goaway($_SESSION['return_url']);
                }
 
@@ -285,7 +285,7 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('msg-header.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
@@ -293,7 +293,7 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('msg-end.tpl');
                $a->page['end'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
@@ -309,19 +309,21 @@ function message_content(&$a) {
                                intval(local_user()),
                                intval($a->argv[2])
                        );
-                       if(!$r) {
+                       if (!dbm::is_result($r)) {
                                $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
                                        intval(local_user()),
                                        dbesc(normalise_link(base64_decode($a->argv[2])))
                                );
                        }
-                       if(!$r) {
+
+                       if (!dbm::is_result($r)) {
                                $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
                                        intval(local_user()),
                                        dbesc(base64_decode($a->argv[2]))
                                );
                        }
-                       if(count($r)) {
+
+                       if (dbm::is_result($r)) {
                                $prename = $r[0]['name'];
                                $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
@@ -362,7 +364,7 @@ function message_content(&$a) {
 
        $_SESSION['return_url'] = $a->query_string;
 
-       if($a->argc == 1) {
+       if ($a->argc == 1) {
 
                // List messages
 
@@ -373,11 +375,13 @@ function message_content(&$a) {
                        intval(local_user())
                );
 
-               if(count($r)) $a->set_pager_total($r[0]['total']);
+               if (dbm::is_result($r)) {
+                       $a->set_pager_total($r[0]['total']);
+               }
 
                $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        info( t('No messages.') . EOL);
                        return $o;
                }
@@ -403,7 +407,7 @@ function message_content(&$a) {
                        intval(local_user()),
                        intval($a->argv[1])
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $contact_id = $r[0]['contact-id'];
                        $convid = $r[0]['convid'];
 
@@ -434,7 +438,7 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('msg-header.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
@@ -442,7 +446,7 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('msg-end.tpl');
                $a->page['end'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
@@ -484,12 +488,18 @@ function message_content(&$a) {
                                $to_name_e = $message['name'];
                        }
 
+                       $contact = get_contact_details_by_url($message['from-url']);
+                       if (isset($contact["thumb"]))
+                               $from_photo = $contact["thumb"];
+                       else
+                               $from_photo = $message['from-photo'];
+
                        $mails[] = array(
                                'id' => $message['id'],
                                'from_name' => $from_name_e,
                                'from_url' => $from_url,
                                'sparkle' => $sparkle,
-                               'from_photo' => $message['from-photo'],
+                               'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
                                'subject' => $subject_e,
                                'body' => $body_e,
                                'delete' => t('Delete message'),
@@ -556,14 +566,14 @@ function get_messages($user, $lstart, $lend) {
        );
 }
 
-function render_messages($msg, $t) {
+function render_messages(array $msg, $t) {
 
        $a = get_app();
 
        $tpl = get_markup_template($t);
        $rslt = '';
 
-       $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
+       $myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
 
        foreach($msg as $rr) {
 
@@ -585,12 +595,18 @@ function render_messages($msg, $t) {
                        $to_name_e = $rr['name'];
                }
 
+               $contact = get_contact_details_by_url($rr['url']);
+               if (isset($contact["thumb"]))
+                       $from_photo = $contact["thumb"];
+               else
+                       $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']);
+
                $rslt .= replace_macros($tpl, array(
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
                        '$sparkle' => ' sparkle',
-                       '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
+                       '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
                        '$subject' => $subject_e,
                        '$delete' => t('Delete conversation'),
                        '$body' => $body_e,