maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fixing display of mailquota in dashboard, fixes #1369

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-01-28 21:13:18 +01:00
parent 9dd63fd1e1
commit b050e3dcd4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/formfields/customer/email/formfield.emails_accountchangequota.php
View File

@@ -30,7 +30,7 @@ return array(
'value' => $result['email_full'] 'value' => $result['email_full']
), ),
'email_quota' => array( 'email_quota' => array(
'label' => $lng['emails']['quota'].' ('.$lng['panel']['megabyte'].')', 'label' => $lng['emails']['quota'].' (MiB)',
'type' => 'text', 'type' => 'text',
'value' => $result['quota'] 'value' => $result['quota']
) )

2
lib/formfields/customer/email/formfield.emails_addaccount.php
View File

@@ -42,7 +42,7 @@ return array(
'email_quota' => array( 'email_quota' => array(
'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false), 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'label' => $lng['emails']['quota'], 'label' => $lng['emails']['quota'],
'desc' => $lng['panel']['megabyte'], 'desc' => "MiB",
'type' => 'text', 'type' => 'text',
'value' => $quota 'value' => $quota
), ),

2
lib/formfields/customer/email/formfield.emails_edit.php
View File

@@ -46,7 +46,7 @@ return array(
'visible' => ($result['popaccountid'] != 0 && Settings::Get('system.mail_quota_enabled')), 'visible' => ($result['popaccountid'] != 0 && Settings::Get('system.mail_quota_enabled')),
'label' => $lng['customer']['email_quota'], 'label' => $lng['customer']['email_quota'],
'type' => 'label', 'type' => 'label',
'value' => $result['quota'].' '.$lng['panel']['megabyte'].' [<a href="'.$filename.'?page=accounts&amp;action=changequota&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['quota_edit'].'</a>]' 'value' => $result['quota'].' MiB [<a href="'.$filename.'?page=accounts&amp;action=changequota&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['quota_edit'].'</a>]'
), ),
'mail_catchall' => array( 'mail_catchall' => array(
'label' => $lng['emails']['catchall'], 'label' => $lng['emails']['catchall'],

2
templates/Sparkle/customer/index/index.tpl vendored
View File

@@ -93,7 +93,7 @@ $header
<if Settings::Get('system.mail_quota_enabled') == 1 && $userinfo['email_quota'] != '0'> <if Settings::Get('system.mail_quota_enabled') == 1 && $userinfo['email_quota'] != '0'>
<div class="canvasbox"> <div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}"> <input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br /> <canvas id="email_quota-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['email_quota']}<br /> {$lng['customer']['email_quota']}<br />
<small> <small>
{$userinfo['email_quota_used']} {$lng['panel']['used']}<br /> {$userinfo['email_quota_used']} {$lng['panel']['used']}<br />