bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2544 from annando/issue-1769

Browse source 
Issue 1769: Some enhancements for sending wall mails
This commit is contained in:
Tobias Diekershoff 2016-05-30 14:35:04 +02:00
commit 2d280f55ac
11 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
mod/message.php
View file

@ -305,15 +305,29 @@ function message_content(&$a) {
$prename = $preurl = $preid = '';
if($preselect) {
$r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval(local_user()),
intval($a->argv[2])
);
if(!$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) {
$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)) {
$prename = $r[0]['name'];
$preurl = $r[0]['url'];
$preid = $r[0]['id'];
}
$preselect = array($preid);
} else
$preselect = false;
}
$prefill = (($preselect) ? $prename : '');
@ -342,7 +356,6 @@ function message_content(&$a) {
'$wait' => t('Please wait'),
'$submit' => t('Submit')
));
return $o;
}
@ -446,9 +459,11 @@ function message_content(&$a) {
if($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
}
else {
$from_url = 'redir/' . $message['contact-id'];
} elseif ($message['contact-id'] != 0) {
$from_url = 'redir/'.$message['contact-id'];
$sparkle = ' sparkle';
} else {
$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
$sparkle = ' sparkle';
}
@ -462,8 +477,7 @@ function message_content(&$a) {
$subject_e = template_escape($message['title']);
$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
$to_name_e = template_escape($message['name']);
}
else {
} else {
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$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("\n\n","\n",$body);
$ret = send_wallmessage($user, $body, $subject, $replyto);
switch($ret){
@ -68,8 +68,8 @@ function wallmessage_post(&$a) {
info( t('Message sent.') . EOL );
}
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
goaway('profile/'.$user['nickname']);
}