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

use the php_eol constant for encoded subjects

Browse Source
This commit is contained in:
zotlabs 2019-03-16 15:23:17 -07:00
parent 8ebc517b41
commit 3c701e780c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Dreport.php
View File

@ -159,6 +159,7 @@ class Dreport extends \Zotlabs\Web\Controller {
'$title' => sprintf( t('Delivery report for %1$s'),basename($mid)) . '...', '$title' => sprintf( t('Delivery report for %1$s'),basename($mid)) . '...',
'$table' => $table, '$table' => $table,
'$mid' => urlencode($mid), '$mid' => urlencode($mid),
'$safe_mid' => urlencode(gen_link_id($mid)),
'$options' => t('Options'), '$options' => t('Options'),
'$push' => t('Redeliver'), '$push' => t('Redeliver'),
'$entries' => $entries '$entries' => $entries

2
include/network.php
View File

@ -895,7 +895,7 @@ function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') {
// define start delimimter, end delimiter and spacer // define start delimimter, end delimiter and spacer
$end = "?="; $end = "?=";
$start = "=?" . $charset . "?B?"; $start = "=?" . $charset . "?B?";
$spacer = $end . "\r\n " . $start; $spacer = $end . PHP_EOL . " " . $start;
// determine length of encoded text within chunks // determine length of encoded text within chunks
// and ensure length is even // and ensure length is even

2
view/tpl/dreport.tpl
View File

@ -6,7 +6,7 @@
<i class="fa fa-sort-desc"></i> <i class="fa fa-sort-desc"></i>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li> <li><a href="dreport/push/{{$safe_mid}}">{{$push}}</a></li>
</ul> </ul>
</div> </div>
{{/if}} {{/if}}