From 240025a183fc03439d5cebcf84163006c7c6a081 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 14 Mar 2011 08:40:00 +0100 Subject: [PATCH] - fix usage of template 'diskspace usage', fixes #656 - added missing template-variables to view, fixes #651 --- scripts/jobs/cron_usage.inc.diskspace.php | 8 ++--- .../admin/templates/templates_add_2.tpl | 27 +++++++++++++++++ .../admin/templates/templates_edit.tpl | 27 +++++++++++++++++ .../Froxlor/admin/admins/admins_admin.tpl | 19 +++++++++++- .../admin/customers/customers_customer.tpl | 4 +-- .../admin/templates/templates_add_2.tpl | 29 +++++++++++++++++++ .../admin/templates/templates_edit.tpl | 29 +++++++++++++++++++ 7 files changed, 136 insertions(+), 7 deletions(-) diff --git a/scripts/jobs/cron_usage.inc.diskspace.php b/scripts/jobs/cron_usage.inc.diskspace.php index 5c7faf3a..8157858e 100644 --- a/scripts/jobs/cron_usage.inc.diskspace.php +++ b/scripts/jobs/cron_usage.inc.diskspace.php @@ -64,14 +64,14 @@ while($row = $db->fetch_array($result)) WHERE `adminid`='" . (int)$row['adminid'] . "' AND `language`='" . $db->escape($row['def_language']) . "' AND `templategroup`='mails' - AND `varname`='webmaxpercent_subject'"); + AND `varname`='diskmaxpercent_subject'"); $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['subject']), $replace_arr)); $result2 = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$row['adminid'] . "' AND `language`='" . $db->escape($row['def_language']) . "' AND `templategroup`='mails' - AND `varname`='webmaxpercent_mailbody'"); + AND `varname`='diskmaxpercent_mailbody'"); $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['mailbody']), $replace_arr)); $_mailerror = false; @@ -143,14 +143,14 @@ while($row = $db->fetch_array($result)) WHERE `adminid`='" . (int)$row['adminid'] . "' AND `language`='" . $db->escape($row['def_language']) . "' AND `templategroup`='mails' - AND `varname`='webmaxpercent_subject'"); + AND `varname`='diskmaxpercent_subject'"); $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['subject']), $replace_arr)); $result2 = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$row['adminid'] . "' AND `language`='" . $db->escape($row['def_language']) . "' AND `templategroup`='mails' - AND `varname`='webmaxpercent_mailbody'"); + AND `varname`='diskmaxpercent_mailbody'"); $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['mailbody']), $replace_arr)); $_mailerror = false; diff --git a/templates/Classic/admin/templates/templates_add_2.tpl b/templates/Classic/admin/templates/templates_add_2.tpl index 6ba15a5a..da81b663 100644 --- a/templates/Classic/admin/templates/templates_add_2.tpl +++ b/templates/Classic/admin/templates/templates_add_2.tpl @@ -106,6 +106,33 @@ $header {TRAFFICUSED}: {$lng['admin']['templates']['TRAFFICUSED']} + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + + + {$lng['admin']['templates']['diskmaxpercent']} + + + {DISKAVAILABLE}: + {$lng['admin']['templates']['DISKAVAILABLE']} + + + {DISKUSED}: + {$lng['admin']['templates']['DISKUSED']} + + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + {$lng['admin']['templates']['ticket']} diff --git a/templates/Classic/admin/templates/templates_edit.tpl b/templates/Classic/admin/templates/templates_edit.tpl index 6dd1d4ba..d224e6bd 100644 --- a/templates/Classic/admin/templates/templates_edit.tpl +++ b/templates/Classic/admin/templates/templates_edit.tpl @@ -108,6 +108,33 @@ $header {TRAFFICUSED}: {$lng['admin']['templates']['TRAFFICUSED']} + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + + + {$lng['admin']['templates']['diskmaxpercent']} + + + {DISKAVAILABLE}: + {$lng['admin']['templates']['DISKAVAILABLE']} + + + {DISKUSED}: + {$lng['admin']['templates']['DISKUSED']} + + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + {$lng['admin']['templates']['ticket']} diff --git a/templates/Froxlor/admin/admins/admins_admin.tpl b/templates/Froxlor/admin/admins/admins_admin.tpl index 2ee12201..67759bfe 100644 --- a/templates/Froxlor/admin/admins/admins_admin.tpl +++ b/templates/Froxlor/admin/admins/admins_admin.tpl @@ -14,7 +14,24 @@ Webspace:  - + + + + + + {$percent}% + + + + 100% + + + + + Traffic:  + + + diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl index 069e55d8..a62f825c 100644 --- a/templates/Froxlor/admin/customers/customers_customer.tpl +++ b/templates/Froxlor/admin/customers/customers_customer.tpl @@ -14,7 +14,7 @@ Webspace:  - + @@ -31,7 +31,7 @@ Traffic:  - + diff --git a/templates/Froxlor/admin/templates/templates_add_2.tpl b/templates/Froxlor/admin/templates/templates_add_2.tpl index 2b7fb739..35d1ae2c 100644 --- a/templates/Froxlor/admin/templates/templates_add_2.tpl +++ b/templates/Froxlor/admin/templates/templates_add_2.tpl @@ -131,6 +131,35 @@ $header {TRAFFICUSED}: {$lng['admin']['templates']['TRAFFICUSED']} + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + + + + {$lng['admin']['templates']['diskmaxpercent']} + + + + {DISKAVAILABLE}: + {$lng['admin']['templates']['DISKAVAILABLE']} + + + {DISKUSED}: + {$lng['admin']['templates']['DISKUSED']} + + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + {$lng['admin']['templates']['ticket']} diff --git a/templates/Froxlor/admin/templates/templates_edit.tpl b/templates/Froxlor/admin/templates/templates_edit.tpl index 89775052..6d5d61ce 100644 --- a/templates/Froxlor/admin/templates/templates_edit.tpl +++ b/templates/Froxlor/admin/templates/templates_edit.tpl @@ -132,6 +132,35 @@ $header {TRAFFICUSED}: {$lng['admin']['templates']['TRAFFICUSED']} + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + + + + {$lng['admin']['templates']['diskmaxpercent']} + + + + {DISKAVAILABLE}: + {$lng['admin']['templates']['DISKAVAILABLE']} + + + {DISKUSED}: + {$lng['admin']['templates']['DISKUSED']} + + + {MAX_PERCENT}: + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT}: + {$lng['admin']['templates']['USAGE_PERCENT']} + {$lng['admin']['templates']['ticket']}