diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-09 18:47:52 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-09 18:47:52 +0100 |
| commit | 41057ac3642ea8c7126cc980be5d896b8b6ff7c3 (patch) | |
| tree | 4ab491a65da69c4deb81693f899b9550f5bee010 /include | |
| parent | bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (diff) | |
| parent | 1c982315dd2d1886432eaece7c7ccb8d385640ae (diff) | |
| download | volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.gz volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.bz2 volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 8be99d91e..1b7b2ce78 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -264,7 +264,7 @@ class Item extends BaseObject { if($keep_reports === 0) $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'); if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) diff --git a/include/notifier.php b/include/notifier.php index 32d702cb5..5260e629f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -578,7 +578,7 @@ function notifier_run($argv, $argc){ )); // 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' ) ", dbesc($target_item['mid']), dbesc($hub['hubloc_host']), diff --git a/include/zot.php b/include/zot.php index a644bbd06..beaa54126 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3924,6 +3924,9 @@ function check_zotinfo($channel,$locations,&$ret) { function delivery_report_is_storable($dr) { + if(get_config('system','disable_dreport')) + return false; + call_hooks('dreport_is_storable',$dr); // let plugins accept or reject - if neither, continue on |