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

fix dreport link

Browse Source
This commit is contained in:
zotlabs 2018-11-14 17:42:02 -08:00
parent 48717dff00
commit ab2376f8d8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Lib/ThreadItem.php
View File

@ -299,8 +299,10 @@ class ThreadItem {
if($keep_reports === 0) if($keep_reports === 0)
$keep_reports = 10; $keep_reports = 10;
if((! get_config('system','disable_dreport')) && 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');
$dreport_link = gen_link_id($item['mid']);
}
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)
$is_new = true; $is_new = true;
@ -316,7 +318,7 @@ class ThreadItem {
$owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@')); $owner_address = substr($item['owner']['xchan_addr'],0,strpos($item['owner']['xchan_addr'],'@'));
$viewthread = $item['llink']; $viewthread = $item['llink'];
if($conv->get_mode() === 'channel') if($conv->get_mode() === 'channel')
$viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode($item['mid']); $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
$list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : ''); $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : '');
@ -364,6 +366,7 @@ class ThreadItem {
'thread_action_menu' => thread_action_menu($item,$conv->get_mode()), 'thread_action_menu' => thread_action_menu($item,$conv->get_mode()),
'thread_author_menu' => thread_author_menu($item,$conv->get_mode()), 'thread_author_menu' => thread_author_menu($item,$conv->get_mode()),
'dreport' => $dreport, 'dreport' => $dreport,
'dreport_link' => $dreport_link,
'name' => $profile_name, 'name' => $profile_name,
'thumb' => $profile_avatar, 'thumb' => $profile_avatar,
'osparkle' => $osparkle, 'osparkle' => $osparkle,

2
view/tpl/conv_item.tpl
View File

@ -181,7 +181,7 @@
{{/if}} {{/if}}
{{if $item.edpost && $item.dreport}} {{if $item.edpost && $item.dreport}}
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> <a class="dropdown-item" href="dreport/{{$item.dreport_link}}">{{$item.dreport}}</a>
{{/if}} {{/if}}
{{if $item.settings}} {{if $item.settings}}
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>