cleanup template
This commit is contained in:
parent
5ca123a9c5
commit
fa6849e4b1
1 changed files with 35 additions and 27 deletions
|
@ -22,10 +22,42 @@ $mailIds = array_map(function ($mail) {
|
||||||
}, $emails);
|
}, $emails);
|
||||||
$mailIdsJoinedString = filter_var(join('|', $mailIds), FILTER_SANITIZE_SPECIAL_CHARS);
|
$mailIdsJoinedString = filter_var(join('|', $mailIds), FILTER_SANITIZE_SPECIAL_CHARS);
|
||||||
|
|
||||||
|
// define bigger renderings here to keep the php sections within the html short.
|
||||||
function niceDate($date) {
|
function niceDate($date) {
|
||||||
$m = new \Moment\Moment($date, date_default_timezone_get());
|
$m = new \Moment\Moment($date, date_default_timezone_get());
|
||||||
return $m->calendar();
|
return $m->calendar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function printMessageBody($email) {
|
||||||
|
global $config;
|
||||||
|
global $purifier;
|
||||||
|
|
||||||
|
// To avoid showing empty mails, first purify the html and plaintext
|
||||||
|
// before checking if they are empty.
|
||||||
|
$safeHtml = $purifier->purify($email->textHtml);
|
||||||
|
|
||||||
|
$safeText = htmlspecialchars($email->textPlain);
|
||||||
|
$safeText = nl2br($safeText);
|
||||||
|
$safeText = \AutoLinkExtension::auto_link_text($safeText);
|
||||||
|
|
||||||
|
$hasHtml = strlen(trim($safeHtml)) > 0;
|
||||||
|
$hasText = strlen(trim($safeText)) > 0;
|
||||||
|
|
||||||
|
if ($config['prefer_plaintext']) {
|
||||||
|
if ($hasText) {
|
||||||
|
echo $safeText;
|
||||||
|
} else {
|
||||||
|
echo $safeHtml;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ($hasHtml) {
|
||||||
|
echo $safeHtml;
|
||||||
|
} else {
|
||||||
|
echo $safeText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,7 +91,7 @@ function niceDate($date) {
|
||||||
console.log("There are", r.responseText, "new mails.");
|
console.log("There are", r.responseText, "new mails.");
|
||||||
document.getElementById("new-content-avalable").style.display = 'block';
|
document.getElementById("new-content-avalable").style.display = 'block';
|
||||||
|
|
||||||
// If there are no emails displayed, we can reload the page without looing any state.
|
// If there are no emails displayed, we can reload the page without losing any state.
|
||||||
if (mailCount === 0) {
|
if (mailCount === 0) {
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
|
@ -167,9 +199,7 @@ function niceDate($date) {
|
||||||
<div id="email-list" class="list-group">
|
<div id="email-list" class="list-group">
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
foreach ($emails
|
foreach ($emails as $email) {
|
||||||
|
|
||||||
as $email) {
|
|
||||||
$safe_email_id = filter_var($email->id, FILTER_VALIDATE_INT); ?>
|
$safe_email_id = filter_var($email->id, FILTER_VALIDATE_INT); ?>
|
||||||
|
|
||||||
<a class="list-group-item list-group-item-action email-list-item" data-toggle="collapse"
|
<a class="list-group-item list-group-item-action email-list-item" data-toggle="collapse"
|
||||||
|
@ -216,29 +246,7 @@ function niceDate($date) {
|
||||||
Delete
|
Delete
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php printMessageBody($email); ?>
|
||||||
$safeHtml = $purifier->purify($email->textHtml);
|
|
||||||
|
|
||||||
$safeText = htmlspecialchars($email->textPlain);
|
|
||||||
$safeText = nl2br($safeText);
|
|
||||||
$safeText = \AutoLinkExtension::auto_link_text($safeText);
|
|
||||||
|
|
||||||
$hasHtml = strlen(trim($safeHtml)) > 0;
|
|
||||||
$hasText = strlen(trim($safeText)) > 0;
|
|
||||||
|
|
||||||
if ($config['prefer_plaintext']) {
|
|
||||||
if ($hasText) {
|
|
||||||
echo $safeText;
|
|
||||||
} else {
|
|
||||||
echo $safeHtml;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if ($hasHtml) {
|
|
||||||
echo $safeHtml;
|
|
||||||
} else {
|
|
||||||
echo $safeText;
|
|
||||||
}
|
|
||||||
} ?>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue