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

mod/message return to conversation if message deleted

This commit is contained in:
Jonny Tischbein 2018-10-02 13:16:43 +02:00
parent 57fe36e9a3
commit 9915523490
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/message.php
View File

@ -165,11 +165,23 @@ function message_content(App $a)
$cmd = $a->argv[1]; $cmd = $a->argv[1];
if ($cmd === 'drop') { if ($cmd === 'drop') {
$r = DBA::SelectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
if(!DBA::isResult($r)){
info(L10n::t('Conversation not founded.') . EOL);
goaway('/message');
}
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
info(L10n::t('Message deleted.') . EOL); info(L10n::t('Message deleted.') . EOL);
} }
$rr = DBA::SelectFirst('mail', ['id'], ['convid' => $r['convid'], 'uid' => local_user()]);
if(!DBA::isResult($rr)){
info(L10n::t('Conversation removed.') . EOL);
goaway('/message'); goaway('/message');
}
goaway('/message/'.$rr['id'] );
} else { } else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]), intval($a->argv[2]),