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

show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-01-15 22:19:28 +01:00
parent e578a29058
commit 2250b3c37a
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_index.php
View File

@@ -140,6 +140,8 @@ if ($page == 'overview') {
$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
$cron_last_runs = getCronjobsLastRun();
$outstanding_tasks = getOutstandingTasks();

2
customer_index.php
View File

@@ -85,6 +85,8 @@ if ($page == 'overview') {
$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
$services_enabled = "";
$se = array();
if ($userinfo['imap'] == '1') $se[] = "IMAP";

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

@@ -180,7 +180,7 @@ $header
</if>
<if $userinfo['custom_notes'] != '' && $userinfo['custom_notes_show'] == '1'>
<table class="dboarditem full" id="customnotes">
<table class="dboarditem full">
<tbody>
<tr><td>{$userinfo['custom_notes']}</td></tr>
</tbody>