clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 1769: Some enhancements for sending wall mails

This commit is contained in:
Michael Vogel 2016-05-29 19:35:23 +02:00
parent d40f32cc55
commit 77f7619720
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/message.php
View File

@ -446,9 +446,11 @@ function message_content(&$a) {
if($message['from-url'] == $myprofile) { if($message['from-url'] == $myprofile) {
$from_url = $myprofile; $from_url = $myprofile;
$sparkle = ''; $sparkle = '';
} } elseif ($message['contact-id'] != 0) {
else { $from_url = 'redir/'.$message['contact-id'];
$from_url = 'redir/' . $message['contact-id']; $sparkle = ' sparkle';
} else {
$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} }
@ -462,8 +464,7 @@ function message_content(&$a) {
$subject_e = template_escape($message['title']); $subject_e = template_escape($message['title']);
$body_e = template_escape(Smilies::replace(bbcode($message['body']))); $body_e = template_escape(Smilies::replace(bbcode($message['body'])));
$to_name_e = template_escape($message['name']); $to_name_e = template_escape($message['name']);
} } else {
else {
$from_name_e = $message['from-name']; $from_name_e = $message['from-name'];
$subject_e = $message['title']; $subject_e = $message['title'];
$body_e = Smilies::replace(bbcode($message['body'])); $body_e = Smilies::replace(bbcode($message['body']));

6
mod/wallmessage.php
View File

@ -48,7 +48,7 @@ function wallmessage_post(&$a) {
$body = str_replace("\r\n","\n",$body); $body = str_replace("\r\n","\n",$body);
$body = str_replace("\n\n","\n",$body); $body = str_replace("\n\n","\n",$body);
$ret = send_wallmessage($user, $body, $subject, $replyto); $ret = send_wallmessage($user, $body, $subject, $replyto);
switch($ret){ switch($ret){
@ -68,8 +68,8 @@ function wallmessage_post(&$a) {
info( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']); goaway('profile/'.$user['nickname']);
} }