harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

private mail: bring additional inbox/outbox views and ajaxify single message drop

Browse Source
This commit is contained in:
Mario Vavti
2015-09-28 17:40:38 +02:00
parent ed876a9c52
commit b97102da01
7 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mod/mail.php
View File

@@ -128,35 +128,47 @@ function mail_content(&$a) {
'$header' => t('Messages'),
));
if((argc() == 3) && (argv(1) === 'drop')) {
if(! intval(argv(2)))
if((argc() == 4) && (argv(2) === 'drop')) {
if(! intval(argv(3)))
return;
$cmd = argv(1);
$r = private_messages_drop(local_channel(), argv(2));
$cmd = argv(2);
$mailbox = argv(1);
$r = private_messages_drop(local_channel(), argv(3));
if($r) {
info( t('Message deleted.') . EOL );
//info( t('Message deleted.') . EOL );
}
goaway($a->get_baseurl(true) . '/mail/combined' );
goaway($a->get_baseurl(true) . '/mail/' . $mailbox);
}
if((argc() == 3) && (argv(1) === 'recall')) {
if(! intval(argv(2)))
if((argc() == 4) && (argv(2) === 'recall')) {
if(! intval(argv(3)))
return;
$cmd = argv(1);
$cmd = argv(2);
$mailbox = argv(1);
$r = q("update mail set mail_recalled = 1 where id = %d and channel_id = %d",
intval(argv(2)),
intval(argv(3)),
intval(local_channel())
);
proc_run('php','include/notifier.php','mail',intval(argv(2)));
proc_run('php','include/notifier.php','mail',intval(argv(3)));
if($r) {
info( t('Message recalled.') . EOL );
}
goaway($a->get_baseurl(true) . '/mail/combined' );
goaway($a->get_baseurl(true) . '/mail/' . $mailbox . '/' . argv(3));
}
if((argc() == 4) && (argv(2) === 'dropconv')) {
if(! intval(argv(3)))
return;
$cmd = argv(2);
$mailbox = argv(1);
$r = private_messages_drop(local_channel(), argv(3), true);
if($r)
info( t('Conversation removed.') . EOL );
goaway($a->get_baseurl(true) . '/mail/' . $mailbox);
}
if((argc() > 1) && (argv(1) === 'new')) {
$plaintext = true;
@@ -266,7 +278,7 @@ function mail_content(&$a) {
$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
$mid = ((argc() > 1) && (intval(argv(1)))) ? argv(1) : $last_message[0]['id'];
$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
$plaintext = true;
@@ -310,6 +322,7 @@ function mail_content(&$a) {
$s = theme_attachments($message);
$mails[] = array(
'mailbox' => $mailbox,
'id' => $message['id'],
'from_name' => $message['from']['xchan_name'],
'from_url' => chanlink_hash($message['from_xchan']),
@@ -338,7 +351,8 @@ function mail_content(&$a) {
$parent = '<input type="hidden" name="replyto" value="' . $message['parent_mid'] . '" />';
$tpl = get_markup_template('mail_display.tpl');
$o = replace_macros($tpl, array(
'$prvmsg_header' => t('Subject:') . ' ' . $message['title'],
'$mailbox' => $mailbox,
'$prvmsg_header' => $message['title'],
'$thread_id' => $mid,
'$thread_subject' => $message['title'],
'$thread_seen' => $seen,