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

provide admin toggle to disable delivery reports

Browse Source
This commit is contained in:
redmatrix 2016-01-07 14:27:06 -08:00
parent 3c88184177
commit bf99906386
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/hidden_configs.bb
View File

@ -60,6 +60,8 @@ This document assumes you're an administrator.
Allow the @mention tagging of anyone whether you are connected or not. Allow the @mention tagging of anyone whether you are connected or not.
[b]system > directorytags[/b] [b]system > directorytags[/b]
Set the number of keyword tags displayed on the directory page. Set the number of keyword tags displayed on the directory page.
[b]system > disable_dreport[/b]
If '1', don't store or link to delivery reports
[b]system > startpage[/b] [b]system > startpage[/b]
Set the default page to be taken to after a login for all channels at Set the default page to be taken to after a login for all channels at
this website. Can be overwritten by user settings. this website. Can be overwritten by user settings.

2
include/ItemObject.php
View File

@ -264,7 +264,7 @@ class Item extends BaseObject {
if($keep_reports === 0) if($keep_reports === 0)
$keep_reports = 30; $keep_reports = 30;
if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0) if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0)
$dreport = t('Delivery Report'); $dreport = t('Delivery Report');
if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)

2
include/notifier.php
View File

@ -578,7 +578,7 @@ function notifier_run($argv, $argc){
)); ));
// only create delivery reports for normal undeleted items // only create delivery reports for normal undeleted items
if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted'])) { if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ", q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
dbesc($target_item['mid']), dbesc($target_item['mid']),
dbesc($hub['hubloc_host']), dbesc($hub['hubloc_host']),

3
include/zot.php
View File

@ -3924,6 +3924,9 @@ function check_zotinfo($channel,$locations,&$ret) {
function delivery_report_is_storable($dr) { function delivery_report_is_storable($dr) {
if(get_config('system','disable_dreport'))
return false;
call_hooks('dreport_is_storable',$dr); call_hooks('dreport_is_storable',$dr);
// let plugins accept or reject - if neither, continue on // let plugins accept or reject - if neither, continue on