Skip to content

Commit a11a310

Browse files
author
Marius Burkard
committed
- fixed idn encoded domains on dashlets
1 parent 43992c0 commit a11a310

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

interface/web/dashboard/dashlets/mailquota.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ function show() {
2121

2222
$has_mailquota = false;
2323
if(is_array($emails) && !empty($emails)){
24+
foreach($emails as &$email) {
25+
$email['email'] = $app->functions->idn_decode($email['email']);
26+
}
27+
unset($email);
2428
// email username is quoted in quota.lib already, so no htmlentities here to prevent double encoding
2529
//$emails = $app->functions->htmlentities($emails);
2630
$tpl->setloop('mailquota', $emails);
2731
$has_mailquota = isset($emails[0]['used']);
2832
}
2933
$tpl->setVar('has_mailquota', $has_mailquota);
30-
34+
3135
return $tpl->grab();
3236
}
3337

interface/web/dashboard/dashlets/quota.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ function show() {
77

88
//* Loading Template
99
$app->uses('tpl,quota_lib');
10-
if (!$app->auth->verify_module_permissions('sites')) {
11-
return;
12-
}
10+
if (!$app->auth->verify_module_permissions('sites')) {
11+
return;
12+
}
1313

1414
$tpl = new tpl;
1515
$tpl->newTemplate("dashlets/templates/quota.htm");
@@ -24,6 +24,11 @@ function show() {
2424

2525
$has_quota = false;
2626
if(is_array($sites) && !empty($sites)){
27+
foreach($sites as &$site) {
28+
$site['domain'] = $app->functions->idn_decode($site['domain']);
29+
}
30+
unset($site);
31+
2732
$sites = $app->functions->htmlentities($sites);
2833
$tpl->setloop('quota', $sites);
2934
$has_quota = isset($sites[0]['used']);

0 commit comments

Comments
 (0)