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

extend delivery reports to mail

Browse Source
This commit is contained in:
friendica 2013-05-16 20:43:24 -07:00
parent c1c2ba7b4e
commit 75461355ff
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/zot.php
View File

@ -1137,18 +1137,24 @@ function delete_imported_item($sender,$item,$uid) {
function process_mail_delivery($sender,$arr,$deliveries) { function process_mail_delivery($sender,$arr,$deliveries) {
$result = array();
foreach($deliveries as $d) { foreach($deliveries as $d) {
$r = q("select * from channel where channel_hash = '%s' limit 1", $r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash']) dbesc($d['hash'])
); );
if(! $r) if(! $r) {
$result[] = array($d['hash'],'not found');
continue; continue;
}
$channel = $r[0]; $channel = $r[0];
if(! perm_is_allowed($channel['channel_id'],$sender['hash'],'post_mail')) { if(! perm_is_allowed($channel['channel_id'],$sender['hash'],'post_mail')) {
logger("permission denied for mail delivery {$channel['channel_id']}"); logger("permission denied for mail delivery {$channel['channel_id']}");
$result[] = array($d['hash'],'permission denied');
continue; continue;
} }
@ -1162,9 +1168,11 @@ function process_mail_delivery($sender,$arr,$deliveries) {
intval($r[0]['id']), intval($r[0]['id']),
intval($channel['channel_id']) intval($channel['channel_id'])
); );
$result[] = array($d['hash'],'mail recalled');
logger('mail_recalled'); logger('mail_recalled');
} }
else { else {
$result[] = array($d['hash'],'duplicate mail received');
logger('duplicate mail received'); logger('duplicate mail received');
} }
continue; continue;
@ -1173,9 +1181,11 @@ function process_mail_delivery($sender,$arr,$deliveries) {
$arr['account_id'] = $channel['channel_account_id']; $arr['account_id'] = $channel['channel_account_id'];
$arr['channel_id'] = $channel['channel_id']; $arr['channel_id'] = $channel['channel_id'];
$item_id = mail_store($arr); $item_id = mail_store($arr);
$result[] = array($d['hash'],'mail delivered');
} }
} }
return $result;
} }
function process_profile_delivery($sender,$arr,$deliveries) { function process_profile_delivery($sender,$arr,$deliveries) {